express-cmd 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08bc2c1db119896d78c2afbad2ffa8f6b8c47071
-  data.tar.gz: e663d753bd60f5950421b1d386febba7eb4e78d1
+  metadata.gz: a73377e3082ce9abb9e910c7d74789a5184f6b11
+  data.tar.gz: 7b364ad9da3eb258800bd6985edc929274504c7a
 SHA512:
-  metadata.gz: 235db8b1e75cc2d5e2a46b13df3f6c4bfa849838449c21d19e36dbbc912fb3ed24d53d40fec82ddd822d5f82d26163562e260d8300b7bf92ed5e96014ed3bfad
-  data.tar.gz: b512c1b15c55c6861ddbff2c44da4af8a9efff746188ae8d260225453436ebc0a0b742ab949535f1db61a7bbf63735b212399f242fc9c6cc16a23c51335378a3
+  metadata.gz: bd714075d15db5718792f258f3434b25c99160172262aa7cc96136e1dcdbfccc8d2ad82dd8dd737ba976d99b1511dfed50e6bef88760f65028a6bed15822c729
+  data.tar.gz: 7289bf3608b1559ffad6484121e9f3d63d3274dba3ab86b23d2b6f7c8dd17000900f93a75133062916856fd31dc90f04b3c25faa22ae2a95026c693b0cfd56d0

data/README.md

@@ -20,15 +20,16 @@ Or install it yourself as:
 
 I choose `mongodb` as my datastore, and I perfer to use `mongoose`.
 
+1. make sure you have installed node-inspector (debug tool) and nodemon (node auto reload after saved).
+
 ```bash
-# make sure you have installed node-inspector (debug tool) and nodemon (node auto reload after saved).
 npm install -g node-inspector
 npm install -g nodemon
+```
 
-gem install express-cmd
+2. `express app_name`, and you can specify an option, for example `express my-project --skip_npm_install`.
 
