viur-cli 2.0.0rc6__tar.gz → 2.0.1.dev1__tar.gz

{viur_cli-2.0.0rc6/src/viur_cli.egg-info → viur_cli-2.0.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: viur_cli
-Version: 2.0.0rc6
+Version: 2.0.1.dev1
 Summary: Command-line interface for ViUR application maintenance.
 Home-page: https://github.com/viur-framework/viur-cli
 Author: Andreas H. Kelch
@@ -12,11 +12,11 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: app_server==0.9.9
-Requires-Dist: click==8.1.7
-Requires-Dist: pipfile-requirements==0.3.0
-Requires-Dist: requests==2.31.0
-Requires-Dist: semver==3.0.2
+Requires-Dist: app_server~=0.9
+Requires-Dist: click~=8.1.7
+Requires-Dist: pipfile-requirements~=0.3
+Requires-Dist: requests~=2.31
+Requires-Dist: semver~=3.0
 
 <div align="center">
     <img src="https://github.com/viur-framework/viur-artwork/raw/main/icons/icon-cli.svg" height="196" alt="A hexagonal logo of the viur-cli" title="viur-cli">

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1}/setup.cfg

@@ -20,11 +20,11 @@ package_dir =
 packages = find:
 python_requires = >=3.11
 install_requires = 
-	app_server==0.9.9
-	click==8.1.7
-	pipfile-requirements==0.3.0
-	requests==2.31.0
-	semver==3.0.2
+	app_server~=0.9
+	click~=8.1.7
+	pipfile-requirements~=0.3
+	requests~=2.31
+	semver~=3.0
 
 [options.packages.find]
 where = src

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1}/src/viur_cli/__init__.py

@@ -9,3 +9,4 @@ from .scriptor import script
 from .tool import *
 from .update import *
 from .cloud import *
+from .deprecated import *

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1}/src/viur_cli/cloud.py

@@ -87,6 +87,14 @@ def enable_gcp_backup():
 @click.argument("service", type=click.Choice(["gcloud"]), default="gcloud")
 @click.argument("profile", default="default")
 def init(service, profile):
+    """
+    Initializes the cloud service deployment.
+
+    Parameters:
+        - service (str): The cloud service to be initialized. Expected values are 'gcloud'.
+        - profile (str): The profile name to be used for initialization. Default value is 'default'.
+
+    """
     deployments = ["cron", "queue", "cron"]
     if service == "gcloud":
         for element in deployments:
@@ -97,6 +105,15 @@ def init(service, profile):
 @click.argument("option", type=click.Choice(["datastore"]), default="datastore")
 @click.argument("profile", default="default")
 def cleanup(service, option, profile):
+    """
+    Cleans up the indexes in the specified service and option.
+
+    Parameters:
+    - service (str): The service to clean up the indexes for.
+    - option (str): The option to clean up the indexes for.
+    - profile (str): The profile to use for configuration.
+
+    """
     conf = config.get_profile(profile)
 
     if service == "gcloud" and option == "datastore":
@@ -572,7 +589,8 @@ def deploy(action, profile, name, ext, yes, additional_args):
                 return
 
         os.system(
-            f'gcloud app deploy --project={conf["application_name"]} {" ".join(additional_args)} {yaml_file}')
+            f'gcloud app deploy --project={conf["application_name"]} {" ".join(additional_args)} {yaml_file} {"-q" if yes else ""}')
+
 
 
 def build_deploy_command(name, conf):

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1}/src/viur_cli/conf.py

@@ -1,10 +1,13 @@
 import json
+from pprint import pprint
+
 import click
 import requests
 import difflib
 from .utils import *
 from .version import __version__ as cli_version
 
+
 PROJECT_CONFIG_FILE = "project.json"
 PROJECT_CONFIG_VERSION = "2.0.0"
 LAST_VERSION = ""
@@ -86,7 +89,40 @@ class ProjectConfig(dict):
         except:
             raise click.ClickException(click.style(f"{configname} not found", fg="red"))
 
+    def find_key(self, dictionary, target_key, target, keep=False):
+        if target_key in dictionary:
+            if keep:
+                value = dictionary[target_key]
+            else:
+                value = dictionary.pop(target_key)
+            if not target:
+                self[target_key] = value
+            else:
+                self.setdefault(target, {})[target_key] = value
+        else:
+            for value in list(dictionary.values()):
+                if isinstance(value, dict):
+
+                    self.find_key(value, target_key, target, keep=keep)
+
+    def remove_key(self, dictionary, target_key):
+        if target_key in dictionary:
+            del dictionary[target_key]
+
+        for value in list(dictionary.values()):
+            if isinstance(value, dict):
+                self.remove_key(value, target_key)
+
     def migrate(self):
+
+        if "application_name" not in self["default"]:
+            self.find_key(self, target_key="application_name", target="default", keep=True)
+            if "application_name" in self:
+                del self["application_name"]
+
+        self.remove_key(self, target_key="core")
+
+
         if old_format := self["default"].get("format"):
             self["format"] = old_format
             del self["default"]["format"]
