Merge branch 'bugfix/1.7.3' into devel

Author: guyzmo

README.md

@@ -13,11 +13,11 @@
 ### main commands
 
 Control your remote git hosting services from the `git` commandline. The usage is
-very simple. To clone a new project, out of github, just issue:
+very simple. To clone a new project, out of GitHub, just issue:
 
     % git hub clone guyzmo/git-repo
 
-But that works also with a project from gitlab, bitbucket, or your own gitlab:
+But that works also with a project from GitLab, Bitbucket, or your own GitLab:
 
     % git lab clone guyzmo/git-repo
     % git bb clone guyzmo/git-repo
@@ -57,7 +57,7 @@ Also, you can open the repository's page, using the `open` command:
 
 ### Requests for merges *(aka Pull Requests aka Merge Requests)*
 
-Once you're all set with your repository, you can check requests to merge 
+Once you're all set with your repository, you can check requests to merge
 (aka Pull Requests on github) using the `request` command:
 
     % git hub request guyzmo/git-repo list
@@ -109,7 +109,7 @@ And when you're done you just get rid of it:
     Successfully deleted gist!
 
 > *Nota Bene*: Thanks to `git` CLI flexibility, by installing `git-repo` you directly
-> have acces to the tool using `git-repo hub …` or `git repo hub …`. For the
+> have access to the tool using `git-repo hub …` or `git repo hub …`. For the
 > `git hub …` call, you have to set up aliases, see below how to configure that.
 
 And as a bonus, each time it's adding a new remote, it's updating the `all` remote,
@@ -166,7 +166,7 @@ for the service you use:
 
     % git-repo bit clone guyzmo/git-repo
 
-Also, you can setup your own gitlab self-hosted server, using that configuration:
+Also, you can setup your own GitLab self-hosted server, using that configuration:
 
     [gitrepo "myprecious"]
         type = gitlab
@@ -188,7 +188,7 @@ So you can run the tool as a git subcommand:
 ### Development
 
 For development, I like to use `buildout`, and the repository is already configured
-for that. All you have to do, is install buildout, and then call it from the root of 
+for that. All you have to do, is install buildout, and then call it from the root of
 the repository:
 
     % pip install zc.buildout
@@ -198,6 +198,19 @@ and then you'll have the executable in `bin`:
 
     % bin/git-repo --help
 
+#### Verbose running
+
+You can repeat the `-v` argument several times to increase the level of verbosity
+of `git-repo`. The more arguments you give, the more details you'll have.
+
+* `-v` will set the debugging level to `DEBUG`, giving some execution info ;
+* `-vv` will print out all the git commands that are being executed ;
+* `-vvv` will give more verbose insight on the git layer ;
+* `-vvvv` will output all the HTTP exchanges with the different APIs ;
+* `-vvvvv` will printout how were parsed the arguments.
+
+##### Testing
+
 To run the tests:
 
     % bin/py.test
@@ -208,25 +221,24 @@ You can use the following options for py.test to help you debug when tests fail:
 * `-x` will stop upon the first failure
 * `--pdb` will launch the debugger where an exception has been launched
 
