zrb 0.0.87__tar.gz → 0.0.88__tar.gz

{zrb-0.0.87 → zrb-0.0.88}/PKG-INFO

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

{zrb-0.0.87 → zrb-0.0.88}/playground-template/generate-project.sh

@@ -65,7 +65,7 @@ zrb project add fastapp-field \
 echo '🤖 Add python package'
 zrb project add pip-package \
     --project-dir . \
-    --package-name "zrb-playground-test" \
+    --package-name "zrb-coba-test" \
     --package-description "A test package" \
     --package-homepage "https://github.com/state-alchemists/zrb" \
     --package-bug-tracker "https://github.com/state-alchemists/zrb/issues" \
@@ -74,7 +74,15 @@ zrb project add pip-package \
 
 echo '🤖 Add generator'
 zrb project add app-generator \
-    --template-name "airflow"
+    --template-name "coba-app"
+
+echo '🤖 Run generator'
+zrb project add coba-app \
+    --project-dir . \
+    --app-name "coba" \
+    --app-image-name "docker.io/gofrendi/coba" \
+    --http-port "8080" \
+    --env-prefix "COBA"
 
 echo '🤖 Test'
 zrb project test-fastapp

{zrb-0.0.87 → zrb-0.0.88}/pyproject.toml

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

{zrb-0.0.87 → zrb-0.0.88}/src/zrb/builtin/devtool/devtool_install.py

@@ -68,7 +68,7 @@ install_gvm = FlowTask(
         StrInput(
             name='go-default-version',
             description='Go default version',
-            default='go1.14'
+            default='go1.21'
         ),
         terminal_config_file_input,
     ],
@@ -429,9 +429,9 @@ install_helix = FlowTask(
                 name='create-helix-theme',
                 run=write_config(
                     template_file=os.path.join(
-                        dir_path, 'helix', 'resource', 'themes', 'gruvbox_transparent.toml' # noqa
+                        dir_path, 'helix', 'resource', 'themes', 'gruvbox_transparent.toml'  # noqa
                     ),
-                    config_file='~/.config/helix/themes/gruvbox_transparent.toml', # noqa
+                    config_file='~/.config/helix/themes/gruvbox_transparent.toml',  # noqa
                     remove_old_config=True
                 ),
                 preexec_fn=None
@@ -447,6 +447,13 @@ install_helix = FlowTask(
                 ),
                 preexec_fn=None
             ),
+            FlowNode(
+                name='install-language-server',
+                cmd_path=os.path.join(
+                    dir_path, 'helix', 'install-language-server.sh'
+                ),
+                preexec_fn=None
+            ),
         ],
     ],
     retry=0

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

@@ -0,0 +1,33 @@
+set +e
+
+pip --version
+if [ "$?" = 0 ]
+then
+    echo "Install python language server"
+    pip install -U 'python-lsp-server[all]'
+else
+    echo "Cannot install python language server, is pip installed?"
+fi
+
+npm --version
+if [ "$?" = 0 ]
+then
+    echo "Install docker language server"
+    npm install -g dockerfile-language-server-nodejs
+else
+    echo "Cannot install docker language server, is npm installed?"
+fi
+
+go version
+if [ "$?" = 0 ]
+then
+    echo "Install go language server"
+    go install golang.org/x/tools/gopls@latest          # LSP
+    go install github.com/go-delve/delve/cmd/dlv@latest # Debugger
+    go install golang.org/x/tools/cmd/goimports@latest  # Formatter
+else
+    echo "Cannot install go language server, is go installed?"
+fi
+
+set -e
+echo "Visit https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers for more information."

{zrb-0.0.87 → zrb-0.0.88}/src/zrb/builtin/generator/app_generator/add.py

@@ -25,6 +25,13 @@ template_name_input = StrInput(
     default=get_random_name()
 )
 
+template_base_image_input = StrInput(
+    name='template-base-image',
+    shortcut='i',
+    prompt='Base image',
+    default='python:3.10-slim'
+)
+
 
 ###############################################################################
 # Task Definitions
