gibson-cli 0.5.3__py3-none-any.whl → 0.5.6__py3-none-any.whl

gibson/api/BaseApi.py

@@ -2,6 +2,7 @@ import os
 
 import requests
 
+import gibson.core.Colors as Colors
 from gibson.core.Configuration import Configuration
 
 
@@ -25,7 +26,15 @@ class BaseApi:
         return r.json()
 
     def headers(self):
-        raise NotImplementedError
+        headers = {
+            "X-Gibson-Client-ID": self.configuration.client_id(),
+        }
+
+        token = self.configuration.get_access_token()
+        if token is not None:
+            headers["Authorization"] = f"Bearer {token}"
+
+        return headers
 
     def post(self, endpoint, json: dict):
         r = requests.post(self.url(endpoint), headers=self.headers(), json=json)
@@ -75,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/api/Cli.py

@@ -1,16 +1,16 @@
+from gibson.api.BaseApi import BaseApi
 from gibson.core.Configuration import Configuration
 from gibson.core.Memory import Memory
 from gibson.lang.Python import Python
 
-from .BaseApi import BaseApi
-
 
 class Cli(BaseApi):
     PREFIX = "cli"
 
     def __init__(self, configuration: Configuration):
         self.configuration = configuration
-        self.configuration.ensure_project()
+        self.configuration.require_login()
+        self.configuration.require_project()
 
     def code_api(self):
         return self.post(
@@ -64,15 +64,8 @@ class Cli(BaseApi):
         ).json()
 
     def headers(self):
-        headers = {
-            "X-Gibson-Client-ID": self.configuration.client_id(),
-            "X-Gibson-API-Key": self.configuration.project.api.key,
-        }
-
-        token = self.configuration.get_access_token()
-        if token is not None:
-            headers["Authorization"] = f"Bearer {token}"
-
+        headers = super().headers()
+        headers["X-Gibson-API-Key"] = self.configuration.project.api.key
         return headers
 
     def import_(self):

gibson/api/ProjectApi.py

@@ -0,0 +1,13 @@
+from gibson.api.BaseApi import BaseApi
+from gibson.core.Configuration import Configuration
+
+
+class ProjectApi(BaseApi):
+    PREFIX = "project"
+
+    def __init__(self, configuration: Configuration):
+        self.configuration = configuration
+        self.configuration.require_login()
+
+    def all_projects(self):
+        return self.get("all")["projects"]

gibson/command/Build.py

@@ -49,7 +49,7 @@ class Build(BaseCommand):
         if len(sys.argv) != 3 or sys.argv[2] != "datastore":
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
 
         if self.memory.entities is None or len(self.memory.entities) == 0:
             self.no_entities()

gibson/command/Conf.py

@@ -39,7 +39,7 @@ class Conf(BaseCommand):
         except KeyError:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         self.configuration.display_project()
         self.conversation.type(f"{key}\n")
         self.conversation.type(f"  [old value] {old_value}\n")

gibson/command/Count.py

@@ -9,7 +9,7 @@ class Count(BaseCommand):
         if len(sys.argv) != 3 or sys.argv[2] not in ["last", "stored"]:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
 
         if sys.argv[2] == "last":
             count = 0

gibson/command/Dev.py

@@ -30,7 +30,7 @@ class Dev(BaseCommand):
         if len(sys.argv) != 3 or sys.argv[2] not in ["off", "on"]:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
 
         if sys.argv[2] == "off":
             if self.configuration.project.dev.active is True:

gibson/command/Forget.py

@@ -9,7 +9,7 @@ class Forget(BaseCommand):
         if len(sys.argv) != 3 or sys.argv[2] not in ["all", "last", "stored"]:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         self.configuration.display_project()
 
         if sys.argv[2] in ["all", "last"]:

gibson/command/Import.py

@@ -15,7 +15,7 @@ class Import(BaseCommand):
         if len(sys.argv) != 3 and len(sys.argv) != 5:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         write_code = False
         if len(sys.argv) == 5:
             if sys.argv[3] != ".." or sys.argv[4] != "dev":

gibson/command/Merge.py

@@ -3,7 +3,7 @@ from gibson.command.BaseCommand import BaseCommand
 
 class Merge(BaseCommand):
     def execute(self):
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         self.configuration.display_project()
 
         if self.memory.last is None or "entities" not in self.memory.last:

gibson/command/Model.py

