👍 Merge branch 'devel' ; 🔖 Version bump to 1.7.5

🚧 Feature:

* Added the repository list feature support, which lists all
  repositories for an user. (fixes #50)

🚒 Bugfixes:

* Allow cloning in empty directories (fixes #58)
* Allow URLs that contain .git in the name (fixes #55)
* Show a nice error when missing credentials on create (fixes #74)
* Made remote add show the proper name on success (fixes #72)

💄 Cosmetics:

* Removed distutil's usage of setup function in setup.py (cf #71)
* Improved versions used in requirements (cf #61)
* Fixed link in TODO list (cf #70)

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

Author: guyzmo

.travis.yml

@@ -1,4 +1,6 @@
 language: python
+# Don't use the Travis Container-Based Infrastructure
+sudo: true
 matrix:
   include:
     - os: linux
@@ -26,6 +28,7 @@ matrix:
 addons:
   apt:
     packages:
+        - git
         - pandoc
 before_install: |
   if [[ $TRAVIS_OS_NAME == 'osx' ]]; then

README.md

@@ -5,6 +5,7 @@
   * https://gitlab.com/guyzmo/git-repo
   * https://bitbucket.org/guyzmo/git-repo
 * Issues: https://github.com/guyzmo/git-repo/issues
+* Chat on IRC: [#git-repo @freenode](irc://irc.freenode.org/git-repo)
 * [![Issues in Ready](https://badge.waffle.io/guyzmo/git-repo.png?label=ready&title=Ready)](https://waffle.io/guyzmo/git-repo) [![Issues in Progress](https://badge.waffle.io/guyzmo/git-repo.png?label=in%20progress&title=Progress)](https://waffle.io/guyzmo/git-repo) [![Show Travis Build Status](https://travis-ci.org/guyzmo/git-repo.svg)](https://travis-ci.org/guyzmo/git-repo)
 * [![Pypi Version](https://img.shields.io/pypi/v/git-repo.svg) ![Pypi Downloads](https://img.shields.io/pypi/dm/git-repo.svg)](https://pypi.python.org/pypi/git-repo)
 
@@ -259,7 +260,7 @@ To use your own credentials, you can setup the following environment variables:
   * [ ] 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 support for managing SSH keys (cf [#22](https://github.com/guyzmo/git-repo/issues/15))
+* [ ] 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))
 * [ ] add support for gerrit (cf [#19](https://github.com/guyzmo/git-repo/issues/19))
@@ -270,13 +271,14 @@ To use your own credentials, you can setup the following environment variables:
 
 The project and original idea has been brought and is maintained by:
 
-* Bernard [@guyzmo](https://github.com/guyzmo) Pratz [commits](https://github.com/guyzmo/git-repo/commits?author=guyzmo)
+* Bernard [@guyzmo](https://github.com/guyzmo) Pratz — [commits](https://github.com/guyzmo/git-repo/commits?author=guyzmo)
 
 With code contributions coming from:
 
-* [@guyhughes](https://github.com/guyhughes) [commits](https://github.com/guyzmo/git-repo/commits?author=guyhughes)
-* [@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)
+* [@guyhughes](https://github.com/guyhughes) — [commits](https://github.com/guyzmo/git-repo/commits?author=guyhughes)
+* [@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)
 
 ### License
 

VERSION

@@ -1 +1 @@
-1.7.4
+1.7.5

git_repo/repo.py

@@ -6,6 +6,7 @@
     {self} [--path=<path>] [-v...] <target> create [--add]
     {self} [--path=<path>] [-v...] <target> delete [-f]
     {self} [--path=<path>] [-v...] <target> open
+    {self} [--path=<path>] [-v...] <target> (list|ls) [-l] <user>
     {self} [--path=<path>] [-v...] <target> fork <user>/<repo> [--branch=<branch>]
     {self} [--path=<path>] [-v...] <target> fork <user>/<repo> <repo> [--branch=<branch>]
     {self} [--path=<path>] [-v...] <target> create <user>/<repo> [--add]
@@ -23,11 +24,11 @@
     {self} [--path=<path>] [-v...] <target> request <user>/<repo> create <title> [--branch=<remote>] [--message=<message>]
     {self} [--path=<path>] [-v...] <target> request <user>/<repo> create <local_branch> <title> [--branch=<remote>] [--message=<message>]
     {self} [--path=<path>] [-v...] <target> request <user>/<repo> create <remote_branch> <local_branch> <title> [--branch=<remote>] [--message=<message>]
-    {self} [--path=<path>] [-v...] <target> gist (list|ls) [<gist>]
-    {self} [--path=<path>] [-v...] <target> gist clone <gist>
-    {self} [--path=<path>] [-v...] <target> gist fetch <gist> [<gist_file>]
-    {self} [--path=<path>] [-v...] <target> gist create [--secret] <description> [<gist_path> <gist_path>...]
-    {self} [--path=<path>] [-v...] <target> gist delete <gist> [-f]
+    {self} [--path=<path>] [-v...] <target> (gist|snippet) (list|ls) [<gist>]
+    {self} [--path=<path>] [-v...] <target> (gist|snippet) clone <gist>
+    {self} [--path=<path>] [-v...] <target> (gist|snippet) fetch <gist> [<gist_file>]
+    {self} [--path=<path>] [-v...] <target> (gist|snippet) create [--secret] <description> [<gist_path> <gist_path>...]
+    {self} [--path=<path>] [-v...] <target> (gist|snippet) delete <gist> [-f]
     {self} [--path=<path>] [-v...] <target> config [--config=<gitconfig>]
     {self} [-v...] config [--config=<gitconfig>]
     {self} --help
@@ -40,6 +41,7 @@
     fork                     Fork (and clone) the repository from the service
     create                   Make this repository a new remote on the service
     delete                   Delete the remote repository
+    list                     Lists the repositories for a given user
     gist                     Manages gist files
     request                  Handles requests for merge
     open                     Open the given or current repository in a browser
@@ -51,6 +53,12 @@
     -v,--verbose             Makes it more chatty (repeat twice to see git commands)
     -h,--help                Shows this message
 
+Options for list:
+    <user>                   Name of the user whose repositories will be listed
+    -l,--long                Show one repository per line, when set show the results
+                             with the following columns:
+    STATUS, COMMITS, REQUESTS, ISSUES, FORKS, CONTRIBUTORS, WATCHERS, LIKES, LANGUAGE, MODIF, NAME
+
 Options for add:
     <name>                   Name to use for the remote (defaults to name of repo)
     -t,--tracking=<branch>   Makes this remote tracking for the current branch
@@ -86,7 +94,6 @@
 
 Configuration options:
     alias                    Name to use for the git remote
-    url                      URL of the repository
     fqdn                     URL of the repository
     type                     Name of the service to use (github, gitlab, bitbucket)
 
@@ -101,7 +108,7 @@
     token = yourapitoken
     fqdn = custom.org
 
-{self} version {version}, Copyright ⓒ2016 Bernard `Guyzmo` Pratz
+{self} version {version}, Copyright ©2016 Bernard `Guyzmo` Pratz
 {self} comes with ABSOLUTELY NO WARRANTY; for more informations
 read the LICENSE file available in the sources, or check
 out: http://www.gnu.org/licenses/gpl-2.0.txt
@@ -112,6 +119,7 @@
 import os
 import sys
 import json
+import shutil
 import logging
 import pkg_resources
 
@@ -168,13 +176,13 @@ def _guess_repo_slug(self, repository, service):
             if remote.name in (target, 'upstream', 'origin'):
                 for url in remote.urls:
                     if url.startswith('https'):
-                        if '.git' in url:
+                        if url.endswith('.git'):
                             url = url[:-4]
                         *_, user, name = url.split('/')
                         self.set_repo_slug('/'.join([user, name]))
                         break
                     elif url.startswith('git@'):
-                        if '.git' in url:
+                        if url.endswith('.git'):
                             url = url[:-4]
                         _, repo_slug = url.split(':')
                         self.set_repo_slug(repo_slug)
@@ -269,6 +277,13 @@ def store_gitconfig(self, val):
 
     '''Actions'''
 
+    @register_action('ls')
+    @register_action('list')
+    def do_list(self):
+        service = self.get_service(False)
+        service.list(self.user, self.long)
+        return 0
+
     @register_action('add')
     def do_remote_add(self):
         service = self.get_service()
@@ -278,7 +293,7 @@ def do_remote_add(self):
                     alone=self.alone)
         log.info('Successfully added `{}` as remote named `{}`'.format(
             self.repo_slug,
-            service.name)
+            self.remote_name or service.name)
         )
         return 0
 
@@ -323,9 +338,10 @@ def do_fork(self):
     def do_clone(self, service=None, repo_path=None):
         service = service or self.get_service(lookup_repository=False)
         repo_path = repo_path or os.path.join(self.path, self.target_repo or self.repo_name)
-        if os.path.exists(repo_path):
+        if os.path.exists(repo_path) and os.listdir(repo_path) != []:
             raise FileExistsError('Cannot clone repository, '
-                                  'a folder named {} already exists!'.format(repo_path))
+                                  'a folder named {} already exists and '
+                                  'is not an empty directory!'.format(repo_path))
         try:
             repository = Repo.init(repo_path)
             service = RepositoryService.get_service(repository, self.target)
@@ -337,8 +353,8 @@ def do_clone(self, service=None, repo_path=None):
             return 0
         except Exception as err:
             if os.path.exists(repo_path):
-                os.removedirs(repo_path)
-            raise err from err
+                shutil.rmtree(repo_path)
+            raise ResourceNotFoundError(err.args[2].decode('utf-8')) from err
 
     @register_action('create')
     def do_create(self):
@@ -418,6 +434,8 @@ def do_request_fetch(self):
 
     @register_action('gist', 'ls')
     @register_action('gist', 'list')
+    @register_action('snippet', 'ls')
+    @register_action('snippet', 'list')
     def do_gist_list(self):
         service = self.get_service(lookup_repository=False)
         if self.gist_ref:
@@ -431,6 +449,7 @@ def do_gist_list(self):
         return 0
 
     @register_action('gist', 'clone')
+    @register_action('snippet', 'clone')
     def do_gist_clone(self):
         service = self.get_service(lookup_repository=False)
         repo_path = os.path.join(self.path, self.gist_ref.split('/')[-1])
@@ -440,24 +459,27 @@ def do_gist_clone(self):
         return 0
 
     @register_action('gist', 'fetch')
+    @register_action('snippet', 'fetch')
     def do_gist_fetch(self):
         service = self.get_service(lookup_repository=False)
         # send gist to stdout, not using log.info on purpose here!
         print(service.gist_fetch(self.gist_ref, self.gist_file))
         return 0
 
     @register_action('gist', 'create')
+    @register_action('snippet', 'create')
     def do_gist_create(self):
         service = self.get_service(lookup_repository=False)
         url = service.gist_create(self.gist_path, self.description, self.secret)
         log.info('Successfully created gist `{}`!'.format(url))
         return 0
 
     @register_action('gist', 'delete')
+    @register_action('snippet', 'delete')
     def do_gist_delete(self):
         service = self.get_service(lookup_repository=False)
         if not self.force: # pragma: no cover
-            if not confirm('gist', self.gist_ref):
+            if not confirm('snippet', self.gist_ref):
                 return 0
 
         service.gist_delete(self.gist_ref)

git_repo/services/ext/github.py

@@ -23,7 +23,7 @@ def connect(self):
             self.gh.login(token=self._privatekey)
             self.username = self.gh.user().login
         except github3.models.GitHubError as err:
-            if err.code is 401:
+            if 401 == err.code:
                 if not self._privatekey:
                     raise ConnectionError('Could not connect to Github. '
                                           'Please configure .gitconfig '
@@ -74,6 +74,69 @@ def delete(self, repo, user=None):
                                               'Check the namespace or the private token\'s privileges') from err
             raise ResourceError('Unhandled exception: {}'.format(err)) from err
 
+    def list(self, user, _long=False):
+        import shutil, sys
+        from datetime import datetime
+        term_width = shutil.get_terminal_size((80, 20)).columns
+        def col_print(lines, indent=0, pad=2):
+            # prints a list of items in a fashion similar to the dir command
+            # borrowed from https://gist.github.com/critiqjo/2ca84db26daaeb1715e1
+            n_lines = len(lines)
+            if n_lines == 0:
+                return
+            col_width = max(len(line) for line in lines)
+            n_cols = int((term_width + pad - indent)/(col_width + pad))
+            n_cols = min(n_lines, max(1, n_cols))
+            col_len = int(n_lines/n_cols) + (0 if n_lines % n_cols == 0 else 1)
+            if (n_cols - 1) * col_len >= n_lines:
+                n_cols -= 1
+            cols = [lines[i*col_len : i*col_len + col_len] for i in range(n_cols)]
+            rows = list(zip(*cols))
+            rows_missed = zip(*[col[len(rows):] for col in cols[:-1]])
+            rows.extend(rows_missed)
+            for row in rows:
+                print(" "*indent + (" "*pad).join(line.ljust(col_width) for line in row))
+
+        if not self.gh.user(user):
+            raise ResourceNotFoundError("User {} does not exists.".format(user))
+
+        repositories = self.gh.iter_user_repos(user)
+        if not _long:
+            repositories = list(repositories)
+            col_print(["/".join([user, repo.name]) for repo in repositories])
+        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
+                ]))
+
+
+
+
+
     def get_repository(self, user, repo):
         repository = self.gh.repository(user, repo)
         if not repository:
@@ -101,7 +164,9 @@ def gist_fetch(self, gist, fname=None):
         try:
             gist = self.gh.gist(self._format_gist(gist))
         except Exception as err:
-            raise ResourceNotFoundError('Could not find gist') from err
+            raise ResourceNotFoundError('Error while fetching gist') from err
+        if not gist:
+            raise ResourceNotFoundError('Could not find gist')
         if gist.files == 1 and not fname:
             gist_file = list(gist.iter_files())[0]
         else:

requirements.txt

@@ -1,7 +1,7 @@
 docopt
-GitPython>=2.0.6
-progress==1.2
-python-gitlab==0.13
+progress
+GitPython>=2.1.0
 uritemplate.py==2.0.0
 github3.py==0.9.5
-bitbucket-api==0.5.0
+python-gitlab>=0.13
+bitbucket-api