Merge pull request JedWatson#6 from JedWatson/refacto

Basic refactor

Author: JedWatson

example_config.js

@@ -3,13 +3,9 @@ var pkg = JSON.parse(require('fs').readFileSync('./package.json'));
 
 // Get default dependencies from package.json.
 // Dependencies can be customised by hard-coding this array.
-var dependencies = [];
-Object.keys(pkg.dependencies).forEach(function(i) {
-	dependencies.push(i);
-});
+var dependencies = [].concat(Object.keys(pkg.dependencies));
 
 module.exports = {
-	
 	component: {
 		file: 'MyComponent.js',
 		name: 'MyComponent',

index.js

@@ -1,60 +1,16 @@
-var _ = require('lodash');
+var defaults = require('defaults')
+var capitalize = require('capitalize')
+var camelCase = require('camelcase')
 
-/**
- * Check that a compatible version of gulp is available in the project
- */
-
-function fatal() {
-	var msg = '\n\n';
-	for (var i = 0; i < arguments.length; i++) {
-		msg += arguments[i] + '\n\n';
-	}
-	console.log(msg);
-	process.exit(1);
-}
-
-try {
-	var projectGulpVersion = require(module.parent.paths[0] + '/gulp/package.json').version;
-} catch(e) {
-	// If we can't find gulp in the parent project, it's a fatal problem.
-	fatal(
-		'You do not seem to have Gulp installed in your project.',
-		'Please add gulp ^' + packageGulpVersion + ' to your package.json, npm install and try again.'
-	);
-}
-try {
-	// Check to make sure the local gulp and the project gulp match.
-	var packageGulpVersion = require('./node_modules/gulp/package.json').version;
-	if (!semver.satisfies(projectGulpVersion, '^' + packageGulpVersion)) {
-		fatal(
-			'You have an incompatible version of Gulp installed (' + projectGulpVersion + ').',
-			'Please add gulp ^' + packageGulpVersion + ' to your package.json, npm install and try again.'
-		);
-	}
-} catch(e) {
-	// Assume gulp has been loaded from ../node_modules and it matches the requirements.
-}
-
-/**
- * Helper method to extract metadata from package.json
- */
-
-function readPackageJSON() {
+// Extract package.json metadata
+function readPackageJSON () {
 	var pkg = JSON.parse(require('fs').readFileSync('./package.json'));
-	var deps = [];
-	if (pkg.dependencies) {
-		Object.keys(pkg.dependencies).forEach(function(i) {
-			deps.push(i);
-		});
-	}
-	if (pkg.peerDependencies) {
-		Object.keys(pkg.peerDependencies).forEach(function(i) {
-			deps.push(i);
-		});
-	}
+	var dependencies = Object.keys(pkg.dependencies);
+	var peerDependencies = Object.keys(pkg.peerDependencies);
+
 	return {
 		name: pkg.name,
-		deps: deps,
+		deps: dependencies.concat(peerDependencies),
 		aliasify: pkg.aliasify
 	};
 }
@@ -63,50 +19,30 @@ function readPackageJSON() {
  * This package exports a function that binds tasks to a gulp instance
  * based on the provided config.
  */
-
-function initTasks(gulp, config) {
-
+function initTasks (gulp, config) {
 	var pkg = readPackageJSON();
+	var name = capitalize(camelCase(config.component.pkgName || pkg.name))
 
-	if (!config) config = {};
-	if (!config.component) config.component = {};
-
-	if (!config.component.pkgName || !config.component.deps) {
-		_.defaults(config.component, {
-			pkgName: pkg.name,
-			dependencies: pkg.deps
-		});
-	}
-
-	if (!config.component.name) {
-		config.component.name = _.capitalize(_.camelCase(config.component.pkgName));
-	}
-	
-	if (!config.aliasify) {
-		config.aliasify = pkg.aliasify;
-	}
-
-	_.defaults(config.component, {
+	config = defaults(config, { aliasify: pkg.aliasify })
+	config.component = defaults(config.component, {
+		pkgName: pkg.name,
+		dependencies: pkg.deps,
+		name: name,
 		src: 'src',
 		lib: 'lib',
 		dist: 'dist',
-		file: config.component.name + '.js'
+		file: (config.component.name || name) + '.js'
 	});
 
 	if (config.example) {
 		if (config.example === true) config.example = {};
-		_.defaults(config.example, {
+
+		defaults(config.example, {
 			src: 'example/src',
 			dist: 'example/dist',
-			files: [
-				'index.html'
-			],
-			scripts: [
-				'example.js'
-			],
-			less: [
-				'example.less'
-			]
+			files: ['index.html'],
+			scripts: ['example.js'],
+			less: ['example.less']
 		});
 	}
 
@@ -132,7 +68,6 @@ function initTasks(gulp, config) {
 
 	gulp.task('build', buildTasks);
 	gulp.task('clean', cleanTasks);
-
 }
 
 module.exports = initTasks;

package.json

@@ -11,14 +11,15 @@
   },
   "dependencies": {
     "aliasify": "^1.7.2",
-    "babel-core": "^5.2.16",
     "babel-plugin-object-assign": "^1.1.0",
-    "babelify": "^6.0.2",
-    "browserify": "^10.1.1",
+    "babelify": "^6.1.0",
+    "browserify": "^10.2.0",
     "browserify-shim": "^3.8.6",
+    "camelcase": "^1.1.0",
+    "capitalize": "^1.0.0",
     "chalk": "^1.0.0",
-    "del": "^1.1.1",
-    "gulp": "^3.8.11",
+    "defaults": "^1.0.2",
+    "del": "^1.2.0",
     "gulp-babel": "^5.1.0",
     "gulp-bump": "^0.3.0",
     "gulp-connect": "^2.2.0",
@@ -29,13 +30,13 @@
     "gulp-streamify": "^0.0.5",
     "gulp-uglify": "^1.2.0",
     "gulp-util": "^3.0.4",
-    "lodash": "^3.8.0",
     "merge-stream": "^0.1.7",
-    "run-sequence": "^1.1.0",
-    "semver": "^4.3.4",
     "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.2.1"
   },
+  "peerDependencies": {
+    "gulp": "^3.8.0"
+  },
   "scripts": {
     "test": "echo \"no tests yet\" && exit 0"
   },