zrb 0.0.99__tar.gz → 0.0.101__tar.gz

zrb-0.0.101/.python-version

@@ -0,0 +1 @@
+3.10.0

{zrb-0.0.99 → zrb-0.0.101}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.0.99
+Version: 0.0.101
 Summary: Super framework for your super app
 Author-email: Go Frendi Gunawan <gofrendiasgard@gmail.com>
 Requires-Python: >=3.10.0

{zrb-0.0.99 → zrb-0.0.101}/docker-template/docker-compose.yml

@@ -9,6 +9,7 @@ x-logging: &default-logging
 networks:
   zrb:
     name: zrb
+    external: true
 
 services:
 

{zrb-0.0.99 → zrb-0.0.101}/docs/concepts/tasks/flow-task.md

@@ -6,7 +6,7 @@
 FlowTask allows you to compose several unrelated tasks/actions into a single tasks.
 
 ```python
-from zrb import FlowTask, FlowNode, CmdTask, HttpChecker, runner
+from zrb import FlowTask, CmdTask, HttpChecker, runner
 import os
 
 CURRENT_DIR = os.dirname(__file__)
@@ -34,16 +34,16 @@ start_app = CmdTask(
 
 prepare_and_start_app = FlowTask(
     name='prepare-and-start-app',
-    nodes=[
+    steps=[
         # Prepare backend and frontend concurrently
         [
-            FlowNode(task=prepare_backend),
-            FlowNode(task=prepare_frontend)
+            prepare_backend,
+            prepare_frontend
         ],
         # Then start app
-        FlowNode(task=start_app),
+        start_app,
         # And finally show instruction
-        FlowNode(
+        CmdTask(
             name='show-instruction',
             cmd='echo "App is ready, Check your browser"'
         )

{zrb-0.0.99 → zrb-0.0.101}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "zrb"
-version = "0.0.99"
+version = "0.0.101"
 authors = [
   { name="Go Frendi Gunawan", email="gofrendiasgard@gmail.com" },
 ]

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/__init__.py

@@ -13,7 +13,7 @@ from zrb.task.path_checker import PathChecker
 from zrb.task.resource_maker import (
     ResourceMaker, Replacement, ReplacementMutator
 )
-from zrb.task.flow_task import FlowTask, FlowNode
+from zrb.task.flow_task import FlowTask
 from zrb.task_input.any_input import AnyInput
 from zrb.task_input.task_input import Input
 from zrb.task_input.bool_input import BoolInput
@@ -43,7 +43,6 @@ assert PortChecker
 assert PathChecker
 assert ResourceMaker
 assert FlowTask
-assert FlowNode
 assert Replacement
 assert ReplacementMutator
 assert AnyInput

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/builtin/devtool/devtool_install.py

@@ -2,7 +2,8 @@ from zrb.helper.typing import Any, Callable
 from zrb.helper.typecheck import typechecked
 from zrb.config.config import get_current_shell
 from zrb.task.task import Task
-from zrb.task.flow_task import FlowTask, FlowNode
+from zrb.task.cmd_task import CmdTask
+from zrb.task.flow_task import FlowTask
 from zrb.task_input.str_input import StrInput
 from zrb.task_input.bool_input import BoolInput
 from zrb.runner import runner
@@ -72,23 +73,22 @@ install_gvm = FlowTask(
         ),
         terminal_config_file_input,
     ],
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='download-gvm',
             cmd_path=os.path.join(dir_path, 'gvm', 'download.sh'),
             preexec_fn=None
         ),
-        FlowNode(
+        Task(
             name='configure-gvm',
             run=write_config(
                 template_file=os.path.join(
                     dir_path, 'gvm', 'resource', 'config.sh'
                 ),
                 config_file='{{input.config_file}}'
-            ),
-            preexec_fn=None
+            )
         ),
-        FlowNode(
+        CmdTask(
             name='finalize-gvm-installation',
             cmd_path=os.path.join(dir_path, 'gvm', 'finalize.sh'),
             preexec_fn=None
@@ -110,23 +110,22 @@ install_pyenv = FlowTask(
         ),
         terminal_config_file_input,
     ],
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='download-pyenv',
             cmd_path=os.path.join(dir_path, 'pyenv', 'download.sh'),
             preexec_fn=None
         ),
-        FlowNode(
+        Task(
             name='configure-pyenv',
             run=write_config(
                 template_file=os.path.join(
                     dir_path, 'pyenv', 'resource', 'config.sh'
                 ),
                 config_file='{{input.config_file}}'
-            ),
-            preexec_fn=None
+            )
         ),
-        FlowNode(
+        CmdTask(
             name='finalize-pyenv-installation',
             cmd_path=os.path.join(dir_path, 'pyenv', 'finalize.sh'),
             preexec_fn=None
@@ -148,23 +147,22 @@ install_nvm = FlowTask(
         ),
         terminal_config_file_input,
     ],
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='download-nvm',
             cmd_path=os.path.join(dir_path, 'nvm', 'download.sh'),
             preexec_fn=None
         ),
-        FlowNode(
+        Task(
             name='configure-nvm',
             run=write_config(
                 template_file=os.path.join(
                     dir_path, 'nvm', 'resource', 'config.sh'
                 ),
                 config_file='{{input.config_file}}'
-            ),
-            preexec_fn=None
+            )
         ),
-        FlowNode(
+        CmdTask(
             name='finalize-nvm-installation',
             cmd_path=os.path.join(dir_path, 'nvm', 'finalize.sh'),
             preexec_fn=None
@@ -193,23 +191,22 @@ install_sdkman = FlowTask(
         ),
         terminal_config_file_input,
     ],
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='download-sdkman',
             cmd_path=os.path.join(dir_path, 'sdkman', 'download.sh'),
             preexec_fn=None
         ),
-        FlowNode(
+        Task(
             name='configure-sdkman',
             run=write_config(
                 template_file=os.path.join(
                     dir_path, 'sdkman', 'resource', 'config.sh'
                 ),
                 config_file='{{input.config_file}}'
-            ),
-            preexec_fn=None
+            )
         ),
-        FlowNode(
+        CmdTask(
             name='finalize-sdkman-installation',
             cmd_path=os.path.join(dir_path, 'sdkman', 'finalize.sh'),
             preexec_fn=None
@@ -224,21 +221,20 @@ install_pulumi = FlowTask(
     group=dev_tool_install_group,
     description='Universal infrastructure as code',
     inputs=[terminal_config_file_input],
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-pulumi',
             cmd_path=os.path.join(dir_path, 'pulumi', 'install.sh'),
             preexec_fn=None
         ),
-        FlowNode(
+        Task(
             name='configure-pulumi',
             run=write_config(
                 template_file=os.path.join(
                     dir_path, 'pulumi', 'resource', 'config.sh'
                 ),
                 config_file='{{input.config_file}}'
-            ),
-            preexec_fn=None
+            )
         ),
     ],
     retry=0
@@ -249,8 +245,8 @@ install_aws = FlowTask(
     name='aws',
     group=dev_tool_install_group,
     description='AWS CLI',
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-aws',
             cmd_path=os.path.join(dir_path, 'aws', 'install.sh'),
             preexec_fn=None
@@ -264,8 +260,8 @@ install_gcloud = FlowTask(
     name='gcloud',
     group=dev_tool_install_group,
     description='Gcloud CLI',
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-gcloud',
             cmd_path=os.path.join(dir_path, 'gcloud', 'install.sh'),
             preexec_fn=None
@@ -287,21 +283,20 @@ install_tmux = FlowTask(
             default='~/.tmux.conf'
         )
     ],
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-tmux',
             cmd_path=os.path.join(dir_path, 'tmux', 'install.sh'),
             preexec_fn=None
         ),
-        FlowNode(
+        Task(
             name='configure-tmux',
             run=write_config(
                 template_file=os.path.join(
                     dir_path, 'tmux', 'resource', 'config.sh'
                 ),
                 config_file='{{input.config_file}}'
-            ),
-            preexec_fn=None
+            )
         ),
     ],
     retry=0
@@ -320,21 +315,20 @@ install_zsh = FlowTask(
             default='~/.zshrc'
         )
     ],
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-zsh',
             cmd_path=os.path.join(dir_path, 'zsh', 'install.sh'),
             preexec_fn=None
         ),
-        FlowNode(
+        Task(
             name='configure-zsh',
             run=write_config(
                 template_file=os.path.join(
                     dir_path, 'zsh', 'resource', 'config.sh'
                 ),
                 config_file='{{input.config_file}}'
-            ),
-            preexec_fn=None
+            )
         ),
     ],
     retry=0
@@ -345,8 +339,8 @@ install_kubectl = FlowTask(
     name='kubectl',
     group=dev_tool_install_group,
     description='Kubernetes CLI tool',
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-kubectl',
             cmd_path=os.path.join(dir_path, 'kubectl', 'install.sh'),
             preexec_fn=None
@@ -360,8 +354,8 @@ install_helm = FlowTask(
     name='helm',
     group=dev_tool_install_group,
     description='Package manager for kubernetes',
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-helm',
             cmd_path=os.path.join(dir_path, 'helm', 'install.sh'),
             preexec_fn=None
@@ -375,8 +369,8 @@ install_docker = FlowTask(
     name='docker',
     group=dev_tool_install_group,
     description='Most popular containerization platform',
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-docker',
             cmd_path=os.path.join(dir_path, 'docker', 'install.sh'),
             preexec_fn=None
@@ -393,21 +387,20 @@ install_terraform = FlowTask(
     inputs=[
         terminal_config_file_input
     ],
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-terraform',
             cmd_path=os.path.join(dir_path, 'terraform', 'install.sh'),
             preexec_fn=None
         ),
-        FlowNode(
+        Task(
             name='configure-terraform',
             run=write_config(
                 template_file=os.path.join(
                     dir_path, 'terraform', 'resource', 'config.sh'
                 ),
                 config_file='{{input.config_file}}'
-            ),
-            preexec_fn=None
+            )
         ),
     ],
     retry=0
@@ -418,14 +411,14 @@ install_helix = FlowTask(
     name='helix',
     group=dev_tool_install_group,
     description='Post modern text editor',
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-helix',
             cmd_path=os.path.join(dir_path, 'helix', 'install.sh'),
             preexec_fn=None
         ),
         [
-            FlowNode(
+            Task(
                 name='create-helix-theme',
                 run=write_config(
                     template_file=os.path.join(
@@ -433,10 +426,9 @@ install_helix = FlowTask(
                     ),
                     config_file='~/.config/helix/themes/gruvbox_transparent.toml',  # noqa
                     remove_old_config=True
-                ),
-                preexec_fn=None
+                )
             ),
-            FlowNode(
+            Task(
                 name='configure-helix',
                 run=write_config(
                     template_file=os.path.join(
@@ -444,10 +436,9 @@ install_helix = FlowTask(
                     ),
                     config_file='~/.config/helix/config.toml',
                     remove_old_config=True
-                ),
-                preexec_fn=None
+                )
             ),
-            FlowNode(
+            CmdTask(
                 name='install-language-server',
                 cmd_path=os.path.join(
                     dir_path, 'helix', 'install-language-server.sh'
@@ -464,8 +455,8 @@ install_selenium = FlowTask(
     name='selenium',
     group=dev_tool_install_group,
     description='Selenium + Chrome web driver',
-    nodes=[
-        FlowNode(
+    steps=[
+        CmdTask(
             name='install-selenium',
             cmd_path=os.path.join(dir_path, 'selenium', 'install.sh'),
             preexec_fn=None

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/builtin/generator/app_generator/add.py

@@ -50,32 +50,28 @@ default_app_port_input = IntInput(
 build_custom_image_input = BoolInput(
     name='build-custom-image',
     description='Whether build custom image or not',
-    prompt='Build custom image',
+    prompt='Does user need to create custom image?',
     default=True
 )
 
 is_container_only_input = BoolInput(
     name='is-container-only',
     description='Whether app only run as container or not',
-    prompt='Is container only',
+    prompt='Is this container only?',
     default=False
 )
 
 is_http_port_input = BoolInput(
     name='is-http-port',
-    description='Whether app run on top of HTTP protocol or not',
-    prompt='Is app a web appp (run on top of HTTP protocol)',
+    description='Whether app run on top of HTTP(s) protocol or not',
+    prompt='Is this a web appp (run on top of HTTP(s))?',
     default=False
 )
 
 use_helm_input = BoolInput(
     name='use-helm',
     description='Whether using helm for deployment or not',
-    prompt=' '.join([
-        'Use helm for deployment',
-        '(Note: If you choose "No" or "False", you can ignore other',
-        'helm related questions)',
-    ]),
+    prompt='Do you want to use helm for deployment?',
     default=False
 )
 

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/builtin/generator/app_generator/template/base/_automate/generate_snake_zrb_meta_template_name/template/src/kebab-zrb-app-name/docker-compose.yml

@@ -9,6 +9,7 @@ x-logging: &default-logging
 networks:
   zrb:
     name: zrb
+    external: true
 
 services:
 

{zrb-0.0.99/src/zrb/builtin/generator/simple_python_app → zrb-0.0.101/src/zrb/builtin/generator/app_generator/template/build-custom-image/_automate/generate_snake_zrb_meta_template_name}/template/src/kebab-zrb-app-name/docker-compose.yml

@@ -9,6 +9,7 @@ x-logging: &default-logging
 networks:
   zrb:
     name: zrb
+    external: true
 
 services:
 

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/builtin/generator/docker_compose_task/template/src/kebab-zrb-task-name/docker-compose.yml

@@ -9,6 +9,7 @@ x-logging: &default-logging
 networks:
   zrb:
     name: zrb
+    external: true
 
 services:
 

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/builtin/generator/fastapp/template/src/kebab-zrb-app-name/docker-compose.yml

@@ -9,6 +9,7 @@ x-logging: &default-logging
 networks:
   zrb:
     name: zrb
+    external: true
 
 services:
 

zrb-0.0.101/src/zrb/builtin/generator/project/template/.python-version

@@ -0,0 +1 @@
+3.10.0

{zrb-0.0.99/src/zrb/builtin/generator/app_generator/template/build-custom-image/_automate/generate_snake_zrb_meta_template_name → zrb-0.0.101/src/zrb/builtin/generator/simple_python_app}/template/src/kebab-zrb-app-name/docker-compose.yml

@@ -9,6 +9,7 @@ x-logging: &default-logging
 networks:
   zrb:
     name: zrb
+    external: true
 
 services:
 

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/helper/git/detect_changes.py

@@ -31,4 +31,4 @@ def get_modified_file_states(commit: str) -> Mapping[str, ModificationState]:
             modification_state.minus = True
         if line.startswith('+++'):
             modification_state.plus = True
-    return modified_files
+    return modified_files

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/helper/log.py

@@ -12,7 +12,7 @@ ch.setLevel(logging_level)
 
 # create formatter
 formatter = logging.Formatter(
-    colored('%(levelname)-8s %(asctime)s', attrs=['dark']) + ' %(message)s'
+    colored('%(levelname)-6s %(asctime)s', attrs=['dark']) + ' %(message)s'
 )
 
 # add formatter to ch

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/helper/python_task.py

@@ -8,4 +8,3 @@ def show_lines(task: Task, *lines: str):
     task.print_out(
         '\n' + separator + separator.join(lines) + '\n', trim_message=False
     )
-

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/shell-scripts/_common-util.sh

@@ -1,8 +1,6 @@
 set -e
-
 # Determine OS type
 OS_TYPE=$(uname)
-
 # Function to check if a command exists
 command_exists() {
     command -v "$1" &> /dev/null

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/shell-scripts/ensure-docker-is-installed.sh

@@ -1,3 +1,4 @@
+set -e
 if command_exists docker
 then
     echo "Docker is already installed."
@@ -67,4 +68,4 @@ then
 else
     echo "Docker Compose plugin is not installed or Docker is not running. Please check your installation."
     exit 1
-fi
+fi

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/shell-scripts/ensure-rsync-is-installed.sh

@@ -1,3 +1,4 @@
+set -e
 if command_exists rsync
 then
     echo "Rsync is already installed."

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/shell-scripts/ensure-ssh-is-installed.sh

@@ -1,3 +1,4 @@
+set -e
 if command_exists ssh
 then
     echo "SSH is already installed."

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/shell-scripts/rsync-util.sh

@@ -1,3 +1,4 @@
+set -e
 auth_rsync(){
     if [ "$_CONFIG_SSH_KEY" != "" ]
     then

zrb-0.0.101/src/zrb/shell-scripts/ssh-util.sh

@@ -0,0 +1,12 @@
+set -e
+auth_ssh(){
+    if [ "$_CONFIG_SSH_KEY" != "" ]
+    then
+        ssh -t -p "$_CONFIG_PORT" -i "$_CONFIG_SSH_KEY" "${_CONFIG_USER}@${_CONFIG_HOST}" "$1"
+    elif [ "$_CONFIG_PASSWORD" != "" ]
+    then
+        sshpass -p "$_CONFIG_PASSWORD" ssh -t -p "$_CONFIG_PORT" "${_CONFIG_USER}@${_CONFIG_HOST}" "$1"
+    else
+        ssh -t -p "$_CONFIG_PORT" "${_CONFIG_USER}@${_CONFIG_HOST}" "$1"
+    fi
+}

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/task/base_remote_cmd_task.py

@@ -108,11 +108,17 @@ class SingleBaseRemoteCmdTask(CmdTask):
 
     def _get_shell_env_map(self) -> Mapping[str, Any]:
         env_map = super()._get_shell_env_map()
-        env_map['_CONFIG_HOST'] = self._remote_config.host
-        env_map['_CONFIG_PORT'] = str(self._remote_config.port)
-        env_map['_CONFIG_SSH_KEY'] = self._remote_config.ssh_key
-        env_map['_CONFIG_USER'] = self._remote_config.user
-        env_map['_CONFIG_PASSWORD'] = self._remote_config.password
+        env_map['_CONFIG_HOST'] = self.render_str(self._remote_config.host)
+        env_map['_CONFIG_PORT'] = str(self.render_int(
+            self._remote_config.port)
+        )
+        env_map['_CONFIG_SSH_KEY'] = self.render_str(
+            self._remote_config.ssh_key
+        )
+        env_map['_CONFIG_USER'] = self.render_str(self._remote_config.user)
+        env_map['_CONFIG_PASSWORD'] = self.render_str(
+            self._remote_config.password
+        )
         return env_map
 
     def _get_cmd_str(self, *args: Any, **kwargs: Any) -> str:

{zrb-0.0.99 → zrb-0.0.101}/src/zrb/task/base_task.py

@@ -14,7 +14,7 @@ from zrb.task_input.any_input import AnyInput
 from zrb.task_input.constant import RESERVED_INPUT_NAMES
 from zrb.helper.accessories.color import colored
 from zrb.helper.advertisement import get_advertisement
-from zrb.helper.string.double_quote import double_quote
+from zrb.helper.string.modification import double_quote
 from zrb.helper.string.conversion import to_variable_name
 from zrb.helper.map.conversion import to_str as map_to_str
 from zrb.config.config import show_advertisement
@@ -267,15 +267,21 @@ class BaseTask(
             self._kwargs = new_kwargs
             # run the task
             coroutines = [
-                asyncio.create_task(self._loop_check(show_info=True)),
+                asyncio.create_task(self._loop_check()),
                 asyncio.create_task(self._run_all(*new_args, **new_kwargs))
             ]
             results = await asyncio.gather(*coroutines)
+            if show_advertisement:
+                selected_advertisement = get_advertisement(advertisements)
+                selected_advertisement.show()
+            self._show_done_info()
+            self._show_run_command()
             result = results[-1]
             self._print_result(result)
             return result
         except Exception as e:
-            self.log_critical(f'{e}')
+            self.log_error(f'{e}')
+            self._show_run_command()
             if raise_error:
                 raise
         finally:
@@ -302,24 +308,20 @@ class BaseTask(
         '''
         print(result)
 
-    async def _loop_check(self, show_info: bool = False) -> bool:
+    async def _loop_check(self) -> bool:
         self.log_info('Start readiness checking')
         while not await self._cached_check():
             self.log_debug('Task is not ready')
             await asyncio.sleep(self._checking_interval)
         self._end_timer()
         self.log_info('State: ready')
-        if show_info:
-            if show_advertisement:
-                selected_advertisement = get_advertisement(advertisements)
-                selected_advertisement.show()
-            self._show_done_info()
-            self._show_run_command()
         return True
 
     def _show_run_command(self):
         params: List[str] = [double_quote(arg) for arg in self._args]
         for task_input in self.get_all_inputs():
+            if task_input.is_hidden():
+                continue
             key = task_input.get_name()
             kwarg_key = self._get_normalized_input_key(key)
             quoted_value = double_quote(str(self._kwargs[kwarg_key]))