Merge branch 'master' into master

This commit is contained in:
Thiago Felix 2016-05-14 20:14:53 -03:00
commit 4d42d83915
3 changed files with 8 additions and 4 deletions

View File

@ -21,6 +21,9 @@ program
'commit message', 'Updates') 'commit message', 'Updates')
.option('-t, --dotfiles', 'Include dotfiles') .option('-t, --dotfiles', 'Include dotfiles')
.option('-a, --add', 'Only add, and never remove existing files.') .option('-a, --add', 'Only add, and never remove existing files.')
.option('-v, --remove <pattern>',
'Remove files that match the given pattern ' +
'(ignored if used together with --add).', '.')
.option('-n, --no-push', 'Commit only (with no push)') .option('-n, --no-push', 'Commit only (with no push)')
.parse(process.argv); .parse(process.argv);
@ -32,6 +35,7 @@ ghpages.publish(path.join(process.cwd(), program.dist), {
message: program.message, message: program.message,
dotfiles: !!program.dotfiles, dotfiles: !!program.dotfiles,
add: !!program.add, add: !!program.add,
only: program.remove,
remote: program.remote, remote: program.remote,
push: !!program.push, push: !!program.push,
logger: function(message) { logger: function(message) {

View File

@ -2,7 +2,7 @@ var path = require('path');
var fs = require('fs'); var fs = require('fs');
var Q = require('q'); var Q = require('q');
var wrench = require('wrench'); var rimraf = require('rimraf');
var globby = require('globby'); var globby = require('globby');
var git = require('./git'); var git = require('./git');
@ -241,5 +241,5 @@ exports.publish = function publish(basePath, config, callback) {
* Clean the cache directory. * Clean the cache directory.
*/ */
exports.clean = function clean() { exports.clean = function clean() {
wrench.rmdirSyncRecursive(getCacheDir(), true); rimraf.sync(getCacheDir());
}; };

View File

@ -32,11 +32,11 @@
"graceful-fs": "4.1.2", "graceful-fs": "4.1.2",
"q": "1.4.1", "q": "1.4.1",
"q-io": "1.13.2", "q-io": "1.13.2",
"wrench": "1.5.8" "rimraf": "^2.5.2"
}, },
"devDependencies": { "devDependencies": {
"chai": "^3.4.1", "chai": "^3.4.1",
"eslint": "2.7.0", "eslint": "2.8.0",
"eslint-config-tschaub": "4.0.0", "eslint-config-tschaub": "4.0.0",
"mocha": "^2.3.4", "mocha": "^2.3.4",
"sinon": "^1.17.3" "sinon": "^1.17.3"