gibson-cli 0.5.8__tar.gz → 0.6.1__tar.gz

{gibson_cli-0.5.8/gibson_cli.egg-info → gibson_cli-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gibson-cli
-Version: 0.5.8
+Version: 0.6.1
 Summary: Gibson Command Line Interface
 Author-email: GibsonAI <noc@gibsonai.com>
 Project-URL: Homepage, https://gibsonai.com/
@@ -14,6 +14,57 @@ Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+Requires-Dist: annotated-types==0.6.0
+Requires-Dist: anyio==4.3.0
+Requires-Dist: certifi==2024.2.2
+Requires-Dist: charset-normalizer==3.3.2
+Requires-Dist: click==8.1.7
+Requires-Dist: dnspython==2.6.1
+Requires-Dist: email_validator==2.1.1
+Requires-Dist: exceptiongroup==1.2.0
+Requires-Dist: Faker==24.0.0
+Requires-Dist: faker_sqlalchemy==0.10.2208140
+Requires-Dist: fastapi==0.111.0
+Requires-Dist: fastapi-cli==0.0.2
+Requires-Dist: h11==0.14.0
+Requires-Dist: httpcore==1.0.5
+Requires-Dist: httptools==0.6.1
+Requires-Dist: httpx==0.27.0
+Requires-Dist: idna==3.6
+Requires-Dist: iniconfig==2.0.0
+Requires-Dist: Jinja2==3.1.4
+Requires-Dist: markdown-it-py==3.0.0
+Requires-Dist: MarkupSafe==2.1.5
+Requires-Dist: mdurl==0.1.2
+Requires-Dist: orjson==3.10.3
+Requires-Dist: packaging==23.2
+Requires-Dist: pluggy==1.4.0
+Requires-Dist: pydantic==2.6.1
+Requires-Dist: pydantic_core==2.16.2
+Requires-Dist: pyfiglet==1.0.2
+Requires-Dist: Pygments==2.18.0
+Requires-Dist: PyMySQL==1.1.0
+Requires-Dist: pytest==8.0.1
+Requires-Dist: python-dateutil==2.9.0.post0
+Requires-Dist: python-dotenv==1.0.1
+Requires-Dist: python-multipart==0.0.9
+Requires-Dist: PyYAML==6.0.1
+Requires-Dist: requests==2.31.0
+Requires-Dist: rich==13.7.1
+Requires-Dist: shellingham==1.5.4
+Requires-Dist: six==1.16.0
+Requires-Dist: sniffio==1.3.1
+Requires-Dist: SQLAlchemy==1.4.41
+Requires-Dist: starlette==0.37.2
+Requires-Dist: tomli==2.0.1
+Requires-Dist: typer==0.12.3
+Requires-Dist: typing_extensions==4.9.0
+Requires-Dist: ujson==5.9.0
+Requires-Dist: urllib3==1.26.6
+Requires-Dist: uvicorn==0.29.0
+Requires-Dist: uvloop==0.19.0
+Requires-Dist: watchfiles==0.21.0
+Requires-Dist: websockets==12.0
 
 
 [![GibsonAI](https://github.com/user-attachments/assets/26bc1002-f878-4995-a6c5-eb8d5eb69c28)](https://gibsonai.com/)

gibson_cli-0.6.1/bin/clean.sh

@@ -0,0 +1,3 @@
+rm -rf build/
+rm -rf dist/
+rm -rf gibson_cli.egg-info/

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/command/Help.py

@@ -37,7 +37,7 @@ class Help(BaseCommand):
             },
             "help": {"description": "for help", "memory": None},
             "import": {
-                "description": "configure from a data source",
+                "description": "import entities from a data source",
                 "memory": "stored",
             },
             "list": {
@@ -57,7 +57,6 @@ class Help(BaseCommand):
                 "memory": "last > stored",
             },
             "new": {"description": "create something new", "memory": None},
-            "openapi": {"description": "build from an OpenAPI spec", "memory": "last"},
             "remove": {
                 "description": "remove an entity from the project",
                 "memory": "last > stored",
@@ -80,7 +79,7 @@ class Help(BaseCommand):
                 "memory": "stored",
             },
             "tree": {"description": "illustrate the project layout", "memory": None},
-            "? | q": {"description": "ask a question", "memory": None},
+            "q": {"description": "ask Gibson a question", "memory": None},
         }
 
         self.conversation.set_delay(0.001)

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/command/Show.py

@@ -26,9 +26,7 @@ class Show(BaseCommand):
             self.usage()
 
         for entity in sorted(entities, key=lambda x: x["name"]):
-            statement = entity["definition"].replace(
-                entity["name"], Colors.argument(entity["name"]), 1
-            )
+            statement = Colors.table(entity["definition"], entity["name"])
             print(f"\n{statement}")
 
     def usage(self):
@@ -37,7 +35,7 @@ class Show(BaseCommand):
             f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('show')} {Colors.hint('display the entire schema')}\n"
         )
         self.conversation.type(
-            f"   or: {Colors.command(self.configuration.command)} {Colors.subcommand('show')} {Colors.argument('[entity name]')} {Colors.hint('display the schema for an entity')}\n"
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('show')} {Colors.argument('[entity name]')} {Colors.hint('display the schema for an entity')}\n"
         )
         self.conversation.newline()
         exit(1)

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/command/auth/Auth.py