@@ -12,7 +12,7 @@ class Model(BaseCommand):
         if len(sys.argv) != 3:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         entity = self.memory.recall_stored_entity(sys.argv[2])
         if entity is None:
             self.conversation.not_sure_no_entity(

gibson/command/Modify.py

@@ -10,7 +10,7 @@ class Modify(BaseCommand):
         if len(sys.argv) < 4:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         entity = self.memory.recall_entity(sys.argv[2])
         if entity is None:
             self.conversation.not_sure_no_entity(

gibson/command/OpenApi.py

@@ -31,7 +31,7 @@ class OpenApi(BaseCommand):
         if "paths" not in contents:
             self.unrecognized_format()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         self.configuration.display_project()
 
         if contents.get("info", None) is not None:

gibson/command/Question.py

@@ -15,7 +15,7 @@ class Question(BaseCommand):
         if len(sys.argv) < 3:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         instructions = ""
         has_file = False
         has_python = False

gibson/command/Remove.py

@@ -11,7 +11,7 @@ class Remove(BaseCommand):
         if len(sys.argv) != 3:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         self.configuration.display_project()
 
         found = False
@@ -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/command/Schema.py

@@ -12,7 +12,7 @@ class Schema(BaseCommand):
         if len(sys.argv) != 3:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         entity = self.memory.recall_stored_entity(sys.argv[2])
         if entity is None:
             self.conversation.not_sure_no_entity(

gibson/command/Show.py

@@ -7,13 +7,13 @@ from gibson.command.BaseCommand import BaseCommand
 class Show(BaseCommand):
     def execute(self):
         if len(sys.argv) == 2:
-            self.configuration.ensure_project()
+            self.configuration.require_project()
             entities = self.memory.recall_merged()
             if entities is None:
                 self.conversation.cant_no_entities(self.configuration.project.name)
                 exit(1)
         elif len(sys.argv) == 3:
-            self.configuration.ensure_project()
+            self.configuration.require_project()
             entity = self.memory.recall_entity(sys.argv[2])
             if entity is None:
                 self.conversation.not_sure_no_entity(
@@ -25,8 +25,11 @@ class Show(BaseCommand):
         else:
             self.usage()
 
-        for entity in entities:
-            print(entity["definition"])
+        for entity in sorted(entities, key=lambda x: x["name"]):
+            statement = entity["definition"].replace(
+                entity["name"], Colors.argument(entity["name"]), 1
+            )
+            print(f"\n{statement}")
 
     def usage(self):
         self.configuration.display_project()

gibson/command/Test.py

@@ -12,7 +12,7 @@ class Test(BaseCommand):
         if len(sys.argv) != 3:
             self.usage()
 
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         entity = self.memory.recall_stored_entity(sys.argv[2])
         if entity is None:
             self.conversation.not_sure_no_entity(

gibson/command/Tree.py

@@ -5,7 +5,7 @@ from .BaseCommand import BaseCommand
 
 class Tree(BaseCommand):
     def execute(self):
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         self.configuration.display_project()
 
         if self.configuration.project.dev.base.path is None:

gibson/command/Version.py

@@ -25,8 +25,5 @@ class Version(BaseCommand):
             )
         else:
             self.conversation.type(
-                f"Nice! You are using the latest version of {Colors.command(self.configuration.command)}: {Colors.colorize(VersionConf.num, Colors.Color.CYAN)}\n"
+                f"Nice! 🎉 You are using the latest version of {Colors.command(self.configuration.command)}: {Colors.colorize(VersionConf.num, Colors.Color.CYAN)}\n"
             )
-
-        self.conversation.newline()
-        return True

gibson/command/code/Code.py

@@ -0,0 +1,26 @@
+import sys
+
+import gibson.core.Colors as Colors
+from gibson.command.BaseCommand import BaseCommand
+from gibson.command.code.Entity import CodeEntity
+
+
+class Code(BaseCommand):
+    def execute(self):
+        if len(sys.argv) == 4 and 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('code')} {Colors.argument('entity')} {Colors.input('[entity name]')} {Colors.hint('create a new entity')}\n"
+        )
+        self.conversation.newline()
+        self.conversation.type(
+            '  To create a new entity named "user":\n'
+            f"      {Colors.command(self.configuration.command)} {Colors.subcommand('code')} {Colors.argument('entity')} {Colors.input('user')}\n"
+        )
+        self.conversation.newline()
+        exit(1)

gibson/command/{Code.py → code/Entity.py}

@@ -1,9 +1,7 @@
 import os
-import re
 import sys
 from string import Template
 
-import gibson.core.Colors as Colors
 from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
 from gibson.command.Merge import Merge
@@ -18,7 +16,7 @@ from gibson.services.code.context.schema.Manager import (
 from gibson.structure.Entity import Entity
 
 
-class Code(BaseCommand):
+class CodeEntity(BaseCommand):
     CODE_WRITER_ENTITY_MODIFIER_NOOP = ""
 
     def __init__(self, configuration: Configuration):
@@ -82,23 +80,15 @@ class Code(BaseCommand):
             return Template(f.read()).substitute({"entity_name": sys.argv[3]})
 
     def execute(self):
-        if len(sys.argv) != 4 or sys.argv[2] not in ["entity"]:
-            self.usage()
-
         cli = Cli(self.configuration)
 
-        self.configuration.ensure_project()
-        self.configuration.display_project()
+        self.configuration.require_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],
@@ -107,8 +97,6 @@ class Code(BaseCommand):
         )
         entity = Entity().import_from_struct(data)
 
-        self.conversation.c64_ready_run()
-
         while True:
             self.__render_workspace(entity, data["code"][0]["definition"])
 
@@ -161,10 +149,10 @@ class Code(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()
@@ -184,16 +172,3 @@ class Code(BaseCommand):
 
         print("")
         print(WorkspaceFooter().render())
-
-    def usage(self):
-        self.configuration.display_project()
-        self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('code')} {Colors.argument('entity')} {Colors.input('[entity name]')} {Colors.hint('create a new entity')}\n"
-        )
-        self.conversation.newline()
-        self.conversation.type(
-            '  To create a new entity named "user":\n'
-            f"      {Colors.command(self.configuration.command)} {Colors.subcommand('code')} {Colors.argument('entity')} {Colors.input('user')}\n"
-        )
-        self.conversation.newline()
-        exit(1)

