kaqing 1.98.92__tar.gz → 1.98.94__tar.gz

{kaqing-1.98.92 → kaqing-1.98.94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 1.98.92
+Version: 1.98.94
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-1.98.92 → kaqing-1.98.94}/adam/commands/bash.py

@@ -84,4 +84,4 @@ class Bash(Command):
         return {}
 
     def help(self, _: ReplState):
-        return f'{Bash.COMMAND} [bash-commands]\t run bash'
+        return f'{Bash.COMMAND} [bash-commands]\t run bash on the Cassandra nodes'

kaqing-1.98.94/adam/commands/shell.py

@@ -0,0 +1,33 @@
+import os
+
+from adam.commands.command import Command
+from adam.repl_state import ReplState
+
+class Shell(Command):
+    COMMAND = ':sh'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(Shell, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return Shell.COMMAND
+
+    def run(self, cmd: str, s0: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, s0)
+
+        _, args = self.apply_state(args, s0)
+
+        os.system('QING_DROPPED=true bash')
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f'{Shell.COMMAND}\t drop down to shell'

{kaqing-1.98.92 → kaqing-1.98.94}/adam/commands/user_entry.py

@@ -7,7 +7,6 @@ import signal
 import threading
 import traceback
 
-from adam import log
 from adam.commands.deploy.code_utils import get_available_port
 from adam.config import Config
 from adam.sso.idp import Idp

{kaqing-1.98.92 → kaqing-1.98.94}/adam/repl.py

@@ -1,3 +1,4 @@
+import os
 import re
 import time
 import traceback
@@ -22,6 +23,10 @@ from adam.apps import Apps
 from . import __version__
 
 def enter_repl(state: ReplState):
+    if os.getenv('QING_DROPPED', 'false') == 'true':
+        log2('You have dropped to bash from another qing instance. Please enter "exit" to go back to qing.')
+        return
+
     cmd_list: list[Command] = ReplCommands.repl_cmd_list() + [Help()]
     # head with the Chain of Responsibility pattern
     cmds: Command = Command.chain(cmd_list)

{kaqing-1.98.92 → kaqing-1.98.94}/adam/repl_commands.py

@@ -8,6 +8,7 @@ from adam.commands.deploy.deploy_pod import DeployPod
 from adam.commands.deploy.undeploy import Undeploy
 from adam.commands.deploy.undeploy_frontend import UndeployFrontend
 from adam.commands.deploy.undeploy_pod import UndeployPod
+from adam.commands.shell import Shell
 from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.cp import ClipboardCopy
 from adam.commands.bash import Bash
@@ -77,7 +78,7 @@ class ReplCommands:
         return Medusa.cmd_list() + [Restart(), RollOut(), Watch()] + Reaper.cmd_list() + Repair.cmd_list()
 
     def tools() -> list[Command]:
-        return [Cqlsh(), Postgres(), Bash(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(), DeployPod(), UndeployPod()]
+        return [Cqlsh(), Postgres(), Bash(), Shell(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(), DeployPod(), UndeployPod()]
 
     def app() -> list[Command]:
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), AppPing(), App()]

kaqing-1.98.94/adam/version.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__version__ = "1.98.94"  #: the working version
+__release__ = "1.0.0"  #: the release version

{kaqing-1.98.92 → kaqing-1.98.94}/kaqing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 1.98.92
+Version: 1.98.94
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-1.98.92 → kaqing-1.98.94}/kaqing.egg-info/SOURCES.txt

@@ -77,6 +77,7 @@ adam/commands/pwd.py
 adam/commands/report.py
 adam/commands/restart.py
 adam/commands/rollout.py
+adam/commands/shell.py
 adam/commands/user_entry.py
 adam/commands/watch.py
 adam/commands/deploy/__init__.py

{kaqing-1.98.92 → kaqing-1.98.94}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='kaqing',
-    version='1.98.92',
+    version='1.98.94',
     packages=find_packages(),
     entry_points={
         'console_scripts': [

kaqing-1.98.92/adam/version.py

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-__version__ = "1.98.92"  #: the working version
-__release__ = "1.0.0"  #: the release version