carnival.cli remove

carnival-org · Dec 3, 2021 · f294b29 · f294b29
1 parent b7670b2
commit f294b29
Show file tree

Hide file tree

Showing 12 changed files with 175 additions and 345 deletions.
diff --git a/carnival/__init__.py b/carnival/__init__.py
@@ -7,7 +7,6 @@
 from carnival.hosts.local import LocalHost, localhost_connection
 from carnival.hosts.ssh import SshHost
 from carnival.task import TaskBase, Task
-from carnival import cmd
 from carnival import internal_tasks
 
 
@@ -40,6 +39,5 @@
     'SshHost', 'LocalHost', 'localhost_connection', 'Host', 'Connection', 'Result',
     'Role', 'SingleRole',
     'TaskBase', 'Task',
-    'cmd',
     'internal_tasks',
 ]
diff --git a/carnival/cmd/__init__.py b/carnival/cmd/__init__.py
diff --git a/carnival/cmd/cli.py b/carnival/cmd/cli.py
diff --git a/carnival/cmd/fs.py b/carnival/cmd/fs.py
diff --git a/carnival/cmd/system.py b/carnival/cmd/system.py
diff --git a/carnival/cmd/transfer.py b/carnival/cmd/transfer.py
diff --git a/carnival/hosts/base.py b/carnival/hosts/base.py
@@ -47,7 +47,7 @@ def __init__(self, host: "Host") -> None:
         """
         Конекст с хостом, все конекты являются контекст-менеджерами
 
-        >>> with host.connection() as c:
+        >>> with host.connect() as c:
         >>>    c.run("ls -1")
 
         """
@@ -63,7 +63,9 @@ def __exit__(self, *args: typing.Any) -> None:
     def run(
         self,
         command: str,
-        hide: bool = False, warn: bool = False, cwd: typing.Optional[str] = None,
+        hide: bool = False,
+        warn: bool = False,
+        cwd: typing.Optional[str] = None,
     ) -> Result:
         """
         Запустить команду
@@ -80,20 +82,11 @@ class Host:
     Базовый класс для хостов
     """
 
-    addr: str
+    addr: str = ""
     """
     Адрес хоста
     """
 
-    def __init__(
-        self,
-    ) -> None:
-        """
-        :param context: Контекст хоста
-        """
-
-        self.addr = ""
-
     @property
     def ip(self) -> str:
         # Maybe self.addr is ip?

diff --git a/carnival/hosts/ssh.py b/carnival/hosts/ssh.py
@@ -11,6 +11,7 @@ def __init__(
         self,
         host: "SshHost",
     ) -> None:
+        super().__init__(host)
         self.host: "SshHost" = host
 
         self._c: typing.Optional[FabricConnection] = None

diff --git a/carnival/steps/_validator_cache.py b/carnival/steps/_validator_cache.py
@@ -25,9 +25,10 @@ def try_get(
     fact_id: str,
 ) -> typing.Tuple[bool, typing.Optional[str]]:
     global __vc
+    cachekey = __build_vc_key(step_class=step_class, host=host, fact_id=fact_id)
 
     return (
-        __build_vc_key(step_class=step_class, host=host, fact_id=fact_id) in __vc,
+        cachekey in __vc,
         __vc.get(
             __build_vc_key(step_class=step_class, host=host, fact_id=fact_id),
             None,