twenty-cli 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a07dbee307b110c4d96b36254fafff8432eb57388c74748f84985b5b0f452fc
-  data.tar.gz: 8badd46d8d4bfe53955082e4e94b87f14f6f9d466ffc7bb3b46e3db835025595
+  metadata.gz: 11aeb74ec54a850fe0d39de13bb11c4da47e452e4e27adb7eb43dc69f6c7237c
+  data.tar.gz: 7ae6e0a4e454e395cd4eb4a60e7fb446099cc19c8bcda15e11d7533e21abbaec
 SHA512:
-  metadata.gz: e9291a9992e134f1fa5872162d053d9be7402810515c020593c89dd2545b1ad4a229cf99bb1aa88dc189b7db5815ea7200b9b7fdc54de2a6a1f4c8c3a5220862
-  data.tar.gz: b5b6479f618f27ff27844371f0fc43b62ad29eaac164cc5f72d5efa47c59d02101dff8d1dbc278110174aba25aa63906e38fdd6b7c8616761c881e37db3bc72f
+  metadata.gz: c30f12237301803e9502f97a1ea1f7fe845f0232acbb77b2a7093007fe5b4e0e5279d088f696b6144402246be56a0c5d43bf7a993a791f50e3cf5e0fcef9ccb0
+  data.tar.gz: a23b70eef9714a4ef3a63f30c6c0b39aadd4ba9434fcbe6713196b66734f3dcb2c7ceca9530a88e80dca176cb6caf3ffac831203452b253a6cd32b53358420af

data/lib/twenty/cli/command/connect.rb

@@ -5,9 +5,13 @@ class Twenty::Command::Connect < Twenty::Command
              description: "Connect a project to twenty"
   set_option "-p PATH", "--path PATH", "The path to a project", default: nil
 
-  prepend Twenty::Command::MigrationMixin
-  prepend Twenty::Command::SQLiteMixin
-  prepend Twenty::Command::RescueMixin
+  ##
+  # Hooks
+  # Run order:
+  # Rescue -> SQLiteConn -> RequireMigration -> command
+  prepend Hook::RequireMigration
+  prepend Hook::SQLiteConn
+  prepend Hook::Rescue
 
   def run
     options = parse_options(argv)
@@ -17,6 +21,7 @@ class Twenty::Command::Connect < Twenty::Command
   private
 
   def run_command(options)
