alexcorre · alexcorre · May 29, 2014 · May 29, 2014 · May 29, 2014 · May 29, 2014
diff --git a/lib/util/RemoteRevision.js b/lib/util/RemoteRevision.js
@@ -61,7 +61,7 @@ _.extend(RemoteRevision.prototype, {
   },
 
   parseProjectAndRepo: function() {
-    var pattern = /[\:\/]([\w-]*)\/([\w-]*)\.git$/;
+    var pattern = /[\:\/]([\w-]*)\/([\w-]*)(\.git)?$/;
     var matches = this.remote.match(pattern);
 
     // if we have no matches just return empty object. caller should validate

diff --git a/spec/RemoteRevision-spec.js b/spec/RemoteRevision-spec.js
@@ -66,6 +66,18 @@ describe('RemoteRevision', function() {
       });
     });
 
+    it('Should parse a standard github url without the .git ending correctly', function () {
+      var githubRemote = 'git@github.com:project/someRepo';
+      instance.remote = githubRemote;
+
+      var output = instance.parseProjectAndRepo();
+
+      expect(output).toEqual({
+        project: 'project',
+        repo: 'someRepo'
+      });
+    });
+
     it('Should parse a read only github url correctly', function () {
       var githubHttpRemote = 'https://github.com/project/someRepo.git';
       instance.remote = githubHttpRemote;
@@ -90,6 +102,18 @@ describe('RemoteRevision', function() {
       });
     });
 
+    it('Should parse a repo url with dashes and wthout a .git ending correctly', function () {
+      var githubHttpRemote = 'https://github.com/some-project/some-repo';
+      instance.remote = githubHttpRemote;
+
+      var output = instance.parseProjectAndRepo();
+
+      expect(output).toEqual({
+        project: 'some-project',
+        repo: 'some-repo'
+      });
+    });
+
     it('Should work with a url with a port', function() {
       var portRemoteUrl = 'ssh://git@git.my-company.com:2222/group/repo-name.git';
       instance.remote = portRemoteUrl;
@@ -116,4 +140,4 @@ describe('RemoteRevision', function() {
 
   });
 
-});
+});