Move dbg and getPkgInfo methods to C

Author: Shuwen Qian

gulp/env.js

@@ -1,6 +1,21 @@
 (function() {
 	'use strict';
 
+	var fs = require('fs');
+	var gif = require('gulp-if');
+	var gutil = require('gulp-util');
+	var debug = require('gulp-debug');
+
+	var IS_DEBUG = !!gutil.env.debug;
+
+	function dbg(t) {
+		return gif(IS_DEBUG, debug({title:t}));
+	}
+
+	function getPkgInfo() {
+		return JSON.parse(fs.readFileSync('package.json', 'utf8'));
+	}
+
 	module.exports = {
 		ROOT: '.',
 		SRC: 'src/',
@@ -18,6 +33,9 @@
 		DOCS_PORT: 8001,
 		PATCH_LIST: [
 			'bower_components/moment/min/moment.min.js'
-		]
+		],
+
+		dbg: dbg,
+		getPkgInfo: getPkgInfo
 	};
 })();

gulp/tasks/build.js

@@ -19,16 +19,11 @@
 	var run = require('run-sequence');
 
 	module.exports = function(gulp, plugins, C) {
-		var IS_DEBUG = !!plugins.gutil.env.debug;
-
-		function dbg(t) {
-			return plugins.gif(IS_DEBUG, plugins.debug({title:t}));
-		}
 
 		gulp.task('patch-lib', function() {
 
 			gulp.src(C.PATCH_LIST, {base: C.BOWER})
-				.pipe(dbg('patch-lib'))
+				.pipe(C.dbg('patch-lib'))
 				.pipe(plugins.wrap(function(data) {
 					if (data.file.contents.toString('utf8').indexOf('/*patched*/') !== -1) {
 						return "{{{contents}}}";
@@ -46,7 +41,7 @@
 		gulp.task('copy', function() {
 			return gulp.src([j(C.SRC,'**/*.+(html|js|woff)'), j('!',C.SRC,'**/example.html')])
 				.pipe(plugins.cache('copy'))
-				.pipe(dbg('copy'))
+				.pipe(C.dbg('copy'))
 				.pipe(gulp.dest(C.BUILD));
 		});
 
@@ -56,25 +51,25 @@
 				.pipe(plugins.cache('scss'))
 				.pipe(plugins.sass({includePaths: C.SASS_INCLUDE}).on('error', plugins.sass.logError))
 				.pipe(plugins.postcss([autoprefixer({browsers: ['last 2 versions']})]))
-				.pipe(dbg('sass'))
+				.pipe(C.dbg('sass'))
 				.pipe(gulp.dest(C.BUILD))
 				.pipe(plugins.wrap(function(data) {
 					data.fname = path.basename(data.file.relative,'.css');
 					return wrapper;
 				},{},{engine:"hogan"}))
 				.pipe(plugins.rename({basename:"style", extname: ".html"}))
-				.pipe(dbg('sass-html'))
+				.pipe(C.dbg('sass-html'))
 				.pipe(gulp.dest(C.BUILD));
 		});
 
 		gulp.task('font', function() {
 			return gulp.src(j(C.SRC, C.SHARED, '/fonts/fonts.scss'))
 				.pipe(plugins.sass({includePaths: C.SASS_INCLUDE}).on('error', plugins.sass.logError))
-				.pipe(dbg('font'))
+				.pipe(C.dbg('font'))
 				.pipe(gulp.dest(C.BUILD + 'shared/fonts/'))
 				.pipe(plugins.wrap("<style>{{{contents}}}</style>",{},{engine:"hogan"}).on('error',console.log))
 				.pipe(plugins.rename("fonts.html").on('error',console.log))
-				.pipe(dbg('font-output'))
+				.pipe(C.dbg('font-output'))
 				.pipe(gulp.dest(j(C.BUILD,'/shared/fonts/')));
 		});
 
@@ -121,7 +116,7 @@
 		            inlineCss: true,
 					implicitStrip: false
 		        }, excludes, C.BUILD))
-		        .pipe(dbg('vulcanize-modules'))
+		        .pipe(C.dbg('vulcanize-modules'))
 		        .pipe(plugins.htmlmin())
 		        .pipe(gulp.dest(C.BUILD));
 
@@ -130,7 +125,7 @@
 					inlineScripts: true,
 					inlineCss: true
 				}))
-				.pipe(dbg('vulcanize-lib'))
+				.pipe(C.dbg('vulcanize-lib'))
 				.pipe(gulp.dest(C.BUILD));
 			return merge(modules, lib);
 		});
@@ -148,7 +143,7 @@
 		});
 
 		gulp.task('lib-version', function() {
-			var pkg = getPkgInfo();
+			var pkg = C.getPkgInfo();
 			var templatePath = j(C.TEMPLATES, '/lib_version.html');
 			var templateString = fs.readFileSync(templatePath, 'utf8');
 			var template = hogan.compile(templateString);
@@ -174,7 +169,7 @@
 				}))
 				.pipe(plugins.inlinemin())
 				.pipe(plugins.header('<!--\n' + fs.readFileSync('BANNER.txt','utf8') + ' -->'))
-				.pipe(dbg('vulcanize-modules'))
+				.pipe(C.dbg('vulcanize-modules'))
 				.pipe(gulp.dest(C.DIST));
 
 			var lib = gulp.src(j(C.BUILD,'strand.html'))
@@ -191,7 +186,7 @@
 				}))
 				.pipe(plugins.inlinemin())
 				.pipe(plugins.header('<!--\n' + fs.readFileSync('BANNER.txt','utf8') + ' -->'))
