👍 Merge branch devel ; 🔖 Version bump to 1.8.0

🚧 Features

* Support for insecure connection through config option (fixes #66)
* Made gitlab feature complete:
 * Added support for list command in gitlab (cf #78)
 * Added support for gitlab gists (fixes #12)
 * Added support for gitlab merge requests (fixes #10)

🚒 Bugfixes

* Bad exceptions handling mistakes (fixes #84, fixes #85)
* Missing edge case handling in list command (fixes #83)

💄 Cosmetics

* Updated README with new config option
* Added @rnestler to contributors
* Updated TODO list

Signed-off-by: Guyzmo <[email protected]>

Author: guyzmo

README.md

@@ -173,6 +173,8 @@ Also, you can setup your own GitLab self-hosted server, using that configuration
         type = gitlab
         token = YourSuperPrivateKey
         fqdn = gitlab.example.org
+        # Set this only if you use a self-signed certificate and experience problems
+        insecure = true
 
 Finally, to make it really cool, you can make a few aliases in your gitconfig:
 
@@ -186,6 +188,20 @@ So you can run the tool as a git subcommand:
 
     git hub clone guyzmo/git-repo
 
+For those who like to keep all dotfiles in a git repository, it'd be horrendous to
+store tokens that offer access to your social accounts in a repository… And I'm not
+even talking about those who want to share your dotfiles. But don't worry, once
+it's all configured, you can fire up your [favorite editor](http://www.vim.org) and
+move all the `[gitrepo …]` sections into a new file, like `~/.gitconfig-repos`.
+
+Your can run the following command to do this automagically:
+
+    python -m git_repo.extract_config
+
+if you want to use another path, you can change the defaults:
+
+    python -m git_repo.extract_config ~/.gitconfig-repos ~/.gitconfig
+
 ### Development
 
 For development, I like to use `buildout`, and the repository is already configured
@@ -253,13 +269,13 @@ To use your own credentials, you can setup the following environment variables:
 * [x] show a nice progress bar, while it's fetching (cf [#15](https://github.com/guyzmo/git-repo/issues/15))
 * [ ] add support for handling gists
   * [x] github support
-  * [ ] gitlab support (cf [#12](https://github.com/guyzmo/git-repo/issues/12))
+  * [x] gitlab support (cf [#12](https://github.com/guyzmo/git-repo/issues/12))
   * [ ] bitbucket support (cf [#13](https://github.com/guyzmo/git-repo/issues/13))
 * [ ] add support for handling pull requests
   * [x] github support
-  * [ ] gitlab support (cf [#10](https://github.com/guyzmo/git-repo/issues/10))
+  * [x] gitlab support (cf [#10](https://github.com/guyzmo/git-repo/issues/10))
   * [ ] bitbucket support (cf [#11](https://github.com/guyzmo/git-repo/issues/11))
-* [ ] add OAuth support for bitbucket (cf [#14](https://github.com/guyzmo/git-repo/issues/14))
+* [ ] add application token support for bitbucket (cf [#14](https://github.com/guyzmo/git-repo/issues/14))
 * [ ] add support for managing SSH keys (cf [#22](https://github.com/guyzmo/git-repo/issues/22))
 * [ ] add support for issues?
 * [ ] add support for gogs (cf [#18](https://github.com/guyzmo/git-repo/issues/18))
@@ -279,6 +295,7 @@ With code contributions coming from:
 * [@buaazp](https://github.com/buaazp) — [commits](https://github.com/guyzmo/git-repo/commits?author=buaazp)
 * [@peterazmanov](https://github.com/peterazmanov) — [commits](https://github.com/guyzmo/git-repo/commits?author=peterazmanov)
 * [@Crazybus](https://github.com/Crazybus) — [commits](https://github.com/guyzmo/git-repo/commits?author=Crazybus)
+* [@rnestler](https://github.com/rnestler) — [commits](https://github.com/guyzmo/git-repo/commits/devel?author=rnestler)
 
 ### License
 

VERSION

@@ -1 +1 @@
-1.7.5
+1.8.0

buildout.cfg

@@ -9,7 +9,7 @@ develop-eggs-directory = ${buildout:directory}/var/develop-eggs
 parts-directory    = ${buildout:directory}/var/parts
 # develop-dir        = ${buildout:directory}/var/clone/
 # extensions=gp.vcsdevelop
-# vcs-extend-develop=git+https://github.com/gitpython-developers/GitPython#egg=GitPython
+# vcs-extend-develop=git+https://github.com/…@…#egg=…
 
 [git_repo]
 recipe = zc.recipe.egg

git_repo/extract_config.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import git
+
+def extract_gitrepo_sections(conf):
+    return filter(lambda k: k.startswith('gitrepo'), conf.sections())
+
+def extract_gitrepo_conf(gconf_old, gconf_new):
+    if os.path.exists(gconf_new):
+        return "✗ cannot execute, file already exists: {}".format(gconf_new)
+    with git.config.GitConfigParser(gconf_old, read_only=False) as cold:
+        with git.config.GitConfigParser(gconf_new, read_only=False) as cnew:
+            sections = list(extract_gitrepo_sections(cold))
+            # copy the sections to the new configuration file
+            cnew.update({s: {k:v for k,v in cold.items(s)} for s in sections})
+            cnew.write()
+            # remove the sections from the old configuration file
+            for section in sections:
+                cold.remove_section(section)
+            # insert path to the new config file in the old one
+            cold.update({'include': {'path': os.path.abspath(gconf_new)}})
+    print("🍻 git-repo configuration extracted to new file: {}".format(gconf_new))
+
+if __name__ == '__main__':
+    if '-h' in sys.argv or '--help' in sys.argv:
+        sys.exit('Usage: {} [.gitconfig-repos] [.gitconfig]'.format(sys.argv[0]))
+    sys.exit(extract_gitrepo_conf(
+        gconf_old=os.path.expanduser(len(sys.argv) >= 3 and sys.argv[2] or '~/.gitconfig'),
+        gconf_new=os.path.expanduser(len(sys.argv) >= 2 and sys.argv[1] or '~/.gitconfig-repos')
+    ))
+
+

git_repo/repo.py

@@ -134,7 +134,7 @@
     print('Please use with python version 3')
     sys.exit(1)
 
-from .exceptions import ArgumentError
+from .exceptions import ArgumentError, ResourceNotFoundError
 from .services.service import RepositoryService
 
 from .kwargparse import KeywordArgumentParser, store_parameter, register_action
@@ -438,12 +438,14 @@ def do_request_fetch(self):
     @register_action('snippet', 'list')
     def do_gist_list(self):
         service = self.get_service(lookup_repository=False)
-        if self.gist_ref:
+        if 'github' == service.name and self.gist_ref:
             log.info("{:15}\t{:>7}\t{}".format('language', 'size', 'name'))
+        else:
+            log.info("{:56}\t{}".format('id', 'title'.ljust(60)))
+        if self.gist_ref:
             for gist_file in service.gist_list(self.gist_ref):
                 print("{:15}\t{:7}\t{}".format(*gist_file))
         else:
-            log.info("{:56}\t{}".format('id', 'title'.ljust(60)))
             for gist in service.gist_list():
                 print( "{:56}\t{}".format(gist[0], gist[1]))
         return 0

git_repo/services/ext/github.py

@@ -107,35 +107,52 @@ def col_print(lines, indent=0, pad=2):
         else:
             print('Status\tCommits\tReqs\tIssues\tForks\tCoders\tWatch\tLikes\tLang\tModif\t\tName', file=sys.stderr)
             for repo in repositories:
-                if repo.updated_at.year < datetime.now().year:
-                    date_fmt = "%b %d %Y"
-                else:
-                    date_fmt = "%b %d %H:%M"
-
-                status = ''.join([
-                    'F' if repo.fork else ' ',               # is a fork?
-                    'P' if repo.private else ' ',            # is private?
-                ])
-                print('\t'.join([
-                    # status
-                    status,
-                    # stats
-                    str(len(list(repo.iter_commits()))),          # number of commits
-                    str(len(list(repo.iter_pulls()))),            # number of pulls
-                    str(len(list(repo.iter_issues()))),           # number of issues
-                    str(repo.forks),                              # number of forks
-                    str(len(list(repo.iter_contributors()))),     # number of contributors
-                    str(repo.watchers),                           # number of subscribers
-                    str(repo.stargazers or 0),                    # number of ♥
-                    # info
-                    repo.language or '?',                      # language
-                    repo.updated_at.strftime(date_fmt),      # date
-                    '/'.join([user, repo.name]),             # name
-                ]))
-
-
-
-
+                try:
+                    if repo.updated_at.year < datetime.now().year:
+                        date_fmt = "%b %d %Y"
+                    else:
+                        date_fmt = "%b %d %H:%M"
+
+                    status = ''.join([
+                        'F' if repo.fork else ' ',               # is a fork?
+                        'P' if repo.private else ' ',            # is private?
+                    ])
+                    print('\t'.join([
+                        # status
+                        status,
+                        # stats
+                        str(len(list(repo.iter_commits()))),          # number of commits
+                        str(len(list(repo.iter_pulls()))),            # number of pulls
+                        str(len(list(repo.iter_issues()))),           # number of issues
+                        str(repo.forks),                              # number of forks
+                        str(len(list(repo.iter_contributors()))),     # number of contributors
+                        str(repo.watchers),                           # number of subscribers
+                        str(repo.stargazers or 0),                    # number of ♥
+                        # info
+                        repo.language or '?',                      # language
+                        repo.updated_at.strftime(date_fmt),      # date
+                        '/'.join([user, repo.name]),             # name
+                    ]))
+                except Exception as err:
+                    if 'Git Repository is empty.' == err.args[0].json()['message']:
+                        print('\t'.join([
+                            # status
+                            'E',
+                            # stats
+                            'ø',          # number of commits
+                            'ø',            # number of pulls
+                            'ø',           # number of issues
+                            'ø',                              # number of forks
+                            'ø',     # number of contributors
+                            'ø',                           # number of subscribers
+                            'ø',                    # number of ♥
+                            # info
+                            '?',                      # language
+                            repo.updated_at.strftime(date_fmt),      # date
+                            '/'.join([user, repo.name]),             # name
+                        ]))
+                    else:
+                        print("Cannot show repository {}: {}".format('/'.join([user, repo.name]), err))
 
     def get_repository(self, user, repo):
         repository = self.gh.repository(user, repo)
@@ -249,7 +266,7 @@ def request_fetch(self, user, repo, request, pull=False):
         try:
             for remote in self.repository.remotes:
                 if remote.name == self.name:
-                    local_branch_name = 'request/{}'.format(request)
+                    local_branch_name = 'requests/github/{}'.format(request)
                     self.fetch(
                         remote,
                         'pull/{}/head'.format(request),