gibson/command/{List.py → list/Entities.py}

@@ -1,16 +1,11 @@
 import sys
 
-import gibson.core.Colors as Colors
-from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
 
 
-class List(BaseCommand):
+class Entities(BaseCommand):
     def execute(self):
-        if len(sys.argv) != 3:
-            self.usage()
-
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         self.configuration.display_project()
 
         entities = {"last": [], "stored": []}
@@ -54,11 +49,3 @@ class List(BaseCommand):
                     self.conversation.newline()
 
                 self.conversation.newline()
-
-    def usage(self):
-        self.configuration.display_project()
-        self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('list')} {Colors.arguments(['entities'])} {Colors.hint('list all entities')}\n"
-        )
-        self.conversation.newline()
-        exit(1)

gibson/command/list/List.py

@@ -0,0 +1,27 @@
+import sys
+
+import gibson.core.Colors as Colors
+from gibson.command.BaseCommand import BaseCommand
+from gibson.command.list.Entities import Entities
+from gibson.command.list.Projects import Projects
+
+
+class List(BaseCommand):
+    def execute(self):
+        if len(sys.argv) == 3 and sys.argv[2] == "entities":
+            Entities(self.configuration).execute()
+        elif len(sys.argv) == 3 and sys.argv[2] == "projects":
+            Projects(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('list')} {Colors.arguments(['entities'])} {Colors.hint('list all entities')}\n"
+        )
+        self.conversation.type(
+            f"   or: {Colors.command(self.configuration.command)} {Colors.subcommand('list')} {Colors.arguments(['projects'])} {Colors.hint('list all projects')}\n"
+        )
+        self.conversation.newline()
+        exit(1)

gibson/command/list/Projects.py

@@ -0,0 +1,31 @@
+import re
+
+import gibson.core.Colors as Colors
+from gibson.api.ProjectApi import ProjectApi
+from gibson.command.BaseCommand import BaseCommand
+
+
+class Projects(BaseCommand):
+    def execute(self):
+        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()
+        self.conversation.type("----".ljust(40))
+        self.conversation.type("-" * 36)
+        self.conversation.newline()
+
+        for project in projects:
+            name = project["name"] if project["name"] is not None else "Untitled"
+            name = re.sub(r"^(.{36}).*$", "\g<1>...", name).ljust(40)
+            self.conversation.type(f"{Colors.command(name)}")
+            self.conversation.type(f"{project['uuid']}")
+            self.conversation.newline()

gibson/command/new/Module.py

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

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/command/{Rename.py → rename/Entity.py}

@@ -1,29 +1,25 @@
 import sys
 
-import gibson.core.Colors as Colors
 from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
 from gibson.command.rewrite.Rewrite import Rewrite
 
 
-class Rename(BaseCommand):
+class Entity(BaseCommand):
     def execute(self):
-        if len(sys.argv) != 4:
-            self.usage()
-
-        self.configuration.ensure_project()
+        self.configuration.require_project()
         self.configuration.display_project()
 
-        if self.memory.recall_entity(sys.argv[2]) is None:
+        if self.memory.recall_entity(sys.argv[3]) is None:
             self.conversation.type(
-                f'Nothing renamed, did not find entity named "{sys.argv[2]}".\n'
+                f'Nothing renamed, did not find entity named "{sys.argv[3]}".\n'
             )
             self.conversation.newline()
             return self
 
-        if self.memory.recall_entity(sys.argv[3]) is not None:
+        if self.memory.recall_entity(sys.argv[4]) is not None:
             self.conversation.type(
-                f'Cannot rename to "{sys.argv[3]}" because that entity already exists.\n'
+                f'Cannot rename to "{sys.argv[4]}" because that entity already exists.\n'
             )
             self.conversation.newline()
             return self
@@ -35,8 +31,8 @@ class Rename(BaseCommand):
             response = cli.modeler_entity_rename(
                 self.configuration.project.modeler.version,
                 last["entities"],
-                sys.argv[2],
                 sys.argv[3],
+                sys.argv[4],
             )
 
             self.memory.remember_last({"entities": response["entities"]})
