From ed761c24187bed0ddee829aeb355d5e0a8ac4d89 Mon Sep 17 00:00:00 2001
From: 0x1eef <0x1eef@protonmail.com>
Date: Tue, 16 Jan 2024 17:46:47 -0300
Subject: [PATCH] cli: shorten mixin names

---
 twenty-cli/lib/twenty-cli/command.rb                          | 4 ++--
 twenty-cli/lib/twenty-cli/command/connect.rb                  | 4 ++--
 twenty-cli/lib/twenty-cli/command/console.rb                  | 4 ++--
 twenty-cli/lib/twenty-cli/command/disconnect.rb               | 4 ++--
 twenty-cli/lib/twenty-cli/command/down.rb                     | 2 +-
 twenty-cli/lib/twenty-cli/command/migrate.rb                  | 2 +-
 .../mixin/{pending_migration_mixin.rb => migration_mixin.rb}  | 2 +-
 .../mixin/{sqlite_connection_mixin.rb => sqlite_mixin.rb}     | 2 +-
 twenty-cli/lib/twenty-cli/command/up.rb                       | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)
 rename twenty-cli/lib/twenty-cli/command/mixin/{pending_migration_mixin.rb => migration_mixin.rb} (87%)
 rename twenty-cli/lib/twenty-cli/command/mixin/{sqlite_connection_mixin.rb => sqlite_mixin.rb} (76%)

diff --git a/twenty-cli/lib/twenty-cli/command.rb b/twenty-cli/lib/twenty-cli/command.rb
index b06c77e..0fe4dae 100644
--- a/twenty-cli/lib/twenty-cli/command.rb
+++ b/twenty-cli/lib/twenty-cli/command.rb
@@ -6,8 +6,8 @@ class Twenty::Command < Cmd
   ##
   # mixins
   require_relative "command/mixin/common_option_mixin"
-  require_relative "command/mixin/pending_migration_mixin"
-  require_relative "command/mixin/sqlite_connection_mixin"
+  require_relative "command/mixin/migration_mixin"
+  require_relative "command/mixin/sqlite_mixin"
 
   ##
   # commands
diff --git a/twenty-cli/lib/twenty-cli/command/connect.rb b/twenty-cli/lib/twenty-cli/command/connect.rb
index 96a93b9..2c9fd69 100644
--- a/twenty-cli/lib/twenty-cli/command/connect.rb
+++ b/twenty-cli/lib/twenty-cli/command/connect.rb
@@ -3,8 +3,8 @@
 class Twenty::Command::Connect < Twenty::Command
   set_banner usage: "twenty connect [OPTIONS]",
              description: "Connect a project to twenty"
-  prepend Twenty::Command::PendingMigrationMixin
-  prepend Twenty::Command::SQLiteConnectionMixin
+  prepend Twenty::Command::MigrationMixin
+  prepend Twenty::Command::SQLiteMixin
 
   def run
     options = parse_options(argv)
diff --git a/twenty-cli/lib/twenty-cli/command/console.rb b/twenty-cli/lib/twenty-cli/command/console.rb
index f149265..7c2196f 100644
--- a/twenty-cli/lib/twenty-cli/command/console.rb
+++ b/twenty-cli/lib/twenty-cli/command/console.rb
@@ -4,8 +4,8 @@ class Twenty::Command::Console < Twenty::Command
   set_banner usage: "twenty console [OPTIONS]",
              description: "Start the twenty developer console"
   include CommonOptionMixin
-  prepend Twenty::Command::PendingMigrationMixin
-  prepend Twenty::Command::SQLiteConnectionMixin
+  prepend Twenty::Command::MigrationMixin
+  prepend Twenty::Command::SQLiteMixin
 
   def run
     options = parse_options(argv)
diff --git a/twenty-cli/lib/twenty-cli/command/disconnect.rb b/twenty-cli/lib/twenty-cli/command/disconnect.rb
index db41fdc..f935e9a 100644
--- a/twenty-cli/lib/twenty-cli/command/disconnect.rb
+++ b/twenty-cli/lib/twenty-cli/command/disconnect.rb
@@ -3,8 +3,8 @@
 class Twenty::Command::Disconnect < Twenty::Command
   set_banner usage: "twenty disconnect [OPTIONS]",
              description: "Disconnect a project from twenty"