@@ -20,10 +20,13 @@ class Auth(BaseCommand):
     def usage(self):
         self.configuration.display_project()
         self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('auth')} {Colors.argument('login')} {Colors.hint('login to Gibson')}\n"
+            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('auth')} {Colors.arguments(['login', 'logout'])}\n"
         )
         self.conversation.type(
-            f"   or: {Colors.command(self.configuration.command)} {Colors.subcommand('auth')} {Colors.argument('logout')} {Colors.hint('logout of Gibson')}\n"
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('auth')} {Colors.argument('login')} {Colors.hint('login to Gibson')}\n"
+        )
+        self.conversation.type(
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('auth')} {Colors.argument('logout')} {Colors.hint('logout of Gibson')}\n"
         )
         self.conversation.newline()
         exit(1)

gibson_cli-0.6.1/gibson/command/code/Code.py

@@ -0,0 +1,42 @@
+import sys
+
+import gibson.core.Colors as Colors
+from gibson.command.BaseCommand import BaseCommand
+from gibson.command.code.Entity import CodeEntity
+from gibson.command.code.Model import CodeModel
+from gibson.command.code.Schema import CodeSchema
+from gibson.command.code.Tests import CodeTests
+
+
+class Code(BaseCommand):
+    def execute(self):
+        if len(sys.argv) == 4 and sys.argv[2] == "entity":
+            CodeEntity(self.configuration).execute()
+        elif len(sys.argv) == 4 and sys.argv[2] == "model":
+            CodeModel(self.configuration).execute()
+        elif len(sys.argv) == 4 and sys.argv[2] == "schema":
+            CodeSchema(self.configuration).execute()
+        elif len(sys.argv) == 4 and sys.argv[2] == "tests":
+            CodeTests(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.arguments(['entity', 'model', 'schema', 'tests'])} {Colors.input('[entity name]')} {Colors.hint('write code')}\n"
+        )
+        self.conversation.type(
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('code')} {Colors.argument('entity')} {Colors.input('[entity name]')} {Colors.hint('create or update an entity using the AI pair programmer')}\n"
+        )
+        self.conversation.type(
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('code')} {Colors.argument('model')} {Colors.input('[entity name]')} {Colors.hint('generate the model code for an entity')}\n"
+        )
+        self.conversation.type(
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('code')} {Colors.argument('schema')} {Colors.input('[entity name]')} {Colors.hint('generate the schema code for an entity')}\n"
+        )
+        self.conversation.type(
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('code')} {Colors.argument('tests')} {Colors.input('[entity name]')} {Colors.hint('generate the unit tests for an entity')}\n"
+        )
+        self.conversation.newline()
+        exit(1)

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/command/code/Entity.py

@@ -2,6 +2,7 @@ import os
 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
@@ -163,7 +164,7 @@ class CodeEntity(BaseCommand):
         print("")
         print(Header().render("SQL"))
         print("")
