From f57c8126cf4c1db4f30f923b5b26ccf68f7b0c40 Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:18:21 -0400 Subject: [PATCH 01/14] Bootstrap gulp tasks --- gulp/index.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 gulp/index.js diff --git a/gulp/index.js b/gulp/index.js new file mode 100644 index 000000000..5c6986be9 --- /dev/null +++ b/gulp/index.js @@ -0,0 +1,7 @@ +var fs = require('fs'), + tasks = fs.readdirSync('./gulp/tasks'), + gulp = require('gulp'); + +tasks.forEach(function(task) { + require('./tasks/' + task); +}); From 8e4cba91578cc9a78a12f56c036d1c167884819c Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:18:44 -0400 Subject: [PATCH 02/14] Move bootstrap task into gulp/tasks --- gulp/tasks/bootstrap.js | 29 +++++++++++++++++++++++++++++ gulpfile.js | 24 +----------------------- 2 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 gulp/tasks/bootstrap.js diff --git a/gulp/tasks/bootstrap.js b/gulp/tasks/bootstrap.js new file mode 100644 index 000000000..9366b4ff1 --- /dev/null +++ b/gulp/tasks/bootstrap.js @@ -0,0 +1,29 @@ +var gulp = require('gulp'), + streamqueue = require('streamqueue'), + minifyHtml = require('gulp-minify-html'), + templateCache = require('gulp-angular-templatecache'), + concat = require('gulp-concat'), + uglify = require('gulp-uglify'); + +gulp.task('bootstrap', function() { + var stream = streamqueue({objectMode: true}); + stream.queue( + gulp.src('./src/directives/decorators/bootstrap/*.html') + .pipe(minifyHtml({ + empty: true, + spare: true, + quotes: true + })) + .pipe(templateCache({ + module: 'schemaForm', + root: 'directives/decorators/bootstrap/' + })) + ); + stream.queue(gulp.src('./src/directives/decorators/bootstrap/*.js')); + + stream.done() + .pipe(concat('bootstrap-decorator.min.js')) + .pipe(uglify()) + .pipe(gulp.dest('./dist/')); + +}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 4c58da9e5..53cd1a28b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -10,29 +10,7 @@ var streamqueue = require('streamqueue'); var jscs = require('gulp-jscs'); - -gulp.task('bootstrap', function() { - var stream = streamqueue({objectMode: true}); - stream.queue( - gulp.src('./src/directives/decorators/bootstrap/*.html') - .pipe(minifyHtml({ - empty: true, - spare: true, - quotes: true - })) - .pipe(templateCache({ - module: 'schemaForm', - root: 'directives/decorators/bootstrap/' - })) - ); - stream.queue(gulp.src('./src/directives/decorators/bootstrap/*.js')); - - stream.done() - .pipe(concat('bootstrap-decorator.min.js')) - .pipe(uglify()) - .pipe(gulp.dest('./dist/')); - -}); +require('./gulp'); gulp.task('bootstrap-datepicker', function() { var stream = streamqueue({objectMode: true}); From b9780d656924987c298142270f565b732c50270c Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:21:49 -0400 Subject: [PATCH 03/14] Move bootstrap-datepicker into gulp/tasks --- gulp/tasks/bootstrap-datepicker.js | 29 +++++++++++++++++++++++++++++ gulpfile.js | 23 ----------------------- 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 gulp/tasks/bootstrap-datepicker.js diff --git a/gulp/tasks/bootstrap-datepicker.js b/gulp/tasks/bootstrap-datepicker.js new file mode 100644 index 000000000..8c2201426 --- /dev/null +++ b/gulp/tasks/bootstrap-datepicker.js @@ -0,0 +1,29 @@ +var gulp = require('gulp'), + streamqueue = require('streamqueue'), + minifyHtml = require('gulp-minify-html'), + templateCache = require('gulp-angular-templatecache'), + concat = require('gulp-concat'), + uglify = require('gulp-uglify'); + +gulp.task('bootstrap-datepicker', function() { + var stream = streamqueue({objectMode: true}); + stream.queue( + gulp.src('./src/directives/decorators/bootstrap/datepicker/*.html') + .pipe(minifyHtml({ + empty: true, + spare: true, + quotes: true + })) + .pipe(templateCache({ + module: 'schemaForm', + root: 'directives/decorators/bootstrap/datepicker/' + })) + ); + stream.queue(gulp.src('./src/directives/decorators/bootstrap/datepicker/*.js')); + + stream.done() + .pipe(concat('bootstrap-datepicker.min.js')) + .pipe(uglify()) + .pipe(gulp.dest('./dist/')); + +}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 53cd1a28b..6d73a8a1d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,29 +12,6 @@ var jscs = require('gulp-jscs'); require('./gulp'); -gulp.task('bootstrap-datepicker', function() { - var stream = streamqueue({objectMode: true}); - stream.queue( - gulp.src('./src/directives/decorators/bootstrap/datepicker/*.html') - .pipe(minifyHtml({ - empty: true, - spare: true, - quotes: true - })) - .pipe(templateCache({ - module: 'schemaForm', - root: 'directives/decorators/bootstrap/datepicker/' - })) - ); - stream.queue(gulp.src('./src/directives/decorators/bootstrap/datepicker/*.js')); - - stream.done() - .pipe(concat('bootstrap-datepicker.min.js')) - .pipe(uglify()) - .pipe(gulp.dest('./dist/')); - -}); - gulp.task('minify', function() { gulp.src([ './src/module.js', From e936ef7d03b303a27df4be120b1207d4072ef834 Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:24:07 -0400 Subject: [PATCH 04/14] Move minify task into gulp/tasks --- gulp/tasks/minify.js | 15 +++++++++++++++ gulpfile.js | 12 ------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 gulp/tasks/minify.js diff --git a/gulp/tasks/minify.js b/gulp/tasks/minify.js new file mode 100644 index 000000000..73f86cb1e --- /dev/null +++ b/gulp/tasks/minify.js @@ -0,0 +1,15 @@ +var gulp = require('gulp'), + concat = require('gulp-concat'), + uglify = require('gulp-uglify'); + +gulp.task('minify', function() { + gulp.src([ + './src/module.js', + './src/sfPath.js', + './src/services/*.js', + './src/directives/*.js' + ]) + .pipe(concat('schema-form.min.js')) + .pipe(uglify()) + .pipe(gulp.dest('./dist/')); +}); diff --git a/gulpfile.js b/gulpfile.js index 6d73a8a1d..9a7ce7d42 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,18 +12,6 @@ var jscs = require('gulp-jscs'); require('./gulp'); -gulp.task('minify', function() { - gulp.src([ - './src/module.js', - './src/sfPath.js', - './src/services/*.js', - './src/directives/*.js' - ]) - .pipe(concat('schema-form.min.js')) - .pipe(uglify()) - .pipe(gulp.dest('./dist/')); -}); - gulp.task('non-minified-dist', function() { gulp.src([ './src/module.js', From 2090d4f4f1c41646326909483da0c45a7b817622 Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:25:52 -0400 Subject: [PATCH 05/14] Move non-minified-dist task into gulp/tasks --- gulp/tasks/non-minified-dist.js | 13 +++++++++++++ gulpfile.js | 11 ----------- 2 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 gulp/tasks/non-minified-dist.js diff --git a/gulp/tasks/non-minified-dist.js b/gulp/tasks/non-minified-dist.js new file mode 100644 index 000000000..521f4c5ee --- /dev/null +++ b/gulp/tasks/non-minified-dist.js @@ -0,0 +1,13 @@ +var gulp = require('gulp'), + concat = require('gulp-concat'); + +gulp.task('non-minified-dist', function() { + gulp.src([ + './src/module.js', + './src/sfPath.js', + './src/services/*.js', + './src/directives/*.js' + ]) + .pipe(concat('schema-form.js')) + .pipe(gulp.dest('./dist/')); +}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 9a7ce7d42..464b498f6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,17 +12,6 @@ var jscs = require('gulp-jscs'); require('./gulp'); -gulp.task('non-minified-dist', function() { - gulp.src([ - './src/module.js', - './src/sfPath.js', - './src/services/*.js', - './src/directives/*.js' - ]) - .pipe(concat('schema-form.js')) - .pipe(gulp.dest('./dist/')); -}); - gulp.task('jscs', function() { gulp.src('./src/**/*.js') .pipe(jscs()); From f2fd8b8ceaa00c2d273768dd74a232276082256c Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:29:19 -0400 Subject: [PATCH 06/14] Move jscs task into gulp/tasks --- gulp/tasks/jscs.js | 7 +++++++ gulpfile.js | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 gulp/tasks/jscs.js diff --git a/gulp/tasks/jscs.js b/gulp/tasks/jscs.js new file mode 100644 index 000000000..8d1bfef9a --- /dev/null +++ b/gulp/tasks/jscs.js @@ -0,0 +1,7 @@ +var gulp = require('gulp'), + jscs = require('gulp-jscs'); + +gulp.task('jscs', function() { + gulp.src('./src/**/*.js') + .pipe(jscs()); +}); diff --git a/gulpfile.js b/gulpfile.js index 464b498f6..a6c21d3a5 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,11 +12,6 @@ var jscs = require('gulp-jscs'); require('./gulp'); -gulp.task('jscs', function() { - gulp.src('./src/**/*.js') - .pipe(jscs()); -}); - gulp.task('default', [ 'minify', 'bootstrap', From 6e90ab64cc0f2cc4922baf7e4c9c2d79711b88df Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:29:30 -0400 Subject: [PATCH 07/14] Lint code --- src/services/Select.js | 2 +- src/sfPath.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/Select.js b/src/services/Select.js index fdb68310c..b3511125c 100644 --- a/src/services/Select.js +++ b/src/services/Select.js @@ -4,7 +4,7 @@ * @kind function * */ -angular.module('schemaForm').factory('sfSelect', ['sfPath', function (sfPath) { +angular.module('schemaForm').factory('sfSelect', ['sfPath', function(sfPath) { var numRe = /^\d+$/; /** diff --git a/src/sfPath.js b/src/sfPath.js index 507c73b39..11b69f1b6 100644 --- a/src/sfPath.js +++ b/src/sfPath.js @@ -20,7 +20,7 @@ angular.module('schemaForm').provider('sfPath', this.parse = ObjectPath.parse; this.stringify = ObjectPath.stringify; this.normalize = ObjectPath.normalize; - this.$get = function () { + this.$get = function() { return ObjectPath; }; }]); From fdbe2e749fa2908649099c67f34d1ab1075544ec Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:31:25 -0400 Subject: [PATCH 08/14] Move default task into gulp/tasks --- gulp/tasks/default.js | 8 ++++++++ gulpfile.js | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 gulp/tasks/default.js diff --git a/gulp/tasks/default.js b/gulp/tasks/default.js new file mode 100644 index 000000000..f50183f47 --- /dev/null +++ b/gulp/tasks/default.js @@ -0,0 +1,8 @@ +var gulp = require('gulp'); + +gulp.task('default', [ + 'minify', + 'bootstrap', + 'bootstrap-datepicker', + 'non-minified-dist' +]); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index a6c21d3a5..573f7ed37 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,13 +12,6 @@ var jscs = require('gulp-jscs'); require('./gulp'); -gulp.task('default', [ - 'minify', - 'bootstrap', - 'bootstrap-datepicker', - 'non-minified-dist' -]); - gulp.task('watch', function() { gulp.watch('./src/**/*', ['default']); }); From d086a8691c51a86ce3eaa4a7c717edb70c143998 Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:31:34 -0400 Subject: [PATCH 09/14] Build JS --- dist/schema-form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/schema-form.js b/dist/schema-form.js index 492835885..0e055bb95 100644 --- a/dist/schema-form.js +++ b/dist/schema-form.js @@ -44,7 +44,7 @@ angular.module('schemaForm').provider('sfPath', this.parse = ObjectPath.parse; this.stringify = ObjectPath.stringify; this.normalize = ObjectPath.normalize; - this.$get = function () { + this.$get = function() { return ObjectPath; }; }]); @@ -55,7 +55,7 @@ angular.module('schemaForm').provider('sfPath', * @kind function * */ -angular.module('schemaForm').factory('sfSelect', ['sfPath', function (sfPath) { +angular.module('schemaForm').factory('sfSelect', ['sfPath', function(sfPath) { var numRe = /^\d+$/; /** From 948c2f3578fa22370432765c2c99e91ac601ca29 Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:32:26 -0400 Subject: [PATCH 10/14] Move watch task into gulp/tasks --- gulp/tasks/watch.js | 5 +++++ gulpfile.js | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 gulp/tasks/watch.js diff --git a/gulp/tasks/watch.js b/gulp/tasks/watch.js new file mode 100644 index 000000000..6fdd634f1 --- /dev/null +++ b/gulp/tasks/watch.js @@ -0,0 +1,5 @@ +var gulp = require('gulp'); + +gulp.task('watch', function() { + gulp.watch('./src/**/*', ['default']); +}); diff --git a/gulpfile.js b/gulpfile.js index 573f7ed37..7f9976ba3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -10,8 +10,4 @@ var streamqueue = require('streamqueue'); var jscs = require('gulp-jscs'); -require('./gulp'); - -gulp.task('watch', function() { - gulp.watch('./src/**/*', ['default']); -}); +require('./gulp'); \ No newline at end of file From df9518c089cc9595fc96815cd51f24e31c0cac23 Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:33:44 -0400 Subject: [PATCH 11/14] Remove unnecessary dependencies --- gulpfile.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7f9976ba3..e3babcbd0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,13 +1,4 @@ -/* global require */ - -var gulp = require('gulp'); - -var templateCache = require('gulp-angular-templatecache'); -var minifyHtml = require('gulp-minify-html'); -var concat = require('gulp-concat'); -var uglify = require('gulp-uglify'); -var streamqueue = require('streamqueue'); -var jscs = require('gulp-jscs'); - +//all of the tasks themselves are contained in the gulp/tasks directory, +//which is accessed through gulp/index.js require('./gulp'); \ No newline at end of file From a7c02c90cb9d99276b93f2cbd4e6b232c9bb7cf4 Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:36:22 -0400 Subject: [PATCH 12/14] Fix indentation on bootstrap-datepicker --- gulp/tasks/bootstrap-datepicker.js | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gulp/tasks/bootstrap-datepicker.js b/gulp/tasks/bootstrap-datepicker.js index 8c2201426..546025b1a 100644 --- a/gulp/tasks/bootstrap-datepicker.js +++ b/gulp/tasks/bootstrap-datepicker.js @@ -1,29 +1,29 @@ var gulp = require('gulp'), - streamqueue = require('streamqueue'), - minifyHtml = require('gulp-minify-html'), - templateCache = require('gulp-angular-templatecache'), - concat = require('gulp-concat'), - uglify = require('gulp-uglify'); +streamqueue = require('streamqueue'), +minifyHtml = require('gulp-minify-html'), +templateCache = require('gulp-angular-templatecache'), +concat = require('gulp-concat'), +uglify = require('gulp-uglify'); gulp.task('bootstrap-datepicker', function() { var stream = streamqueue({objectMode: true}); stream.queue( - gulp.src('./src/directives/decorators/bootstrap/datepicker/*.html') - .pipe(minifyHtml({ - empty: true, - spare: true, - quotes: true - })) - .pipe(templateCache({ - module: 'schemaForm', - root: 'directives/decorators/bootstrap/datepicker/' - })) + gulp.src('./src/directives/decorators/bootstrap/datepicker/*.html') + .pipe(minifyHtml({ + empty: true, + spare: true, + quotes: true + })) + .pipe(templateCache({ + module: 'schemaForm', + root: 'directives/decorators/bootstrap/datepicker/' + })) ); stream.queue(gulp.src('./src/directives/decorators/bootstrap/datepicker/*.js')); stream.done() - .pipe(concat('bootstrap-datepicker.min.js')) - .pipe(uglify()) - .pipe(gulp.dest('./dist/')); + .pipe(concat('bootstrap-datepicker.min.js')) + .pipe(uglify()) + .pipe(gulp.dest('./dist/')); }); \ No newline at end of file From fcf4ca44c9f6c495c95743d768323373b0b1845b Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:37:21 -0400 Subject: [PATCH 13/14] Fix indentation in entry file --- gulp/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gulp/index.js b/gulp/index.js index 5c6986be9..e805ff031 100644 --- a/gulp/index.js +++ b/gulp/index.js @@ -1,7 +1,7 @@ var fs = require('fs'), - tasks = fs.readdirSync('./gulp/tasks'), - gulp = require('gulp'); + tasks = fs.readdirSync('./gulp/tasks'), + gulp = require('gulp'); tasks.forEach(function(task) { - require('./tasks/' + task); + require('./tasks/' + task); }); From e76da7a4476dd8432cd1b86d66946a2abbb015e8 Mon Sep 17 00:00:00 2001 From: Cameron Edwards Date: Tue, 9 Sep 2014 13:44:53 -0400 Subject: [PATCH 14/14] Fix indentation on deps in bootstrap-datepicker --- gulp/tasks/bootstrap-datepicker.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gulp/tasks/bootstrap-datepicker.js b/gulp/tasks/bootstrap-datepicker.js index 546025b1a..c3b066e83 100644 --- a/gulp/tasks/bootstrap-datepicker.js +++ b/gulp/tasks/bootstrap-datepicker.js @@ -1,9 +1,9 @@ var gulp = require('gulp'), -streamqueue = require('streamqueue'), -minifyHtml = require('gulp-minify-html'), -templateCache = require('gulp-angular-templatecache'), -concat = require('gulp-concat'), -uglify = require('gulp-uglify'); + streamqueue = require('streamqueue'), + minifyHtml = require('gulp-minify-html'), + templateCache = require('gulp-angular-templatecache'), + concat = require('gulp-concat'), + uglify = require('gulp-uglify'); gulp.task('bootstrap-datepicker', function() { var stream = streamqueue({objectMode: true});