-
 The tests use recordings of exchanged HTTP data, so that we don't need real credentials
 and a real connection, when testing the API on minor changes. Those recordings are
 called cassettes, thanks to the [betamax](https://github.com/sigmavirus24/betamax) framework
 being in use in the test suites.
 
-When running existing tests, based on the provided cassettes, you don't need any 
+When running existing tests, based on the provided cassettes, you don't need any
 setting. Also, if you've got a configuration in `~/.gitconfig`, the tests will use
 them. Anyway, you can use environment variables for those settings (environment
 variables will have precedence over the configuration settings):
 
 To use your own credentials, you can setup the following environment variables:
 
-* `GITHUB_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on github
-* `GITLAB_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on gitlab 
-* `BITBUCKET_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on bitbucket
-* `PRIVATE_KEY_GITHUB` your private token you've setup on github for your account
-* `PRIVATE_KEY_GITLAB` your private token you've setup on gitlab for your account
-* `PRIVATE_KEY_BITBUCKET` your private token you've setup on bitbucket for your account
+* `GITHUB_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on GitHub
+* `GITLAB_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on GitLab
+* `BITBUCKET_NAMESPACE` (which defaults to `not_configured`) is the name of the account to use on Bitbucket
+* `PRIVATE_KEY_GITHUB` your private token you've setup on GitHub for your account
+* `PRIVATE_KEY_GITLAB` your private token you've setup on GitLab for your account
+* `PRIVATE_KEY_BITBUCKET` your private token you've setup on Bitbucket for your account
 
 ### TODO
 
@@ -256,7 +268,7 @@ To use your own credentials, you can setup the following environment variables:
 
 ### License
 
-    Copyright ⓒ Bernard `Guyzmo` Pratz <[email protected]>
+    Copyright © Bernard `Guyzmo` Pratz <[email protected]>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License

VERSION

@@ -1 +1 @@
-1.6.0
+1.7.2

git_repo/repo.py

@@ -355,6 +355,8 @@ def do_create(self):
         if not self.user_name and not self.repo_name:
             self.set_repo_slug('/'.join([service.user,
                 os.path.basename(os.path.abspath(self.path))]))
+        if not self.user_name:
+            self.user_name = service.user
         service.create(self.user_name, self.repo_name, add=self.add)
         log.info('Successfully created remote repository `{}`, '
                  'with local remote `{}`'.format(
@@ -532,10 +534,12 @@ def main(args):
             log.exception('------------------------------------')
         return 2
 
-
-
 def cli(): #pragma: no cover
-    sys.exit(main(docopt(__doc__.format(self=sys.argv[0].split('/')[-1], version=__version__))))
+    try:
+        sys.exit(main(docopt(__doc__.format(self=sys.argv[0].split('/')[-1], version=__version__))))
+    finally:
+        # Whatever happens, make sure that the cursor reappears with some ANSI voodoo
+        sys.stdout.write('\033[?25h')
 
 if __name__ == '__main__': #pragma: no cover
     cli()

git_repo/services/ext/github.py

@@ -21,8 +21,7 @@ def __init__(self, *args, **kwarg):
     def connect(self):
         try:
             self.gh.login(token=self._privatekey)
-            self.username = self.gh.user().name
-            self.username = self.gh.user().name
+            self.username = self.gh.user().login
         except github3.models.GitHubError as err:
             if err.code is 401:
                 if not self._privatekey:
@@ -81,7 +80,7 @@ def _format_gist(self, gist):
 
     def gist_list(self, gist=None):
         if not gist:
-            for gist in self.gh.iter_gists(self.gh.user().name):
+            for gist in self.gh.iter_gists(self.gh.user().login):
                 yield (gist.html_url, gist.description)
         else:
             gist = self.gh.gist(self._format_gist(gist))
@@ -149,9 +148,9 @@ def request_create(self, user, repo, local_branch, remote_branch, title, descrip
         repository = self.gh.repository(user, repo)
         if not repository:
             raise ResourceNotFoundError('Could not find repository `{}/{}`!'.format(user, repo))
-        if not local_branch:
-            remote_branch = self.repository.active_branch.name or self.repository.active_branch.name
         if not remote_branch:
+            remote_branch =  self.repository.active_branch.name
+        if not local_branch:
             local_branch = repository.master_branch or 'master'
         try:
             request = repository.create_pull(title,
@@ -160,15 +159,12 @@ def request_create(self, user, repo, local_branch, remote_branch, title, descrip
                     body=description)
         except github3.models.GitHubError as err:
             if err.code == 422:
-                for error in err.errors:
-                    if 'message' in error:
-                        if 'No commits' in error['message']:
+                if err.message == 'Validation Failed':
+                    for error in err.errors:
+                        if 'message' in error:
                             raise ResourceError(error['message'])
-                else:
-                    if 'message' in error:
-                        raise ResourceError(error['message'])
-                raise ResourceError("Unhandled formatting error: {}".format(err.errors))
-
+                    raise ResourceError("Unhandled formatting error: {}".format(err.errors))
+            raise ResourceError(err.message)
 
         return {'local': local_branch, 'remote': remote_branch, 'ref': request.number}
 
@@ -208,5 +204,5 @@ def get_auth_token(cls, login, password):
 
     @property
     def user(self):
-        return self.gh.user().name
+        return self.gh.user().login
 

git_repo/services/ext/gitlab.py

@@ -20,6 +20,7 @@ def __init__(self, *args, **kwarg):
         super(GitlabService, self).__init__(*args, **kwarg)
 
     def connect(self):
+        self.gl.set_url(self.url_ro)
         self.gl.set_token(self._privatekey)
         self.gl.token_auth()
         self.username = self.gl.user.username

git_repo/services/service.py

@@ -195,7 +195,7 @@ def format_path(self, repository, namespace=None, rw=False):
         elif rw and '/' in repo:
             return '{}:{}'.format(self.url_rw, repo)
         else:
-            raise ArgumentError("Cannot tell how to handle this url: `{}/{}`!".format(user, repo_name))
+            raise ArgumentError("Cannot tell how to handle this url: `{}/{}`!".format(namespace, repo))
 
     def pull(self, remote, branch=None):
         '''Pull a repository

requirements.txt

@@ -1,5 +1,5 @@
 docopt
-GitPython==2.0.6
+GitPython>=2.0.6
 progress==1.2
 python-gitlab==0.13
 uritemplate.py==2.0.0