-        print(entity.create_statement())
+        print(Colors.table(entity.create_statement(), entity.name))
 
         print("")
         print(Header().render("Model"))

{gibson_cli-0.5.8/gibson/command → gibson_cli-0.6.1/gibson/command/code}/Model.py

@@ -7,16 +7,13 @@ from gibson.core.TimeKeeper import TimeKeeper
 from gibson.dev.Dev import Dev
 
 
-class Model(BaseCommand):
+class CodeModel(BaseCommand):
     def execute(self):
-        if len(sys.argv) != 3:
-            self.usage()
-
         self.configuration.require_project()
-        entity = self.memory.recall_stored_entity(sys.argv[2])
+        entity = self.memory.recall_stored_entity(sys.argv[3])
         if entity is None:
             self.conversation.not_sure_no_entity(
-                self.configuration.project.name, sys.argv[2]
+                self.configuration.project.name, sys.argv[3]
             )
             exit(1)
 
@@ -29,13 +26,10 @@ class Model(BaseCommand):
             response["code"][0]["entity"]["name"], response["code"][0]["definition"]
         )
 
+        if self.configuration.project.dev.active is True:
+            self.conversation.type(
+                f"Gibson wrote the following {Colors.argument('model')} code to your project:\n"
+            )
+
         print(response["code"][0]["definition"])
         time_keeper.display()
-
-    def usage(self):
-        self.configuration.display_project()
-        self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('model')} {Colors.input('[entity name]')} {Colors.hint('generate the model for an entity')}\n"
-        )
-        self.conversation.newline()
-        exit(1)

{gibson_cli-0.5.8/gibson/command → gibson_cli-0.6.1/gibson/command/code}/Schema.py

@@ -7,16 +7,13 @@ from gibson.core.TimeKeeper import TimeKeeper
 from gibson.dev.Dev import Dev
 
 
-class Schema(BaseCommand):
+class CodeSchema(BaseCommand):
     def execute(self):
-        if len(sys.argv) != 3:
-            self.usage()
-
         self.configuration.require_project()
-        entity = self.memory.recall_stored_entity(sys.argv[2])
+        entity = self.memory.recall_stored_entity(sys.argv[3])
         if entity is None:
             self.conversation.not_sure_no_entity(
-                self.configuration.project.name, sys.argv[2]
+                self.configuration.project.name, sys.argv[3]
             )
             exit(1)
 
@@ -29,13 +26,10 @@ class Schema(BaseCommand):
             response["code"][0]["entity"]["name"], response["code"][0]["definition"]
         )
 
+        if self.configuration.project.dev.active is True:
+            self.conversation.type(
+                f"Gibson wrote the following {Colors.argument('schema')} code to your project:\n"
+            )
+
         print(response["code"][0]["definition"])
         time_keeper.display()
-
-    def usage(self):
-        self.configuration.display_project()
-        self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('schema')} {Colors.argument('[entity name]')} {Colors.hint('write the schema code for an entity')}\n"
-        )
-        self.conversation.newline()
-        exit(1)

gibson_cli-0.5.8/gibson/command/Test.py → gibson_cli-0.6.1/gibson/command/code/Tests.py

@@ -7,16 +7,13 @@ from gibson.core.TimeKeeper import TimeKeeper
 from gibson.dev.Dev import Dev
 
 
-class Test(BaseCommand):
+class CodeTests(BaseCommand):
     def execute(self):
-        if len(sys.argv) != 3:
-            self.usage()
-
         self.configuration.require_project()
-        entity = self.memory.recall_stored_entity(sys.argv[2])
+        entity = self.memory.recall_stored_entity(sys.argv[3])
         if entity is None:
             self.conversation.not_sure_no_entity(
-                self.configuration.project.name, sys.argv[2]
+                self.configuration.project.name, sys.argv[3]
             )
             exit(1)
 
@@ -29,13 +26,10 @@ class Test(BaseCommand):
             response["code"][0]["entity"]["name"], response["code"][0]["definition"]
         )
 
+        if self.configuration.project.dev.active is True:
+            self.conversation.type(
+                f"Gibson wrote the following {Colors.argument('tests')} to your project:\n"
+            )
+
         print(response["code"][0]["definition"])
         time_keeper.display()
