ominfra 0.0.0.dev143__tar.gz → 0.0.0.dev144__tar.gz

{ominfra-0.0.0.dev143/ominfra.egg-info → ominfra-0.0.0.dev144}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev143
+Version: 0.0.0.dev144
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev143
-Requires-Dist: omlish==0.0.0.dev143
+Requires-Dist: omdev==0.0.0.dev144
+Requires-Dist: omlish==0.0.0.dev144
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

ominfra-0.0.0.dev144/ominfra/manage/deploy/command.py

@@ -0,0 +1,23 @@
+# ruff: noqa: UP006 UP007
+import dataclasses as dc
+
+from ..commands.base import Command
+from ..commands.base import CommandExecutor
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployCommand(Command['DeployCommand.Output']):
+    @dc.dataclass(frozen=True)
+    class Output(Command.Output):
+        pass
+
+
+##
+
+
+class DeployCommandExecutor(CommandExecutor[DeployCommand, DeployCommand.Output]):
+    def execute(self, cmd: DeployCommand) -> DeployCommand.Output:
+        return DeployCommand.Output()

ominfra-0.0.0.dev144/ominfra/manage/deploy/inject.py

@@ -0,0 +1,19 @@
+# ruff: noqa: UP006 UP007
+import typing as ta
+
+from omlish.lite.inject import InjectorBindingOrBindings
+from omlish.lite.inject import InjectorBindings
+from omlish.lite.inject import inj
+
+from ..commands.inject import bind_command
+from .command import DeployCommand
+from .command import DeployCommandExecutor
+
+
+def bind_deploy(
+) -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        bind_command(DeployCommand, DeployCommandExecutor),
+    ]
+
+    return inj.as_bindings(*lst)

{ominfra-0.0.0.dev143 → ominfra-0.0.0.dev144}/ominfra/manage/inject.py

@@ -8,6 +8,7 @@ from omlish.lite.marshal import ObjMarshalerManager
 
 from .commands.inject import bind_commands
 from .config import MainConfig
+from .deploy.inject import bind_deploy
 from .marshal import ObjMarshalerInstaller
 from .marshal import ObjMarshalerInstallers
 from .remote.config import RemoteConfig
@@ -32,6 +33,8 @@ def bind_main(
         bind_remote(
             remote_config=remote_config,
         ),
+
+        bind_deploy(),
     ]
 
     #

{ominfra-0.0.0.dev143 → ominfra-0.0.0.dev144}/ominfra/manage/main.py

