Removed logs, allow unknown arguments in 'generate' command.

gaugendre · Jan 17, 2014 · 6c22780 · 6c22780
1 parent b6a7033
commit 6c22780
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/bin/_commander.js b/bin/_commander.js
@@ -25,8 +25,4 @@ function () {
 	program.emit('version');
 };
 
-// Don't balk at unknown options
-program.unknownOption = function(){};
-
-
 module.exports = program;
diff --git a/bin/sails-generate.js b/bin/sails-generate.js
@@ -26,6 +26,7 @@ module.exports = function () {
 	// Get CLI configuration
 	var config = rc('sails');
 
+
 	// Build initial scope
 	var scope = {
 		rootPath: process.cwd(),
@@ -35,6 +36,12 @@ module.exports = function () {
 	// Mix-in rc config
 	_.merge(scope, config.generators);
 
+	// TODO: just do a top-level merge and reference
+	// `scope.generators.modules` as needed (simpler)
+	_.merge(scope, config);
+
+	console.log(config);
+
 	var cliArguments = Array.prototype.slice.call(arguments);
 
 	// Remove commander's extra argument

diff --git a/bin/sails.js b/bin/sails.js
@@ -6,7 +6,8 @@
  */
 var _ = require('lodash')
 	, program = require('./_commander')
-	, package = require('../package.json');
+	, package = require('../package.json')
+	, NOOP    = function(){};
 
 
 
@@ -70,7 +71,9 @@ program
 
 
 // $ sails generate <module>
-program.command('generate')
+var generate = program.command('generate');
+generate.unknownOption = NOOP;
+generate
 	.description('')
 	.option('--dry')
 	.action(require('./sails-generate'));
@@ -131,6 +134,9 @@ program
 
 
 
+// Don't balk at unknown options
+program.unknownOption = NOOP;
+
 
 
 // $ sails