+    require "twenty/server/model"
     path = File.realpath(options.path ? options.path : Dir.getwd)
     if File.exist?(path)
       project = Twenty::Project.create(

data/lib/twenty/cli/command/console.rb

@@ -3,10 +3,18 @@
 class Twenty::Command::Console < Twenty::Command
   set_banner usage: "twenty console [OPTIONS]",
              description: "Start the twenty developer console"
-  include CommonOptionMixin
-  prepend Twenty::Command::MigrationMixin
-  prepend Twenty::Command::SQLiteMixin
-  prepend Twenty::Command::RescueMixin
+
+  ##
+  # Option(s)
+  include Option::Database
+
+  ##
+  # Hooks
+  # Run order:
+  # Rescue -> SQLiteConn -> RequireMigration -> command
+  prepend Hook::RequireMigration
+  prepend Hook::SQLiteConn
+  prepend Hook::Rescue
 
   def run
     options = parse_options(argv)
@@ -16,6 +24,7 @@ class Twenty::Command::Console < Twenty::Command
   private
 
   def run_command(options)
+    require "twenty/server/model"
     require "irb"
     TOPLEVEL_BINDING.irb
   end

data/lib/twenty/cli/command/disconnect.rb

@@ -4,9 +4,12 @@ class Twenty::Command::Disconnect < Twenty::Command
   set_banner usage: "twenty disconnect [OPTIONS]",
              description: "Disconnect a project from twenty"
   set_option "-p PATH", "--path PATH", "The path to a project", default: nil
-  prepend Twenty::Command::MigrationMixin
-  prepend Twenty::Command::SQLiteMixin
-  prepend Twenty::Command::RescueMixin
+
+  ##
+  # Hooks
+  prepend Hook::RequireMigration
+  prepend Hook::SQLiteConn
+  prepend Hook::Rescue
 
   def run
     options = parse_options(argv)
@@ -16,6 +19,7 @@ class Twenty::Command::Disconnect < Twenty::Command
   private
 
   def run_command(options)
+    require "twenty/server/model"
     path = File.realpath(options.path ? options.path : Dir.getwd)
     Twenty::Project
       .where(path:)

data/lib/twenty/cli/command/down.rb

@@ -3,9 +3,13 @@
 class Twenty::Command::Down < Twenty::Command
   set_banner usage: "twenty down [OPTIONS]",
              description: "Stop the twenty web server"
-  include Twenty::Path
-  prepend Twenty::Command::SQLiteMixin
-  prepend Twenty::Command::RescueMixin
+
+  ##
+  # Hooks
+  # Run order:
+  # Rescue -> SQLiteConn -> command
+  prepend Hook::SQLiteConn
+  prepend Hook::Rescue
 
   def run
     options = parse_options(argv)
@@ -15,19 +19,18 @@ class Twenty::Command::Down < Twenty::Command
   private
 
   def run_command(options)
-    if File.readable?(pidfile)
-      Process.kill("SIGINT", Integer(pid))
+    if File.readable?(pid)
+      pid = Integer(File.binread(pid).gsub(/[^\d]/, ""))
+      Process.kill("SIGINT", pid)
     else
-      warn "PID file is not readable."
+      warn "[x] #{pid} is not readable"
     end
   rescue Errno::ESRCH
-    warn "No such process."
-    FileUtils.rm(pidfile)
+    warn "[x] Process not found"
+    rm(pid)
   end
 
   def pid
-    @pid ||= File
-               .binread(pidfile)
-               .gsub(/[^\d]/, "")
+    Twenty.pid
   end
 end

data/lib/twenty/cli/command/hook/require_migration.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Twenty::Command::Hook
+  module RequireMigration
+    Error = Class.new(RuntimeError)
+
+    def run_command(...)
+      if pending_migrations?
+        raise Error, "There are pending database migrations to run. \n" \
+                     "Try 'twenty migrate'"
+      else
+        super(...)
+      end
+    end
+
+    private
+
+    def pending_migrations?
+      Twenty::Migration.pending_migrations?
+    end
+  end
+end

data/lib/twenty/cli/command/{mixin/rescue_mixin.rb → hook/rescue.rb}

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
-class Twenty::Command
-  module RescueMixin
+module Twenty::Command::Hook
+  module Rescue
+    FRAME_MAX = 15
+    INDENT_BY = 2
+
     def run(...)
       super(...)
     rescue => ex
@@ -9,7 +12,8 @@ class Twenty::Command
       $stderr.print "\n",
                     "  ", Paint[" Exception ", :white, :red, :bold], "\n",
                     "  ", Paint[ex.class.to_s, :bold], "\n",
-                    "  ", ex.message, "\n\n",
+                    ex.message.each_line.map { [" " * INDENT_BY, _1] }.join,
+                    "\n\n",
                     "  ", Paint[" Backtrace ", :white, :blue, :bold], "\n",
                     format_backtrace(ex.backtrace), "\n",
                     "\n"
@@ -18,8 +22,8 @@ class Twenty::Command
     private
 
     def format_backtrace(backtrace)
-      backtrace.last(5).map do
-        "  #{_1.gsub(Dir.getwd, "")}"
+      backtrace[0..FRAME_MAX-1].map do
+        [" " * INDENT_BY, _1.gsub(Dir.getwd, "")].join
       end.join("\n")
     end
   end

data/lib/twenty/cli/command/hook/sqlite_conn.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Twenty::Command::Hook
+  module SQLiteConn
+    def run_command(options)
+      path = options.database || Twenty.default_database
+      Twenty.establish_connection(path:)
+      super(options)
+    end
+  end
+end

data/lib/twenty/cli/command/hook.rb

@@ -0,0 +1,5 @@
+module Twenty::Command::Hook
+  require_relative "hook/require_migration"
+  require_relative "hook/sqlite_conn"
+  require_relative "hook/rescue"
+end

data/lib/twenty/cli/command/migrate.rb

@@ -3,9 +3,18 @@
 class Twenty::Command::Migrate < Twenty::Command
   set_banner usage: "twenty migrate [OPTIONS]",
              description: "Migrate the database"
-  include CommonOptionMixin
-  prepend Twenty::Command::SQLiteMixin
-  prepend Twenty::Command::RescueMixin
+  set_option "-t TARGET", "--target TARGET", "The target version", default: nil
+
+  ##
+  # Options
+  include Option::Database
+
+  ##
+  # Hooks
+  # Run order:
+  # Rescue -> SQLiteConn -> command.
+  prepend Hook::SQLiteConn
+  prepend Hook::Rescue
 
   def run
     options = parse_options(argv)
@@ -15,6 +24,6 @@ class Twenty::Command::Migrate < Twenty::Command
   private
 
   def run_command(options)
-    Twenty::Migration.run!
+    Twenty::Migration.run!(target: options.target)
   end
 end

data/lib/twenty/cli/command/mixin/common_option_mixin.rb

@@ -6,7 +6,7 @@ class Twenty::Command
       mod.module_eval do
         set_option "-d PATH",
                    "--database PATH",
-                   "The path to an alternate SQLite3 database",
+                   "The path to an alternate SQLite database",
                    as: String,
                    default: nil
       end

data/lib/twenty/cli/command/option/database.rb

@@ -0,0 +1,13 @@
+module Twenty::Command::Option
+  module Database
+    def self.included(mod)
+      mod.module_eval do
+        set_option "-d PATH",
+                   "--database PATH",
+                   "The path to an alternate SQLite database",
+                   as: String,
+                   default: nil
+      end
+    end
+  end
+end

data/lib/twenty/cli/command/option.rb

@@ -0,0 +1,3 @@
+module Twenty::Command::Option
+  require_relative "option/database"
+end

data/lib/twenty/cli/command/up.rb

@@ -16,11 +16,17 @@ class Twenty::Command::Up < Twenty::Command
              "--unix PATH",
              "Listen on a UNIX socket"
 
-  include CommonOptionMixin
-  include Twenty::Path
-  prepend Twenty::Command::MigrationMixin
-  prepend Twenty::Command::SQLiteMixin
-  prepend Twenty::Command::RescueMixin
+  ##
+  # Option(s)
+  include Option::Database
+
+  ##
+  # Hooks
+  # Run order:
+  # Rescue -> SQLiteConn -> RequireMigration -> command
+  prepend Hook::RequireMigration
+  prepend Hook::SQLiteConn
+  prepend Hook::Rescue
 
   def run
     options = parse_options(argv)
@@ -30,12 +36,17 @@ class Twenty::Command::Up < Twenty::Command
   private
 
   def run_command(options)
-    File.binwrite(pidfile, Process.pid.to_s)
+    require "twenty/server/model"
+    File.binwrite(pid, Process.pid.to_s)
     thr = Twenty::Rack.server(options).start
     thr.join
   rescue Interrupt
     thr.kill
   ensure
-    FileUtils.rm(pidfile)
+    FileUtils.rm(pid)
+  end
+
+  def pid
+    Twenty.pid
   end
 end

data/lib/twenty/cli/command.rb

@@ -4,14 +4,12 @@ require "cmd"
 
 class Twenty::Command < Cmd
   ##
-  # mixins
-  require_relative "command/mixin/common_option_mixin"
-  require_relative "command/mixin/migration_mixin"
-  require_relative "command/mixin/sqlite_mixin"
-  require_relative "command/mixin/rescue_mixin"
+  # Hooks
+  require_relative "command/option"
+  require_relative "command/hook"
 
   ##
-  # commands
+  # Commands
   require_relative "command/up"
   require_relative "command/down"
   require_relative "command/connect"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twenty-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - '0x1eef'
@@ -110,11 +110,14 @@ files:
 - "./lib/twenty/cli/command/console.rb"
 - "./lib/twenty/cli/command/disconnect.rb"
 - "./lib/twenty/cli/command/down.rb"
+- "./lib/twenty/cli/command/hook.rb"
+- "./lib/twenty/cli/command/hook/require_migration.rb"
+- "./lib/twenty/cli/command/hook/rescue.rb"
+- "./lib/twenty/cli/command/hook/sqlite_conn.rb"
 - "./lib/twenty/cli/command/migrate.rb"
 - "./lib/twenty/cli/command/mixin/common_option_mixin.rb"
-- "./lib/twenty/cli/command/mixin/migration_mixin.rb"
-- "./lib/twenty/cli/command/mixin/rescue_mixin.rb"
-- "./lib/twenty/cli/command/mixin/sqlite_mixin.rb"
+- "./lib/twenty/cli/command/option.rb"
+- "./lib/twenty/cli/command/option/database.rb"
 - "./lib/twenty/cli/command/up.rb"
 - "./lib/twenty/cli/libexec.rb"
 - "./libexec/twenty/connect"

data/lib/twenty/cli/command/mixin/migration_mixin.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Twenty::Command::MigrationMixin
-  def run_command(...)
-    if pending_migrations?
-      warn "There are pending migrations.\n" \
-           "Run \"twenty migrate\" first.\n"
-      exit(1)
-    else
-      super(...)
-    end
-  end
-
-  private
-
-  def pending_migrations?
-    Twenty::Migration.pending_migrations?
-  end
-end

data/lib/twenty/cli/command/mixin/sqlite_mixin.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Twenty::Command::SQLiteMixin
-  def run_command(options)
-    path = options.database || Twenty.default_database
-    Twenty.establish_connection(path:)
-    require "twenty/server/migration"
-    require "twenty/server/model"
-    super(options)
-  end
-end