Implement upload hook

Author: AndrewJo

index.js

@@ -185,6 +185,30 @@ module.exports = {
       });
     }
 
+    /**
+     * Private function for pushing to upstream branch.
+     *
+     * @params {Repo} repository
+     * @params {String} branch
+     * @params {String} remote
+     * @params {Boolean} setUpstream
+     * @return {Promise}
+     */
+    function pushUpstream(repository, branch, remote, setUpstream) {
+      return new Promise((resolve, reject) => {
+        repository.git('push', {
+          u: setUpstream,
+          f: true
+        }, [remote, branch], error => {
+          if (error) {
+            return reject(error);
+          }
+
+          return resolve();
+        });
+      });
+    }
+
     var GHPagesPlugin = DeployPluginBase.extend({
       name: options.name,
 
@@ -287,7 +311,8 @@ module.exports = {
         let branch = this.readConfig('gitBranch');
 
         return addRemote(context.gitRepo, remoteName, remoteUrl)
-          .then(function () {
+          .then(() => {
+            this.log('remote repository added', { color: 'green' });
             return setUpstream(context.gitRepo, branch, remoteName);
           })
           .catch(() => {
@@ -299,6 +324,18 @@ module.exports = {
       },
 
       upload: function (context) {
+        let repo = context.gitRepo;
+        let branch = this.readConfig('gitBranch');
+        let remoteName = this.readConfig('gitRemoteName');
+        let setUpstream = context.setUpstreamOnPush;
+
+        this.log('pushing to remote repository');
+
+        return pushUpstream(repo, branch, remoteName, setUpstream)
+          .then(() => {
+            this.log('push success', { color: 'green' });
+          })
+          .catch(error => this.log(error, { color: 'red' }));
       },
 
       teardown: function (context) {

tests/unit/index-test.js

@@ -5,6 +5,7 @@ var expect = require('chai').expect;
 var path = require('path');
 var fs = require('fs-extra');
 var git = require('gift');
+var RSVP = require('rsvp');
 
 describe('github pages plugin', function () {
   let subject;
@@ -185,4 +186,55 @@ describe('github pages plugin', function () {
       });
     });
   });
+
+  describe('#upload hook', function () {
+    this.timeout(10000);
+    let repo;
+
+    before(function (done) {
+      plugin.beforeHook(context);
+      plugin.configure(context);
+      plugin.setup(context)
+        .then(function () {
+          return plugin.didBuild(context);
+        })
+        .then(function () {
+          return plugin.willUpload(context);
+        })
+        .then(function () {
+          return plugin.upload(context);
+        })
+        .then(function () {
+          repo = git(repoPath);
+          done();
+        });
+    });
+
+    function revParse(branch) {
+      return new RSVP.Promise((resolve, reject) => {
+        repo.git('rev-parse', {}, [branch], (error, stdout) => {
+          if (error) {
+            return reject(error);
+          }
+
+          return resolve(stdout);
+        });
+      });
+    }
+
+    it('pushes branch to remote repository', function (done) {
+      // Fetch from remote and see if local is up-to-date
+      repo.remote_fetch('ember-cli-deploy-test', error => {
+        expect(error).to.be.null;
+
+        RSVP.all([
+          revParse('gh-pages'),
+          revParse('ember-cli-deploy-test/gh-pages')
+        ]).then((shaHashes) => {
+          expect(shaHashes[0]).to.be.equal(shaHashes[1]);
+          done();
+        });
+      });
+    });
+  });
 });