refactor(xcmd): xcmd is now available externally

rgs1 · Dec 29, 2016 · 1ec4e44 · 1ec4e44
1 parent de0ad74
commit 1ec4e44
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 678 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -3,3 +3,4 @@ kazoo==2.2.1
 nose==1.3.7
 tabulate==0.7.7
 twitter.common.net==0.3.9
+xcmd==0.0.1
diff --git a/setup.py b/setup.py
@@ -49,22 +49,25 @@ def get_version():
           'ansicolors==1.0.2',
           'kazoo==2.2.1',
           'tabulate==0.7.7',
-          'twitter.common.net==0.3.9'
+          'twitter.common.net==0.3.9',
+          'xcmd==0.0.1'
       ],
       tests_require=[
           'ansicolors==1.0.2',
           'kazoo==2.2.1',
           'nose==1.3.7',
           'tabulate==0.7.7',
-          'twitter.common.net==0.3.9'
+          'twitter.common.net==0.3.9',
+          'xcmd==0.0.1'
       ],
       extras_require={
           'test': [
               'ansicolors==1.0.2',
               'kazoo==2.2.1',
               'nose==1.3.7',
               'tabulate==0.7.7',
-              'twitter.common.net==0.3.9'
+              'twitter.common.net==0.3.9',
+              'xcmd==0.0.1'
           ]
       },
       include_package_data=True,

diff --git a/zk_shell/conf.py b/zk_shell/conf.py
diff --git a/zk_shell/conf_store.py b/zk_shell/conf_store.py
diff --git a/zk_shell/shell.py b/zk_shell/shell.py
@@ -46,12 +46,9 @@
 from kazoo.security import OPEN_ACL_UNSAFE, READ_ACL_UNSAFE
 from tabulate import tabulate
 from twitter.common.net.tunnel import TunnelHelper
-
-from .acl import ACLReader
-from .conf import Conf, ConfVar
-from .conf_store import ConfStore
-from .xclient import XClient
-from .xcmd import (
+from xcmd.conf import Conf, ConfVar
+from xcmd.conf_store import ConfStore
+from xcmd.xcmd import (
     XCmd,
     FloatRequired,
     IntegerOptional,
@@ -64,6 +61,8 @@
     Optional,
     Required,
 )
+
+from .acl import ACLReader
 from .complete import complete, complete_boolean, complete_labeled_boolean, complete_values
 from .copy import CopyError, Proxy
 from .keys import Keys
@@ -84,6 +83,7 @@
     to_int,
     which
 )
+from .xclient import XClient
 
 
 def connected(func):
@@ -242,7 +242,8 @@ def __init__(self,
                  read_only=False,
                  tunnel=None):
 
-        self._conf_store = ConfStore()
+        self._conf_store = ConfStore(
+            path=os.path.join(os.environ["HOME"], ".zk_shell"))
         self._conf_store.ensure_path()
 
         # mv (old) history file to zk-shell's private dir

diff --git a/zk_shell/tests/test_conf.py b/zk_shell/tests/test_conf.py
diff --git a/zk_shell/tests/test_conf_store.py b/zk_shell/tests/test_conf_store.py