@@ -118,17 +154,6 @@ class ProjectConfig(dict):
                     builds[k]["kind"] = "exec"
             self["default"]["builds"] = builds
 
-        # Version 1.2.0
-        """
-            Convert versions in the configuration to builds.
-
-            This method iterates through the provided version list and updates the project configuration
-            by converting versions to builds.
-
-            :param version_list: list
-                List of versions to convert to builds.
-            :return: None
-        """
         # Check if Builds is in the project.json
         if "builds" not in self["default"].keys():
             self["default"]["builds"] = {}
@@ -159,27 +184,12 @@ class ProjectConfig(dict):
             )
 
             if response == "yes":
-                del self["default"]["builds"]["vi"]
+                self["default"]["builds"].pop("vi", None)
+                echo_info("You are using the ViUR Admin")
             elif response == "no":
-                del self["default"]["builds"]["admin"]
-
-        """
-             Fetch the version of the 'viur-core' package.
-
-             This method is responsible for fetching the version of the 'viur-core' package using 'pip list' and updating
-             the project configuration accordingly.
-
-             :return: None
-        """
-        try:
-            result = os.popen('pip list --format=json').read()
-            core_version = [x for x in json.loads(result) if x["name"] == "viur-core"][0]["version"]
-            self["default"]["core"] = core_version
-
-        except:
-            self["default"]["core"] = "submodule"
+                self["default"]["builds"].pop("admin", None)
+                echo_info("You are using the Vi Administration")
 
-        # conf updates must increase format version
         self.save()
 
 

viur_cli-2.0.1.dev1/src/viur_cli/deprecated.py

@@ -0,0 +1,18 @@
+import click
+from . import cli, echo_error
+
+'''
+    This Document keeps Track of "Deprecation Warnings"
+'''
+
+@cli.command(hidden= True)
+@click.argument('argument', nargs=-1)
+def install(argument: list):
+    echo_error("the ViUR install command is out of Date")
+    echo_error("Please use the 'viur package' commands instead")
+
+@cli.command(hidden= True)
+@click.argument('argument', nargs=-1)
+def deploy(argument: list):
+    echo_error("The 'deploy' command out of Date")
+    echo_error("Please use 'viur cloud deploy' commands instead")

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1}/src/viur_cli/local.py

@@ -7,7 +7,7 @@ import subprocess
 
 from viur_cli import echo_info, echo_warning
 from .conf import config
-from . import cli, echo_error, utils
+from . import cli, echo_error, utils, echo_fatal
 from requests import get
 from .package import vi as vi_install
 from types import SimpleNamespace
@@ -23,7 +23,7 @@ def get_user_info():
     curl_command = f'curl -X GET -H "Authorization: Bearer {auth_token}" "https://www.googleapis.com/oauth2/v1/userinfo?alt=json"'
 
     curl_process = subprocess.run(curl_command,
-                                  capture_output=True, shell = True,
+                                  capture_output=True, shell=True,
                                   text=True)
     user_info = json.loads(curl_process.stdout)
 
@@ -37,11 +37,18 @@ def run(profile, additional_args):
     """
         Start your application locally.
         The 'run' command launches your ViUR application locally specified configuration and optional arguments.
+        This Enforces the Usage of gcloud tool
     """
-    echo_warning(f"You are using the development Server with your default account: {get_user_info()['email']}")
+    try:
+        echo_warning(f"You are using the development Server with your default account: {get_user_info()['email']}")
+    except:
+        echo_fatal(f"It seems you are not Using an appropriate account. "
+                   f"Please install the 'gcloud' tool or Log in with an appropriate account.")
+
     conf = config.get_profile(profile)
+    utils.system(
+        f'app_server -A={conf["application_name"]} {conf["distribution_folder"]} {" ".join(additional_args)}')
 
-    utils.system(f'app_server -A={conf["application_name"]} {conf["distribution_folder"]} {" ".join(additional_args)}')
 
 @cli.command()
 @click.argument("profile", default="default")
@@ -149,10 +156,11 @@ def env(profile):
     else:
         click.echo(f"{failed_icon} gcloud")
 
-    click.echo(f"Your default gcloud user Info:")
-    for k,v in get_user_info().items():
+    click.echo(f"\nYour default gcloud user Info:\n--------------------------------")
+    for k, v in get_user_info().items():
         click.echo(f"{k}: {v}")
 
+
 @cli.command()
 @click.option('--dev', '-d', is_flag=True, default=False)
 def check(dev):

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1}/src/viur_cli/update.py

@@ -3,7 +3,7 @@ import os
 import sys
 import re
 from .conf import config
-from . import cli, echo_error, echo_positive, echo_info, utils
+from . import cli, echo_error, echo_info, utils
 
 
 @cli.command(context_settings={"ignore_unknown_options": True})
@@ -20,20 +20,14 @@ def update(action, profile, additional_args):
     that the specified project configuration exists.
 
     Note:
-
         - Ensure that the specified project configuration ('name') is valid and defined in your project's configuration.
-
         - Additional arguments can be used to customize the update process if supported by the action.
