Fix paths in Gulp build pipeline

gulpfile.js

@@ -7,17 +7,28 @@ var lazypipe = require('lazypipe');
 var rimraf = require('rimraf');
 var wiredep = require('wiredep').stream;
 var runSequence = require('run-sequence');
+var map = require('lodash.map');
 
 var yeoman = {
   app: 'rd_ui/app',
   dist: 'rd_ui/dist'
 };
 
+function applyAppPath(p) {
+  if (typeof p === 'string') {
+    return yeoman.app + p;
+  } else {
+    return map(p, function (path) {
+      return applyAppPath(path);
+    });
+  }
+}
+
 var paths = {
   scripts: [yeoman.app + '/scripts/**/*.js'],
   styles: [yeoman.app + '/styles/**/*.css'],
   views: {
-    main: [yeoman.app + '/index.html', 'app/vendor_scripts.html', 'app/login.html', 'app/embed.html', 'app/public.html', 'app/app_layout.html', 'app/signed_out_layout.html'],
+    main: applyAppPath(['/index.html', '/vendor_scripts.html', '/login.html', '/embed.html', '/public.html', '/app_layout.html', '/signed_out_layout.html']),
     files: [yeoman.app + '/views/**/*.html']
   }
 };
@@ -75,9 +86,7 @@ gulp.task('client:build', ['html', 'styles'], function () {
   var cssFilter = $.filter('**/*.css');
 
   return gulp.src(paths.views.main)
-    .pipe($.print(function(p) { return "1: " + p; }))
     .pipe($.useref({searchPath: [yeoman.app, '.tmp']}))
-    .pipe($.print(function(p) { return "useref: " + p; }))
     .pipe(jsFilter)
     .pipe($.ngAnnotate())
     .pipe($.uglify())
@@ -106,12 +115,12 @@ gulp.task('images', function () {
 });
 
 gulp.task('copy:extras', function () {
-  return gulp.src([yeoman.app + '/*/.*', 'app/google_login.png', 'favicon.ico', 'robots.txt'], { dot: true })
+  return gulp.src(applyAppPath(['/*/.*', '/google_login.png', '/favicon.ico', '/robots.txt']), { dot: true })
     .pipe(gulp.dest(yeoman.dist));
 });
 
 gulp.task('copy:fonts', function () {
-  return gulp.src([yeoman.app + '/fonts/**/*', 'app/bower_components/font-awesome/fonts/*', 'app/bower_components/material-design-iconic-font/dist/fonts/*'])
+  return gulp.src(applyAppPath(['/fonts/**/*', '/bower_components/font-awesome/fonts/*', '/bower_components/material-design-iconic-font/dist/fonts/*']))
     .pipe(gulp.dest(yeoman.dist + '/fonts'));
 });
 

package.json

@@ -26,7 +26,8 @@
     "gulp-print": "^2.0.1",
     "gulp-rev-all": "^0.8.22",
     "bower": "~1.7.1",
-    "gulp-cli": "~1.2.0"
+    "gulp-cli": "~1.2.0",
+    "lodash.map": "^4.4.0"
   },
   "engines": {
     "node": ">=0.10.0"

rd_ui/app/app_layout.html

@@ -64,7 +64,7 @@
 
 {% include 'vendor_scripts.html' %}
 
-<!-- build:js({.tmp}) /scripts/scripts.js -->
+<!-- build:js({.tmp,rd_ui/app}) /scripts/scripts.js -->
 <script src="/scripts/app.js"></script>
 <script src="/scripts/services/services.js"></script>
 <script src="/scripts/services/resources.js"></script>

rd_ui/app/vendor_scripts.html

@@ -1,4 +1,4 @@
-<!-- build:js(rd_ui/app) /scripts/plugins.js -->
+<!-- build:js /scripts/plugins.js -->
 <script src="/bower_components/jquery/jquery.js"></script>
 <script src="/bower_components/angular/angular.js"></script>
 <script src="/bower_components/angular-sanitize/angular-sanitize.js"></script>