Test cache dir path creation

Author: tschaub

lib/index.js

@@ -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);
       })

test/lib/index.spec.js

@@ -0,0 +1,46 @@
+const path = require('path');
+const assert = require('../helper').assert;
+const index = require('../../lib/index');
+
+describe('index', () => {
+  describe('getCacheDir()', () => {
+    it('works for [email protected]:<username>/<project>.git', () => {
+      const dir = index.getCacheDir(
+        '[email protected]:example-user/example-project.git'
+      );
+
+      const expected = path.join(
+        '.cache',
+        'gh-pages',
+        '[email protected]!example-user!example-project.git'
+      );
+      assert(dir.endsWith(expected), `unexpected cache dir: ${dir}`);
+    });
+
+    it('works for https://github.com/<username>/<project>.git', () => {
+      const dir = index.getCacheDir(
+        'https://github.com/example-user/example-project.git'
+      );
+
+      const expected = path.join(
+        '.cache',
+        'gh-pages',
+        'https!github.com!example-user!example-project.git'
+      );
+      assert(dir.endsWith(expected), `unexpected cache dir: ${dir}`);
+    });
+
+    it('works for https://<username>:<password>@github.com/<username>/<project>.git', () => {
+      const dir = index.getCacheDir(
+        'https://user:[email protected]/example-user/example-project.git'
+      );
+
+      const expected = path.join(
+        '.cache',
+        'gh-pages',
+        '[email protected]!example-user!example-project.git'
+      );
+      assert(dir.endsWith(expected), `unexpected cache dir: ${dir}`);
+    });
+  });
+});