-
-    def usage(self):
-        self.configuration.display_project()
-        self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('test')} {Colors.argument('[entity name]')} {Colors.hint('write the unit tests for an entity')}\n"
-        )
-        self.conversation.newline()
-        exit(1)

{gibson_cli-0.5.8/gibson/command → gibson_cli-0.6.1/gibson/command/importer}/Import.py

@@ -6,44 +6,30 @@ from sqlalchemy.orm import sessionmaker
 import gibson.core.Colors as Colors
 from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
+from gibson.command.importer.OpenApi import OpenApi
 from gibson.command.rewrite.Rewrite import Rewrite
 from gibson.db.TableExceptions import TableExceptions
 
 
 class Import(BaseCommand):
     def execute(self):
-        if len(sys.argv) != 3 and len(sys.argv) != 5:
-            self.usage()
-
         self.configuration.require_project()
         write_code = False
-        if len(sys.argv) == 5:
-            if sys.argv[3] != ".." or sys.argv[4] != "dev":
-                self.usage()
-
-            if self.configuration.project.dev.active is False:
-                self.configuration.display_project()
-                self.conversation.type(
-                    "Dude, seriously?! You have Dev Mode turned off. "
-                    + "Why would you do that?\n"
-                )
-                self.conversation.newline()
-                exit(1)
-
-            write_code = True
 
-        if sys.argv[2] == "api":
+        if len(sys.argv) == 3 and sys.argv[2] == "api":
             entities = self.__import_from_api()
-        elif sys.argv[2] == "datastore":
+            write_code = self.configuration.project.dev.active
+        elif len(sys.argv) == 3 and sys.argv[2] == "datastore":
             entities = self.__import_from_datastore()
+            write_code = self.configuration.project.dev.active
+        elif len(sys.argv) == 4 and sys.argv[2] == "openapi":
+            return OpenApi(self.configuration).execute()
         else:
             self.usage()
 
         self.memory.remember_entities(entities)
 
-        word_entities = "entities"
-        if len(entities) == 1:
-            word_entities = "entity"
+        word_entities = "entity" if len(entities) == 1 else "entities"
 
         self.conversation.type("\nSummary\n")
         self.conversation.type(f"    {len(entities)} {word_entities} imported\n")
@@ -62,7 +48,6 @@ class Import(BaseCommand):
         response = Cli(self.configuration).import_()
         self.conversation.type("Building schema...\n")
 
-        entities = []
         for entity in response["project"]["entities"]:
             self.conversation.type(f"    {entity['name']}\n", delay=0.002)
 
@@ -106,13 +91,16 @@ class Import(BaseCommand):
             else ""
         )
         self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('import')} {Colors.argument('api')} {Colors.hint('import all entities from your project created on GibsonAI.com')}\n"
+            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('import')} {Colors.arguments(['api', 'datastore', 'openapi'])} {Colors.hint('import entities')}\n"
+        )
+        self.conversation.type(
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('import')} {Colors.argument('api')} {Colors.hint(f'import all entities from your project created on {Colors.link(self.configuration.app_domain())}')}\n"
         )
         self.conversation.type(
-            f"   or: {Colors.command(self.configuration.command)} {Colors.subcommand('import')} {Colors.argument('datastore')} {Colors.hint('import all entities from your local datastore')} {datastore_uri}\n"
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('import')} {Colors.argument('datastore')} {Colors.hint('import all entities from your local datastore')} {Colors.link(datastore_uri)}\n"
         )
         self.conversation.type(
-            f"   or: {Colors.command(self.configuration.command)} {Colors.subcommand('import')} {Colors.arguments(['api', 'datastore'])} {Colors.option('.. dev')} {Colors.hint('have dev mode write all the code')}\n"
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('import')} {Colors.argument('openapi')} {Colors.input('path/to/openapi.json')} {Colors.hint('import all entities from an OpenAPI spec file')}\n"
         )
         self.conversation.newline()
         exit(1)

{gibson_cli-0.5.8/gibson/command → gibson_cli-0.6.1/gibson/command/importer}/OpenApi.py

