twenty-cli 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2788338657a1baa50cd9df1dbf6f0ee6cec4670c70e888d0ecf483c2dee42aec
-  data.tar.gz: b1cc4f163fc1a2be7aeb924ab9bbfba5f4769d4d848fe78265b288fb77e14dc3
+  metadata.gz: 39b8553e6aa621c07c81e4379940c7da72e535b26ac3c98714288ad75ad80f0e
+  data.tar.gz: 2742e7429d90c5affec8e5d335773c776f9a4bfb1299b853fc97b4dd471a2b7a
 SHA512:
-  metadata.gz: d3db4deea8e6f421c1189d328298f1acf38f2058f33fff6d11b3413c898a674159130252e5131992268871e4a217de19b051e516c76ddc128d27688865a92403
-  data.tar.gz: 2cdd2d036d9d1abb8680abe9b97a904a6608f650093579897f7b00dc3b3dd874971eae85ede66d308371a0d46c1f5362a0f7cb543dc5d997ff092f48c25ba0ca
+  metadata.gz: e94e2a9446e37590d542ab101588cffd2fa8fbf31406f30f1113c72b79e23cb4f1a0d7b84680c1bb778e1210b15013fddbd20fe49e547a612150df84f8a05d8b
+  data.tar.gz: 46a6643af111fbdb0dfa5c52eda52d68150948a2aa377ba0065d3ae131bf0b9c43193173e4bc1d6b8ec0a544b7bc3a34484ca143076e4932ae8cfba39a70756c

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

@@ -21,9 +21,9 @@ 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)
+      require_models!
       project = Twenty::Project.create(
         name: File.basename(path),
         path:

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

@@ -24,7 +24,7 @@ class Twenty::Command::Console < Twenty::Command
   private
 
   def run_command(options)
-    require "twenty/server/model"
+    require_models!
     require "irb"
     TOPLEVEL_BINDING.irb
   end

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

@@ -19,8 +19,8 @@ class Twenty::Command::Disconnect < Twenty::Command
   private
 
   def run_command(options)
-    require "twenty/server/model"
     path = File.realpath(options.path ? options.path : Dir.getwd)
+    require_models!
     Twenty::Project
       .where(path:)
       .first!

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

@@ -2,11 +2,12 @@
 
 module Twenty::Command::Hook
   module RequireMigration
+    Error = Class.new(RuntimeError)
+
     def run_command(...)
       if pending_migrations?
-        warn "There are pending migrations.\n" \
-             "Run \"twenty migrate\" first.\n"
-        exit(1)
+        raise Error, "There are pending database migrations to run. \n" \
+                     "Try 'twenty migrate'"
       else
         super(...)
       end

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

@@ -3,6 +3,7 @@
 module Twenty::Command::Hook
   module Rescue
     FRAME_MAX = 15
+    INDENT_BY = 2
 
     def run(...)
       super(...)
@@ -11,7 +12,8 @@ module Twenty::Command::Hook
       $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"
@@ -20,8 +22,8 @@ module Twenty::Command::Hook
     private
 
     def format_backtrace(backtrace)
-      backtrace.last(FRAME_MAX).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/up.rb

@@ -36,7 +36,7 @@ class Twenty::Command::Up < Twenty::Command
   private
 
   def run_command(options)
-    require "twenty/server/model"
+    require_models!
     File.binwrite(pid, Process.pid.to_s)
     thr = Twenty::Rack.server(options).start
     thr.join

data/lib/twenty/cli/command.rb

@@ -16,4 +16,10 @@ class Twenty::Command < Cmd
   require_relative "command/disconnect"
   require_relative "command/migrate"
   require_relative "command/console"
+
+  private
+
+  def require_models!
+    require "twenty/server/model"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twenty-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - '0x1eef'
@@ -115,7 +115,6 @@ files:
 - "./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/option.rb"
 - "./lib/twenty/cli/command/option/database.rb"
 - "./lib/twenty/cli/command/up.rb"

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

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class Twenty::Command
-  module CommonOptionMixin
-    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