From 98868c4a0487debe19e4c22d54387444261426d5 Mon Sep 17 00:00:00 2001
From: Kelly Domico <kelly.domico@hpe.com>
Date: Fri, 15 Jan 2016 08:10:06 -0800
Subject: [PATCH 1/2] Added Gulp config files for paths

---
 tools/gulp.config.js |  57 +++++++++++++++++++++++
 tools/gulpfile.js    | 106 +++++++++++--------------------------------
 2 files changed, 83 insertions(+), 80 deletions(-)
 create mode 100644 tools/gulp.config.js

diff --git a/tools/gulp.config.js b/tools/gulp.config.js
new file mode 100644
index 0000000000..29be27796f
--- /dev/null
+++ b/tools/gulp.config.js
@@ -0,0 +1,57 @@
+/**
+ * This stores all the configuration information for Gulp
+ */
+module.exports = function () {
+  var paths = {
+    src: '../src/',
+    dist: '../dist/'
+  };
+
+  var config = {
+    paths: paths,
+
+    jsSourceFiles: [
+      paths.src + '**/*.js'
+    ],
+
+    jsLibs: [
+      paths.dist + 'lib/angular/angular.js',
+      paths.dist + 'lib/angular-gettext/dist/angular-gettext.js',
+      paths.dist + 'lib/angular-sanitize/angular-sanitize.js',
+      paths.dist + 'lib/angular-bootstrap/ui-bootstrap.js',
+      paths.dist + 'lib/angular-bootstrap/ui-bootstrap-tpls.js',
+      paths.dist + 'lib/angular-ui-router/release/angular-ui-router.js',
+      paths.dist + 'lib/lodash/lodash.js',
+      paths.dist + 'lib/helion-ui-framework/**/*.module.js',
+      paths.dist + 'lib/helion-ui-framework/**/*.js'
+    ],
+
+    plugins: [],
+
+    jsFiles: [
+      paths.dist + 'index.module.js',
+      paths.dist + 'app/**/*.module.js',
+      paths.dist + 'app/**/*.js',
+      '!' + paths.dist + '**/*.mock.js',
+      '!' + paths.dist + '**/*.spec.js'
+    ],
+
+    scssSourceFiles: [
+      paths.src + 'index.scss'
+    ],
+
+    scssFiles: [
+      paths.src + '**/*.scss'
+    ],
+
+    cssFiles: [
+      paths.dist + 'index.css'
+    ],
+
+    partials: [
+      paths.src + 'app/**/*.html'
+    ]
+  };
+
+  return config;
+};
diff --git a/tools/gulpfile.js b/tools/gulpfile.js
index b2a0800f7f..eddd2076f1 100644
--- a/tools/gulpfile.js
+++ b/tools/gulpfile.js
@@ -8,129 +8,75 @@ var sass = require('gulp-sass');
 var eslint = require('gulp-eslint');
 var del = require('del');
 