@@ -50,10 +57,12 @@ copy_resource = ResourceMaker(
     inputs=[
         project_dir_input,
         template_name_input,
+        template_base_image_input,
     ],
     upstreams=[validate],
     replacements={
         'zrbMetaTemplateName': '{{input.template_name}}',
+        'zrbMetaTemplateBaseImage': '{{input.template_base_image}}',
     },
     template_path=os.path.join(CURRENT_DIR, 'template'),
     destination_path='{{ input.project_dir }}',

{zrb-0.0.87 → zrb-0.0.88}/src/zrb/builtin/generator/app_generator/template/_automate/snake_zrb_meta_template_name/add.py

@@ -159,7 +159,7 @@ add_destroy_upstream = create_add_destroy_upstream(
 
 
 @python_task(
-    name='simple-python-app',
+    name='kebab-zrb-meta-template-name',
     group=project_add_group,
     upstreams=[
         register_local_module,
@@ -177,6 +177,6 @@ add_destroy_upstream = create_add_destroy_upstream(
     ],
     runner=runner
 )
-async def add_simple_python_app(*args: Any, **kwargs: Any):
+async def snake_zrb_meta_template_name(*args: Any, **kwargs: Any):
     task: Task = kwargs.get('_task')
     task.print_out('Success')

zrb-0.0.88/src/zrb/builtin/generator/app_generator/template/_automate/snake_zrb_meta_template_name/template/_automate/snake_zrb_app_name/cmd/app-start.sh

@@ -0,0 +1 @@
+go run main.go

{zrb-0.0.87/src/zrb/builtin/generator/simple_python_app → zrb-0.0.88/src/zrb/builtin/generator/app_generator/template/_automate/snake_zrb_meta_template_name}/template/src/kebab-zrb-app-name/src/.gitignore

@@ -1,3 +1,5 @@
 .env
 __pycache__
 .venv
+web-server
+main

zrb-0.0.88/src/zrb/builtin/generator/app_generator/template/_automate/snake_zrb_meta_template_name/template/src/kebab-zrb-app-name/src/Dockerfile

@@ -0,0 +1,12 @@
+FROM golang:1.21 as build
+WORKDIR /app
+COPY . .
+RUN go build -o web-server main.go
+
+
+FROM zrbMetaTemplateBaseImage
+ENV APP_MESSAGE "Hello, world!"
+ENV APP_PORT 8080
+WORKDIR /app
+COPY --from=build /app /app
+CMD ./web-server

zrb-0.0.88/src/zrb/builtin/generator/app_generator/template/_automate/snake_zrb_meta_template_name/template/src/kebab-zrb-app-name/src/go.work

@@ -0,0 +1 @@
+go 1.21.0

zrb-0.0.88/src/zrb/builtin/generator/app_generator/template/_automate/snake_zrb_meta_template_name/template/src/kebab-zrb-app-name/src/main.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+)
+
+func main() {
+	// Get configurations
+	appPort := os.Getenv("APP_PORT")
+	if appPort == "" {
+		appPort = "8080"
+	}
+	appMessage := os.Getenv("APP_MESSAGE")
+	if appMessage == "" {
+		appMessage = "Hello world"
+	}
+
+	// Define handler
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprint(w, appMessage)
+	})
+	// Listen and serve
+	fmt.Printf("Listening on port %s\n", appPort)
+	log.Fatal(http.ListenAndServe(fmt.Sprintf(":%s", appPort), nil))
+}

{zrb-0.0.87 → zrb-0.0.88}/src/zrb/builtin/generator/project/create.py

@@ -12,6 +12,10 @@ from ....config.config import version
 import os
 
 CURRENT_DIR = os.path.dirname(__file__)
+SYSTEM_USER = os.getenv('USER', 'incognito')
+IMAGE_DEFAULT_NAMESPACE = os.getenv(
+    'PROJECT_IMAGE_DEFAULT_NAMESPACE', 'docker.io/' + SYSTEM_USER
+)
 
 ###############################################################################
 # Replacement Mutator Definitions
@@ -58,6 +62,7 @@ copy_resource = ResourceMaker(
     replacements={
         'zrbProjectDir': '{{input.project_dir}}',
         'zrbProjectName': '{{input.project_name}}',
+        'zrbImageDefaultNamespace': IMAGE_DEFAULT_NAMESPACE,
         'zrbVersion': version,
     },
     replacement_mutator=copy_resource_replacement_mutator,

zrb-0.0.88/src/zrb/builtin/generator/project/template/template.env

@@ -0,0 +1,3 @@
+export PROJECT_IMAGE_DEFAULT_NAMESPACE=zrbImageDefaultNamespace
+export PROJECT_USE_VENV=1
+export PROJECT_AUTO_INSTALL_PIP=1

{zrb-0.0.87 → zrb-0.0.88}/src/zrb/builtin/ubuntu.py

@@ -43,8 +43,8 @@ install_packages = CmdTask(
         'libbz2-dev libreadline-dev libsqlite3-dev libpq-dev python3-dev \\',
         'llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev \\',
         'liblzma-dev python3-openssl bison libblas-dev liblapack-dev \\',
-        'gfortran rustc fd-find ripgrep wget curl git ncat cmake make tree \\',
-        'tmux zsh neovim xdotool xsel'
+        'golang gfortran rustc fd-find ripgrep wget curl git ncat \\',
+        'cmake make tree tmux zsh neovim xdotool xsel'
     ],
     upstreams=[update_task],
     checking_interval=3,

zrb-0.0.87/src/zrb/builtin/generator/project/template/template.env

@@ -1,3 +0,0 @@
-export PROJECT_IMAGE_DEFAULT_NAMESPACE=
-export PROJECT_USE_VENV=1
-export PROJECT_AUTO_INSTALL_PIP=1

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

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

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

@@ -1,7 +0,0 @@
-FROM python:3.10-slim
-ENV APP_MESSAGE "Hello, world!"
-ENV APP_PORT 8080
-WORKDIR /home
-COPY . .
-RUN pip install -r requirements.txt
-CMD uvicorn main:app --host "0.0.0.0" --port "$APP_PORT"

zrb-0.0.87/src/zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/src/main.py

@@ -1,20 +0,0 @@
-import os
-
-MESSAGE = os.getenv('APP_MESSAGE', 'Hello, world!')
-PORT = int(os.getenv('APP_PORT', '8000'))
-
-
-async def app(scope, receive, send):
-    assert scope['type'] == 'http'
-
-    await send({
-        'type': 'http.response.start',
-        'status': 200,
-        'headers': [
-            [b'content-type', b'text/plain'],
-        ],
-    })
-    await send({
-        'type': 'http.response.body',
-        'body': bytes(MESSAGE, 'utf-8'),
-    })

zrb-0.0.87/src/zrb/builtin/generator/simple_python_app/template/src/kebab-zrb-app-name/src/requirements.txt

@@ -1 +0,0 @@
-uvicorn==0.20.0