Merge branch 'generators' of https://github.com/balderdashy/sails into generators

Conflicts:
	bin/sails-generate.js

Author: sgress454

.npmignore

@@ -4,25 +4,15 @@ ssl
 .DS_STORE
 *~
 .idea
-
 nbproject
-
-# Ignore config file w/ sensitive information
-config/db.js
-
-# Ignore dev minified/compiled assets
-public/stylesheets/_*.css
-public/js/_*.js
-
-# Ignore production minified/compiled assets
-public/_target/*.js
-public/_target/*.css
-
+test
+CONTRIBUTING.md
+.git
+.gitignore
+.tmp
 *.swo
 *.swp
 *.swn
 *.swm
-
-
-#Ignore JSHint RC file for NPM
-.jshintrc
+.jshintrc
+.editorconfig

bin/_commander.js

@@ -25,5 +25,4 @@ function () {
 	program.emit('version');
 };
 
-
 module.exports = program;

bin/sails-generate.js

@@ -26,19 +26,22 @@ module.exports = function ( ) {
 	// Get CLI configuration
 	var config = rc('sails');
 
+
 	// Build initial scope
 	var scope = {
 		rootPath: process.cwd(),
-		sailsPackageJSON: package,
-		options: {
-			maxDepth: 5
-		},
 		modules: {}
+		sailsPackageJSON: package
 	};
 
 	// 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);
+
+
 	var cliArguments = Array.prototype.slice.call(arguments);
 
 	// Remove commander's extra argument

bin/sails-lift.js

@@ -5,9 +5,12 @@
  * Module dependencies
  */
 
-var Sails = require('../lib/app')
-	, path  = require('path')
-	, captains = require('captains-log');
+var package = require('../package.json')
+	, Sails = require('../lib/app')
+	, rc = require('rc')
+	, reportback = require('reportback')()
+	, _ = require('lodash')
+	, path  = require('path');
 
 
 
@@ -16,29 +19,41 @@ var Sails = require('../lib/app')
  *
  * Expose method which lifts the appropriate instance of Sails.
  * (Fire up the Sails app in our working directory.)
- *
- * @param {Object} options - to pass to sails.lift()
  */
 
 module.exports = function () {
 
-	var config = {};
-	var log = captains(config.log);
+	// Get CLI configuration
+	var config = rc('sails');
+
+
+	// Build initial scope
+	var scope = {
+		rootPath: process.cwd(),
+		sailsPackageJSON: package
+	};
+
+	// 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);
 
 	// Use the app's local Sails in `node_modules` if one exists
 	var appPath = process.cwd();
 	var localSailsPath = path.resolve(appPath, '/node_modules/sails', '/lib');
 
 	// But first make sure it'll work...
 	if ( Sails.isLocalSailsValid(localSailsPath, appPath) ) {
-		require(localSailsPath).lift(options);
+		require(localSailsPath).lift(scope);
 		return;
 	}
 
 	// Otherwise, if no workable local Sails exists, run the app 
 	// using the currently running version of Sails.  This is 
 	// probably always the global install.
 	var globalSails = new Sails();
-	globalSails.lift(options);
+	globalSails.lift(scope);
 	return;
 };

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

errors/README.md

@@ -3,4 +3,5 @@
 
 > TODO:
 > 1. move messages into locales
-> 2. Ideally we don't call `process.exit()` at all- instead, consistently call sails.lower().  See comment at bottom of `fatal.js`.
+> 2. Ideally we don't call `process.exit()` at all- instead, consistently call sails.lower().  See comment at bottom of `fatal.js`.
+> 3. This directory can probably be deleted.

lib/app/index.js

@@ -14,7 +14,7 @@ var events			= require('events'),
 	Logger			= require('captains-log');
 
 // Build logger using command-line config
-var log = new Logger(util.getCLIConfig(argv).log);
+var log = Logger(util.getCLIConfig(argv).log);
 
 
 
