zrb 0.0.100__tar.gz → 0.0.101__tar.gz

zrb-0.0.101/.python-version

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.0.100
+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.100 → 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.100 → zrb-0.0.101}/pyproject.toml

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

{zrb-0.0.100 → 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.100 → 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.100/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.100 → 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.100 → 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.100/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.100 → 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.100 → 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.100 → zrb-0.0.101}/src/zrb/task/base_task.py

@@ -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,19 +308,13 @@ 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):