Merge pull request #2 from mrprompt/develop

refactoring to use sdk
mrprompt · May 24, 2017 · ba0d0dd · ba0d0dd
2 parents f0000e6 + a514508
commit ba0d0dd
Show file tree

Hide file tree

Showing 21 changed files with 8 additions and 381 deletions.
diff --git a/cli.py b/cli.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from deploybot.scripts.cli import main
+from cli.cli import main
 
 if __name__ == '__main__':
     main()
diff --git a/deploybot/scripts/cli.py → cli/__init__.py b/deploybot/scripts/cli.py → cli/__init__.py
@@ -6,7 +6,8 @@
 from deploybot.repository import Repository
 from deploybot.environment import Environment
 from deploybot.server import Server
-from deploybot.help import Help
+from .help import Help
+
 import json
 import tableprint
 import copy

diff --git a/deploybot/help.py → cli/help.py b/deploybot/help.py → cli/help.py
diff --git a/deploybot/__init__.py b/deploybot/__init__.py
diff --git a/deploybot/client.py b/deploybot/client.py
diff --git a/deploybot/deploy.py b/deploybot/deploy.py
diff --git a/deploybot/environment.py b/deploybot/environment.py
diff --git a/deploybot/repository.py b/deploybot/repository.py
diff --git a/deploybot/scripts/__init__.py b/deploybot/scripts/__init__.py
diff --git a/deploybot/server.py b/deploybot/server.py
diff --git a/deploybot/user.py b/deploybot/user.py
diff --git a/requirements.txt b/requirements.txt
@@ -6,3 +6,4 @@ coverage
 pytest
 pytest-cov
 unittest-data-provider
+deploybot-sdk
diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
     zip_safe=False,
     packages=find_packages(),
     install_requires=[
-        'python_http_client', 'tableprint',
+        'python_http_client', 'tableprint', 'deploybot-sdk',
     ],
     extras_require={
         'test': ['pytest', 'pytest-cov', 'mock', 'unittest-data-provider'],

diff --git a/test/cli_test.py b/test/cli_test.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
-from deploybot.scripts import cli
 from unittest import TestCase
 from unittest_data_provider import data_provider
 from deploybot.deploy import Deploy
 from deploybot.user import User
 from deploybot.repository import Repository
 from deploybot.environment import Environment
 from deploybot.server import Server
-from deploybot.help import Help
+from cli.help import Help
 
+import cli
 import mock
 import sys
 import json

diff --git a/test/client_test.py b/test/client_test.py
diff --git a/test/deploy_test.py b/test/deploy_test.py
diff --git a/test/environment_test.py b/test/environment_test.py
diff --git a/test/help_test.py b/test/help_test.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from unittest import TestCase
-from deploybot.help import Help
+from cli.help import Help
 
 
 class TestHelper(TestCase):