@@ -46,13 +42,13 @@ class Rename(BaseCommand):
             response = cli.modeler_entity_rename(
                 self.configuration.project.modeler.version,
                 stored,
-                sys.argv[2],
                 sys.argv[3],
+                sys.argv[4],
             )
 
             self.memory.remember_entities(response["entities"])
 
-        self.conversation.type(f"[Renamed] {sys.argv[2]} -> {sys.argv[3]}\n")
+        self.conversation.type(f"[Renamed] {sys.argv[3]} -> {sys.argv[4]}\n")
         self.conversation.newline()
 
         Rewrite(self.configuration, header="Refactoring").write()
@@ -60,11 +56,3 @@ class Rename(BaseCommand):
         self.conversation.newline()
 
         return self
-
-    def usage(self):
-        self.configuration.display_project()
-        self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('rename')} {Colors.argument('[current]')} {Colors.input('[new]')} {Colors.hint('rename an entity')}\n"
-        )
-        self.conversation.newline()
-        exit(1)

gibson/command/rename/Rename.py

@@ -0,0 +1,21 @@
+import sys
+
+import gibson.core.Colors as Colors
+from gibson.command.BaseCommand import BaseCommand
+from gibson.command.rename.Entity import Entity
+
+
+class Rename(BaseCommand):
+    def execute(self):
+        if len(sys.argv) == 5 and sys.argv[2] == "entity":
+            Entity(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('rename')} {Colors.argument('entity')} {Colors.input('[existing name]')} {Colors.input('[new name]')} {Colors.hint('rename an entity')}\n"
+        )
+        self.conversation.newline()
+        exit(1)

gibson/command/rewrite/Rewrite.py

@@ -37,7 +37,7 @@ class Rewrite(BaseCommand):
             self.usage()
 
     def write(self, argument=None):
-        self.configuration.ensure_project()
+        self.configuration.require_project()
 
         if len(self.memory.recall_merged()) == 0:
             self.conversation.cant_no_entities(self.configuration.project.name)

gibson/core/CommandRouter.py

@@ -2,14 +2,14 @@ import sys
 
 from gibson.command.auth.Auth import Auth
 from gibson.command.Build import Build
-from gibson.command.Code import Code
+from gibson.command.code.Code import Code
 from gibson.command.Conf import Conf
 from gibson.command.Count import Count
 from gibson.command.Dev import Dev
 from gibson.command.Forget import Forget
 from gibson.command.Help import Help
 from gibson.command.Import import Import
-from gibson.command.List import List
+from gibson.command.list.List import List
 from gibson.command.Merge import Merge
 from gibson.command.Model import Model
 from gibson.command.Modify import Modify
@@ -17,13 +17,8 @@ from gibson.command.new.New import New
 from gibson.command.OpenApi import OpenApi
 from gibson.command.Question import Question
 from gibson.command.Remove import Remove
-from gibson.command.Rename import Rename
-from gibson.command.rewrite.Api import Api
-from gibson.command.rewrite.Base import Base
-from gibson.command.rewrite.Models import Models
+from gibson.command.rename.Rename import Rename
 from gibson.command.rewrite.Rewrite import Rewrite
-from gibson.command.rewrite.Schemas import Schemas
-from gibson.command.rewrite.Tests import Tests
 from gibson.command.Schema import Schema
 from gibson.command.Show import Show
 from gibson.command.Test import Test

gibson/core/Configuration.py

@@ -248,7 +248,7 @@ class Configuration:
         return self
 
     def create_project_memory(self):
-        self.ensure_project()
+        self.require_project()
         try:
             os.makedirs(self.project.paths.memory)
         except OSError as e:
@@ -259,17 +259,6 @@ class Configuration:
         if self.project is not None:
             self.conversation.display_project(self.project.name)
 
-    def ensure_project(self):
-        if self.project is None:
-            self.conversation.gibsonai_project_not_set(self)
-            exit(1)
-
-        if self.project.name not in self.settings:
-            self.conversation.unrecognized_project(self, self.project.name)
-            exit(1)
-
-        return self
-
     def get_access_token(self):
         try:
             with open(f"{self.paths.auth}/{self.API_ENV}", "r") as f:
@@ -281,7 +270,7 @@ class Configuration:
         return token["access_token"]
 
     def get_my_settings(self):
-        self.ensure_project()
+        self.require_project()
         return self.settings[self.project.name]
 
     def get_refresh_token(self):
@@ -358,6 +347,24 @@ class Configuration:
 
         return self
 
