Merge branch fix/124 into devel

Author: guyzmo

git_repo/services/ext/github.py

@@ -85,10 +85,10 @@ def list(self, user, _long=False):
         if not _long:
             repositories = list(["/".join([user, repo.name]) for repo in repositories])
             yield "{}"
-            yield "Total repositories: {}".format(len(repositories))
+            yield ("Total repositories: {}".format(len(repositories)),)
             yield from columnize(repositories)
         else:
-            yield "{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t\t{}"
+            yield "{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{:12}\t{}"
             yield ['Status', 'Commits', 'Reqs', 'Issues', 'Forks', 'Coders', 'Watch', 'Likes', 'Lang', 'Modif', 'Name']
             for repo in repositories:
                 try:

git_repo/services/ext/gitlab.py

@@ -14,6 +14,8 @@
 
 import os
 import json, time
+import dateutil.parser
+from datetime import datetime
 
 @register_target('lab', 'gitlab')
 class GitlabService(RepositoryService):
@@ -82,16 +84,18 @@ def list(self, user, _long=False):
         if not _long:
             repositories = list([repo.path_with_namespace for repo in repositories])
             yield "{}"
-            yield "Total repositories: {}".format(len(repositories))
+            yield ("Total repositories: {}".format(len(repositories)),)
             yield from columnize(repositories)
         else:
+            yield "{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{:12}\t{}"
             yield ['Status', 'Commits', 'Reqs', 'Issues', 'Forks', 'Coders', 'Watch', 'Likes', 'Lang', 'Modif\t', 'Name']
             for repo in repositories:
                 time.sleep(0.5)
-                # if repo.last_activity_at.year < datetime.now().year:
-                #     date_fmt = "%b %d %Y"
-                # else:
-                #     date_fmt = "%b %d %H:%M"
+                repo_last_activity_at = dateutil.parser.parse(repo.last_activity_at)
+                if repo_last_activity_at.year < datetime.now().year:
+                    date_fmt = "%b %d %Y"
+                else:
+                    date_fmt = "%b %d %H:%M"
 
                 status = ''.join([
                     'F' if False else ' ',               # is a fork?
@@ -110,7 +114,7 @@ def list(self, user, _long=False):
                     str(repo.star_count),                      # number of ♥
                                                                # info
                     'N.A.',                                    # language
-                    repo.last_activity_at,                     # date
+                    repo_last_activity_at.strftime(date_fmt),  # date
                     repo.name_with_namespace,                  # name
                 ]
 

git_repo/services/ext/gogs.py

@@ -11,6 +11,7 @@
 from requests import Session, HTTPError
 from urllib.parse import urlparse, urlunparse
 from datetime import datetime
+import dateutil.parser
 import functools
 
 from git import config as git_config
@@ -152,21 +153,23 @@ def delete(self, repo, user=None):
             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
-
         repositories = self.gg.repositories(user)
         if user != self.username and not repositories and user not in self.orgs:
             raise ResourceNotFoundError("Unable to list namespace {} - only authenticated user and orgs available for listing.".format(user))
         if not _long:
             repositories = list([repo['full_name'] for repo in repositories])
             yield "{}"
-            yield "Total repositories: {}".format(len(repositories))
+            yield ("Total repositories: {}".format(len(repositories)),)
             yield from columnize(repositories)
         else:
+            yield "{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{:12}\t{}"
             yield ['Status', 'Commits', 'Reqs', 'Issues', 'Forks', 'Coders', 'Watch', 'Likes', 'Lang', 'Modif\t', 'Name']
             for repo in repositories:
+                repo_updated_at = dateutil.parser.parse(repo['updated_at'])
+                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?
@@ -188,7 +191,7 @@ def list(self, user, _long=False):
                     str(repo.get('stars_count') or 0),     # number of ♥
                     # info
                     repo.get('language') or '?',           # language
-                    repo['updated_at'],                    # date
+                    repo_updated_at.strftime(date_fmt),    # date
                     repo['full_name'],                     # name
                 ]
 

requirements.txt

@@ -1,5 +1,6 @@
 docopt
 progress
+python-dateutil
 GitPython>=2.1.0
 uritemplate.py==2.0.0
 github3.py==0.9.5

tests/integration/test_github.py

@@ -354,12 +354,12 @@ def test_33_open(self):
 
     def test_34_list__short(self, caplog):
         projects = self.action_list(namespace='git-repo-test')
-        assert projects == ['{}', 'Total repositories: 1', ['git-repo-test/git-repo']]
+        assert projects == ['{}', ('Total repositories: 1',), ['git-repo-test/git-repo']]
         assert 'GET https://api.github.com/users/git-repo-test/repos' in caplog.text
 
     def test_34_list__long(self, caplog):
         projects = self.action_list(namespace='git-repo-test', _long=True)
-        assert projects == ['{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t\t{}',
+        assert projects == ['{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\t{:12}\t{}',
                 ['Status', 'Commits', 'Reqs', 'Issues', 'Forks', 'Coders', 'Watch', 'Likes', 'Lang', 'Modif', 'Name'],
                 ['F ', '92', '0', '0', '0', '1', '0', '0', 'Python', 'Mar 30 2016', 'git-repo-test/git-repo']]
         assert 'GET https://api.github.com/users/git-repo-test/repos' in caplog.text