-
-var paths = {
-  src: '../src/',
-  dist: '../dist/'
-};
-
-
-var jsSourceFiles = [
-  paths.src + '**/*.js'
-];
-
-
-var jsLibs = [
-  paths.dist + 'lib/angular/angular.js',
-  paths.dist + 'lib/angular-gettext/dist/angular-gettext.js',
-  paths.dist + 'lib/angular-sanitize/angular-sanitize.js',
-  paths.dist + 'lib/angular-bootstrap/ui-bootstrap.js',
-  paths.dist + 'lib/angular-bootstrap/ui-bootstrap-tpls.js',
-  paths.dist + 'lib/angular-ui-router/release/angular-ui-router.js',
-  paths.dist + 'lib/lodash/lodash.js',
-  paths.dist + 'lib/helion-ui-framework/**/*.module.js',
-  paths.dist + 'lib/helion-ui-framework/**/*.js'
-];
-
-
-var plugins = [
-];
-
-
-var jsFiles = [
-  paths.dist + 'index.module.js',
-  paths.dist + 'app/**/*.module.js',
-  paths.dist + 'app/**/*.js',
-  '!' + paths.dist + '**/*.mock.js',
-  '!' + paths.dist + '**/*.spec.js'
-];
-
-
-var scssSourceFiles = [
-  paths.src + 'index.scss'
-];
-
-
-var scssFiles = [
-  paths.src + '**/*.scss'
-]
-
-
-var cssFiles = [
-   paths.dist + 'index.css'
-];
-
-
-var partials = [
-  paths.src + 'app/**/*.html'
-];
+// Paths are stored in gulp.config.js
+var config = require('./gulp.config')();
 
 
 gulp.task('js', function () {
   return gulp
-    .src(jsSourceFiles, { base: paths.src })
-    .pipe(gulp.dest(paths.dist));
+    .src(config.jsSourceFiles, { base: config.paths.src })
+    .pipe(gulp.dest(config.paths.dist));
 });
 
 
 gulp.task('css', function () {
   return gulp
-    .src(scssSourceFiles, { base: paths.src })
+    .src(config.scssSourceFiles, { base: config.paths.src })
     .pipe(sass())
-    .pipe(gulp.dest(paths.dist));
+    .pipe(gulp.dest(config.paths.dist));
 });
 
 
 gulp.task('html', function () {
   return gulp
-    .src(partials, { base: paths.src })
-    .pipe(gulp.dest(paths.dist));
+    .src(config.partials, { base: config.paths.src })
+    .pipe(gulp.dest(config.paths.dist));
 });
 
 
 gulp.task('lib', function () {
   return gulp
-    .src(paths.src + 'lib/**')
-    .pipe(gulp.dest(paths.dist + 'lib/'));
+    .src(config.paths.src + 'lib/**')
+    .pipe(gulp.dest(config.paths.dist + 'lib/'));
 });
 
 
 gulp.task('index:copy', function () {
   return gulp
-    .src(paths.src + 'index.html')
-    .pipe(gulp.dest(paths.dist));
+    .src(config.paths.src + 'index.html')
+    .pipe(gulp.dest(config.paths.dist));
 });
 
 
 gulp.task('index:inject', [ 'index:copy' ], function () {
   var sources = gulp.src(
-    [ paths.dist + 'config.js' ]
-    .concat(jsLibs)
-    .concat(plugins)
-    .concat(jsFiles)
-    .concat(cssFiles), { read: false });
+    [ config.paths.dist + 'config.js' ]
+    .concat(config.jsLibs)
+    .concat(config.plugins)
+    .concat(config.jsFiles)
+    .concat(config.cssFiles), { read: false });
 
   return gulp
-    .src(paths.dist + 'index.html')
+    .src(config.paths.dist + 'index.html')
     .pipe(gulpinject(sources, { relative: true }))
     .pipe(concat.header())
-    .pipe(gulp.dest(paths.dist));
+    .pipe(gulp.dest(config.paths.dist));
 });
 
 
 gulp.task('watch', function () {
-  gulp.watch(jsSourceFiles, { interval: 1000, usePoll: true }, [ 'js' ]);
-  gulp.watch(scssFiles, [ 'css' ]);
-  gulp.watch(partials, { interval: 1000, usePoll: true }, [ 'html' ]);
-  gulp.watch(paths.src + 'index.html', [ 'index:inject' ]);
+  gulp.watch(config.jsSourceFiles, { interval: 1000, usePoll: true }, [ 'js' ]);
+  gulp.watch(config.scssFiles, [ 'css' ]);
+  gulp.watch(config.partials, { interval: 1000, usePoll: true }, [ 'html' ]);
+  gulp.watch(config.paths.src + 'index.html', [ 'index:inject' ]);
 });
 
 
 gulp.task('lint', function () {
   return gulp
     .src([
-      paths.src + '**/*.js',
-      '!' + paths.src + 'lib/**/*.js'
+      config.paths.src + '**/*.js',
+      '!' + config.paths.src + 'lib/**/*.js'
     ])
     .pipe(eslint())
     .pipe(eslint.format())
@@ -139,7 +85,7 @@ gulp.task('lint', function () {
 
 
 gulp.task('clean', function (next) {
-  del(paths.dist + '**/*', { force: true }, next);
+  del(config.paths.dist + '**/*', { force: true }, next);
 });
 
 

From 05c1cefe2f9bb76951656b360711a7a4e34e9f3e Mon Sep 17 00:00:00 2001
From: Kelly Domico <kelly.domico@hpe.com>
Date: Fri, 15 Jan 2016 09:30:21 -0800
Subject: [PATCH 2/2] Added aliases in Gulp file for paths

---
 tools/gulpfile.js | 57 +++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/tools/gulpfile.js b/tools/gulpfile.js
index eddd2076f1..772f7cb28c 100644
--- a/tools/gulpfile.js
+++ b/tools/gulpfile.js
@@ -10,73 +10,82 @@ var del = require('del');
 
 // Paths are stored in gulp.config.js
 var config = require('./gulp.config')();
+var paths = config.paths,
+  jsSourceFiles = config.jsSourceFiles,
+  jsLibs = config.jsLibs,
+  plugins = config.plugins,
+  jsFiles = config.jsFiles,
+  scssSourceFiles = config.scssSourceFiles,
+  scssFiles = config.scssFiles,
+  cssFiles = config.cssFiles,
+  partials = config.partials;
 
 
 gulp.task('js', function () {
   return gulp
-    .src(config.jsSourceFiles, { base: config.paths.src })
-    .pipe(gulp.dest(config.paths.dist));
+    .src(jsSourceFiles, { base: paths.src })
+    .pipe(gulp.dest(paths.dist));
 });
 
 
 gulp.task('css', function () {
   return gulp
-    .src(config.scssSourceFiles, { base: config.paths.src })
+    .src(scssSourceFiles, { base: paths.src })
     .pipe(sass())
-    .pipe(gulp.dest(config.paths.dist));
+    .pipe(gulp.dest(paths.dist));
 });
 
 
 gulp.task('html', function () {
   return gulp
-    .src(config.partials, { base: config.paths.src })
-    .pipe(gulp.dest(config.paths.dist));
+    .src(partials, { base: paths.src })
+    .pipe(gulp.dest(paths.dist));
 });
 
 
 gulp.task('lib', function () {
   return gulp
-    .src(config.paths.src + 'lib/**')
-    .pipe(gulp.dest(config.paths.dist + 'lib/'));
+    .src(paths.src + 'lib/**')
+    .pipe(gulp.dest(paths.dist + 'lib/'));
 });
 
 
 gulp.task('index:copy', function () {
   return gulp
-    .src(config.paths.src + 'index.html')
-    .pipe(gulp.dest(config.paths.dist));
+    .src(paths.src + 'index.html')
+    .pipe(gulp.dest(paths.dist));
 });
 
 
 gulp.task('index:inject', [ 'index:copy' ], function () {
   var sources = gulp.src(
-    [ config.paths.dist + 'config.js' ]
-    .concat(config.jsLibs)
-    .concat(config.plugins)
-    .concat(config.jsFiles)
-    .concat(config.cssFiles), { read: false });
+    [ paths.dist + 'config.js' ]
+    .concat(jsLibs)
+    .concat(plugins)
+    .concat(jsFiles)
+    .concat(cssFiles), { read: false });
 
   return gulp
-    .src(config.paths.dist + 'index.html')
+    .src(paths.dist + 'index.html')
     .pipe(gulpinject(sources, { relative: true }))
     .pipe(concat.header())
-    .pipe(gulp.dest(config.paths.dist));
+    .pipe(gulp.dest(paths.dist));
 });
 
 
 gulp.task('watch', function () {
-  gulp.watch(config.jsSourceFiles, { interval: 1000, usePoll: true }, [ 'js' ]);
-  gulp.watch(config.scssFiles, [ 'css' ]);
-  gulp.watch(config.partials, { interval: 1000, usePoll: true }, [ 'html' ]);
-  gulp.watch(config.paths.src + 'index.html', [ 'index:inject' ]);
+  gulp.watch(jsSourceFiles, { interval: 1000, usePoll: true }, [ 'js' ]);
+  gulp.watch(scssFiles, [ 'css' ]);
+  gulp.watch(partials, { interval: 1000, usePoll: true }, [ 'html' ]);
+  gulp.watch(paths.src + 'index.html', [ 'index:inject' ]);
 });
 
 
 gulp.task('lint', function () {
   return gulp
     .src([
-      config.paths.src + '**/*.js',
-      '!' + config.paths.src + 'lib/**/*.js'
+      paths.src + '**/*.js',
+      '!' + paths.src + 'lib/**/*.js'
     ])
     .pipe(eslint())
     .pipe(eslint.format())
@@ -85,7 +94,7 @@ gulp.task('lint', function () {
 
 
 gulp.task('clean', function (next) {
-  del(config.paths.dist + '**/*', { force: true }, next);
+  del(paths.dist + '**/*', { force: true }, next);
 });