add support for multiple configurations, uglify by default and fix watchers

Author: maxklenk

index.js

@@ -16,7 +16,7 @@ module.exports = function(gulp, tasks, config) {
   }
 
   if (tasks.indexOf('configScripts') !== -1) {
-    require('./tasks/configScripts')(gulp, config.app.config, config.configName, config.dist.js);
+    require('./tasks/configScripts')(gulp, config.env.constants, config.configName, config.dist.js);
   }
 
   if (tasks.indexOf('connect') !== -1) {
@@ -76,7 +76,7 @@ module.exports = function(gulp, tasks, config) {
   }
 
   if (tasks.indexOf('sass') !== -1) {
-    require('./tasks/sass')(gulp, config.app.scss, config.dist.css, config.production, config.sourceMapsPath);
+    require('./tasks/sass')(gulp, config.app.scss, config.dist.css, config.sourceMapsPath);
   }
 
   if (tasks.indexOf('scripts') !== -1) {
@@ -92,7 +92,7 @@ module.exports = function(gulp, tasks, config) {
   }
 
   if (tasks.indexOf('vendorScripts') !== -1) {
-    require('./tasks/vendorScripts')(gulp, config.dist.js, config.sourcemapPath, config.production, config.debug);
+    require('./tasks/vendorScripts')(gulp, config.dist.js, config.sourcemapPath, config.debug);
   }
 
   if (tasks.indexOf('vendorStyles') !== -1) {

tasks/configScripts.js

@@ -1,14 +1,18 @@
 'use strict';
 
-var ngConstant = require('gulp-ng-constant');
+var ngConstant = require('gulp-ng-constant'),
+  //gulpif = require('gulp-if'),
+  //rev = require('gulp-rev'),
+  uglify = require('gulp-uglify');
 
-
-module.exports = function(gulp, config, name, dest) {
+module.exports = function(gulp, constants, name, dest) {
   gulp.task('configScripts', function() {
-    gulp.src(config)
-      .pipe(ngConstant({
+    ngConstant({
+        constants: constants,
         name: name
-      }))
+      })
+      .pipe(uglify())
+      //.pipe(gulpif(config.env.rev, rev()))
       .pipe(gulp.dest(dest));
   });
 };

tasks/sass.js

@@ -6,10 +6,10 @@ var sass = require('gulp-sass'),
   //revReplace = require('gulp-rev-replace'),
 
 
-module.exports = function(gulp, src, dest, uglifyFlag, sourceMapsPath) {
+module.exports = function(gulp, src, dest, sourceMapsPath) {
   gulp.task('styles', [], function (done) {
     var options = {
-      outputStyle: uglifyFlag ? 'compressed' : 'nested'
+      outputStyle: 'compressed'
     };
 
     //var revOptions = {

tasks/vendorScripts.js

@@ -15,14 +15,14 @@ var jsFilter = {
   filter: /\.js$/i
 };
 
-module.exports = function(gulp, dest, sourceMapPath, production, debugFlag) {
+module.exports = function(gulp, dest, sourceMapPath, debugFlag) {
   gulp.task('vendorScripts', ['bower:install', 'bower:prune'], function(done) {
     gulp.src(bowerFiles(jsFilter))
       .pipe(gulpif(debugFlag, debug()))
       .pipe(sourceMaps.init())
       .pipe(gulpif(isFirstRun, newer(dest + vendorFile)))
       .pipe(concat(vendorFile))
-      .pipe(gulpif(production, uglify()))
+      .pipe(uglify())
       .pipe(sourceMaps.write(sourceMapPath))
       .pipe(gulp.dest(dest));
 

tasks/watch.js

@@ -9,10 +9,9 @@ module.exports = function(gulp, config) {
     gulp.watch(config.app.views, ['partials']);
     gulp.watch(config.app.statics, ['statics']);
     gulp.watch(config.app.images, ['images']);
-    gulp.watch(config.app.scssAll, ['compass']);
-    gulp.watch(config.app.config, ['config']);
+    gulp.watch(config.app.scssAll, ['styles']);
     gulp.watch(config.app.js, ['scripts']);
-    gulp.watch(config.bowerjson, ['vendorScripts', 'vendorStyles', 'fonts']);
+    gulp.watch(config.bowerjson, ['vendorScripts', 'vendorStyles', 'vendorFonts']);
     // watch any change in dist folder; reload immediately in case of detected change
     gulp.watch(config.bases.dist + '**', ['reload']);
   });