-express project-name
-```
+**supported options**: `--skip_npm_install`.
 
 ## Test
 

data/lib/express_cmd/generator.rb

@@ -5,6 +5,7 @@ module ExpressCmd
     include Thor::Actions
 
     argument :app_name
+    class_option :skip_npm_install, :type => :boolean
 
     def self.source_root
       File.join(File.dirname(__FILE__), "../../", "templates")
@@ -54,7 +55,9 @@ module ExpressCmd
     end
 
     def bundle_install
-      system "cd #{app_name} && npm install && cd ../"
+      unless options[:skip_npm_install]
+        system "cd #{app_name} && npm install && cd ../"
+      end
     end
 
     protected

data/lib/express_cmd/version.rb

@@ -1,3 +1,3 @@
 module ExpressCmd
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/generate_spec.rb

@@ -1,6 +1,6 @@
 describe ExpressCmd do
   it "Generator express" do
     bin_path = File.join(File.expand_path('../../bin', __FILE__))
-    system("#{bin_path}/express test-project")
+    system("#{bin_path}/express test-project --skip_npm_install")
   end
 end

data/templates/.gitignore

@@ -4,3 +4,5 @@
 /log
 /test/reporter/*.xml
 .npm-debug.log
+
+/*.gem

data/templates/config/mongo.js

@@ -7,41 +7,12 @@ var mongoose = require('mongoose');
 
 var logger = require('../lib/logger');
 
-var dbURI = 'mongodb://';
-
-// CONNECTION EVENTS
-// When successfully connected
-mongoose.connection.on('connected', function (aaa, bbb, ccc) {
-  logger.info('Mongoose default connection open to ' + dbURI);
-});
-
-// If the connection throws an error
-mongoose.connection.on('error',function (err) {
-  logger.error('Mongoose default connection error: ' + err);
-});
-
-// When the connection is disconnected
-mongoose.connection.on('disconnected', function () {
-  logger.info('Mongoose default connection disconnected');
-});
-
-// When the connection is open
-mongoose.connection.on('open', function () {
-  logger.info('Mongoose default connection is open');
-});
-
-// If the Node process ends, close the Mongoose connection
-process.on('SIGINT', function() {
-  mongoose.connection.close(function () {
-    logger.info('Mongoose default connection disconnected through app termination');
-    process.exit(0);
-  });
-});
-
-module.exports.connect = function (env) {
+module.exports.connect = function (env, connectedCallback) {
   var dbFile = yaml.safeLoad(ejs.render(fs.readFileSync(path.resolve(__dirname, '../config/mongo.yml'), 'UTF-8')));
   var dbcf = dbFile[env];
 
+  var dbURI = 'mongodb://';
+
   // Build the connection string
   if (dbcf.username && dbcf.password) {
     dbURI += encodeURIComponent(dbcf.username) + ':' + encodeURIComponent(dbcf.password) + '@';
@@ -53,6 +24,38 @@ module.exports.connect = function (env) {
     dbURI += queryString.stringify(dbcf.options);
   }
 
+  // CONNECTION EVENTS
+  // When successfully connected
+  mongoose.connection.on('connected', function (aaa, bbb, ccc) {
+    logger.info('Mongoose default connection open to ' + dbURI);
+  });
+
+  // If the connection throws an error
+  mongoose.connection.on('error',function (err) {
+    logger.error('Mongoose default connection error: ' + err);
+  });
+
+  // When the connection is disconnected
+  mongoose.connection.on('disconnected', function () {
+    logger.info('Mongoose default connection disconnected');
+  });
+
+  // When the connection is open
+  mongoose.connection.on('open', function () {
+    logger.info('Mongoose default connection is open');
+    if (typeof connectedCallback === 'function') {
+      connectedCallback();
+    }
+  });
+
+  // If the Node process ends, close the Mongoose connection
+  process.on('SIGINT', function() {
+    mongoose.connection.close(function () {
+      logger.info('Mongoose default connection disconnected through app termination');
+      process.exit(0);
+    });
+  });
+
   // Create the database connection
   mongoose.connect(dbURI);
 }

data/templates/lib/errors.js

@@ -1,5 +1,5 @@
 var hasProp = {}.hasOwnProperty;
-var extend = function(child, parent) {
+var extend = function (child, parent) {
   for (var key in parent) {
     if (hasProp.call(parent, key))
       child[key] = parent[key];
@@ -13,7 +13,7 @@ var extend = function(child, parent) {
   return child;
 };
 
-var AuthError = (function(superClass) {
+var AuthError = (function (superClass) {
   extend(AuthError, superClass);
 
   function AuthError(message) {
@@ -25,7 +25,7 @@ var AuthError = (function(superClass) {
   return AuthError;
 })(Error);
 
-var ReqError = (function(superClass) {
+var ReqError = (function (superClass) {
   extend(ReqError, superClass);
 
   function ReqError(message) {

data/templates/middlewares/before-filter.js

@@ -1,7 +1,7 @@
 var AuthError = require('../lib/errors').AuthError;
 
 module.exports = function(app) {
-  return app.use(function(req, res, next) {
+  return app.use(function (req, res, next) {
     var origin = req.get('origin');
     if (origin) {
       res.header('Access-Control-Allow-Origin', origin);

data/templates/middlewares/error-handler.js

@@ -1,8 +1,8 @@
 var logger = require('../lib/logger');
 
 // definded error handler.
-module.exports = function(app, apiRouter) {
-  return app.use(function(err, req, res, next) {
+module.exports = function (app, apiRouter) {
+  return app.use(function (err, req, res, next) {
     var statusCode = err.status || 500;
     logger.error(statusCode + ": " + err.message + ", \n " + (err.stack || ''));
 

data/templates/middlewares/morgan-log.js

@@ -2,7 +2,7 @@ var morgan = require('morgan');
 var path = require('path');
 var fs = require('fs');
 
-module.exports = function(app) {
+module.exports = function (app) {
   var accessLogStream, env, logDirectory;
 
   logDirectory = path.join(__dirname, '../log');

data/templates/routes/configuration.js

@@ -1,5 +1,5 @@
-module.exports = function(router) {
-  router.route('/').get(function(req, res, next) {
+module.exports = function (router) {
+  router.route('/').get(function (req, res, next) {
     res.status(204).end();
   });
 };

data/templates/routes/instance.js

@@ -1,9 +1,9 @@
-module.exports = function(router) {
-  router.route('/').get(function(req, res, next) {
+module.exports = function (router) {
+  router.route('/').get(function (req, res, next) {
     res.json({instances: []});
   });
 
-  router.route('/:hostname').get(function(req, res, next) {
+  router.route('/:hostname').get(function (req, res, next) {
     res.json({hostname: req.params.hostname});
   });
 };

data/templates/routes/translation.js

@@ -1,5 +1,5 @@
-module.exports = function(router) {
-  router.route('/').get(function(req, res, next) {
+module.exports = function (router) {
+  router.route('/').get(function (req, res, next) {
     res.status(204).end();
   });
 };

data/templates/server.js

@@ -19,28 +19,29 @@ app.set('env', process.env.NODE_ENV || 'development');
 
 // Before Filter
 require('./middlewares/before-filter')(app);
-// Error handler
-require('./middlewares/error-handler')(app);
 // Access Log
 require('./middlewares/morgan-log')(app);
 
 // Routes Example
-var apiRouter = express.Router();
+var rootRouter = express.Router();
 var instanceRouter = express.Router();
 var configurationRouter = express.Router({ mergeParams: true });
 var translationRouter = express.Router({ mergeParams: true });
 
 instanceRouter.use('/:hostname/configurations', configurationRouter);
 instanceRouter.use('/:hostname/translations', translationRouter);
-apiRouter.use('/instances', instanceRouter);
+rootRouter.use('/instances', instanceRouter);
 
 require('./routes/configuration')(configurationRouter);
 require('./routes/translation')(translationRouter);
 require('./routes/instance')(instanceRouter);
 
-app.use('/api', apiRouter);
+app.use('/1', rootRouter);
+
+// Error handler (should be here)
+require('./middlewares/error-handler')(app);
 
-app.listen(app.get('port'), function() {
+app.listen(app.get('port'), function () {
   logger.info('Server started, listened on ' + app.get('port') + '.');
   // connect with mongodb.
   mongo.connect(app.get('env'));

data/templates/test/units/demo_test.js

@@ -1,5 +1,5 @@
-describe('Demo Test', function(){
-  it("#Chai should sample example", function(done) {
+describe('Demo Test', function () {
+  it("#Chai should sample example", function (done) {
     var user = {
       name: 'tj',
       pets: ['tobi', 'loki', 'jane', 'bandit']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express-cmd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - wluo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler