oks-cli 1.19__tar.gz → 1.20__tar.gz

{oks_cli-1.19 → oks_cli-1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.19
+Version: 1.20
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi>=2024.8.30
 Requires-Dist: charset-normalizer>=3.3.2
-Requires-Dist: click<8.3.0,>=8.1.7
+Requires-Dist: click<8.3.0,>=8.2.0
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: idna>=3.10
 Requires-Dist: pyyaml>=6.0.2

{oks_cli-1.19 → oks_cli-1.20}/oks_cli/cluster.py

@@ -74,6 +74,13 @@ def cluster_logout(ctx, profile):
     """Clear the current default cluster selection."""
     _, _, profile = ctx_update(ctx, None, None, profile)
     login_profile(profile)
+    
+    current_cluster = get_cluster_id() 
+
+    if not current_cluster:
+        click.echo("You are not connected to any cluster.")
+        return
+    
     set_cluster_id("")
     click.echo("Logged out from the current cluster")
 

{oks_cli-1.19 → oks_cli-1.20}/oks_cli/project.py

@@ -56,6 +56,13 @@ def project_logout(ctx, profile):
     """Unset the current default project and log out."""
     _, _, profile = ctx_update(ctx, None, None, profile)
     login_profile(profile)
+    
+    current_project = get_project_id()
+    
+    if not current_project:
+        click.echo("You are not connected to any project.")
+        return
+
     set_project_id("")
     set_cluster_id("")
     click.echo("Logged out from the current project")
@@ -404,7 +411,7 @@ def project_get_public_ips(ctx, project_name, output, profile):
 # GET NETS BY PROJECT NAME
 @project.command('nets', help="Get project nets")
 @click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
-@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
+@click.option('--output', '-o', type=click.Choice(["json", "yaml", "table"]), help="Specify output format, by default is json")
 @click.option('--profile',help="Configuration profile to use")
 @click.pass_context
 def project_get_public_ips(ctx, project_name, output, profile):
@@ -415,4 +422,11 @@ def project_get_public_ips(ctx, project_name, output, profile):
     project_id = find_project_id_by_name(project_name)
 
     data = do_request("GET", f'projects/{project_id}/nets')
-    print_output(data, output)
+    if output == "table":
+        print_table(data, [["DHCP options set id", "DhcpOptionsSetId"],
+                                     ["Ip range", "IpRange"],
+                                     ["Net id", "NetId"],
+                                     ["State", "State"],
+                                     ["Tenancy", "Tenancy"]])
+    else:
+        print_output(data, output)

{oks_cli-1.19 → oks_cli-1.20}/oks_cli/utils.py

@@ -917,7 +917,11 @@ def find_shell_profile(home, shell_type):
         if os.path.exists(bash_profile) and os.path.exists(bashrc):
             return None
 
-        shell_profile = bash_profile or bashrc
+        if os.path.exists(bash_profile):
+            shell_profile = bash_profile
+
+        if os.path.exists(bashrc):
+            shell_profile = bashrc
 
     elif shell_type == "zsh":
 
@@ -927,7 +931,11 @@ def find_shell_profile(home, shell_type):
         if os.path.exists(zshrc) and os.path.exists(profile):
             return None
 
-        shell_profile = zshrc or profile
+        if os.path.exists(zshrc):
+            shell_profile = zshrc
+
+        if os.path.exists(profile):
+            shell_profile = profile
 
     return shell_profile
 
@@ -1097,30 +1105,19 @@ def is_interesting_status(status):
 def normalize_key_path(key_path: str) -> str:
     return re.sub(r'\[(\d+)\]', r'.\1', key_path)
 
-def parse_value(value):
+def parse_value(value: str):
     value = value.strip()
 
-    # Inline list: [a,b,c]
-    if value.startswith('[') and value.endswith(']'):
-        inner = value[1:-1].strip()
-        if not inner:
-            return []
-        return [parse_value(v.strip()) for v in inner.split(',')]
+    try:
+        return json.loads(value)
+    except Exception:
+        pass
 
     if value.lower() == "true":
         return True
     if value.lower() == "false":
         return False
 
-    try:
-        return int(value)
-    except ValueError:
-        pass
-
-    try:
-        return float(value)
-    except ValueError:
-        pass
 
     if ',' in value:
         return [parse_value(v) for v in value.split(',')]

{oks_cli-1.19 → oks_cli-1.20}/oks_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.19
+Version: 1.20
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi>=2024.8.30
 Requires-Dist: charset-normalizer>=3.3.2
-Requires-Dist: click<8.3.0,>=8.1.7
+Requires-Dist: click<8.3.0,>=8.2.0
 Requires-Dist: colorama>=0.4.6
 Requires-Dist: idna>=3.10
 Requires-Dist: pyyaml>=6.0.2

{oks_cli-1.19 → oks_cli-1.20}/oks_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
 certifi>=2024.8.30
 charset-normalizer>=3.3.2
-click<8.3.0,>=8.1.7
+click<8.3.0,>=8.2.0
 colorama>=0.4.6
 idna>=3.10
 pyyaml>=6.0.2

{oks_cli-1.19 → oks_cli-1.20}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="oks-cli",
-    version="1.19",
+    version="1.20",
     packages=['oks_cli'],
     author="Outscale SAS",
     author_email="opensource@outscale.com",
@@ -26,7 +26,7 @@ setup(
     install_requires=[
         "certifi>=2024.8.30",
         "charset-normalizer>=3.3.2",
-        "click>=8.1.7,<8.3.0",
+        "click>=8.2.0,<8.3.0",
         "colorama>=0.4.6",
         "idna>=3.10",
         "pyyaml>=6.0.2",

{oks_cli-1.19 → oks_cli-1.20}/tests/test_shell_completion.py

@@ -9,7 +9,7 @@ def test_install_completion_zsh():
 
     result = runner.invoke(cli, ["install-completion", "--type", "zsh"])
     assert result.exit_code == 0
-    assert "Autocompletion installed for zsh" in result.output
+    assert "To activate autocompletion on login please add following lines into your .profile or .zshrc file" in result.output
 
     completion_file = Path("~/.oks_cli/completions/oks-cli.sh").expanduser()
     assert completion_file.exists()
@@ -22,7 +22,7 @@ def test_install_completion_bash():
 
     result = runner.invoke(cli, ["install-completion", "--type", "bash"])
     assert result.exit_code == 0
-    assert "Autocompletion installed for bash" in result.output
+    assert "To activate autocompletion on login please add following lines into your .bash_profile or .bashrc file" in result.output
 
     completion_file = Path("~/.oks_cli/completions/oks-cli.sh").expanduser()
     assert completion_file.exists()