+    def require_login(self):
+        if self.get_access_token() is None:
+            self.conversation.message_login_required()
+            exit(1)
+
+        return self
+
+    def require_project(self):
+        if self.project is None:
+            self.conversation.gibsonai_project_not_set(self)
+            exit(1)
+
+        if self.project.name not in self.settings:
+            self.conversation.unrecognized_project(self, self.project.name)
+            exit(1)
+
+        return self
+
     def set_auth_tokens(self, access_token, refresh_token):
         try:
             os.mkdir(self.paths.auth)
@@ -386,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]
@@ -439,15 +446,16 @@ class Configuration:
         return self
 
     def turn_dev_off(self):
-        self.ensure_project()
+        self.require_project()
         self.settings[self.project.name]["dev"]["active"] = False
         self.write_config()
+        self.setup_project()
         return self
 
     def turn_dev_on(
         self, api_path, api_prefix, api_version, base_path, model_path, schema_path
     ):
-        self.ensure_project()
+        self.require_project()
         self.settings[self.project.name]["dev"]["active"] = True
         self.settings[self.project.name]["dev"]["api"]["path"] = api_path
         self.settings[self.project.name]["dev"]["api"]["prefix"] = api_prefix
@@ -456,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/core/Conversation.py

@@ -130,6 +130,13 @@ class Conversation:
         self.type("Login failed, please try again.\n")
         return self
 
+    def message_login_required(self):
+        self.type("You need to login before performing this action.\n")
+        self.type(
+            f"Run {Colors.command('gibson')} {Colors.subcommand('auth')} {Colors.argument('login')} and try again.\n"
+        )
+        return self
+
     def message_login_success(self):
         self.newline()
         self.type("Nice! You're now logged in.\n")

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/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.3.dist-info → gibson_cli-0.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gibson-cli
-Version: 0.5.3
+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.3.dist-info → gibson_cli-0.5.6.dist-info}/RECORD

@@ -1,41 +1,46 @@
 bin/build.sh,sha256=H3TAd349BECbcK3_t_jW9VzoLInMNrXtaLnXMEVanew,49
 bin/release.sh,sha256=LxPqH5kxhLKvzHaPRLBlq_ApaK7FHEteH4SzeRenidk,49
-gibson/api/BaseApi.py,sha256=l_EsHdKRz-cXGXd3Ju5IFwmCRUkunba6ckB957S9DAk,2696
-gibson/api/Cli.py,sha256=JlioOwE3oob_OY_cr6qis0QEINU1H68ZjkWEQiGhZ-4,7897
+gibson/api/BaseApi.py,sha256=tLY4IahK9Ppy5gfYvlayRb46852UFq0mHKMmv8aF6xc,3033
+gibson/api/Cli.py,sha256=KvlMDvcMh7i6p3yGeikGmfi4HjUWb49RncJyF-J-9lM,7752
+gibson/api/ProjectApi.py,sha256=T7TqtywJjrzFIfARenQUsrH-80x9Oo1pABbFAdlQkI0,356
 gibson/bin/gibson.py,sha256=N1mAWaww9pw8s5u0et87FC5cFHVU6JzN4Kls3lDn-xw,354
 gibson/command/BaseCommand.py,sha256=mmWUO0FxjMCbv3cHWnnasfAWnU_hTuGHUsRVJ4hUcqM,777
-gibson/command/Build.py,sha256=xo3gPqMAyNZ8qcoaaSSUZ_CZXdtBDf-1zYTyaJwV4kU,2848
-gibson/command/Code.py,sha256=clzdgcv2yOMoWEa-SAK8nvWRu1D7xiPB95m7qd9lh_Y,6938
-gibson/command/Conf.py,sha256=adj39A6Qlsg5BulYqA1zSbO-dWKZLfTr1FOqhKk1NA4,2471
-gibson/command/Count.py,sha256=67P4NPzVonsaLk13ziASY26uIIGi3uzpAAyLQbRydf8,1082
-gibson/command/Dev.py,sha256=UprSgTUMHf9tZaa3FMhar8tKDADrM7N1MJpS1hDq7ZQ,4354
-gibson/command/Forget.py,sha256=yMjyIOlwnqM6Hy_3k9152PKJCvxiwZM3E4WbIOUMSis,1060
+gibson/command/Build.py,sha256=KWGaTBF-_uChOmXQsaZChq--nXc4xJPpLfOG8K89vME,2849
+gibson/command/Conf.py,sha256=MbEPT-lRujRJMBjKRQlshA3T3pplQ-zzia8RY_muWU4,2472
+gibson/command/Count.py,sha256=Jh9_ImJibpiTitbllSl0xF6KUrOhrY7Bz7-5sx9cBVs,1083
+gibson/command/Dev.py,sha256=-kmRHpOApUXklaCs4bJVqCRft4ubcVjAL7S1-BGr-ps,4355
+gibson/command/Forget.py,sha256=5fszuq6oIe0unMbXpFtDpouJ1eYZIvsi2mLsa8RwN5U,1061
 gibson/command/Help.py,sha256=KoHukpEk_jLNxaNdM-n4R-dXj_VZub6x4xIXbTK1_wU,4794