@@ -52,7 +52,9 @@ function Sails () {
 	 * Enable server-side CoffeeScript support
 	 */
 
-	require('coffee-script');
+	try {
+		require('coffee-script');
+	} catch(e){ log.verbose('Please run `npm install coffee-script` to use coffescript (skipping for now)'); }
 
 
 

lib/app/isLocalSailsValid.js

@@ -3,7 +3,7 @@
  */
 var _			= require('lodash'),
 	argv		= require('optimist').argv,
-	fs			= require('fs-extra'),
+	fs			= require('fs'),
 	Err			= require('../../errors'),
 	Logger		= require('captains-log'),
 	util		= require('sails-util');

lib/app/isSailsApp.js

@@ -3,7 +3,7 @@
  */
 var _			= require('lodash'),
 	argv		= require('optimist').argv,
-	fs			= require('fs-extra'),
+	fs			= require('fs'),
 	Err			= require('../../errors'),
 	Logger		= require('captains-log'),
 	util		= require('sails-util');

locales/README.md

@@ -27,48 +27,37 @@
   "directories": {
     "lib": "lib"
   },
-  "dependencies": {
+  "configuredDependencies": {
+    "connect-redis": "~1.4.5",
+    "connect-mongo": "~0.3.2"
+  },
+  "optionalDependencies": {
     "waterline": "git://github.com/balderdashy/waterline.git#v0.10",
     "sails-disk": "git://github.com/balderdashy/sails-disk.git#associations",
-    "sails-util": "~0.10.0",
-    "captains-log": "~0.11.0",
+    "socket.io": "~0.9.14",
+    "connect-flash": "~0.1.1",
+    "pluralize": "~0.0.5",
+    "node-uuid": "~1.4.0",
+    "ejs": "~0.8.4",
+    "ejs-locals": "~1.0.2",
+    "glob": "~3.1.14",
+    "i18n": "~0.4.1"
+  },
+  "dependencies": {
     "express": "3.4.3",
-    "socket.io": "0.9.14",
-    "connect-redis": "1.4.5",
-    "connect-mongo": "0.3.2",
-    "async": "0.2.9",
-    "i18n": "0.4.1",
-    "lodash": "2.4.1",
-    "underscore.string": "2.3.0",
-    "include-all": "0.1.2",
-    "connect-flash": "0.1.1",
-    "pluralize": "0.0.5",
-    "json-stringify-safe": "5.0.0",
-    "node-uuid": "1.4.0",
-    "ejs": "0.8.4",
-    "ejs-locals": "1.0.2",
-    "grunt": "0.4.1",
-    "optimist": "0.3.4",
-    "fs-extra": "0.8.1",
-    "glob": "3.1.14",
-    "grunt-cli": "0.1.9",
-    "sails-generate-gruntfile": "0.10.1",
-    "grunt-contrib-copy": "0.4.1",
-    "grunt-contrib-clean": "0.4.1",
-    "grunt-contrib-concat": "0.3.0",
-    "grunt-sails-linker": "0.9.5",
-    "grunt-contrib-jst": "0.5.0",
-    "grunt-contrib-watch": "0.4.4",
-    "grunt-contrib-uglify": "0.2.2",
-    "grunt-contrib-cssmin": "0.6.1",
-    "grunt-contrib-less": "~0.8.3",
-    "grunt-contrib-coffee": "0.7.0",
-    "sails-generate": "0.0.8",
     "commander": "~2.1.0",
+    "rc": "~0.3.3",
+    "sails-stringfile": "~0.0.0",
+    "async": "~0.2.9",
+    "lodash": "~2.4.1",
+    "include-all": "~0.1.2",
+    "captains-log": "~0.11.0",
     "reportback": "~0.1.4",
-    "rc": "~0.3.3"
+    "sails-util": "~0.10.0",
+    "optimist": "~0.3.4",
+    "sails-generate": "~0.0.12"
   },
-  "devDependencies": {
+  "testDependencies": {
     "root-require": "~0.2.0",
     "checksum": "~0.1.1",
     "mocha": "*",
@@ -79,10 +68,8 @@
     "colors": "~0.6.2",
     "expect.js": "~0.2.0",
     "should": "~2.1.1",
-    "supertest": "~0.8.2"
-  },
-  "optionalDependencies": {
-    "coffee-script": "1.6.2"
+    "supertest": "~0.8.2",
+    "fs-extra": "~0.8.1"
   },
   "repository": {
     "type": "git",