Skip to content

Commit

Permalink
linux fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
speier committed May 21, 2012
1 parent f315c81 commit 9d1a97a
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 6 deletions.
8 changes: 6 additions & 2 deletions lib/cli/commands/bundler.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var fs = require('fs');
var path = require('path');
var mkdirp = require('mkdirp');
var visitor = require('./visitor');
var wrappers = require('browserify/lib/wrappers');

Expand All @@ -25,9 +26,12 @@ module.exports = {
result = self._prepends(config, result);
result = self._append(config, result);
result = result + '\n' + entry;
fs.writeFile(config.output.js, result, function(err) {
mkdirp(path.dirname(config.output.js), function(err) {
if (err) throw err;
done();
fs.writeFile(config.output.js, result, function(err) {
if (err) throw err;
done();
});
});
}, function(r) {
return require.resolve('browserify/builtins/' + r);
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/commands/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function updateProjectInfo(name) {
pkg.name = path.basename(name);
fs.writeFileSync(path.join(name, 'package.json'), JSON.stringify(pkg, null, 2));
// update readme.md ..
var readme = fs.readFileSync(path.join(name, 'readme.md'), 'utf-8');
var readme = fs.readFileSync(path.join(name, 'README.md'), 'utf-8');
readme = readme.replace(/application-name/gi, pkg.name);
fs.writeFileSync(path.join(name, 'readme.md'), readme);
// log info ..
Expand Down
45 changes: 45 additions & 0 deletions lib/cli/commands/create.js~
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
var fs = require('fs');
var path = require('path');
var mkdirp = require('mkdirp');
var ncp = require('ncp').ncp;
var logger = require('../clilogger');
var skeletons = require('../skeletons');

module.exports = function(name, skeleton) {
if (!skeleton) {
skeleton = skeletons.express;
}
if (!path.existsSync(skeleton)) {
skeleton = skeletons[skeleton];
}
if (!skeleton) {
return logger.error('invalid skeleton');
}
mkdirp(name, function(err) {
if (err) {
return logger.error(err);
} else {
ncp(skeleton, name, function(err) {
if (err) {
return logger.error(err);
}
updateProjectInfo(name);
});
}
});
};

function updateProjectInfo(name) {
// update package.json ..
var pkg = JSON.parse(fs.readFileSync(path.join(name, 'package.json')));
pkg.name = path.basename(name);
fs.writeFileSync(path.join(name, 'package.json'), JSON.stringify(pkg, null, 2));
// update readme.md ..
var readme = fs.readFileSync(path.join(name, 'readme.md'), 'utf-8');
readme = readme.replace(/application-name/gi, pkg.name);
fs.writeFileSync(path.join(name, 'readme.md'), readme);
// log info ..
logger.info('new project created');
logger.info('dont forget to install dependencies:');
logger.info('$ cd ' + name + ' && npm install');
};
2 changes: 1 addition & 1 deletion skeletons/express/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var torpedo = require('../..');
var torpedo = require('torpedo');

var app = module.exports = torpedo.createApp();

Expand Down
3 changes: 2 additions & 1 deletion skeletons/express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"torpedo": "~0.1.0",
"express": "~2.5.9",
"consolidate": "~0.3.0",
"hogan.js": "~2.0.0"
"hogan.js": "~2.0.0",
"up": "https://github.com/LearnBoost/up/tarball/master"
},
"scripts": {
"start": "node ./bin/server"
Expand Down
13 changes: 13 additions & 0 deletions skeletons/express/package.json~
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "application-name",
"version": "0.0.1",
"dependencies": {
"torpedo": "~0.1.0",
"express": "~2.5.9",
"consolidate": "~0.3.0",
"hogan.js": "~2.0.0"
},
"scripts": {
"start": "node ./bin/server"
}
}
2 changes: 1 addition & 1 deletion skeletons/express/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var app = require('./app');
var server = module.exports = express.createServer();

server.configure(function() {
server.register('html', require('../../plugins/hogan'));
server.register('html', require('torpedo/plugins/hogan'));
server.set('view engine', 'html');
server.set('views', __dirname + '/views/templates');
server.use(express.bodyParser());
Expand Down

0 comments on commit 9d1a97a

Please sign in to comment.