-gibson/command/Import.py,sha256=3cMQ4u0IGGqXUG65lQTZpB1vJzfn1SRr4xyTyRh01NA,4215
-gibson/command/List.py,sha256=2_YuQ19CDhrYyLYISM0Gyl1R2LIpNgbcyrKr_Evg7aA,2314
-gibson/command/Merge.py,sha256=AKhyImy_MH8sy7m9Anh1SKBINvLrRmt91fFE4oVPg7k,1060
-gibson/command/Model.py,sha256=vkZEFJdeupGQ2EsaGVHYnzhkGXY0ZiyKY7C70MJbI6Y,1278
-gibson/command/Modify.py,sha256=usqJZOeMftH3DhzGPQmSrviCV8cvyUPRY8WtBy8L56U,1266
-gibson/command/OpenApi.py,sha256=Jyfl8MKdYDCVZEet6uGj7RFUHhAbcBGZ-g3C2SnRSxA,4313
-gibson/command/Question.py,sha256=5pJdVTpv7yi_sT-idwVx2aFniqge28GBFZIrtcatJUY,3997
-gibson/command/Remove.py,sha256=zr0aNj0DZHtMkgjt9vV8Gyp3xu1KZYGtZfOoMmgDj5c,2435
-gibson/command/Rename.py,sha256=xrey4zYgS6y49auS-v-3nsSksiUggDi36on9wlykHYI,2242
-gibson/command/Schema.py,sha256=nTATB1fQ0QS0dTiT0AtWJJGGmqYzmsbhVsk1yqJaQxs,1288
-gibson/command/Show.py,sha256=sn_UULaL6gteX3EH-gU7CNc9eHrG5vhlngKBhqwX_8c,1423
-gibson/command/Test.py,sha256=Uy3l0jXXof-NBTViXa93jTfsJJvvsT8JugSNm0b6gKQ,1282
-gibson/command/Tree.py,sha256=pqVbebySThqJ-29izerScwaIb4XE40K3cYNA8bUpNkE,3055
-gibson/command/Version.py,sha256=ZMaLYYX8rR8aVdC85EgKaKV6dhyL9I8F0gqWmlIsZY0,1319
+gibson/command/Import.py,sha256=fD-PNsRk5qaOWmdmgLdFJ97wCYJDNFXzmHw_e68Lcv0,4216
+gibson/command/Merge.py,sha256=R5ybMC1tUR5_T8YyUfXutzFa_V9j1_flv0s7KTJRq0M,1061
+gibson/command/Model.py,sha256=eRAAvklZjXgstGbM-P9QeG85YQ80TRVZyYTIzzUPzsk,1279
+gibson/command/Modify.py,sha256=3_fEGvLfGpgoXQ77SFA9J2KQDe1GMaAUPWkl-yCwR1E,1267
+gibson/command/OpenApi.py,sha256=G1LGfco0PgMIBw4C_ksja2_0nKKnZzUoiNl2iY64QKw,4314
+gibson/command/Question.py,sha256=8mWumOFKBeS_Lw8_4vF6eDIEx3kdbIwz11mLtY6e9zo,3998
+gibson/command/Remove.py,sha256=fRPJCTCQFZVfl6Ri319E1ZudADkbWBZUOPiBue1Vrao,2512
+gibson/command/Schema.py,sha256=zg10N6uHL37CHQRx8fH00kKS6loSS9kpFe_yv1K6-j8,1289
+gibson/command/Show.py,sha256=odBwJ-VXIjTnopnys586LSWm5HunfLgeNLxt-aFAPng,1589
+gibson/command/Test.py,sha256=HBwroaudQ1BSEsRDbv8MOOUiwXFjJgCUNnSFUi6uX3s,1283
+gibson/command/Tree.py,sha256=BeJ_13xrrRCK5FP2rQHWpDKrshVzte-_D1pNG1GXPIw,3056
+gibson/command/Version.py,sha256=YLd2c9eiVT6Xzj-ulRuL9QSiu21Fid2Jp_B7nD6k86o,1267
 gibson/command/WarGames.py,sha256=V0KIpz-Z546qtQaOPdIVHQ6wp2n3r3M3tgKx-GRQzzU,1300
 gibson/command/auth/Auth.py,sha256=rkWhAast68jL-_XVRU-3mIx2_ntlgmAJuwYx37gNVEI,1025
 gibson/command/auth/Login.py,sha256=b43OfV76i6aGdOwj1NK64ZOdYlNyc08g3lZGQ_37KDw,437
 gibson/command/auth/Logout.py,sha256=V01q4TdbiBqCnIrM6IA4T25fO6ws0UpXp42I3pwHZVM,248
