Package subcommands.utils

src/kiwi/subcommands/_subcommand.py

@@ -0,0 +1,18 @@
+from ..parser import Parser
+
+
+class SubCommand:
+    __name = None
+    _sub_parser = None
+
+    def __init__(self, name, **kwargs):
+        self.__name = name
+        self._sub_parser = Parser().get_subparsers().add_parser(name, **kwargs)
+
+    def __str__(self):
+        return self.__name
+
+    def run(self, config, args):
+        pass
+
+

src/kiwi/subcommands/init.py

@@ -4,7 +4,8 @@ import os
 from .._constants import KIWI_CONF_NAME
 from ..config import DefaultConfig
 
-from ._utils import SubCommand, is_executable, find_exe_file, get_exe_key
+from ._subcommand import SubCommand
+from .utils.executable import get_exe_key, is_executable, find_exe_file
 
 
 def user_input(config, key, prompt):

src/kiwi/subcommands/logs.py

@@ -1,6 +1,7 @@
 import logging
 
-from ._utils import SubCommand, DockerCommand
+from ._subcommand import SubCommand
+from .utils.dockercommand import DockerCommand
 
 
 class LogsCommand(SubCommand):

src/kiwi/subcommands/show.py

@@ -1,4 +1,4 @@
-from ._utils import SubCommand
+from ._subcommand import SubCommand
 
 
 class ShowCommand(SubCommand):

src/kiwi/subcommands/utils/__init__.py

@@ -0,0 +1 @@
+# git keep

src/kiwi/subcommands/utils/dockercommand.py

@@ -1,44 +1,8 @@
 import logging
-import os
 import subprocess
 
-from ..parser import Parser
-from ..config import LoadedConfig
-
-
-def is_executable(filename):
-    if filename is None:
-        return False
-
-    return os.path.isfile(filename) and os.access(filename, os.X_OK)
-
-
-def find_exe_file(exe_name):
-    for path in os.environ['PATH'].split(os.pathsep):
-        exe_file = os.path.join(path, exe_name)
-        if is_executable(exe_file):
-            return exe_file
-
-    return None
-
-
-def get_exe_key(exe_name):
-    return f'executables:{exe_name}'
-
-
-class SubCommand:
-    __name = None
-    _sub_parser = None
-
-    def __init__(self, name, **kwargs):
-        self.__name = name
-        self._sub_parser = Parser().get_subparsers().add_parser(name, **kwargs)
-
-    def __str__(self):
-        return self.__name
-
-    def run(self, config, args):
-        pass
+from ...config import LoadedConfig
+from .executable import get_exe_key
 
 
 class DockerCommand:
@@ -100,4 +64,4 @@ class DockerCommand:
             DockerCommand.__instances[exe_name] = DockerCommand.__DockerCommand(exe_name)
 
     def __getattr__(self, item):
-        return getattr(self.__instances[self.__exe_name], item)
+        return getattr(self.__instances[self.__exe_name], item)

src/kiwi/subcommands/utils/executable.py

@@ -0,0 +1,21 @@
+import os
+
+
+def get_exe_key(exe_name):
+    return f'executables:{exe_name}'
+
+
+def is_executable(filename):
+    if filename is None:
+        return False
+
+    return os.path.isfile(filename) and os.access(filename, os.X_OK)
+
+
+def find_exe_file(exe_name):
+    for path in os.environ['PATH'].split(os.pathsep):
+        exe_file = os.path.join(path, exe_name)
+        if is_executable(exe_file):
+            return exe_file
+
+    return None