-
     """
-    conf = config.get_profile(profile)
 
     if action == "requirements":
         create_req(True, profile)
 
 
-
-
 def create_req(yes, profile, confirm_value=True):
     """
     Load project's pipenv and build a requirements.txt.
@@ -53,27 +47,28 @@ def create_req(yes, profile, confirm_value=True):
     """
     conf = config.get_profile(profile)
     dist_folder = conf["distribution_folder"]
-    if conf["core"] != "submodule":
-        if yes or click.confirm(
-                text=f"Do you want to regenerate the requirements.txt located in the {dist_folder}?",
-                default=confirm_value):
-            os.system(f"pipfile2req  --hashes > {dist_folder}/requirements.txt")
-            file_object = open(f"{dist_folder}/requirements.txt", 'r')
-            generated_requirements = file_object.read()
-            for line in generated_requirements.splitlines():
-                if "]==" in line:
-                    # we got a dependency with extras
-                    generated_requirements += re.sub(r"\[.*?\]", "", line) + "\n"
-            file_object.close()
-
-            file_obj = open(f"{dist_folder}/requirements.txt", 'w')
-            file_obj.write(generated_requirements)
-            file_obj.close()
-            echo_info("requirements.txt successfully generated")
-
-        if check_req(f"{dist_folder}/requirements.txt"):
-            if not click.confirm(f"There are some depencency errors, are you sure you want to continue?"):
-                sys.exit(0)
+
+    if yes or click.confirm( text=f"Do you want to regenerate the requirements.txt located in the {dist_folder}?",
+                             default=confirm_value):
+        os.system(f"pipfile2req  --hashes > {dist_folder}/requirements.txt")
+        file_object = open(f"{dist_folder}/requirements.txt", 'r')
+        generated_requirements = file_object.read()
+
+        for line in generated_requirements.splitlines():
+            if "]==" in line:
+                # we got a dependency with extras
+                generated_requirements += re.sub(r"\[.*?\]", "", line) + "\n"
+        file_object.close()
+
+
+        file_obj = open(f"{dist_folder}/requirements.txt", 'w')
+        file_obj.write(generated_requirements)
+        file_obj.close()
+        echo_info("requirements.txt successfully generated")
+
+    if check_req(f"{dist_folder}/requirements.txt"):
+        if not click.confirm(f"There are some depencency errors, are you sure you want to continue?"):
+            sys.exit(0)
 
 
 def check_req(projects_requirements_path):

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1}/src/viur_cli/version.py

@@ -1,3 +1,3 @@
-__version__ = "2.0.0-rc6"
+__version__ = "2.0.1.dev1"
 MINIMAL_PIPENV = "2023.11.15"
 

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1/src/viur_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: viur_cli
-Version: 2.0.0rc6
+Version: 2.0.1.dev1
 Summary: Command-line interface for ViUR application maintenance.
 Home-page: https://github.com/viur-framework/viur-cli
 Author: Andreas H. Kelch
@@ -12,11 +12,11 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: app_server==0.9.9
-Requires-Dist: click==8.1.7
-Requires-Dist: pipfile-requirements==0.3.0
-Requires-Dist: requests==2.31.0
-Requires-Dist: semver==3.0.2
+Requires-Dist: app_server~=0.9
+Requires-Dist: click~=8.1.7
+Requires-Dist: pipfile-requirements~=0.3
+Requires-Dist: requests~=2.31
+Requires-Dist: semver~=3.0
 
 <div align="center">
     <img src="https://github.com/viur-framework/viur-artwork/raw/main/icons/icon-cli.svg" height="196" alt="A hexagonal logo of the viur-cli" title="viur-cli">

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1}/src/viur_cli.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ src/viur_cli/build.py
 src/viur_cli/cli.py
 src/viur_cli/cloud.py
 src/viur_cli/conf.py
+src/viur_cli/deprecated.py
 src/viur_cli/local.py
 src/viur_cli/package.py
 src/viur_cli/setup.py

viur_cli-2.0.1.dev1/src/viur_cli.egg-info/requires.txt

@@ -0,0 +1,5 @@
+app_server~=0.9
+click~=8.1.7
+pipfile-requirements~=0.3
+requests~=2.31
+semver~=3.0

viur_cli-2.0.0rc6/src/viur_cli.egg-info/requires.txt

@@ -1,5 +0,0 @@
-app_server==0.9.9
-click==8.1.7
-pipfile-requirements==0.3.0
-requests==2.31.0
-semver==3.0.2

{viur_cli-2.0.0rc6 → viur_cli-2.0.1.dev1}/src/viur_cli/scripts/viur_2to3.py

@@ -21,8 +21,8 @@ lookup = {
     "onItemEdited": "onEdited",
     "projectID": "conf[\"viur.instance.project_id\"]",
     "utils.currentLanguage": "current.language",
-    "utils.currentRequest": "current.request",
     "utils.currentRequestData": "current.request_data",
+    "utils.currentRequest": "current.request",
     "utils.currentSession": "current.session",
     "utils.getCurrentUser": "current.user.get",
     "utils.isLocalDevelopmentServer": "conf[\"viur.instance.is_dev_server\"]",