gibson-cli 0.5.4__tar.gz → 0.5.6__tar.gz

{gibson_cli-0.5.4/gibson_cli.egg-info → gibson_cli-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gibson-cli
-Version: 0.5.4
+Version: 0.5.6
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/api/BaseApi.py

@@ -2,6 +2,7 @@ import os
 
 import requests
 
+import gibson.core.Colors as Colors
 from gibson.core.Configuration import Configuration
 
 
@@ -83,9 +84,9 @@ class BaseApi:
 
     def __raise_for_status(self, r):
         if r.status_code == 401:
-            print("\n\nYou need to log in to continue. Please run:\n")
-            print("  gibson auth login\n\n")
-            print("and then try again.\n")
+            self.configuration.conversation.type(
+                f"\nYou need to log in to continue. Please run {Colors.command('gibson')} {Colors.subcommand('auth')} {Colors.argument('login')} and then try again.\n"
+            )
             exit(1)
 
         try:

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/command/Remove.py

@@ -31,7 +31,9 @@ class Remove(BaseCommand):
                 else:
                     self.memory.remember_last({"entities": entities})
 
-                self.conversation.type(f"[Removed] {sys.argv[2]}\n")
+                self.conversation.type(
+                    f"[Removed] {sys.argv[2]} from {Colors.argument('last')} memory\n"
+                )
                 self.conversation.newline()
 
                 return self

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/command/Show.py

@@ -27,7 +27,7 @@ class Show(BaseCommand):
 
         for entity in sorted(entities, key=lambda x: x["name"]):
             statement = entity["definition"].replace(
-                entity["name"], Colors.argument(entity["name"])
+                entity["name"], Colors.argument(entity["name"]), 1
             )
             print(f"\n{statement}")
 

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/command/code/Code.py

@@ -2,13 +2,13 @@ import sys
 
 import gibson.core.Colors as Colors
 from gibson.command.BaseCommand import BaseCommand
-from gibson.command.code.Entity import Entity
+from gibson.command.code.Entity import CodeEntity
 
 
 class Code(BaseCommand):
     def execute(self):
         if len(sys.argv) == 4 and sys.argv[2] == "entity":
-            Entity(self.configuration).execute()
+            CodeEntity(self.configuration).execute()
         else:
             self.usage()
 

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/command/code/Entity.py

@@ -16,7 +16,7 @@ from gibson.services.code.context.schema.Manager import (
 from gibson.structure.Entity import Entity
 
 
-class Entity(BaseCommand):
+class CodeEntity(BaseCommand):
     CODE_WRITER_ENTITY_MODIFIER_NOOP = ""
 
     def __init__(self, configuration: Configuration):
@@ -83,17 +83,12 @@ class Entity(BaseCommand):
         cli = Cli(self.configuration)
 
         self.configuration.require_project()
-        self.configuration.display_project()
         definition = self.configure_definition()
 
-        self.conversation.c64_boot_search()
-
         self.__context = CodeContextSchemaManager().from_code_writer_schema_context(
             cli.code_writer_schema_context()
         )
 
-        self.conversation.c64_boot_loading()
-
         data = cli.code_writer_entity_modifier(
             self.__context.json,
             sys.argv[3],
@@ -102,8 +97,6 @@ class Entity(BaseCommand):
         )
         entity = Entity().import_from_struct(data)
 
-        self.conversation.c64_ready_run()
-
         while True:
             self.__render_workspace(entity, data["code"][0]["definition"])
 
@@ -156,10 +149,10 @@ class Entity(BaseCommand):
                 entity = Entity().import_from_struct(data)
 
     def get_default_ref_table_template_path(self):
-        return os.path.dirname(__file__) + "/../data/default-ref-table.tmpl"
+        return os.path.dirname(__file__) + "/../../data/default-ref-table.tmpl"
 
     def get_default_table_template_path(self):
-        return os.path.dirname(__file__) + "/../data/default-table.tmpl"
+        return os.path.dirname(__file__) + "/../../data/default-table.tmpl"
 
     def __render_workspace(self, entity: Entity, model):
         self.configuration.platform.cmd_clear()

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/command/list/Projects.py

@@ -10,6 +10,12 @@ class Projects(BaseCommand):
         self.configuration.require_login()
         projects = ProjectApi(self.configuration).all_projects()
 
+        if len(projects) == 0:
+            self.conversation.type(
+                f"No projects found. Create one with {Colors.command('gibson')} {Colors.subcommand('new')} {Colors.argument('project')}\n"
+            )
+            exit(1)
+
         self.conversation.type("Name".ljust(40))
         self.conversation.type("ID")
         self.conversation.newline()

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/command/new/Module.py

@@ -3,7 +3,7 @@ from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
 
 
-class Module(BaseCommand):
+class NewModule(BaseCommand):
     def execute(self):
         self.configuration.require_project()
         module_name = self.conversation.prompt_module()

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/command/new/New.py

@@ -2,25 +2,28 @@ import sys
 
 import gibson.core.Colors as Colors
 from gibson.command.BaseCommand import BaseCommand
-from gibson.command.new.Module import Module
-from gibson.command.new.Project import Project
+from gibson.command.code.Entity import CodeEntity
+from gibson.command.new.Module import NewModule
+from gibson.command.new.Project import NewProject
 
 
 class New(BaseCommand):
     def execute(self):
-        if len(sys.argv) != 3:
+        if not len(sys.argv) >= 3:
             self.usage()
         elif sys.argv[2] == "project":
-            Project(self.configuration).execute()
+            NewProject(self.configuration).execute()
         elif sys.argv[2] == "module":
-            Module(self.configuration).execute()
+            NewModule(self.configuration).execute()
+        elif sys.argv[2] == "entity":
+            CodeEntity(self.configuration).execute()
         else:
             self.usage()
 
     def usage(self):
         self.configuration.display_project()
         self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('new')} {Colors.arguments(['project', 'module'])} {Colors.hint('create something new')}\n"
+            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('new')} {Colors.arguments(['project', 'module', 'entity'])} {Colors.hint('create something new')}\n"
         )
         self.conversation.type(
             f"       {Colors.command(self.configuration.command)} {Colors.subcommand('new')} {Colors.argument('project')} {Colors.hint('create a new project')}\n"
@@ -28,5 +31,8 @@ class New(BaseCommand):
         self.conversation.type(
             f"       {Colors.command(self.configuration.command)} {Colors.subcommand('new')} {Colors.argument('module')} {Colors.hint('create a new module')}\n"
         )
+        self.conversation.type(
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('new')} {Colors.argument('entity')} {Colors.hint('create a new entity')}\n"
+        )
         self.conversation.newline()
         exit(1)

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/core/Configuration.py