-gibson/command/new/Module.py,sha256=uTxrWE3NmRDbWzWHzzAs3HW_tWXSX0pGjFqn3N8DMys,1598
-gibson/command/new/New.py,sha256=yAES_nhiZcv3Jo9kb2E_YfAiVAcnRoeE6Ftd1PqQbQ8,1256
+gibson/command/code/Code.py,sha256=9nR3m1VXtbK8xUBwu3XPZj4V8tN1udbJMDImMXj9Vqs,985
+gibson/command/code/Entity.py,sha256=Y9Nl-e5Idq4EamK5e0gHncPupEZR8GifL7kRzxSIDAU,6001
+gibson/command/list/Entities.py,sha256=4qUxR5pBsUwnaW3SZQzCVbwyl_sCfM9lD9TWwipSyWw,1869
+gibson/command/list/List.py,sha256=r6YQdaeMRgFKcz-VyEQTE_I2lRaaJ4kew3E_RKKaaTU,1047
+gibson/command/list/Projects.py,sha256=yR4o0eZFYxORLiEe0Z5Vs9T-hKb1NxrGVUOCrYx9qDM,1140
+gibson/command/new/Module.py,sha256=HK6CGAMvrzi5kVn7zNG6JDB5Y580djI12xHfXwFrj1w,1602
+gibson/command/new/New.py,sha256=PbXj6i4Dop65DWDFSoQthm1Podubh8z652l7DICL4Gc,1626
 gibson/command/new/Project.py,sha256=sExmNYDKWMIohAoBiF73nkVubgy6iMleaknXW8fWZJA,657
+gibson/command/rename/Entity.py,sha256=SaAiN1bYsTOsqjyVzxghK8-N3sAKITThTzS5LEYgppY,1801
+gibson/command/rename/Rename.py,sha256=T6iTjo6KRArbT8wBgrn-ehtNlY7tRlovlEZfBOUKYlk,731
 gibson/command/rewrite/Api.py,sha256=sSvAqEJXdgQjYcu0uiM6ndHE3GnfkfVL6eqP2Otkbww,1002
 gibson/command/rewrite/Base.py,sha256=YJ2a5Hl0f9NXHUBBPvlt-dUIqEPWQz5vH6-1EHmbFbA,640
 gibson/command/rewrite/Models.py,sha256=eoUpZHpR0qwNgX60EWfcNz49GHmBw_FGfBuHH2ueZqY,799
-gibson/command/rewrite/Rewrite.py,sha256=Yn4YlPU62KvubLpZnYSuKOO5mPQOD-H3GcYH6BS0QIo,4683
+gibson/command/rewrite/Rewrite.py,sha256=2v5xhb6JYv-I7jF7B5CpQbw7KWBFHnXLWK5mMaL-N8k,4684
 gibson/command/rewrite/Schemas.py,sha256=zZ1gjmOJg77gh70t5y2WkzHWSAvEKx5-gqRN9OcsCXA,802
 gibson/command/rewrite/Tests.py,sha256=HO1WM6pSToVKsuJn7nUA_I5qrfBN0cgKgBzjlm2Qxt8,799
 gibson/command/tests/test_command_BaseCommand.py,sha256=hSbBfLFI3RTp_DdEHtm5oOLWoN6drI6ucFJypi7xxV8,364
@@ -59,16 +64,16 @@ gibson/conf/dev/Schema.py,sha256=kOSlX1jEyVb82xd8TO8jEAimLcaefIFJr6d2JYvyTqg,74
 gibson/conf/tests/test_conf_Dependencies.py,sha256=LITeeYiqXM5rKkyWFBqcnMvUR5pzDRuHVAngH372jWc,116
 gibson/conf/tests/test_conf_Platform.py,sha256=Zc53IsZmV-hT9VRrZEPNrsuehSdWnJXWKGMmOhEqWHo,138
 gibson/core/Colors.py,sha256=5XJdm9n5Sa75Hv0BYVaGVhnzsgpwfbB2pGXcbGh5EjU,1539
-gibson/core/CommandRouter.py,sha256=_CN9BVHDbBMy-o0RJ4NjZ8rHbZolqSEKYwWLCNRBMMw,3999
+gibson/core/CommandRouter.py,sha256=96Y38GvY14BtBNfb3LwBz-T0_qscyeo51q6xDxVjto0,3781
 gibson/core/Completions.py,sha256=Bsh25vnf0pjpJA6MJNR_2MA2s58Ujj8XolR8fm8AQ_s,1197