@@ -2,7 +2,6 @@ import json
 import re
 import sys
 
-import gibson.core.Colors as Colors
 from gibson.api.Cli import Cli
 from gibson.command.BaseCommand import BaseCommand
 
@@ -17,11 +16,8 @@ class OpenApi(BaseCommand):
         exit(1)
 
     def execute(self):
-        if len(sys.argv) != 3:
-            self.usage()
-
         try:
-            with open(sys.argv[2], "r") as f:
+            with open(sys.argv[3], "r") as f:
                 contents = json.loads(f.read())
         except FileNotFoundError:
             self.file_not_found()
@@ -119,7 +115,7 @@ class OpenApi(BaseCommand):
     def file_not_found(self):
         self.configuration.display_project()
         self.conversation.type(
-            f'Well that embarrassing. There is no file "{sys.argv[2]}".\n'
+            f'Well that embarrassing. There is no file "{sys.argv[3]}".\n'
         )
         self.conversation.newline()
         exit(1)
@@ -131,11 +127,3 @@ class OpenApi(BaseCommand):
         )
         self.conversation.newline()
         exit(1)
-
-    def usage(self):
-        self.configuration.display_project()
-        self.conversation.type(
-            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('openapi')} {Colors.input('[file path]')} {Colors.hint('import entities from an OpenAPI spec file')}\n"
-        )
-        self.conversation.newline()
-        exit(1)

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/command/list/List.py

@@ -18,10 +18,13 @@ class List(BaseCommand):
     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"
+            f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('list')} {Colors.arguments(['entities', 'projects'])}\n"
         )
         self.conversation.type(
-            f"   or: {Colors.command(self.configuration.command)} {Colors.subcommand('list')} {Colors.arguments(['projects'])} {Colors.hint('list all projects')}\n"
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('list')} {Colors.argument('entities')} {Colors.hint('list all entities')}\n"
+        )
+        self.conversation.type(
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('list')} {Colors.argument('projects')} {Colors.hint('list all projects')}\n"
         )
         self.conversation.newline()
         exit(1)

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/command/new/New.py

@@ -9,13 +9,11 @@ from gibson.command.new.Project import NewProject
 
 class New(BaseCommand):
     def execute(self):
-        if not len(sys.argv) >= 3:
-            self.usage()
-        elif sys.argv[2] == "project":
+        if len(sys.argv) == 3 and sys.argv[2] == "project":
             NewProject(self.configuration).execute()
-        elif sys.argv[2] == "module":
+        elif len(sys.argv) == 3 and sys.argv[2] == "module":
             NewModule(self.configuration).execute()
-        elif sys.argv[2] == "entity":
+        elif len(sys.argv) == 4 and sys.argv[2] == "entity":
             CodeEntity(self.configuration).execute()
         else:
             self.usage()
@@ -32,7 +30,7 @@ class New(BaseCommand):
             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"
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('new')} {Colors.argument('entity')} {Colors.input('[entity name]')} {Colors.hint('create a new entity')}\n"
         )
         self.conversation.newline()
         exit(1)

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/command/rewrite/Rewrite.py

@@ -121,7 +121,7 @@ class Rewrite(BaseCommand):
             f"usage: {Colors.command(self.configuration.command)} {Colors.subcommand('rewrite')} {Colors.hint('rewrite all code')}\n"
         )
         self.conversation.type(
-            f"   or: {Colors.command(self.configuration.command)} {Colors.subcommand('rewrite')} {Colors.arguments(self.arguments)} {Colors.hint('rewrite only the specified code')}\n"
+            f"       {Colors.command(self.configuration.command)} {Colors.subcommand('rewrite')} {Colors.arguments(self.arguments)} {Colors.hint('rewrite only the specified code')}\n"
         )
         self.conversation.newline()
         exit(1)

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/core/Colors.py

@@ -40,41 +40,61 @@ class Color:
     YELLOW2 = "\033[93m"
 
 
+# Colorize text with a given color
 def colorize(text, color):
     return f"{color}{text}{Color.END}"
 
 
+# Colorize a command
 def command(text):
     return colorize(text, Color.GREEN)
 
 