@@ -393,7 +393,7 @@ class Configuration:
 
     def setup_project(self):
         config = None
-        if len(self.settings.keys()) == 1:
+        if self.settings is not None and len(self.settings.keys()) == 1:
             config = list(self.settings.values())[0]
             self.project = Project()
             self.project.name = list(self.settings.keys())[0]
@@ -449,6 +449,7 @@ class Configuration:
         self.require_project()
         self.settings[self.project.name]["dev"]["active"] = False
         self.write_config()
+        self.setup_project()
         return self
 
     def turn_dev_on(
@@ -463,6 +464,7 @@ class Configuration:
         self.settings[self.project.name]["dev"]["model"]["path"] = model_path
         self.settings[self.project.name]["dev"]["schema"]["path"] = schema_path
         self.write_config()
+        self.setup_project()
         return self
 
     def write_config(self):

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/data/bash-completion.tmpl

@@ -66,12 +66,11 @@ __gibson_completions() {
     dev) __gibson_generate_completion "on off" ;;
     forget) __gibson_generate_completion "stored last all" ;;
     import) __gibson_generate_completion "api datastore" ;;
-    list) __gibson_generate_completion "entities" ;;
-    new) __gibson_generate_completion "project module" ;;
+    list) __gibson_generate_completion "entities projects" ;;
+    new) __gibson_generate_completion "project module entity" ;;
+    rename) __gibson_generate_completion "entity" ;;
     rewrite) __gibson_generate_completion "api base models schemas tests" ;;
-    # create) __gibson_generate_completion "project module entity" ;;
     # project) __gibson_generate_completion "create delete list" ;;
-    # rename) __gibson_generate_completion "entity" ;;
     esac
 
     return 0

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/gibson/display/WorkspaceHeader.py

@@ -1,8 +1,8 @@
 class WorkspaceHeader:
     def render(self, project_name):
         return (
-            f"Workspace {project_name}".ljust(50)
-            + " " * 13
-            + "[CONTEXT LOADED]\n"
+            f"Project {project_name}".ljust(50)
+            + " " * 12
+            + "[PAIR PROGRAMMER]\n"
             + "=" * 79
         )

{gibson_cli-0.5.4 → gibson_cli-0.5.6/gibson_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gibson-cli
-Version: 0.5.4
+Version: 0.5.6
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/

{gibson_cli-0.5.4 → gibson_cli-0.5.6}/pyproject.toml

@@ -14,7 +14,7 @@ classifiers = [
   "Intended Audience :: Developers",
   "Programming Language :: Python :: 3.9",
 ]
-version = "0.5.4"
+version = "0.5.6"
 
 [tool.setuptools.packages.find]
 where = ["."]