Merge pull request #395 from tw0517tw/filenamify

Switch from filenamify-url to filenamify

Author: tschaub

lib/index.js

@@ -1,6 +1,6 @@
 const findCacheDir = require('find-cache-dir');
 const Git = require('./git');
-const filenamify = require('filenamify-url');
+const filenamify = require('filenamify');
 const copy = require('./util').copy;
 const getUser = require('./util').getUser;
 const fs = require('fs-extra');
@@ -10,9 +10,20 @@ const util = require('util');
 
 const log = util.debuglog('gh-pages');
 
-function getCacheDir() {
-  return findCacheDir({name: 'gh-pages'});
+/**
+ * Get the cache directory.
+ * @param {string} [optPath] Optional path.
+ * @returns {string} The full path to the cache directory.
+ */
+function getCacheDir(optPath) {
+  const dir = findCacheDir({name: 'gh-pages'});
+  if (!optPath) {
+    return dir;
+  }
+
+  return path.join(dir, filenamify(optPath));
 }
+exports.getCacheDir = getCacheDir;
 
 function getRepo(options) {
   if (options.repo) {
@@ -111,7 +122,7 @@ exports.publish = function publish(basePath, config, callback) {
     getRepo(options)
       .then(repo => {
         repoUrl = repo;
-        const clone = path.join(getCacheDir(), filenamify(repo));
+        const clone = getCacheDir(repo);
         log('Cloning %s into %s', repo, clone);
         return Git.clone(repo, clone, options.branch, options);
       })

package-lock.json

@@ -37,7 +37,7 @@
     "async": "^2.6.1",
     "commander": "^2.18.0",
     "email-addresses": "^3.0.1",
-    "filenamify-url": "^1.0.0",
+    "filenamify": "^4.3.0",
     "find-cache-dir": "^3.3.1",
     "fs-extra": "^8.1.0",
     "globby": "^6.1.0"