ssm-cli 0.0.9__tar.gz → 0.1.0.dev0__tar.gz

{ssm_cli-0.0.9/ssm_cli.egg-info → ssm_cli-0.1.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssm-cli
-Version: 0.0.9
+Version: 0.1.0.dev0
 Summary: CLI tool to help with SSM functionality, aimed at adminstrators
 Author-email: Simon Fletcher <simon.fletcher@lexisnexisrisk.com>
 License: MIT License

{ssm_cli-0.0.9 → ssm_cli-0.1.0.dev0}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 61.0"]
+requires = ["setuptools >= 61.0", "setuptools-git-versioning>=2.1"]
 build-backend = "setuptools.build_meta"
 
 
@@ -39,6 +39,9 @@ file = "LICENCE"
 Homepage = "https://github.com/simonfletcher-ln/ssm-cli"
 Issues = "https://github.com/simonfletcher-ln/ssm-cli/issues"
 
-
-[tool.setuptools.dynamic]
-version = { attr = "ssm_cli.__version__" }
+[tool.setuptools-git-versioning]
+enabled = true
+version_file = "VERSION"
+count_commits_from_version_file = true
+dev_template = "{tag}.dev{ccount}"
+dirty_template = "{tag}.dev{ccount}"

{ssm_cli-0.0.9 → ssm_cli-0.1.0.dev0}/ssm_cli/commands/shell.py

@@ -5,6 +5,9 @@ from ssm_cli.cli_args import ARGS
 import logging
 logger = logging.getLogger(__name__)
 
+from rich.console import Console
+
+console = Console()
 
 class ShellCommand(BaseCommand):
     HELP = "Connects to instances"
@@ -16,11 +19,17 @@ class ShellCommand(BaseCommand):
         logger.info("running shell action")
 
         instances = Instances()
-        instance = instances.select_instance(ARGS.group, "tui")
+        try:
+            instance = instances.select_instance(ARGS.group, "tui")
+        except KeyboardInterrupt:
+            logger.error("user cancelled")
+            console.print(f":x: [bold red]user cancelled[/bold red]")
+            return
 
         if instance is None:
             logger.error("failed to select host")
-            raise RuntimeError("failed to select host")
+            console.print(f":x: [bold red]failed to select host[/bold red]")
+            return
 
         logger.info(f"connecting to {repr(instance)}")
         

{ssm_cli-0.0.9 → ssm_cli-0.1.0.dev0}/ssm_cli/xdg.py

@@ -1,7 +1,10 @@
 from pathlib import Path
-from xdg_base_dirs import xdg_config_home
+from xdg_base_dirs import xdg_config_home, xdg_state_home
 
-# We just put everything in the same directory as there is so little
+# Default locations for ssm-cli files
+# ~/.config/ssm-cli/ssm.yaml
+# ~/.config/ssm-cli/hostkey.pem
+# ~/.local/state/ssm-cli/ssm.log
 
 def get_conf_root(check=True) -> Path:
     root = xdg_config_home() / 'ssm-cli'
@@ -10,6 +13,12 @@ def get_conf_root(check=True) -> Path:
         create_conf_dir()
     return root
 
+def get_state_root() -> Path:
+    path = xdg_state_home() / 'ssm-cli'
+    if not path.exists():
+        path.mkdir(parents=True)
+    return path
+
 def get_conf_file(check=True) -> Path:
     path = get_conf_root(check) / 'ssm.yaml'
     if check and not path.exists():
@@ -17,7 +26,7 @@ def get_conf_file(check=True) -> Path:
     return path
 
 def get_log_file(check=False) -> Path:
-    path = get_conf_root(True) / 'ssm.log'
+    path = get_state_root() / 'run.log'
     if check and not path.exists():
         raise EnvironmentError(f"{path} missing, run `ssm setup` to create")
     return path

{ssm_cli-0.0.9 → ssm_cli-0.1.0.dev0/ssm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssm-cli
-Version: 0.0.9
+Version: 0.1.0.dev0
 Summary: CLI tool to help with SSM functionality, aimed at adminstrators
 Author-email: Simon Fletcher <simon.fletcher@lexisnexisrisk.com>
 License: MIT License

ssm_cli-0.0.9/ssm_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.9"