-gibson/core/Configuration.py,sha256=rJq6XFS-vV8elACYmbFdnzzW4PsQb1BjyWuajfx46KQ,15787
-gibson/core/Conversation.py,sha256=ZyWBMUZp4dJ5pkEs0hRwFMsw1_XJJht5T47PvO7pUxo,8997
+gibson/core/Configuration.py,sha256=s6b09fC1qnQadB_Nbm3wcdMb1kjS95dP-32TSVv01c8,16050
+gibson/core/Conversation.py,sha256=ExZvefcbBZH69z0aYvQ9aLItnG_1v6EtZ6mK5h5_QYg,9275
 gibson/core/Env.py,sha256=08dZRHzzR0ahrbM4S0bXC7V1xhYQkT8Zefs00qUHf0U,498
 gibson/core/Memory.py,sha256=Yw6xmqtAsFwd5Q4VgmGDt4U2dUGLyFXZ_nO8c74Oo8E,4005
 gibson/core/PythonPath.py,sha256=p1q7n_5KnPvA8XbxJyvqC2vrIdEdTiMr6vRU9yj77Cs,1567
 gibson/core/TimeKeeper.py,sha256=0mzs04wizjGEJbiQFWZyi4ja4XgeJaDqc0JzPCHp9po,250
 gibson/core/utils.py,sha256=KTnPvA3sUYnLFTZG7Tke5YEdls8Da0rNbeaOm8hapiU,408
-gibson/data/bash-completion.tmpl,sha256=HhLAQryO-EAc5IY6q39bH1QjtE0-BNmbTxZadLnVsZU,2701
+gibson/data/bash-completion.tmpl,sha256=X1E6EUsFDWSiLI0jmEQALpATZWKfWor65R5sOVx9Kvg,2645
 gibson/data/default-ref-table.tmpl,sha256=cVqjTsmHDjmTGrbDEpNHaDG-GX1iWMzsQDXk5TASEXg,123
 gibson/data/default-table.tmpl,sha256=4t7SmXBuZN4nV5SjuQp6PBdo0-c3hdRnl8TQ2wdaS3w,247
 gibson/db/TableExceptions.py,sha256=F1NGHDhusg9E_3tLez1_abrbANtWyR0UtC_wE9CwNFE,137
@@ -76,7 +81,7 @@ gibson/db/tests/test_db_TableExceptions.py,sha256=PjZiIqfE-sr3zDR744qyMPJktI94fJ
 gibson/dev/Dev.py,sha256=O-GiMATpVd9kYHsVfbHaC-Omh17HQ8FalFQNelfxh2s,2544
 gibson/display/Header.py,sha256=moTxePVMNhtpeFtcI9EhnnLSK1gHIQiwYiWQtBPq_bY,298
 gibson/display/WorkspaceFooter.py,sha256=1-PsPtLcC7xUZLwufSSaVo9caXuyZEwfR_iZatxwHF4,316
-gibson/display/WorkspaceHeader.py,sha256=1oyyhZJF6C0SUCY2Cs_VkXt5Plp8xLb51XWa278l9mo,217
+gibson/display/WorkspaceHeader.py,sha256=qBKtwdtO3jnbQYGwqXZH5ph4jpR9a9KEVUA63VN_zAU,216
 gibson/display/tests/test_display_Header.py,sha256=I1GmB9RRa80rcYtgm3YXtpugdp5obca94zBVjmREYCY,324
 gibson/display/tests/test_display_WorkspaceFooter.py,sha256=96syJutXZWbGOLiAS5SkRZjwEAgj0E0t-uTT85BJe_w,359
 gibson/display/tests/test_display_WorkspaceHeader.py,sha256=9FuNLOkCAyFSDaonZbLQhLJSizc7bI2HAz3z1ifJlYs,316
@@ -108,8 +113,8 @@ gibson/structure/tests/test_Entity.py,sha256=Gl9f1NcEKdpWCx4W3takFFzp18mLhCYWKrd
 gibson/tests/test_Env.py,sha256=DPWmP0-aEelducq9bAwv7rKoY2NjWXUeCrzfJDQkn2M,369
 gibson/tests/test_Memory.py,sha256=YP7owToABAk_-s7fD5UG0HTc4lamDjdA39JUlLnk3Fg,2574
 gibson/tests/test_utils.py,sha256=r_y-EG05YTCNtL8MWiAK1KmPsmeoMgypKsQC_lVgOtM,559
-gibson_cli-0.5.3.dist-info/METADATA,sha256=z2AUmsaQpWtDJZEWVkS2XhEVZErwpfCIfSvdJmYnShQ,11605
-gibson_cli-0.5.3.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-gibson_cli-0.5.3.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
-gibson_cli-0.5.3.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
-gibson_cli-0.5.3.dist-info/RECORD,,
+gibson_cli-0.5.6.dist-info/METADATA,sha256=W2mJzIX32p-W8PnTedY6BpxLPY2CQoCENjM4dxTJu0c,11605
+gibson_cli-0.5.6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+gibson_cli-0.5.6.dist-info/entry_points.txt,sha256=j5VUvq3AzL21xPvVC24zMoXFt-I5lUWulr66nL3OAPM,50
+gibson_cli-0.5.6.dist-info/top_level.txt,sha256=RFaUY7VXGiqkMwo1Rj7pM4kGvxkhhnfo-2LmPpuL_fs,11
+gibson_cli-0.5.6.dist-info/RECORD,,

{gibson_cli-0.5.3.dist-info → gibson_cli-0.5.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any