@@ -5,15 +5,21 @@
 manage.py -s 'docker run -i python:3.12'
 manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
 """
+import contextlib
+import typing as ta
+
 from omlish.lite.logs import log  # noqa
-from omlish.lite.marshal import ObjMarshalOptions
 from omlish.lite.marshal import ObjMarshalerManager
+from omlish.lite.marshal import ObjMarshalOptions
 from omlish.lite.pycharm import PycharmRemoteDebug
 
 from .bootstrap import MainBootstrap
 from .bootstrap_ import main_bootstrap
+from .commands.base import Command
+from .commands.base import CommandExecutor
 from .commands.subprocess import SubprocessCommand
 from .config import MainConfig
+from .deploy.command import DeployCommand
 from .remote.config import RemoteConfig
 from .remote.execution import RemoteExecution
 from .remote.spawning import RemoteSpawning
@@ -39,6 +45,8 @@ def _main() -> None:
 
     parser.add_argument('--debug', action='store_true')
 
+    parser.add_argument('--local', action='store_true')
+
     parser.add_argument('command', nargs='+')
 
     args = parser.parse_args()
@@ -69,28 +77,34 @@ def _main() -> None:
 
     #
 
-    cmds = [
-        SubprocessCommand([c])
-        for c in args.command
-    ]
+    cmds: ta.List[Command] = []
+    for c in args.command:
+        if c == 'deploy':
+            cmds.append(DeployCommand())
+        else:
+            cmds.append(SubprocessCommand([c]))
 
     #
 
-    tgt = RemoteSpawning.Target(
-        shell=args.shell,
-        shell_quote=args.shell_quote,
-        python=args.python,
-    )
+    with contextlib.ExitStack() as es:
+        ce: CommandExecutor
 
-    with injector[RemoteExecution].connect(tgt, bs) as rce:
-        for cmd in cmds:
-            r = rce.try_execute(cmd)
+        if args.local:
+            ce = injector[CommandExecutor]
 
-            print(injector[ObjMarshalerManager].marshal_obj(r, opts=ObjMarshalOptions(raw_bytes=True)))
+        else:
+            tgt = RemoteSpawning.Target(
+                shell=args.shell,
+                shell_quote=args.shell_quote,
+                python=args.python,
+            )
 
-    #
+            ce = es.enter_context(injector[RemoteExecution].connect(tgt, bs))  # noqa
 
-    print('Success')
+        for cmd in cmds:
+            r = ce.try_execute(cmd)
+
+            print(injector[ObjMarshalerManager].marshal_obj(r, opts=ObjMarshalOptions(raw_bytes=True)))
 
 
 if __name__ == '__main__':

{ominfra-0.0.0.dev143 → ominfra-0.0.0.dev144}/ominfra/scripts/manage.py

@@ -2807,6 +2807,28 @@ def install_command_marshaling(
         )
 
 
+########################################
+# ../deploy/command.py
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class DeployCommand(Command['DeployCommand.Output']):
+    @dc.dataclass(frozen=True)
+    class Output(Command.Output):
+        pass
+
+
+##
+
+
+class DeployCommandExecutor(CommandExecutor[DeployCommand, DeployCommand.Output]):
+    def execute(self, cmd: DeployCommand) -> DeployCommand.Output:
+        return DeployCommand.Output()
+
+
 ########################################
 # ../marshal.py
 
@@ -3423,6 +3445,19 @@ class RemoteExecution:
             yield RemoteCommandExecutor(chan)
 
 
+########################################
+# ../deploy/inject.py
+
+
+def bind_deploy(
+) -> InjectorBindings:
+    lst: ta.List[InjectorBindingOrBindings] = [
+        bind_command(DeployCommand, DeployCommandExecutor),
+    ]
+
+    return inj.as_bindings(*lst)
+
+
 ########################################
 # ../remote/inject.py
 
@@ -3467,6 +3502,8 @@ def bind_main(
         bind_remote(
             remote_config=remote_config,
         ),
+
+        bind_deploy(),
     ]
 
     #
@@ -3530,6 +3567,8 @@ def _main() -> None:
 
     parser.add_argument('--debug', action='store_true')
 
+    parser.add_argument('--local', action='store_true')
+
     parser.add_argument('command', nargs='+')
 
     args = parser.parse_args()
@@ -3560,28 +3599,34 @@ def _main() -> None:
 
     #
 
-    cmds = [
-        SubprocessCommand([c])
-        for c in args.command
-    ]
+    cmds: ta.List[Command] = []
+    for c in args.command:
+        if c == 'deploy':
+            cmds.append(DeployCommand())
+        else:
+            cmds.append(SubprocessCommand([c]))
 
     #
 
-    tgt = RemoteSpawning.Target(
-        shell=args.shell,
-        shell_quote=args.shell_quote,
-        python=args.python,
-    )
+    with contextlib.ExitStack() as es:
+        ce: CommandExecutor
 
-    with injector[RemoteExecution].connect(tgt, bs) as rce:
-        for cmd in cmds:
-            r = rce.try_execute(cmd)
+        if args.local:
+            ce = injector[CommandExecutor]
 
-            print(injector[ObjMarshalerManager].marshal_obj(r, opts=ObjMarshalOptions(raw_bytes=True)))
+        else:
+            tgt = RemoteSpawning.Target(
+                shell=args.shell,
+                shell_quote=args.shell_quote,
+                python=args.python,
+            )
 
-    #
+            ce = es.enter_context(injector[RemoteExecution].connect(tgt, bs))  # noqa
 
-    print('Success')
+        for cmd in cmds:
+            r = ce.try_execute(cmd)
+
+            print(injector[ObjMarshalerManager].marshal_obj(r, opts=ObjMarshalOptions(raw_bytes=True)))
 
 
 if __name__ == '__main__':

{ominfra-0.0.0.dev143 → ominfra-0.0.0.dev144/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev143
+Version: 0.0.0.dev144
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev143
-Requires-Dist: omlish==0.0.0.dev143
+Requires-Dist: omdev==0.0.0.dev144
+Requires-Dist: omlish==0.0.0.dev144
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev143 → ominfra-0.0.0.dev144}/ominfra.egg-info/SOURCES.txt

@@ -51,6 +51,9 @@ ominfra/manage/commands/execution.py
 ominfra/manage/commands/inject.py
 ominfra/manage/commands/marshal.py
 ominfra/manage/commands/subprocess.py
+ominfra/manage/deploy/__init__.py
+ominfra/manage/deploy/command.py
+ominfra/manage/deploy/inject.py
 ominfra/manage/remote/__init__.py
 ominfra/manage/remote/channel.py
 ominfra/manage/remote/config.py

{ominfra-0.0.0.dev143 → ominfra-0.0.0.dev144}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev143
-omlish==0.0.0.dev143
+omdev==0.0.0.dev144
+omlish==0.0.0.dev144
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev143 → ominfra-0.0.0.dev144}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev143'
+version = '0.0.0.dev144'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev143',
-    'omlish == 0.0.0.dev143',
+    'omdev == 0.0.0.dev144',
+    'omlish == 0.0.0.dev144',
 ]
 
 [project.optional-dependencies]