Skip to content

Commit

Permalink
Subject: replace grunt with gulp
Browse files Browse the repository at this point in the history
What Happened:
- replace grunt with gulp
- add gulp and boilerplate-gulp to dev dependencies
- add gulp configuration file
- update jshint configuration file
- rename demo folder to example
  • Loading branch information
ziscloud committed Sep 25, 2014
1 parent aa7d554 commit 84c4b2f
Show file tree
Hide file tree
Showing 12 changed files with 56 additions and 177 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ lib-cov
# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Generated reports (testing, coverage, complexity)
reports

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
Expand Down
32 changes: 14 additions & 18 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
{
"globals": {
/* Jasmine >> */
"jasmine": true,
"describe": true,
"it": true,
"expect": true,
"beforeEach": true,
"afterEach": true,
/* ngMock >> */
"module": true,
"inject": true,
"$controller": true,
"$compile": true,
/* << ngMock */
/* << Jasmine */
"angular": true
},
"predef": [
"jasmine",
"describe",
"it",
"expect",
"beforeEach",
"afterEach",
"module",
"inject",
"$controller",
"$compile",
"angular"
],
"regexdash": true,
"browser": true,
"sub": true,
Expand Down Expand Up @@ -55,4 +51,4 @@
"white": false,
"laxbreak": true,
"validthis": true
}
}
1 change: 0 additions & 1 deletion dist/angular-footable.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/angular-footable.min.js

This file was deleted.

File renamed without changes.
File renamed without changes.
112 changes: 0 additions & 112 deletions gruntfile.js

This file was deleted.

6 changes: 6 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
var gulp = require('gulp'),
boilerplate = require('boilerplate-gulp');
boilerplate(gulp, {
pkg: require('./package.json'),
jsMain: './src/angular-footable.js'
});
71 changes: 29 additions & 42 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,31 @@
{
"name": "angular-footable",
"version": "0.0.1",
"description": "Angular library/reusable module seed",
"main": "gruntfile.js",
"directories": {
"test": "test"
},
"scripts": {
"test": "grunt test"
},
"repository": {
"type": "git",
"url": "https://github.com/ziscloud/angular-footable.git"
},
"keywords": [
"angular",
"library",
"seed"
],
"author": "Eryk Napierała",
"license": "MIT",
"bugs": {
"url": "https://github.com/ziscloud/angular-footable/issues"
},
"homepage": "https://github.com/ziscloud/angular-footable",
"devDependencies": {
"grunt": "~0.4",
"grunt-contrib-clean": "~0.5",
"grunt-contrib-concat": "~0.4",
"grunt-contrib-jshint": "~0.10",
"grunt-contrib-uglify": "~0.5",
"grunt-contrib-watch": "~0.6",
"grunt-http-server": "0.0.5",
"grunt-karma": "~0.8",
"grunt-ng-annotate": "^0.2.2",
"karma": "~0.12",
"karma-jasmine": "~0.2",
"karma-phantomjs-launcher": "~0.1",
"load-grunt-tasks": "~0.5",
"ng-annotate": "^0.9.6",
"phantomjs": "~1.9"
}
"name": "angular-footable",
"version": "0.0.1",
"description": "Angular derictive for FooTable",
"main": "gruntfile.js",
"directories": {
"test": "test"
},
"scripts": {
"test": "gulp test"
},
"repository": {
"type": "git",
"url": "https://github.com/ziscloud/angular-footable.git"
},
"keywords": [
"angular",
"library",
"seed"
],
"author": "Tony Wang",
"license": "MIT",
"bugs": {
"url": "https://github.com/ziscloud/angular-footable/issues"
},
"homepage": "https://github.com/ziscloud/angular-footable",
"devDependencies": {
"gulp": "~3.8.0",
"boilerplate-gulp": "~0.2.0"
}
}
2 changes: 2 additions & 0 deletions src/angular-footable.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

angular
.module('angular-footable', [ ])
.factory('example', function($rootScope) {
Expand Down
2 changes: 2 additions & 0 deletions src/angular-footable.spec.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

describe('example service - module test', function() {

beforeEach(angular.mock.module('angular-footable'));
Expand Down
2 changes: 1 addition & 1 deletion test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = function (config) {
'bower_components/jquery/dist/jquery.js',
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'dist/angular-footable.js',
'src/angular-footable.js',
'src/**/*.spec.js',
'test/main.js'
],
Expand Down

0 comments on commit 84c4b2f

Please sign in to comment.