Merge branch 'master' into master

bin/gh-pages

@@ -21,6 +21,9 @@ program
       'commit message', 'Updates')
   .option('-t, --dotfiles', 'Include dotfiles')
   .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)')
   .parse(process.argv);
 
@@ -32,6 +35,7 @@ ghpages.publish(path.join(process.cwd(), program.dist), {
   message: program.message,
   dotfiles: !!program.dotfiles,
   add: !!program.add,
+  only: program.remove,
   remote: program.remote,
   push: !!program.push,
   logger: function(message) {

lib/index.js

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

package.json

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