refactor(repository): make repo#move more promise-y

clayreimann · clayreimann · commit ce55779922f5 · 2016-05-19T13:08:27.000-05:00
diff --git a/lib/Repository.js b/lib/Repository.js
@@ -531,29 +531,24 @@ class Repository extends Requestable {
     * @return {Promise} - the promise for the http request
     */
    move(branch, oldPath, newPath, cb) {
+      let oldSha;
       return this.getRef(`heads/${branch}`)
-         .then((response) => {
-            return this.getTree(`${response.data.object.sha}?recursive=true`)
-               .then((response) => {
-                  let _resp = response;
-                  response.data.tree.forEach((ref) => {
-                     if (ref.path === oldPath) {
-                        ref.path = newPath;
-                     }
-                     if (ref.type === 'tree') {
-                        delete ref.sha;
-                     }
-                  });
-                  return this.createTree(response.data.tree).then(
-                     (response) => {
-                        return this.commit(_resp.data.sha, response.data.sha, `Renamed '${oldPath}' to '${newPath}'`)
-                           .then((response) => {
-                              return this.updateHead(`heads/${branch}`, response.data.sha, true, cb);
-                           });
-                     }
-                  );
-               });
-         });
+         .then(({data: {object}}) => this.getTree(`${object.sha}?recursive=true`))
+         .then(({data: {tree, sha}}) => {
+            oldSha = sha;
+            let newTree = tree.map((ref) => {
+               if (ref.path === oldPath) {
+                  ref.path = newPath;
+               }
+               if (ref.type === 'tree') {
+                  delete ref.sha;
+               }
+               return ref;
+            });
+            return this.createTree(newTree);
+         })
+         .then(({data: tree}) => this.commit(oldSha, tree.sha, `Renamed '${oldPath}' to '${newPath}'`))
+         .then(({data: commit}) => this.updateHead(`heads/${branch}`, commit.sha, true, cb));
    }
 
    /**
diff --git a/test/repository.spec.js b/test/repository.spec.js
@@ -141,7 +141,7 @@ describe('Repository', function() {
       it('should show repo contributors', function(done) {
          remoteRepo.getContributors(assertSuccessful(done, function(err, contributors) {
             if (!(contributors instanceof Array)) {
-               console.log(contributors); // eslint-disable-line
+               console.log(JSON.stringify(contributors, null, 2)); // eslint-disable-line
             }
             expect(contributors).to.be.an.array();
             expect(contributors.length).to.be.above(1);
@@ -258,7 +258,7 @@ describe('Repository', function() {
       it('should show repo collaborators', function(done) {
          remoteRepo.getCollaborators(assertSuccessful(done, function(err, collaborators) {
             if (!(collaborators instanceof Array)) {
-               console.log(collaborators); // eslint-disable-line
+               console.log(JSON.stringify(collaborators, null, 2)); // eslint-disable-line
             }
             expect(collaborators).to.be.an.array();
             expect(collaborators).to.have.length(1);