-				.pipe(dbg('vulcanize-lib'))
+				.pipe(C.dbg('vulcanize-lib'))
 				.pipe(gulp.dest(C.DIST));
 
 			return merge(modules, lib);

gulp/tasks/docs.js

@@ -22,11 +22,6 @@
 	var run = require('run-sequence');
 
 	module.exports = function(gulp, plugins, C) {
-		var IS_DEBUG = !!plugins.gutil.env.debug;
-
-		function dbg(t) {
-			return plugins.gif(IS_DEBUG, plugins.debug({title:t}));
-		}
 
 		gulp.task('docs', ['copy:docs', 'sass:docs', 'docs:templates']);
 
@@ -43,19 +38,19 @@
 				.pipe(gulp.dest(C.BUILD_DOCS));
 
 			var bower_components = gulp.src([j(C.BOWER,'/webcomponentsjs/**/*'), j(C.BOWER,'/polymer/**/*')], {base:C.BOWER})
-				.pipe(dbg('copy-bower'))
+				.pipe(C.dbg('copy-bower'))
 				.pipe(gulp.dest(j(C.BUILD_DOCS,C.BOWER)));
 
 			var lib = gulp.src(j(C.BUILD,'**'))
-				.pipe(dbg('copy-lib'))
+				.pipe(C.dbg('copy-lib'))
 				.pipe(gulp.dest(j(C.BUILD_DOCS,C.BOWER,'/strand/dist')));
 
 			return merge(bower_components, merged_static, lib);
 		});
 
 		gulp.task('sass:docs', function() {
 			return gulp.src(j(C.DOCS,'/**/*.scss'))
-				.pipe(dbg('sass-docs'))
+				.pipe(C.dbg('sass-docs'))
 				.pipe(plugins.sass({includePaths: C.SASS_INCLUDE}).on('error', plugins.sass.logError))
 				.pipe(plugins.postcss([autoprefixer({browsers: ['last 2 versions']})]))
 				.pipe(gulp.dest(C.BUILD_DOCS));
@@ -162,7 +157,7 @@
 				});
 			}
 
-			var pkg = getPkgInfo();
+			var pkg = C.getPkgInfo();
 
 			// Create moduleList from directory listing
 			var modules = glob.sync(j(C.MODULE_MASK, "/doc.json"), {cwd:C.SRC});
@@ -233,7 +228,7 @@
 				.pipe(plugins.cache('docs_module'))
 				.pipe(injectBehaviorDocs(behaviorsMap))
 				.pipe(injectModuleData(pkg, moduleMap, articleList, articleMap))
-				.pipe(dbg('docs-modules'))
+				.pipe(C.dbg('docs-modules'))
 				.pipe(through.obj(function(file, enc, cb) {
 					var moduleDoc = JSON.parse(file.contents);
 					var templatePath = j(C.DOCS,'/component_template.html');
@@ -257,16 +252,16 @@
 				.pipe(plugins.marked().on('error',console.log))
 				.pipe(injectArticleData(pkg, moduleMap, articleList, articleMap))
 				.pipe(plugins.rename({prefix: 'article_'}))
-				.pipe(dbg('docs-articles'))
+				.pipe(C.dbg('docs-articles'))
 				.pipe(gulp.dest(C.BUILD_DOCS));
 
 			return merge(indexStream, moduleStream, articleStream);
 		});
 
 		gulp.task('gh-pages', function() {
-			var pkg = getPkgInfo();
+			var pkg = C.getPkgInfo();
 			return gulp.src(C.BUILD_DOCS+'**/*')
-				.pipe(dbg('gh-pages'))
+				.pipe(C.dbg('gh-pages'))
 				.pipe(plugins.ghPages({
 					message: 'docs updates v'+pkg.version
 				}));

gulp/tasks/live.js

@@ -23,12 +23,6 @@
 
 	module.exports = function(gulp, plugins, C) {
 
-		var IS_DEBUG = !!plugins.gutil.env.debug;
-
-		function dbg(t) {
-			return plugins.gif(IS_DEBUG, plugins.debug({title:t}));
-		}
-
 		gulp.task('watch', function () {
 			gulp.watch(j(C.SRC, C.MODULE_MASK, '/*.scss'), ['sass']);
 			gulp.watch(j(C.SRC, C.MODULE_MASK, C.MODULE_HTML), ['copy', 'vulcanize']);

gulp/tasks/release.js

@@ -23,12 +23,6 @@
 
 	module.exports = function(gulp, plugins, C) {
 
-		var IS_DEBUG = !!plugins.gutil.env.debug;
-
-		function dbg(t) {
-			return plugins.gif(IS_DEBUG, plugins.debug({title:t}));
-		}
-
 		function inc(version) {
 			if(!version) version = 'patch';
 			return gulp.src(['package.json', 'bower.json'])
@@ -66,23 +60,19 @@
 						}
 					}
 				}))
-				.pipe(dbg('changelog'))
+				.pipe(C.dbg('changelog'))
 				.pipe(gulp.dest('.'));
 		});
 
-		function getPkgInfo() {
-			return JSON.parse(fs.readFileSync('package.json', 'utf8'));
-		}
-
 		gulp.task('stage-release', function() {
-			var pkg = getPkgInfo();
+			var pkg = C.getPkgInfo();
 			return gulp.src([C.DIST, 'package.json', 'bower.json', 'CHANGELOG.md'])
 				.pipe(plugins.git.add())
 				.pipe(plugins.git.commit('Release v'+pkg.version));
 		});
 
 		gulp.task('tag-release', function() {
-			var pkg = getPkgInfo();
+			var pkg = C.getPkgInfo();
 			plugins.git.tag('v'+pkg.version, 'Version '+pkg.version, function(err) {
 				console.log(err);
 			});