mirror of
https://github.com/CryptKeeperZK/ejs.git
synced 2026-01-10 07:58:26 -05:00
No longer need to wrap paths for Windows, invoking Jake directly
This commit is contained in:
Matthew Eernisse
422
bin/cli.js
422
bin/cli.js
@@ -1,213 +1,209 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
// Dependencies
|
||||
var geddy = require('../lib/geddy')
|
||||
, exec = require('child_process').exec
|
||||
, path = require('path')
|
||||
, utils = require('utilities')
|
||||
, parseopts = require('../lib/parseopts');
|
||||
|
||||
// Variables
|
||||
var cwd = process.cwd()
|
||||
, args = process.argv.slice(2)
|
||||
, parser
|
||||
, optsMap
|
||||
, cmds
|
||||
, opts
|
||||
, usage
|
||||
, cmd
|
||||
, engineCmd
|
||||
, modelCmd
|
||||
, filepath
|
||||
, die
|
||||
, start;
|
||||
|
||||
// Usage dialog
|
||||
usage = [
|
||||
'Geddy web framework for Node.js'
|
||||
, ''
|
||||
, 'Usage:'
|
||||
, ' geddy [options/commands] [arguments]'
|
||||
, ''
|
||||
, 'Options:'
|
||||
, ' --environment, -e Environment to use'
|
||||
, ' --port, -p Port to connect to'
|
||||
, ' --workers, -w Number of worker processes to start(Default: 2)'
|
||||
, ' --debug, -d Sets the log level to output debug messages to'
|
||||
, ' the console'
|
||||
, ' --jade, -j When generating views this will create Jade'
|
||||
, ' templates(Default: EJS)'
|
||||
, ' --handle, -H When generating views this will create Handlebars'
|
||||
, ' templates(Default: EJS)'
|
||||
, ' --mustache, -m When generating views this will create Mustache'
|
||||
, ' templates(Default: EJS)'
|
||||
, ' --help, -h Output this usage dialog'
|
||||
, ' --version, -v Output the version of Geddy that\'s installed'
|
||||
, ''
|
||||
, 'Commands:'
|
||||
, ' app <name> Create a new Geddy application'
|
||||
, ' resource <name> [attrs] Create a new resource. A resource includes'
|
||||
, ' a model, controller and route'
|
||||
, ' scaffold <name> [attrs] Create a new scaffolding. Scaffolding includes'
|
||||
, ' the views, a model, controller and route'
|
||||
, ' secret Generate a new application secret in'
|
||||
, ' `congig/environment`'
|
||||
, ' controller <name> Generate a new controller including an index view'
|
||||
, ' and and a route'
|
||||
, ' model <name> [attrs] Generate a new model'
|
||||
, ''
|
||||
, 'Examples:'
|
||||
, ' geddy Start Geddy on localhost:4000 in development mode'
|
||||
, ' or if the directory isn\'t a Geddy app it\'ll'
|
||||
, ' this usage dialog'
|
||||
, ' geddy -p 3000 Start Geddy on port 3000'
|
||||
, ' geddy -e production Start Geddy in production mode'
|
||||
, ' geddy -j scaffold user Generate a users scaffolding using Jade templates'
|
||||
, ' geddy resource user name admin:boolean'
|
||||
, ' Generate a users resource with the model properties'
|
||||
, ' name as a string and admin as a boolean'
|
||||
, ' geddy scaffold user name:string:default'
|
||||
, ' Generate a users scaffolding user name as the default'
|
||||
, ' value to display data with'
|
||||
, ''
|
||||
].join('\n');
|
||||
|
||||
// Options available
|
||||
optsMap = [
|
||||
{ full: 'origins', abbr: 'o' }
|
||||
, { full: 'port', abbr: 'p' }
|
||||
, { full: 'workers', abbr: ['n', 'w'] }
|
||||
, { full: 'version', abbr: ['v', 'V'], args: false }
|
||||
, { full: 'help', abbr: 'h', args: false }
|
||||
, { full: 'debug', abbr: 'd' }
|
||||
, { full: 'loglevel', abbr: 'l' }
|
||||
, { full: 'environment', abbr: 'e' }
|
||||
, { full: 'spawned', abbr: ['s', 'q', 'Q'] }
|
||||
, { full: 'jade', abbr: 'j', args: false }
|
||||
, { full: 'handle', abbr: 'H', args: false }
|
||||
, { full: 'handlebars', abbr: 'H', args: false }
|
||||
, { full: 'mustache', abbr: 'm', args: false }
|
||||
];
|
||||
|
||||
// Parse optsMap and generate options and cmd commands
|
||||
parser = new parseopts.Parser(optsMap);
|
||||
parser.parse(args);
|
||||
cmds = parser.cmds;
|
||||
opts = parser.opts;
|
||||
|
||||
// Set handlebars option to handle option
|
||||
opts.handle = opts.handlebars || opts.handle;
|
||||
|
||||
// Exit the process with a message
|
||||
die = function (str) {
|
||||
console.log(str);
|
||||
process.exit();
|
||||
};
|
||||
|
||||
// Start Geddy with options
|
||||
start = function () {
|
||||
geddy.config(opts);
|
||||
geddy.start();
|
||||
};
|
||||
|
||||
if (opts.help) {
|
||||
die(usage);
|
||||
}
|
||||
if (opts.version) {
|
||||
die(geddy.version);
|
||||
}
|
||||
|
||||
// `geddy app foo` or `geddy resource bar` etc. -- run generators
|
||||
if (cmds.length) {
|
||||
// Get templates Jake file
|
||||
filepath = path.normalize(path.join(__dirname, '..', 'templates', 'Jakefile'));
|
||||
|
||||
// Wrap quotes in case path has spaces
|
||||
if (process.platform === 'win32') {
|
||||
filepath = '"' + filepath + '"';
|
||||
}
|
||||
cmd = '-t -f ' + filepath + ' ';
|
||||
|
||||
// Some commands take only one arg
|
||||
if (!(cmds[0] == 'secret' ||
|
||||
cmds[0] == 'db:init' ||
|
||||
cmds[0] == 'console') && !cmds[1]) {
|
||||
throw new Error(cmds[0] + ' command requires another argument.');
|
||||
}
|
||||
|
||||
// Add engines to command
|
||||
if (opts.jade) {
|
||||
engineCmd = ',' + 'jade';
|
||||
} else if (opts.handle) {
|
||||
engineCmd = ',' + 'handlebars';
|
||||
} else if (opts.mustache) {
|
||||
engineCmd = ',' + 'mustache';
|
||||
} else engineCmd = '';
|
||||
|
||||
// Get the model properties
|
||||
if (cmds.slice(2).length > 0) {
|
||||
modelCmd = ',' + cmds.slice(2).join(' ');
|
||||
} else modelCmd = '';
|
||||
|
||||
// Add Jake argument based on commands
|
||||
switch (cmds[0]) {
|
||||
case 'console':
|
||||
// Create DBs
|
||||
cmd += 'console:start[' + (cmds[1] || 'development') + ']';
|
||||
break;
|
||||
case 'db:init':
|
||||
// Create DBs
|
||||
cmd += 'db:init';
|
||||
break;
|
||||
case 'db:createTable':
|
||||
// Create DBs
|
||||
cmd += 'db:createTable[' + cmds[1] + ']';
|
||||
break;
|
||||
case 'app':
|
||||
// Generating application
|
||||
cmd += 'gen:app[' + cmds[1] + engineCmd + ']';
|
||||
break;
|
||||
case 'resource':
|
||||
// Generating resource
|
||||
cmd += 'gen:resource[' + cmds[1] + modelCmd + ']';
|
||||
break;
|
||||
case 'scaffold':
|
||||
// Generating application
|
||||
cmd += 'gen:scaffold[' + cmds[1] + engineCmd + modelCmd + ']';
|
||||
break;
|
||||
case 'controller':
|
||||
// Generating controller
|
||||
cmd += 'gen:bareController[' + cmds[1] + engineCmd + ']';
|
||||
break;
|
||||
case 'model':
|
||||
// Generating model
|
||||
cmd += 'gen:model[' + cmds[1] + modelCmd + ']';
|
||||
break;
|
||||
case 'secret':
|
||||
// Generating new app secret
|
||||
cmd += 'gen:secret';
|
||||
break;
|
||||
default:
|
||||
die(cmds[0] + ' is not a Geddy command.');
|
||||
}
|
||||
|
||||
if (!opts.debug) {
|
||||
cmd += ' --quiet';
|
||||
}
|
||||
|
||||
cmd = cmd.split(' ');
|
||||
var jake = require('jake');
|
||||
jake.run.apply(jake, cmd);
|
||||
}
|
||||
// Just `geddy` -- start the server
|
||||
else {
|
||||
// Search for 'config' directory in parent directories
|
||||
utils.file.searchParentPath('config', function (err, filePath) {
|
||||
if (err) {
|
||||
die(usage);
|
||||
}
|
||||
else {
|
||||
start();
|
||||
}
|
||||
});
|
||||
}
|
||||
#!/usr/bin/env node
|
||||
|
||||
// Dependencies
|
||||
var geddy = require('../lib/geddy')
|
||||
, exec = require('child_process').exec
|
||||
, path = require('path')
|
||||
, utils = require('utilities')
|
||||
, parseopts = require('../lib/parseopts');
|
||||
|
||||
// Variables
|
||||
var cwd = process.cwd()
|
||||
, args = process.argv.slice(2)
|
||||
, parser
|
||||
, optsMap
|
||||
, cmds
|
||||
, opts
|
||||
, usage
|
||||
, cmd
|
||||
, engineCmd
|
||||
, modelCmd
|
||||
, filepath
|
||||
, die
|
||||
, start;
|
||||
|
||||
// Usage dialog
|
||||
usage = [
|
||||
'Geddy web framework for Node.js'
|
||||
, ''
|
||||
, 'Usage:'
|
||||
, ' geddy [options/commands] [arguments]'
|
||||
, ''
|
||||
, 'Options:'
|
||||
, ' --environment, -e Environment to use'
|
||||
, ' --port, -p Port to connect to'
|
||||
, ' --workers, -w Number of worker processes to start(Default: 2)'
|
||||
, ' --debug, -d Sets the log level to output debug messages to'
|
||||
, ' the console'
|
||||
, ' --jade, -j When generating views this will create Jade'
|
||||
, ' templates(Default: EJS)'
|
||||
, ' --handle, -H When generating views this will create Handlebars'
|
||||
, ' templates(Default: EJS)'
|
||||
, ' --mustache, -m When generating views this will create Mustache'
|
||||
, ' templates(Default: EJS)'
|
||||
, ' --help, -h Output this usage dialog'
|
||||
, ' --version, -v Output the version of Geddy that\'s installed'
|
||||
, ''
|
||||
, 'Commands:'
|
||||
, ' app <name> Create a new Geddy application'
|
||||
, ' resource <name> [attrs] Create a new resource. A resource includes'
|
||||
, ' a model, controller and route'
|
||||
, ' scaffold <name> [attrs] Create a new scaffolding. Scaffolding includes'
|
||||
, ' the views, a model, controller and route'
|
||||
, ' secret Generate a new application secret in'
|
||||
, ' `congig/environment`'
|
||||
, ' controller <name> Generate a new controller including an index view'
|
||||
, ' and and a route'
|
||||
, ' model <name> [attrs] Generate a new model'
|
||||
, ''
|
||||
, 'Examples:'
|
||||
, ' geddy Start Geddy on localhost:4000 in development mode'
|
||||
, ' or if the directory isn\'t a Geddy app it\'ll'
|
||||
, ' this usage dialog'
|
||||
, ' geddy -p 3000 Start Geddy on port 3000'
|
||||
, ' geddy -e production Start Geddy in production mode'
|
||||
, ' geddy -j scaffold user Generate a users scaffolding using Jade templates'
|
||||
, ' geddy resource user name admin:boolean'
|
||||
, ' Generate a users resource with the model properties'
|
||||
, ' name as a string and admin as a boolean'
|
||||
, ' geddy scaffold user name:string:default'
|
||||
, ' Generate a users scaffolding user name as the default'
|
||||
, ' value to display data with'
|
||||
, ''
|
||||
].join('\n');
|
||||
|
||||
// Options available
|
||||
optsMap = [
|
||||
{ full: 'origins', abbr: 'o' }
|
||||
, { full: 'port', abbr: 'p' }
|
||||
, { full: 'workers', abbr: ['n', 'w'] }
|
||||
, { full: 'version', abbr: ['v', 'V'], args: false }
|
||||
, { full: 'help', abbr: 'h', args: false }
|
||||
, { full: 'debug', abbr: 'd' }
|
||||
, { full: 'loglevel', abbr: 'l' }
|
||||
, { full: 'environment', abbr: 'e' }
|
||||
, { full: 'spawned', abbr: ['s', 'q', 'Q'] }
|
||||
, { full: 'jade', abbr: 'j', args: false }
|
||||
, { full: 'handle', abbr: 'H', args: false }
|
||||
, { full: 'handlebars', abbr: 'H', args: false }
|
||||
, { full: 'mustache', abbr: 'm', args: false }
|
||||
];
|
||||
|
||||
// Parse optsMap and generate options and cmd commands
|
||||
parser = new parseopts.Parser(optsMap);
|
||||
parser.parse(args);
|
||||
cmds = parser.cmds;
|
||||
opts = parser.opts;
|
||||
|
||||
// Set handlebars option to handle option
|
||||
opts.handle = opts.handlebars || opts.handle;
|
||||
|
||||
// Exit the process with a message
|
||||
die = function (str) {
|
||||
console.log(str);
|
||||
process.exit();
|
||||
};
|
||||
|
||||
// Start Geddy with options
|
||||
start = function () {
|
||||
geddy.config(opts);
|
||||
geddy.start();
|
||||
};
|
||||
|
||||
if (opts.help) {
|
||||
die(usage);
|
||||
}
|
||||
if (opts.version) {
|
||||
die(geddy.version);
|
||||
}
|
||||
|
||||
// `geddy app foo` or `geddy resource bar` etc. -- run generators
|
||||
if (cmds.length) {
|
||||
// Get templates Jake file
|
||||
filepath = path.normalize(path.join(__dirname, '..', 'templates', 'Jakefile'));
|
||||
|
||||
cmd = '-t -f ' + filepath + ' ';
|
||||
|
||||
// Some commands take only one arg
|
||||
if (!(cmds[0] == 'secret' ||
|
||||
cmds[0] == 'db:init' ||
|
||||
cmds[0] == 'console') && !cmds[1]) {
|
||||
throw new Error(cmds[0] + ' command requires another argument.');
|
||||
}
|
||||
|
||||
// Add engines to command
|
||||
if (opts.jade) {
|
||||
engineCmd = ',' + 'jade';
|
||||
} else if (opts.handle) {
|
||||
engineCmd = ',' + 'handlebars';
|
||||
} else if (opts.mustache) {
|
||||
engineCmd = ',' + 'mustache';
|
||||
} else engineCmd = '';
|
||||
|
||||
// Get the model properties
|
||||
if (cmds.slice(2).length > 0) {
|
||||
modelCmd = ',' + cmds.slice(2).join(' ');
|
||||
} else modelCmd = '';
|
||||
|
||||
// Add Jake argument based on commands
|
||||
switch (cmds[0]) {
|
||||
case 'console':
|
||||
// Create DBs
|
||||
cmd += 'console:start[' + (cmds[1] || 'development') + ']';
|
||||
break;
|
||||
case 'db:init':
|
||||
// Create DBs
|
||||
cmd += 'db:init';
|
||||
break;
|
||||
case 'db:createTable':
|
||||
// Create DBs
|
||||
cmd += 'db:createTable[' + cmds[1] + ']';
|
||||
break;
|
||||
case 'app':
|
||||
// Generating application
|
||||
cmd += 'gen:app[' + cmds[1] + engineCmd + ']';
|
||||
break;
|
||||
case 'resource':
|
||||
// Generating resource
|
||||
cmd += 'gen:resource[' + cmds[1] + modelCmd + ']';
|
||||
break;
|
||||
case 'scaffold':
|
||||
// Generating application
|
||||
cmd += 'gen:scaffold[' + cmds[1] + engineCmd + modelCmd + ']';
|
||||
break;
|
||||
case 'controller':
|
||||
// Generating controller
|
||||
cmd += 'gen:bareController[' + cmds[1] + engineCmd + ']';
|
||||
break;
|
||||
case 'model':
|
||||
// Generating model
|
||||
cmd += 'gen:model[' + cmds[1] + modelCmd + ']';
|
||||
break;
|
||||
case 'secret':
|
||||
// Generating new app secret
|
||||
cmd += 'gen:secret';
|
||||
break;
|
||||
default:
|
||||
die(cmds[0] + ' is not a Geddy command.');
|
||||
}
|
||||
|
||||
if (!opts.debug) {
|
||||
cmd += ' --quiet';
|
||||
}
|
||||
|
||||
cmd = cmd.split(' ');
|
||||
var jake = require('jake');
|
||||
jake.run.apply(jake, cmd);
|
||||
}
|
||||
// Just `geddy` -- start the server
|
||||
else {
|
||||
// Search for 'config' directory in parent directories
|
||||
utils.file.searchParentPath('config', function (err, filePath) {
|
||||
if (err) {
|
||||
die(usage);
|
||||
}
|
||||
else {
|
||||
start();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user