Minor code improvements

joelvh · Jul 8, 2019 · 3364b58 · 3364b58
1 parent 57c1cc3
commit 3364b58
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/downloadTemplateFromRepo.js
@@ -56,15 +56,15 @@ function parseGitHubURL(url) {
   const owner = parts[1];
   const repo = parts[2];
   const branch = isSubdirectory ? parts[pathLength] : 'master';
-  const isGhe = url.hostname !== 'github.com';
+  const isGitHubEnterprise = url.hostname !== 'github.com';
 
-  if (!isGhe) {
+  if (!isGitHubEnterprise) {
     // validate if given url is a valid GitHub url
     validateUrl(url, 'github.com', 'GitHub', owner, repo);
   }
 
   const downloadUrl = `https://${
-    isGhe ? url.hostname : 'github.com'
+    isGitHubEnterprise ? url.hostname : 'github.com'
   }/${owner}/${repo}/archive/${branch}.zip`;
 
   return {
@@ -74,7 +74,7 @@ function parseGitHubURL(url) {
     downloadUrl,
     isSubdirectory,
     pathToDirectory: getPathDirectory(pathLength + 1, parts),
-    auth: url.auth ? url.auth : '',
+    auth: url.auth || '',
   };
 }
 
@@ -181,6 +181,7 @@ function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
   let serviceName;
   let dirName;
   let downloadServicePath;
+  const { auth } = repoInformation;
 
   if (repoInformation.isSubdirectory) {
     const folderName = repoInformation.pathToDirectory.split('/').splice(-1)[0];
@@ -208,7 +209,7 @@ function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
     extract: true,
     strip: 1,
     mode: '755',
-    auth: repoInformation.auth || '',
+    auth,
   };
   // download service
   return download(repoInformation.downloadUrl, downloadServicePath, downloadOptions)

diff --git a/lib/utils/downloadTemplateFromRepo.test.js b/lib/utils/downloadTemplateFromRepo.test.js
@@ -51,7 +51,7 @@ describe('downloadTemplateFromRepo', () => {
     });
 
     it('should throw an error if the passed URL is not a valid GitHub URL', () => {
-      expect(() => downloadTemplateFromRepo('http://no-git-url.com/foo/bar')).to.throw(Error);
+      expect(() => downloadTemplateFromRepo('http://no-git-hub-url.com/foo/bar')).to.throw(Error);
     });
 
     it('should throw an error if a directory with the same service name is already present', () => {