zrb 0.6.2__py3-none-any.whl → 0.7.0__py3-none-any.whl

zrb/builtin/generator/project/create.py

@@ -1,6 +1,9 @@
 import os
 
 from zrb.builtin.generator.common.task_input import (
+    project_author_email_input,
+    project_author_name_input,
+    project_description_input,
     project_dir_input,
     project_name_input,
 )
@@ -55,11 +58,20 @@ async def validate(*args: Any, **kwargs: Any):
 
 copy_resource = ResourceMaker(
     name="copy-resource",
-    inputs=[project_dir_input, project_name_input],
+    inputs=[
+        project_dir_input,
+        project_name_input,
+        project_description_input,
+        project_author_name_input,
+        project_author_email_input,
+    ],
     upstreams=[validate],
     replacements={
         "zrbProjectDir": "{{input.project_dir}}",
         "zrbProjectName": "{{input.project_name}}",
+        "zrbProjectDescription": "{{input.project_description}}",
+        "zrbProjectAuthorName": "{{input.project_author_name}}",
+        "zrbProjectAuthorEmail": "{{input.project_author_email}}",
         "zrbImageDefaultNamespace": IMAGE_DEFAULT_NAMESPACE,
         "zrbVersion": version,
     },

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

@@ -1,55 +1,43 @@
 #!/bin/bash
 
-PROJECT_DIR=$(pwd)
-echo "🤖 Set project directory to ${PROJECT_DIR}"
+log_progress() {
+    echo -e "🤖 \e[0;33m${1}\e[0;0m"
+}
+
 
+init() {
+    export PROJECT_DIR=$(pwd)
+    log_progress "Setting project directory to ${PROJECT_DIR}"
 
-_IS_EMPTY_VENV=0
-if [ -z "$PROJECT_USE_VENV" ] || [ "$PROJECT_USE_VENV" = 1 ]
-then
-    if [ ! -d .venv ]
+    _IS_EMPTY_VENV=0
+    if [ ! -d "${PROJECT_DIR}/.venv" ]
     then
-        echo '🤖 Create virtual environment'
+        log_progress 'Creating virtual environment'
         python -m venv "${PROJECT_DIR}/.venv"
+        source "${PROJECT_DIR}/.venv/bin/activate"
+        pip install --upgrade pip
+        pip install "poetry==1.7.1"
         _IS_EMPTY_VENV=1
     fi
-    echo '🤖 Activate virtual environment'
-    source "${PROJECT_DIR}/.venv/bin/activate"
-fi
 
-install_requirements() {
-    echo '🤖 Install requirements'
-    pip install --upgrade pip
-    pip install -r "${PROJECT_DIR}/requirements.txt"
+    log_progress 'Activating virtual environment'
+    source "${PROJECT_DIR}/.venv/bin/activate"
 }
 
+
 reload() {
 
     if [ ! -f "${PROJECT_DIR}/.env" ]
     then
-        echo '🤖 Create project configuration (.env)'
+        log_progress 'Creating project configuration (.env)'
         cp "${PROJECT_DIR}/template.env" "${PROJECT_DIR}/.env"
     fi
 
-    echo '🤖 Load project configuration (.env)'
+    log_progress 'Loading project configuration (.env)'
     source "${PROJECT_DIR}/.env"
 
-    if [ -z "$PROJECT_AUTO_INSTALL_PIP" ] || [ "$PROJECT_AUTO_INSTALL_PIP" = 1 ]
-    then
-        if [ "$_IS_EMPTY_VENV" = 1 ]
-        then
-            install_requirements
-            _IS_EMPTY_VENV=0
-        else
-            echo '🤖 Checking .venv and requirements.txt timestamp'
-            _VENV_TIMESTAMP=$(find .venv -type d -exec stat -c %Y {} \; | sort -n | tail -n 1)
-            _REQUIREMENTS_TIMESTAMP=$(stat -c %Y requirements.txt)
-            if [ "$_VENV_TIMESTAMP" -lt "$_REQUIREMENTS_TIMESTAMP" ] 
-            then
-                install_requirements
-            fi
-        fi
-    fi
+    log_progress 'Install'
+    poetry install
 
     _CURRENT_SHELL=$(ps -p $$ | awk 'NR==2 {print $4}')
     case "$_CURRENT_SHELL" in
@@ -62,12 +50,13 @@ reload() {
     esac
     if [ "$_CURRENT_SHELL" = "zsh" ] || [ "$_CURRENT_SHELL" = "bash" ]
     then
-        echo "🤖 Set up shell completion for $_CURRENT_SHELL"
+        log_progress "Setting up shell completion for $_CURRENT_SHELL"
         eval "$(_ZRB_COMPLETE=${_CURRENT_SHELL}_source zrb)"
     else
-        echo "🤖 Cannot set up shell completion for $_CURRENT_SHELL"
+        log_progress "Cannot set up shell completion for $_CURRENT_SHELL"
     fi
 }
 
+init
 reload
-echo '🤖 Happy Coding :)'
+log_progress 'Happy Coding :)'

zrb/builtin/generator/project/template/pyproject.toml

@@ -0,0 +1,21 @@
+[tool.poetry]
+name = "kebab-zrb-project-name"
+version = "0.0.1"
+description = "zrbProjectDescription"
+authors = ["zrbProjectAuthorName <zrbProjectAuthorEmail>"]
+keywords = []
+packages = [
+  {include = "kebab-zrb-project-name", from = ".."},
+]
+
+[tool.poetry.dependencies]
+python = ">=3.10.0,<4.0.0"
+zrb = ">=zrbVersion"
+
+[tool.poetry.dev-dependencies]
+
+[tool.poetry.scripts]
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

zrb/builtin/generator/simple_python_app/add.py

@@ -6,6 +6,9 @@ from zrb.builtin.generator.common.helper import (
 )
 from zrb.builtin.generator.common.task_factory import create_register_module
 from zrb.builtin.generator.common.task_input import (
+    app_author_email_input,
+    app_author_name_input,
+    app_description_input,
     app_image_name_input,
     app_name_input,
     env_prefix_input,
@@ -58,6 +61,9 @@ copy_resource = ResourceMaker(
     inputs=[
         project_dir_input,
         app_name_input,
+        app_description_input,
+        app_author_name_input,
+        app_author_email_input,
         app_image_name_input,
         http_port_input,
         env_prefix_input,
@@ -65,6 +71,9 @@ copy_resource = ResourceMaker(
     upstreams=[validate],
     replacements={
         "zrbAppName": "{{input.app_name}}",
+        "zrbAppDescription": "{{input.app_description}}",
+        "zrbAppAuthorName": "{{input.app_author_name}}",
+        "zrbAppAuthorEmail": "{{input.app_author_email}}",
         "zrbAppHttpPort": '{{util.coalesce(input.http_port, "3000")}}',
         "ZRB_ENV_PREFIX": '{{util.coalesce(input.env_prefix, "MY").upper()}}',
         "zrb-app-image-name": "{{input.app_image_name}}",

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/cmd/app-activate-venv.sh

@@ -2,6 +2,11 @@ if [ ! -d .venv ]
 then
   echo "Init virtual environment"
   python -m venv .venv
+  source .venv/bin/activate
+  echo "Upgrade Pip"
+  pip install -U pip
+  echo "Install Poetry"
+  pip install "poetry==1.7.1"
 fi
 echo "Activate virtual environment"
-source .venv/bin/activate
+source .venv/bin/activate

zrb/builtin/generator/simple_python_app/template/_automate/snake_zrb_app_name/cmd/app-start.sh

@@ -1,6 +1,6 @@
 PYTHONUNBUFFERED=1
 echo "Install packages"
-pip install -r requirements.txt
+poetry install --no-root
 
 echo "Start app"
-uvicorn main:app --host {{env.get("APP_HOST", "0.0.0.0")}} --port {{env.get("APP_PORT", "8080")}}
+poetry run uvicorn main:app --host {{env.get("APP_HOST", "0.0.0.0")}} --port {{env.get("APP_PORT", "8080")}}

zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/src/Dockerfile

@@ -2,6 +2,8 @@ FROM python:3.10-slim
 ENV APP_MESSAGE "Hello, world!"
 ENV APP_PORT 8080
 WORKDIR /home
+COPY ./pyproject.toml ./pyproject.toml
+RUN pip install "poetry==1.7.1"
+RUN poetry install --only main --no-root
 COPY . .
-RUN pip install -r requirements.txt
-CMD uvicorn main:app --host "0.0.0.0" --port "$APP_PORT"
+CMD poetry run uvicorn main:app --host "0.0.0.0" --port "$APP_PORT"

zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/src/pyproject.toml

@@ -0,0 +1,27 @@
+[tool.poetry]
+name = "kebab-zrb-app-name"
+version = "0.0.1"
+description = "zrbAppDescription"
+authors = ["zrbAppAuthorName <zrbAppAuthorEmail>"]
+keywords = []
+packages = [
+  {include = "kebab-zrb-project-name", from = ".."},
+]
+
+[tool.poetry.dependencies]
+python = ">=3.10.0,<4.0.0"
+uvicorn = "==0.20.0"
+
+[tool.poetry.dev-dependencies]
+flake8 = "~6.0.0"
+black = "~23.12.1"
+isort = "~5.13.2"
+pytest = "~7.4.0"
+pytest-cov = "~4.1.0"
+pytest-asyncio = "~0.21.0"
+flameprof = "~0.4"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+

zrb/shell-scripts/_common-util.sh

@@ -12,4 +12,8 @@ try_sudo() {
     else
         $@
     fi
-}
+}
+
+log_progress() {
+    echo -e "🤖 \e[0;33m${1}\e[0;0m"
+}

{zrb-0.6.2.dist-info → zrb-0.7.0.dist-info}/METADATA

@@ -1,35 +1,33 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.6.2
+Version: 0.7.0
 Summary: A Framework to Enhance Your Workflow
-Author-email: Go Frendi Gunawan <gofrendiasgard@gmail.com>
-Requires-Python: >=3.10.0
-Description-Content-Type: text/markdown
-Classifier: Programming Language :: Python :: 3
+Home-page: https://github.com/state-alchemists/zrb
+License: AGPL-3.0-or-later
+Keywords: Automation,Task Runner,Code Generator,Low Code
+Author: Go Frendi Gunawan
+Author-email: gofrendiasgard@gmail.com
+Requires-Python: >=3.10.0,<4.0.0
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
-Classifier: Operating System :: OS Independent
-Requires-Dist: click ~= 8.1.4
-Requires-Dist: aiofiles ~= 23.1.0
-Requires-Dist: beartype ~= 0.15.0
-Requires-Dist: termcolor ~= 2.3.0
-Requires-Dist: Jinja2 ~= 3.1.2
-Requires-Dist: libcst ~= 0.4.9
-Requires-Dist: python-dotenv ~= 1.0.0
-Requires-Dist: jsons ~= 1.6.3
-Requires-Dist: ruamel.yaml ~= 0.17.32
-Requires-Dist: setuptools ~= 68.0.0
-Requires-Dist: autopep8 ~= 2.0.2
-Requires-Dist: croniter ~= 2.0.1
-Requires-Dist: flake8 ~= 6.0.0 ; extra == "dev"
-Requires-Dist: black~=23.12.1 ; extra == "dev"
-Requires-Dist: isort~=5.13.2 ; extra == "dev"
-Requires-Dist: pytest ~= 7.4.0 ; extra == "dev"
-Requires-Dist: pytest-cov ~= 4.1.0 ; extra == "dev"
-Requires-Dist: pytest-asyncio ~= 0.21.0 ; extra == "dev"
-Requires-Dist: flameprof ~= 0.4 ; extra == "dev"
-Project-URL: Bug Tracker, https://github.com/state-alchemists/zrb/issues
-Project-URL: Homepage, https://github.com/state-alchemists/zrb
-Provides-Extra: dev
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Dist: Jinja2 (>=3.1.2,<3.2.0)
+Requires-Dist: aiofiles (>=23.1.0,<23.2.0)
+Requires-Dist: autopep8 (>=2.0.2,<2.1.0)
+Requires-Dist: beartype (>=0.15.0,<0.16.0)
+Requires-Dist: click (>=8.1.4,<8.2.0)
+Requires-Dist: croniter (>=2.0.1,<2.1.0)
+Requires-Dist: jsons (>=1.6.3,<1.7.0)
+Requires-Dist: libcst (>=0.4.9,<0.5.0)
+Requires-Dist: python-dotenv (>=1.0.0,<1.1.0)
+Requires-Dist: ruamel.yaml (>=0.17.32,<0.18.0)
+Requires-Dist: setuptools (>=68.0.0,<68.1.0)
+Requires-Dist: termcolor (>=2.3.0,<2.4.0)
+Project-URL: Documentation, https://github.com/state-alchemists/zrb
+Project-URL: Repository, https://github.com/state-alchemists/zrb
+Description-Content-Type: text/markdown
 
 ![](https://raw.githubusercontent.com/state-alchemists/zrb/main/_images/zrb/android-chrome-192x192.png)