fix(deploy): fail gracefully for permissions error (#569)

Author: filipesilva

addon/ng2/commands/github-pages-deploy.ts

@@ -100,7 +100,8 @@ module.exports = Command.extend({
       .then(addAndCommit)
       .then(returnStartingBranch)
       .then(pushToGitRepo)
-      .then(printProjectUrl);
+      .then(printProjectUrl)
+      .catch(failGracefully);
 
     function checkForPendingChanges() {
       return execPromise('git status --porcelain')
@@ -120,7 +121,7 @@ module.exports = Command.extend({
 
     function saveStartingBranchName() {
       return execPromise('git rev-parse --abbrev-ref HEAD')
-        .then((stdout) => initialBranch = stdout);
+        .then((stdout) => initialBranch = stdout.replace(/\s/g, ''));
     }
 
     function createGitHubRepoIfNeeded() {
@@ -180,5 +181,15 @@ module.exports = Command.extend({
           ui.writeLine('Github pages might take a few minutes to show the deployed site.');
         });
     }
+
+    function failGracefully(error) {
+      if (error && (/git clean/.test(error.message) || /Permission denied/.test(error.message))) {
+        let msg = 'There was a permissions error during git file operations, please close any open project files/folders and try again.';
+        msg += `\nYou might also need to return to the ${initialBranch} branch manually.`;
+        return Promise.reject(new SilentError(msg));
+      } else {
+        return Promise.reject(error);
+      }
+    }
   }
 });

tests/acceptance/github-pages-deploy.spec.js

@@ -240,4 +240,23 @@ describe('Acceptance: ng github-pages:deploy', function() {
       })
       .then(() => httpsStub.restore());
   });
+
+  it('should fail gracefully when checkout has permissions failure', function() {
+    execStub.addExecSuccess('git status --porcelain')
+      .addExecSuccess('git rev-parse --abbrev-ref HEAD', initialBranch)
+      .addExecSuccess('git remote -v', remote)
+      .addExecSuccess(`git checkout ${branch}`)
+      .addExecSuccess('git add .')
+      .addExecSuccess(`git commit -m "${message}"`)
+      .addExecError(`git checkout ${initialBranch}`, 'error: cannot stat \'src/client\': Permission denied');
+
+    return ng(['github-pages:deploy', '--skip-build'])
+      .then(() => {
+        throw new SilentError('Should not pass the deploy.');
+      }, (ret) => {
+        expect(ret.name).to.equal('SilentError');
+        expect(ret.isSilentError).to.equal(true);
+        expect(ret.message).to.contain('There was a permissions error');
+      });
+  });
 });