zrb 0.7.2__py3-none-any.whl → 0.8.0__py3-none-any.whl

zrb/builtin/__init__.py

@@ -1,6 +1,7 @@
 from zrb.builtin import (
     base64,
     devtool,
+    docker,
     env,
     eval,
     explain,
@@ -18,18 +19,19 @@ from zrb.builtin import (
 )
 
 assert base64
+assert devtool
+assert docker
 assert env
 assert eval
+assert explain
+assert generator
 assert git
 assert md5
-assert explain
+assert process
 assert project
 assert ubuntu
 assert update
-assert version
-assert devtool
-assert generator
-assert process
 assert say
-assert watch_changes
 assert schedule
+assert version
+assert watch_changes

zrb/builtin/devtool/helix/install-language-server.sh

@@ -29,5 +29,15 @@ else
     echo "Cannot install go language server, is go installed?"
 fi
 
+if command_exists hx
+then
+    hx --grammar fetch
+    hx --grammar build
+elif command_exists helix
+then
+    helix --grammar fetch
+    helix --grammar build
+fi
+
 set -e
 echo "Visit https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers for more information."

zrb/builtin/devtool/helix/install.sh

@@ -18,7 +18,7 @@ else
         if command_exists pkg
         then
              try_sudo pkg update
-             try_sudo pkg install -y xclip helix
+             try_sudo pkg install -y helix
         elif command_exists apt
         then
              try_sudo add-apt-repository ppa:maveonair/helix-editor -y
@@ -46,13 +46,3 @@ else
         exit 1
     fi
 fi
-
-if command_exists hx
-then
-    hx --grammar fetch
-    hx --grammar build
-elif command_exists helix
-then
-    helix --grammar fetch
-    helix --grammar build
-fi

zrb/builtin/devtool/zsh/install.sh

@@ -48,7 +48,7 @@ fi
 if command_exists chsh
 then
     echo "Changing default shell to zsh..."
-     try_sudo chsh -s "$(command -v zsh)"
+     try_sudo chsh -s zsh
 else
     echo "chsh command not found. Please change the default shell manually."
 fi

zrb/builtin/devtool/zsh/resource/config.sh

@@ -131,3 +131,17 @@ KUBE_PS1_CTX_COLOR=cyan
 PROMPT='$(kube_ps1)'$PROMPT
 
 export COLORTERM=truecolor
+
+# Activate pyenv if exists
+if [ -d "${HOME}/.pyenv" ]
+then
+    export PYENV_ROOT="$HOME/.pyenv"
+    export PATH="$PYENV_ROOT/bin:$PATH"
+    eval "$(pyenv init --path)"
+fi
+
+# Activate local venv if exists
+if [ -f "${HOME}/.local-venv/bin/activate" ]
+then
+    source "${HOME}/.local-venv/bin/activate"
+fi

zrb/builtin/docker.py

@@ -0,0 +1,20 @@
+from zrb.builtin.group import docker_group
+from zrb.runner import runner
+from zrb.task.cmd_task import CmdTask
+
+###############################################################################
+# Task Definitions
+###############################################################################
+
+prune = CmdTask(
+    name="prune",
+    group=docker_group,
+    description="Prune unused images and volumes",
+    cmd=[
+        "docker system prune -af",
+        "docker image prune -af",
+        "docker system prune -af --volumes",
+        "docker system df",
+    ],
+)
+runner.register(prune)

zrb/builtin/generator/plugin/template/project.sh

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+if [ -n "$PREFIX" ] && [ "$PREFIX" = "/data/data/com.termux/files/usr" ]
+then
+    IS_TERMUX=1
+else
+    IS_TERMUX=0
+fi
+
+
 log_progress() {
     echo -e "🤖 \e[0;33m${1}\e[0;0m"
 }
@@ -17,7 +25,7 @@ init() {
     then
         log_progress 'Install poetry'
         pip install --upgrade pip setuptools
-        pip install "poetry==1.7.1"
+        pip install "poetry"
     fi
     if [ ! -d "${PROJECT_DIR}/.venv" ]
     then
@@ -40,9 +48,22 @@ reload() {
     log_progress 'Loading project configuration (.env)'
     source "${PROJECT_DIR}/.env"
 
+    if [ "$IS_TERMUX" = "1" ]
+    then
+        log_progress 'Updating Build Flags'
+        _OLD_CFLAGS="$CFLAGS"
+        export CFLAGS="$_OLD_CFLAGS -Wno-incompatible-function-pointer-types" # ruamel.yaml need this.
+    fi
+
     log_progress 'Install'
     poetry install
 
+    if [ "$IS_TERMUX" = "1" ]
+    then
+        log_progress 'Restoring Build Flags'
+        export CFLAGS="$_OLD_CFLAGS"
+    fi
+
     _CURRENT_SHELL=$(ps -p $$ | awk 'NR==2 {print $4}')
     case "$_CURRENT_SHELL" in
     *zsh)

zrb/builtin/generator/project/template/project.sh

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+if [ -n "$PREFIX" ] && [ "$PREFIX" = "/data/data/com.termux/files/usr" ]
+then
+    IS_TERMUX=1
+else
+    IS_TERMUX=0
+fi
+
+
 log_progress() {
     echo -e "🤖 \e[0;33m${1}\e[0;0m"
 }
@@ -17,7 +25,7 @@ init() {
     then
         log_progress 'Install poetry'
         pip install --upgrade pip setuptools
-        pip install "poetry==1.7.1"
+        pip install "poetry"
     fi
     if [ ! -d "${PROJECT_DIR}/.venv" ]
     then
@@ -40,9 +48,22 @@ reload() {
     log_progress 'Loading project configuration (.env)'
     source "${PROJECT_DIR}/.env"
 
+    if [ "$IS_TERMUX" = "1" ]
+    then
+        log_progress 'Updating Build Flags'
+        _OLD_CFLAGS="$CFLAGS"
+        export CFLAGS="$_OLD_CFLAGS -Wno-incompatible-function-pointer-types" # ruamel.yaml need this.
+    fi
+
     log_progress 'Install'
     poetry install
 
+    if [ "$IS_TERMUX" = "1" ]
+    then
+        log_progress 'Restoring Build Flags'
+        export CFLAGS="$_OLD_CFLAGS"
+    fi
+
     _CURRENT_SHELL=$(ps -p $$ | awk 'NR==2 {print $4}')
     case "$_CURRENT_SHELL" in
     *zsh)

zrb/builtin/git.py

@@ -20,7 +20,7 @@ clear_branch = CmdTask(
     cmd=[
         "for BRANCH in $(git branch)",
         "do",
-        '  if [ "$BRANCH" != "main" ]',
+        '  if [ "$BRANCH" != "main" ] && [ "$BRANCH" != "*" ]',
         "  then",
         "    git branch -D $BRANCH",
         "  fi",

zrb/builtin/group.py

@@ -17,5 +17,6 @@ dev_tool_install_group = Group(
     name="install", description="Install developer tools", parent=dev_tool_group
 )
 git_group = Group(name="git", description="Git related commands")
+docker_group = Group(name="docker", description="Docker related commands")
 process_group = Group(name="process", description="Process related commands")
 plugin_group = Group(name="plugin", description="Plugin related command")

{zrb-0.7.2.dist-info → zrb-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.7.2
+Version: 0.8.0
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -58,10 +58,10 @@ You can install Zrb as a pip package by invoking the following command:
 pip install zrb
 ```
 
-Alternatively, you can also use our installation script to install Zrb along with `pyenv`:
+Alternatively, you can also use our installation script to install Zrb along with some prerequisites:
 
 ```bash
-curl https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh | bash
+source <(curl -s https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)
 ```
 
 Check our [installation guide](https://github.com/state-alchemists/zrb/blob/main/docs/installation.md) for more information about the installation methods, including installation as a docker container.

{zrb-0.7.2.dist-info → zrb-0.8.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ zrb/__main__.py,sha256=dL2dVMkIZVBTcPuztE-WAbgKYsRPDMBp-IZtdgGYYf0,412
 zrb/action/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/action/runner.py,sha256=rjJvfcMwpcCIx6rrZLiXDwpnBi_yz6K0OKZ76SGqXSE,5092
 zrb/advertisement.py,sha256=qL-2EauUG8B6wxvZDIBchBfogYtXLJvWt_iw_IbYeO4,548
-zrb/builtin/__init__.py,sha256=NcBtDNQyUbJ-m6F8szPoBfk8Kmw7vd7keTxeRCFApis,451
+zrb/builtin/__init__.py,sha256=W6InzR85JLPkja-cCFqgsk93GXcvKYnYQnPhEKo-g0M,477
 zrb/builtin/base64.py,sha256=LtKgDoZzrzf_yWpBU8Xic3az6qXEkgS50gIleSelrV4,1335
 zrb/builtin/devtool/__init__.py,sha256=PNpOlo6DiaMYfOXXVG3z9T2UyBshbVYFrYJsufBWCZ8,613
 zrb/builtin/devtool/aws/install.sh,sha256=K6VfNvTI5gfPfNA-oKqMqmP6uJ27WdLqASkDAkElYcA,1613
@@ -13,8 +13,8 @@ zrb/builtin/devtool/gcloud/install.sh,sha256=IWZ44ZS0XCYnPdclC77PBjsa2HDes7NNcQX
 zrb/builtin/devtool/gvm/download.sh,sha256=nK8mQh3mm3QBIk7tBprBE10CmXDMRBkuz3S_uobLRm4,407
 zrb/builtin/devtool/gvm/finalize.sh,sha256=ngKNpdA3P7Op3nTlHLMEK0U6k0di9pW_hX3Wd7MQ8AA,518
 zrb/builtin/devtool/gvm/resource/config.sh,sha256=M_r6XjtoYZjx8rJaT3FIwVl3HUd7lJF5_KqUSEJQeo4,253
-zrb/builtin/devtool/helix/install-language-server.sh,sha256=pSCjnnmjojLAPScWsAqzcEIjqEXikF8ZRwZuCyRYjOM,881
-zrb/builtin/devtool/helix/install.sh,sha256=RGn3f-cPOf_6YED9EqGxvdm2e10wW8ELjDAqOzE6Bak,1520
+zrb/builtin/devtool/helix/install-language-server.sh,sha256=ZkV_ARwhTnLjjbAhJe8Pvp1hyRYVn176DYwg7ObkQ1w,1040
+zrb/builtin/devtool/helix/install.sh,sha256=9LIsQaZ_Rdto0TC-vEUB3qFEu_70hEiUG0Le0EuKPKA,1355
 zrb/builtin/devtool/helix/resource/config.toml,sha256=zEeA-oiVbCGs6dQNZAbeFfMJ3giClOkuhgJ6Pcel2ww,282
 zrb/builtin/devtool/helix/resource/themes/gruvbox_transparent.toml,sha256=Kz6AhxXKVHrP5mpFI99uPFyfUOvB_0x2fapj0tUkIaA,56
 zrb/builtin/devtool/helm/install.sh,sha256=IFls6qIgaP6AaGVVyhPcY24eUl30yRdvwdP0DdmfLgY,224
@@ -35,8 +35,9 @@ zrb/builtin/devtool/terraform/install.sh,sha256=HILxhcfvFPBhjqp4vk2bf9yoMC0nN7Hf
 zrb/builtin/devtool/terraform/resource/config.sh,sha256=Ded5pE1u4ByzfI64mtJcxIfCCqpz6N0AmnJHRetYwME,84
 zrb/builtin/devtool/tmux/install.sh,sha256=-H-VIipUKLJJGk55Ml0c642G60Iq1DtXj8EQUA0AzNk,1209
 zrb/builtin/devtool/tmux/resource/config.sh,sha256=wQCb4Q-mNkxIPOcvpN84X9RUWkGY16u3Vd-pOhVidgg,416
-zrb/builtin/devtool/zsh/install.sh,sha256=TgQLrqxw_3FPzjupF4BD_WcxjkCx8Zn2HiHp4_ylGB4,1696
-zrb/builtin/devtool/zsh/resource/config.sh,sha256=SRkcXvVT3tdfS1UDT0-dSj2PKXPLohhyakY6tUEQPjc,4764
+zrb/builtin/devtool/zsh/install.sh,sha256=O6LnYuNzRAi-gC856Hb1kwqv57JljCRCIVJFuCroC5c,1680
+zrb/builtin/devtool/zsh/resource/config.sh,sha256=2ZEmmiu5KS-FSMlj48IDPh5dhx5fnbzri86CtzI5Np0,5068
+zrb/builtin/docker.py,sha256=bn3vJrPJLQqO4WcoFgv7L-FB-PWYHeFOzySSkRjp4qM,586
 zrb/builtin/env.py,sha256=LwSLSn4nM-r9IGgrQA6uyIbnf2hEC5KagAvW3UZ_ZSY,1134
 zrb/builtin/eval.py,sha256=_y18fe28INT9ZA5OWHxAu8Jw3E0nm5fCv51UVFfkb9w,746
 zrb/builtin/explain.py,sha256=akQfTCgFTiWutAAC6VMZFrjlyDVQ90IWFPDdM_IgUpw,5353
@@ -1037,7 +1038,7 @@ zrb/builtin/generator/plugin/template/_cmd/build.sh,sha256=BdrlubJq1b9kjtB06IIBx
 zrb/builtin/generator/plugin/template/_cmd/install-symlink.sh,sha256=DntlTyRlfRyxier2byya2dUqW33T2g61yhZLKELVri8,37
 zrb/builtin/generator/plugin/template/_cmd/prepare-venv.sh,sha256=rXg-BvwoWK2xgbZvl01xHko6TZkSkb-yc_LiW8iF2n4,38
 zrb/builtin/generator/plugin/template/_cmd/publish.sh,sha256=kiF-8ngC9g-2OqDHH3Px5VLuP0q58JVh-EIPMYSLvr4,64
-zrb/builtin/generator/plugin/template/project.sh,sha256=G5fJDCxhhB3PCwvD1VP1IiqpP3LgB65RTltL-oVs_WE,1524
+zrb/builtin/generator/plugin/template/project.sh,sha256=JROKY8-KQF6OFDb9XhkesE8838kYDY8q5D2SuMuv1aU,1990
 zrb/builtin/generator/plugin/template/pyproject.toml,sha256=xgCPcWXo3rwEvGEzH2nJG-dF9OSRcl7f_4vwnW8Y9U4,764
 zrb/builtin/generator/plugin/template/src/snake_zrb_package_name/__init__.py,sha256=5Twm0lVcddWW1tnRKDkKSkwMeuTxZgZ-GyPcr2MeyZk,130
 zrb/builtin/generator/plugin/template/src/snake_zrb_package_name/__main__.py,sha256=xniLN9eAYflMDjM9LOPlt7FATS1P6aZBkUTGa9cfv6w,121
@@ -1053,7 +1054,7 @@ zrb/builtin/generator/project/template/.gitignore,sha256=9Sy-cmSDOIawqlmervgoO1e
 zrb/builtin/generator/project/template/.python-version,sha256=rGeoqWHOE1NzOu73didX8_OyjR9O8b-XNp87WjKbO0s,7
 zrb/builtin/generator/project/template/README.md,sha256=jNnkBuWhfab1HlcOqi0NKaM1O1NtTjchFrvOtR4KQPg,2026
 zrb/builtin/generator/project/template/_automate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/builtin/generator/project/template/project.sh,sha256=G5fJDCxhhB3PCwvD1VP1IiqpP3LgB65RTltL-oVs_WE,1524
+zrb/builtin/generator/project/template/project.sh,sha256=JROKY8-KQF6OFDb9XhkesE8838kYDY8q5D2SuMuv1aU,1990
 zrb/builtin/generator/project/template/pyproject.toml,sha256=OZEOtje1M6wVBoCx4ChcNNPMUWVFHv33CVV_isGdLmI,466
 zrb/builtin/generator/project/template/src/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/generator/project/template/template.env,sha256=mO3-iPEHihFbkBSr2VBZ15vyleL1S5MMpUKzGo9qtuw,124
@@ -1100,8 +1101,8 @@ zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/src/Dock
 zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/src/main.py,sha256=9oXlXs0J3d2fhm9flhVGA-H_XxCDsOj_dFRhyhWEjvc,511
 zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/src/pyproject.toml,sha256=c8Vz3Q2AmzZzayyAuAKlQk8YdwgaK4KLnzvpTHcEZLM,569
 zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/src/template.env,sha256=vtoZ0LV8OKAU1EUWBiB8PIKbf1FaNfm-49j7aXvKsgs,87
-zrb/builtin/git.py,sha256=cqmN_CTSjzZI0g-gvOvCKjNOyOKLj2sA6uXjlYgCb3g,2992
-zrb/builtin/group.py,sha256=o67C7nGyApqs5U7QMu5xGQyylPC7Ji9GaYbhrIP4AAk,1093
+zrb/builtin/git.py,sha256=Djz83w8_DiF1lZkWSl5HRgWlj7SArOpyQW5rQTjVUf0,3016
+zrb/builtin/group.py,sha256=LotriKtrebUzHgA4_0XzO4WPSG6Dkwb-E8_HsHPQlo8,1168
 zrb/builtin/helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/helper/reccuring_action.py,sha256=_oApvOrn7K4NZa-vt-A-xvpUSPjPEG2gydPXzJEUzSo,1940
 zrb/builtin/md5.py,sha256=MUPvqfqExW0Bj--6K7_WkQiDCdxf3tW6JZiNn4HJyIg,1235
@@ -1215,8 +1216,8 @@ zrb/task_input/int_input.py,sha256=NVXAToqgdmWVwDqnr3XGuvq_QMNvUiIdD-pW5L4uebk,4
 zrb/task_input/password_input.py,sha256=5sS3XP7WtGow7r7Fid8J9SX0iNCidO6Bg7q40UpZDM0,4029
 zrb/task_input/str_input.py,sha256=D2WBeB-CdmAuOSzT7jTXvie7X3EK_m_Oq8_SVwmNpWA,4042
 zrb/task_input/task_input.py,sha256=L-U5dX-I2U5ci7GU226Q8pXcQe5SpGuOl5viFwlfiM0,2022
-zrb-0.7.2.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
-zrb-0.7.2.dist-info/METADATA,sha256=DpjmH8nQnLTxd0JwhKDNAGZb82YxhV1gLFdZYtAAfHU,16484
-zrb-0.7.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-zrb-0.7.2.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
-zrb-0.7.2.dist-info/RECORD,,
+zrb-0.8.0.dist-info/LICENSE,sha256=WfnGCl8G60EYOPAEkuc8C9m9pdXWDe08NsKj3TBbxsM,728
+zrb-0.8.0.dist-info/METADATA,sha256=9KMmw8WC5nnLhEEJOvEj5eo6PHw2mvZbtmYf1fM6dAk,16501
+zrb-0.8.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+zrb-0.8.0.dist-info/entry_points.txt,sha256=xTgXc1kBKYhJHEujdaSPHUcJT3-hbyP1mLgwkv-5sSk,40
+zrb-0.8.0.dist-info/RECORD,,