+# Colorize a subcommand
 def subcommand(text):
     return colorize(text, Color.YELLOW)
 
 
+# Colorize an argument
 def argument(text):
     return colorize(text, Color.VIOLET)
 
 
+# Colorize a list of arguments
 def arguments(list):
     return f"[{'|'.join(map(lambda x: argument(x), list))}]"
 
 
+# Colorize user input
 def input(text):
     return colorize(text, Color.WHITE2)
 
 
+# Colorize a command option
 def option(text):
     return colorize(text, Color.CYAN)
 
 
+# Colorize a hint
 def hint(text):
     return colorize(text, Color.GREY)
 
 
+# Colorize a project name
 def project(text):
     return colorize(text, Color.BOLD)
 
 
+# Colorize a URL to appear as a link
 def link(text):
     return colorize(colorize(text, Color.BLUE), Color.UNDERLINE)
+
+
+# Colorize the table name in a SQL statement
+def table(sql, name):
+    return sql.replace(name, colorize(name, Color.VIOLET))
+
+
+# Colorize a time/duration output
+def time(text):
+    return colorize(text, Color.GREEN)

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/core/CommandRouter.py

@@ -8,20 +8,16 @@ 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.importer.Import import Import
 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
 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.Rename import Rename
 from gibson.command.rewrite.Rewrite import Rewrite
-from gibson.command.Schema import Schema
 from gibson.command.Show import Show
-from gibson.command.Test import Test
 from gibson.command.Tree import Tree
 from gibson.command.Version import Version
 from gibson.command.WarGames import WarGames
@@ -65,34 +61,24 @@ class CommandRouter:
             command = List(self.configuration)
         elif sys.argv[1] == "merge":
             command = Merge(self.configuration)
-        elif sys.argv[1] == "model":
-            command = Model(self.configuration)
         elif sys.argv[1] == "modify":
             command = Modify(self.configuration)
         elif sys.argv[1] == "new":
             command = New(self.configuration)
-        elif sys.argv[1] == "openapi":
-            command = OpenApi(self.configuration)
         elif sys.argv[1] == "remove":
             command = Remove(self.configuration)
         elif sys.argv[1] == "rename":
             command = Rename(self.configuration)
         elif sys.argv[1] == "rewrite":
             command = Rewrite(self.configuration, with_header=True)
-        elif sys.argv[1] == "schema":
-            command = Schema(self.configuration)
         elif sys.argv[1] == "show":
             command = Show(self.configuration)
-        elif sys.argv[1] == "test":
-            command = Test(self.configuration)
         elif sys.argv[1] == "tree":
             command = Tree(self.configuration)
-        elif sys.argv[1] in ["?", "q"]:
+        elif sys.argv[1] in ["q"]:
             command = Question(self.configuration)
-        elif sys.argv[1] in ["--version", "-v"]:
+        elif sys.argv[1] in ["version", "--version", "-v"]:
             command = Version(self.configuration)
-        else:
-            command = WarGames(self.configuration)
 
         if command is None or command.execute() is False:
             Help(self.configuration).execute()

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/core/Memory.py

@@ -71,7 +71,7 @@ class Memory:
     def recall_last_entity(self, name):
         if self.last is not None:
             for entity in self.last["entities"]:
-                if entity["name"] == name:
+                if entity["name"].lower() == name.lower():
                     return entity
         return None
 
@@ -98,7 +98,7 @@ class Memory:
     def recall_stored_entity(self, name):
         if self.entities is not None:
             for entity in self.entities:
-                if entity["name"] == name:
+                if entity["name"].lower() == name.lower():
                     return entity
 
         return None

{gibson_cli-0.5.8 → gibson_cli-0.6.1}/gibson/core/TimeKeeper.py

@@ -1,5 +1,7 @@
 import time
 
+import gibson.core.Colors as Colors
+
 
 class TimeKeeper:
     def __init__(self):
@@ -9,4 +11,4 @@ class TimeKeeper:
         print(self.get_display() + "\n")
 
     def get_display(self):
-        return "[%ss]" % str(time.time() - self.__started)[0:7]
+        return Colors.time("[%ss]" % str(time.time() - self.__started)[0:7])