-  prepend Twenty::Command::PendingMigrationMixin
-  prepend Twenty::Command::SQLiteConnectionMixin
+  prepend Twenty::Command::MigrationMixin
+  prepend Twenty::Command::SQLiteMixin
 
   def run
     options = parse_options(argv)
diff --git a/twenty-cli/lib/twenty-cli/command/down.rb b/twenty-cli/lib/twenty-cli/command/down.rb
index b9c2e72..0695593 100644
--- a/twenty-cli/lib/twenty-cli/command/down.rb
+++ b/twenty-cli/lib/twenty-cli/command/down.rb
@@ -3,7 +3,7 @@
 class Twenty::Command::Down < Twenty::Command
   set_banner usage: "twenty down [OPTIONS]",
              description: "Stop the twenty web server"
-  prepend Twenty::Command::SQLiteConnectionMixin
+  prepend Twenty::Command::SQLiteMixin
 
   def run
     options = parse_options(argv)
diff --git a/twenty-cli/lib/twenty-cli/command/migrate.rb b/twenty-cli/lib/twenty-cli/command/migrate.rb
index f1f4aed..64342f1 100644
--- a/twenty-cli/lib/twenty-cli/command/migrate.rb
+++ b/twenty-cli/lib/twenty-cli/command/migrate.rb
@@ -4,7 +4,7 @@ class Twenty::Command::Migrate < Twenty::Command
   set_banner usage: "twenty migrate [OPTIONS]",
              description: "Migrate the database"
   include CommonOptionMixin
-  prepend Twenty::Command::SQLiteConnectionMixin
+  prepend Twenty::Command::SQLiteMixin
 
   def run
     options = parse_options(argv)
diff --git a/twenty-cli/lib/twenty-cli/command/mixin/pending_migration_mixin.rb b/twenty-cli/lib/twenty-cli/command/mixin/migration_mixin.rb
similarity index 87%
rename from twenty-cli/lib/twenty-cli/command/mixin/pending_migration_mixin.rb
rename to twenty-cli/lib/twenty-cli/command/mixin/migration_mixin.rb
index 73593fd..ab8570d 100644
--- a/twenty-cli/lib/twenty-cli/command/mixin/pending_migration_mixin.rb
+++ b/twenty-cli/lib/twenty-cli/command/mixin/migration_mixin.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Twenty::Command::PendingMigrationMixin
+module Twenty::Command::MigrationMixin
   def run_command(...)
     if pending_migrations?
       warn "There are pending migrations.\n" \
diff --git a/twenty-cli/lib/twenty-cli/command/mixin/sqlite_connection_mixin.rb b/twenty-cli/lib/twenty-cli/command/mixin/sqlite_mixin.rb
similarity index 76%
rename from twenty-cli/lib/twenty-cli/command/mixin/sqlite_connection_mixin.rb
rename to twenty-cli/lib/twenty-cli/command/mixin/sqlite_mixin.rb
index 3105c40..11609a9 100644
--- a/twenty-cli/lib/twenty-cli/command/mixin/sqlite_connection_mixin.rb
+++ b/twenty-cli/lib/twenty-cli/command/mixin/sqlite_mixin.rb
@@ -1,4 +1,4 @@
-module Twenty::Command::SQLiteConnectionMixin
+module Twenty::Command::SQLiteMixin
   def run_command(options)
     path = options.database || Twenty.default_database
     Twenty.establish_connection(path:)
diff --git a/twenty-cli/lib/twenty-cli/command/up.rb b/twenty-cli/lib/twenty-cli/command/up.rb
index ebfca05..4aebe1a 100644
--- a/twenty-cli/lib/twenty-cli/command/up.rb
+++ b/twenty-cli/lib/twenty-cli/command/up.rb
@@ -4,8 +4,8 @@ class Twenty::Command::Up < Twenty::Command
   set_banner usage: "twenty up [OPTIONS]",
              description: "Start the twenty web server"
   include CommonOptionMixin
-  prepend Twenty::Command::PendingMigrationMixin
-  prepend Twenty::Command::SQLiteConnectionMixin
+  prepend Twenty::Command::MigrationMixin
+  prepend Twenty::Command::SQLiteMixin
 
   def run
     options = parse_options(argv)