Merge pull request #40 from mogproject/develop

Develop #37 #38

.gitignore

@@ -7,6 +7,7 @@ __pycache__/
 
 # Distribution / packaging
 .Python
+.eggs/
 env/
 build/
 develop-eggs/

requirements.txt

@@ -0,0 +1,5 @@
+pytz
+python-dateutil
+GitPython>=0.3.5
+boto
+

setup.py

@@ -10,22 +10,21 @@ def get_version():
     return __import__('artifactcli').__version__
 
 
+def get_requirements(path):
+    import os
+
+    with open(path) as f:
+        return f.read().splitlines()
+
 setup(
     name='artifact-cli',
     version=get_version(),
     description='Private Artifact Manager using Amazon S3',
     author='mogproject',
     author_email='mogproj@gmail.com',
     url='https://github.com/mogproject/artifact-cli',
-    install_requires=[
-        'pytz',
-        'python-dateutil',
-        'GitPython',
-        'boto',
-    ],
-    tests_require=[
-        'moto',
-    ],
+    install_requires=get_requirements('requirements.txt'),
+    tests_require=get_requirements('test-requirements.txt'),
     package_dir={'': SRC_DIR},
     packages=find_packages(SRC_DIR),
     include_package_data=True,

src/artifactcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.7"
+__version__ = "0.1.8"

src/artifactcli/artifact/artifact.py

@@ -15,7 +15,7 @@ def __init__(self, basic_info, file_info, scm_info=None):
         self.scm_info = scm_info
 
     def __str__(self):
-        buf = [self.basic_info, self.file_info] + [self.scm_info] if self.scm_info else []
+        buf = [self.basic_info, self.file_info] + ([self.scm_info] if self.scm_info else [])
         return to_str('\n'.join(map(str, buf)))
 
     def to_dict(self):

src/artifactcli/artifact/gitinfo.py

@@ -1,6 +1,7 @@
 import time
 from datetime import datetime
 import logging
+import os
 import dateutil.parser
 import git
 from baseinfo import BaseInfo
@@ -57,11 +58,23 @@ def from_dict(d):
             d['sha'],
         )
 
+    @staticmethod
+    def _search_git_repo(path):
+        while True:
+            try:
+                return git.Repo(path)
+            except git.InvalidGitRepositoryError:
+                parent_dir = os.path.dirname(path)
+                if path == parent_dir:
+                    return None
+                path = parent_dir
+            except git.NoSuchPathError:
+                return None
+
     @staticmethod
     def from_path(path):
-        try:
-            repo = git.Repo(path)
-        except (git.InvalidGitRepositoryError, git.NoSuchPathError):
+        repo = GitInfo._search_git_repo(path)
+        if not repo:
             logging.warn('Failed to fetch Git information: %s' % path)
             return None
 

test-requirements.txt

@@ -0,0 +1,2 @@
+moto
+

tests/artifactcli/artifact/test_artifact.py

@@ -91,6 +91,22 @@ def test_str(self):
         ])
         self.assertEqual(str(self.test_data[1]), expected.encode('utf-8'))
 
+    def test_str_no_scm_info(self):
+        expected = '\n'.join([
+            'Basic Info:',
+            '  Group ID   : com.github.mogproject',
+            '  Artifact ID: xxx-yyy-assembly',
+            '  Version    : 0.1-SNAPSHOT',
+            '  Packaging  : jar',
+            '  Revision   : None',
+            'File Info:',
+            '  User    : USER@HOST',
+            '  Modified: 2014-12-31 12:34:56',
+            '  Size    : 0 (0.0B)',
+            '  MD5     : 0',
+        ])
+        self.assertEqual(str(self.test_data[2]), expected.encode('utf-8'))
+
     def test_repr(self):
         self.assertEqual(
             repr(self.test_data[0]),
@@ -103,6 +119,7 @@ def test_from_path(self):
         ret = Artifact.from_path('GROUP_ID', 'tests/resources/test-artifact-1.2.3.dat')
         self.assertEqual(ret.basic_info, BasicInfo('GROUP_ID', 'test-artifact', '1.2.3', 'dat', None))
         self.assertEqual((ret.file_info.size, ret.file_info.md5), (11, '7a38cb250db7127113e00ad5e241d563'))
+        self.assertFalse(ret.scm_info is None)
 
     def test_dict_conversions(self):
         self.assertEqual(Artifact.from_dict(self.test_data[0].to_dict()), self.test_data[0])

tests/artifactcli/artifact/test_gitinfo.py

@@ -63,6 +63,7 @@ def test_repr(self):
 
     def test_from_path(self):
         gi = GitInfo.from_path('tests/resources/test-artifact-1.2.3.dat')
+        self.assertFalse(gi is None)
 
     def test_from_path_error(self):
         self.assertEqual(GitInfo.from_path('tests/resources/test001_no_such_path.dat'), None)

tests/artifactcli/operation/test_upload.py

@@ -29,3 +29,4 @@ def test_run(self):
         ret = r.artifacts['test-artifact'][1]
         self.assertEqual(ret.basic_info, BasicInfo('com.github.mogproject', 'test-artifact', '1.2.3', 'dat', 2))
         self.assertEqual((ret.file_info.size, ret.file_info.md5), (11, '7a38cb250db7127113e00ad5e241d563'))
+        self.assertFalse(ret.scm_info is None)

tests/artifactcli/test_repository.py

@@ -167,6 +167,7 @@ def test_upload_file_real_file(self):
         ret = r.artifacts['test-artifact'][0]
         self.assertEqual(ret.basic_info, BasicInfo('com.github.mogproject', 'test-artifact', '1.2.3', 'dat', 1))
         self.assertEqual((ret.file_info.size, ret.file_info.md5), (11, '7a38cb250db7127113e00ad5e241d563'))
+        self.assertFalse(ret.scm_info is None)
 
     def test_upload_file_force(self):
         expected = [Artifact(BasicInfo('com.github.mogproject', 'art-test', '0.0.1', 'jar', 1),
@@ -609,23 +610,25 @@ def test_print_list_output_json_long(self):
         fp = StringIO()
         r.print_list(output='json', fp=fp)
         arts = [Artifact.from_dict(d) for d in json.loads(fp.getvalue())]
-        self.assertEqual(arts, [
+        a = [
             Artifact(BasicInfo('com.github.mogproject', 'art-test', '0.0.1', 'jar', i),
                      FileInfo('host1', 'user1', 4567890, datetime(2014, 12, 31, 9, 12, 34),
                               'ffffeeeeddddccccbbbbaaaa99998888'),
                      GitInfo('master', ['release 0.0.1'], 'mogproject', 'x@example.com',
                              datetime(2014, 12, 30, 8, 11, 29), 'first commit',
                              '111122223333444455556666777788889999aaaa'))
             for i in range(1, 16)
-        ] + [
+        ]
+        b = [
             Artifact(BasicInfo('com.github.mogproject', 'art-test', '0.0.2', 'jar', i),
                      FileInfo('host1', 'user1', 4567890, datetime(2014, 12, 31, 9, 12, 34),
                               'ffffeeeeddddccccbbbbaaaa99998888'),
                      GitInfo('master', ['release 0.0.2'], 'mogproject', 'x@example.com',
                              datetime(2014, 12, 30, 8, 11, 29), 'new version',
                              '111122223333444455556666777788889999aaaa'))
             for i in range(1, 16)
-        ])
+        ]
+        self.assertEqual(arts, a + b)
         fp.close()
 
     def test_print_list_output_error(self):