Merge branch requests/github/148 into devel

fixes #148

Author: guyzmo

git_repo/repo.py

@@ -163,15 +163,15 @@ def _guess_repo_slug(self, repository, service, resolve_targets=None):
         for remote in repository.remotes:
             if remote.name in targets:
                 for url in remote.urls:
-                    if url.startswith('https'):
-                        if url.endswith('.git'):
-                            url = url[:-4]
+                    if url.endswith('.git'):
+                        url = url[:-4]
+                    if url.find('://') > -1:
+                        # http://, https:// and ssh://
                         *_, user, name = url.split('/')
                         self.set_repo_slug('/'.join([user, name]))
                         return
-                    elif url.startswith('git@'):
-                        if url.endswith('.git'):
-                            url = url[:-4]
+                    elif url.find('@') > -1 and url.find(':') > -1:
+                        # scp-style URL
                         _, repo_slug = url.split(':')
                         self.set_repo_slug(repo_slug)
                         return

git_repo/services/service.py

@@ -246,7 +246,10 @@ def format_path(self, repository, namespace=None, rw=False):
         if not rw and '/' in repo:
             return '{}/{}'.format(self.url_ro, repo)
         elif rw and '/' in repo:
-            return '{}:{}'.format(self.url_rw, repo)
+            if self.url_rw.startswith('ssh://'):
+                return '{}/{}'.format(self.url_rw, repo)
+            else:
+                return '{}:{}'.format(self.url_rw, repo)
         else:
             raise ArgumentError("Cannot tell how to handle this url: `{}/{}`!".format(namespace, repo))