twenty-cli 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02ffbcbc1469c436068a744196bb3b2d21b5f75666565b510ef72fc112bdcfe2
-  data.tar.gz: a9a08aa7257d2b60873da4c5aed54393a1150f6d1f23a6532f0ce22ad24b268c
+  metadata.gz: 2d9a6a045f05746636ba95a807ef653ad26f003c36981f6f3830d95818d4781a
+  data.tar.gz: 55db9d8d8d9c1e63abf36d52e1ab018133fc6778b40145cb8f1b98c3667feb80
 SHA512:
-  metadata.gz: 6f38a296f2855760d07a71fa1f17409db6d36fbf6762a2dfec101fe009f98a71bdf356320db955e63ef215da5b5829652049c52c56ad62a80f96bc3e32713334
-  data.tar.gz: 94ced3c64a02e1bc2c8a7ce2d1e6b30e72f4f3a601a7a68ea368f68e7fe173a7c5d9ba1ecf44d530794bf74b14a6e3739dd3f79ae04138ce4ad59a32440db77b
+  metadata.gz: b450d2e1c1074682dbf2fe35f9c2fea183ccdfea42f19bd04b55a8373017e62c8c3553bf17c882d8832a49c5b217b98f4e9f2e7dbce034d533a43ddfd85f916b
+  data.tar.gz: d066ed882a336f8415a9ea6657194cb3a79be75da24075c29c099570464b07fb4810204719a8373c1d8ad1593161482d1fb594b5811d123c00ece8319e7a85c6

data/bin/twenty

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 libdir = File.join(__dir__, "..", "lib")
-require File.join(libdir, "twenty-cli", "libexec")
+require File.join(libdir, "twenty", "cli", "libexec")
 
 case ARGV[0]
 when "up"
@@ -24,7 +24,7 @@ when "console"
   wait spawn("console", *ARGV[1..])
   exit $?.exitstatus
 else
-  warn "Usage: 20 COMMAND [OPTIONS]\n\n" \
+  warn "Usage: twenty COMMAND [OPTIONS]\n\n" \
        "Commands:\n" \
        "  up             Start the twenty web server.\n" \
        "  down           Stop the twenty web server.\n" \

data/lib/{twenty-cli → twenty/cli}/command/connect.rb

@@ -5,18 +5,19 @@ class Twenty::Command::Connect < Twenty::Command
              description: "Connect a project to twenty"
   prepend Twenty::Command::MigrationMixin
   prepend Twenty::Command::SQLiteMixin
+  prepend Twenty::Command::RescueMixin
 
   def run
     options = parse_options(argv)
-    options.help ? show_help : run_command(options)
+    run_command(options)
   end
 
   private
 
   def run_command(options)
-    Twenty::Project.new(
+    Twenty::Project.create(
       name: File.basename(Dir.getwd),
       path: Dir.getwd
-    ).save!
+    )
   end
 end

data/lib/{twenty-cli → twenty/cli}/command/console.rb

@@ -6,10 +6,11 @@ class Twenty::Command::Console < Twenty::Command
   include CommonOptionMixin
   prepend Twenty::Command::MigrationMixin
   prepend Twenty::Command::SQLiteMixin
+  prepend Twenty::Command::RescueMixin
 
   def run
     options = parse_options(argv)
-    options.help ? show_help : run_command(options)
+    run_command(options)
   end
 
   private

data/lib/{twenty-cli → twenty/cli}/command/disconnect.rb

@@ -5,15 +5,19 @@ class Twenty::Command::Disconnect < Twenty::Command
              description: "Disconnect a project from twenty"
   prepend Twenty::Command::MigrationMixin
   prepend Twenty::Command::SQLiteMixin
+  prepend Twenty::Command::RescueMixin
 
   def run
     options = parse_options(argv)
-    options.help ? show_help : run_command(options)
+    run_command(options)
   end
 
   private
 
   def run_command(options)
-    warn "[twenty] disconnect..."
+    Twenty::Project
+      .where(path: Dir.getwd)
+      .first!
+      .destroy
   end
 end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+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
+
+  def run
+    options = parse_options(argv)
+    run_command(options)
+  end
+
+  private
+
+  def run_command(options)
+    if File.readable?(pidfile)
+      Process.kill("SIGINT", Integer(pid))
+    else
+      warn "PID file is not readable."
+    end
+  rescue Errno::ESRCH
+    warn "No such process."
+    FileUtils.rm(pidfile)
+  end
+
+  def pid
+    @pid ||= File
+               .binread(pidfile)
+               .gsub(/[^\d]/, "")
+  end
+end

data/lib/{twenty-cli → twenty/cli}/command/migrate.rb

@@ -5,10 +5,11 @@ class Twenty::Command::Migrate < Twenty::Command
              description: "Migrate the database"
   include CommonOptionMixin
   prepend Twenty::Command::SQLiteMixin
+  prepend Twenty::Command::RescueMixin
 
   def run
     options = parse_options(argv)
-    options.help ? show_help : run_command(options)
+    run_command(options)
   end
 
   private

data/lib/{twenty-cli → twenty/cli}/command/mixin/common_option_mixin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Twenty::Command
   module CommonOptionMixin
     def self.included(mod)

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Twenty::Command
+  module RescueMixin
+    def run(...)
+      super(...)
+    rescue => ex
+      require "paint"
+      $stderr.print "\n",
+                    "  ", Paint[" Exception ", :white, :red, :bold], "\n",
+                    "  ", Paint[ex.class.to_s, :bold], "\n",
+                    "  ", ex.message, "\n\n",
+                    "  ", Paint[" Backtrace ", :white, :blue, :bold], "\n",
+                    format_backtrace(ex.backtrace), "\n",
+                    "\n"
+    end
+
+    private
+
+    def format_backtrace(backtrace)
+      backtrace.last(5).map do
+        "  #{_1.gsub(Dir.getwd, "")}"
+      end.join("\n")
+    end
+  end
+end

data/lib/{twenty-cli → twenty/cli}/command/mixin/sqlite_mixin.rb

@@ -1,7 +1,11 @@
+# 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

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class Twenty::Command::Up < Twenty::Command
+  set_banner usage: "twenty up [OPTIONS]",
+             description: "Start the twenty web server"
+  set_option "-b ADDR",
+             "--bind ADDR",
+             "An address to bind to (default: 127.0.0.1)",
+             default: "127.0.0.1"
+  set_option "-p PORT",
+             "--port PORT",
+             "A port to listen on (default: 2020)",
+             default: 2020,
+             as: Integer
+  set_option "-u PATH",
+             "--unix PATH",
+             "Listen on a UNIX socket"
+
+  include CommonOptionMixin
+  include Twenty::Path
+  prepend Twenty::Command::MigrationMixin
+  prepend Twenty::Command::SQLiteMixin
+  prepend Twenty::Command::RescueMixin
+
+  def run
+    options = parse_options(argv)
+    run_command(options)
+  end
+
+  private
+
+  def run_command(options)
+    File.binwrite(pidfile, Process.pid.to_s)
+    thr = Twenty::Rack.server(options).start
+    thr.join
+  rescue Interrupt
+    thr.kill
+  ensure
+    FileUtils.rm(pidfile)
+  end
+end

data/lib/{twenty-cli → twenty/cli}/command.rb

@@ -8,6 +8,7 @@ class Twenty::Command < Cmd
   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"
 
   ##
   # commands

data/lib/{twenty-cli → twenty/cli}/libexec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 def spawn(exec, *)
-  libexec_dir = File.realpath(File.join(__dir__, "..", "..", "libexec", "twenty"))
+  libexec_dir = File.realpath(File.join(__dir__, "..", "..", "..", "libexec", "twenty"))
   Process.spawn(File.join(libexec_dir, exec), *)
 end
 

data/lib/twenty/cli.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Twenty
+  require "json"
+  require "twenty/server"
+  require "twenty/client"
+  require_relative "cli/command"
+end

data/libexec/twenty/connect

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 libdir = File.expand_path File.join(__dir__, "..", "..", "lib")
-require File.join(libdir, "twenty-cli")
+require File.join(libdir, "twenty/cli")
 
 ##
 # main

data/libexec/twenty/console

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 libdir = File.expand_path File.join(__dir__, "..", "..", "lib")
-require File.join(libdir, "twenty-cli")
+require File.join(libdir, "twenty/cli")
 
 ##
 # main

data/libexec/twenty/disconnect

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 libdir = File.expand_path File.join(__dir__, "..", "..", "lib")
-require File.join(libdir, "twenty-cli")
+require File.join(libdir, "twenty/cli")
 
 ##
 # main

data/libexec/twenty/down

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 libdir = File.expand_path File.join(__dir__, "..", "..", "lib")
-require File.join(libdir, "twenty-cli")
+require File.join(libdir, "twenty/cli")
 
 ##
 # main

data/libexec/twenty/migrate

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 libdir = File.expand_path File.join(__dir__, "..", "..", "lib")
-require File.join(libdir, "twenty-cli")
+require File.join(libdir, "twenty/cli")
 
 ##
 # main

data/libexec/twenty/up

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 libdir = File.expand_path File.join(__dir__, "..", "..", "lib")
-require File.join(libdir, "twenty-cli")
+require File.join(libdir, "twenty", "cli")
 
 ##
 # main

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twenty-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmd.rb
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -72,44 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.35'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
-description: 'twenty: command-line interface'
+        version: '1.35'
+description: Command-line interface
 email:
 - 0x1eef@protonmail.com
 executables:
 - twenty
-- '20'
 extensions: []
 extra_rdoc_files: []
 files:
-- "./bin/20"
 - "./bin/twenty"
-- "./lib/twenty-cli.rb"
-- "./lib/twenty-cli/command.rb"
-- "./lib/twenty-cli/command/connect.rb"
-- "./lib/twenty-cli/command/console.rb"
-- "./lib/twenty-cli/command/disconnect.rb"
-- "./lib/twenty-cli/command/down.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/sqlite_mixin.rb"
-- "./lib/twenty-cli/command/up.rb"
-- "./lib/twenty-cli/libexec.rb"
+- "./lib/twenty/cli.rb"
+- "./lib/twenty/cli/command.rb"
+- "./lib/twenty/cli/command/connect.rb"
+- "./lib/twenty/cli/command/console.rb"
+- "./lib/twenty/cli/command/disconnect.rb"
+- "./lib/twenty/cli/command/down.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/up.rb"
+- "./lib/twenty/cli/libexec.rb"
 - "./libexec/twenty/connect"
 - "./libexec/twenty/console"
 - "./libexec/twenty/disconnect"
 - "./libexec/twenty/down"
 - "./libexec/twenty/migrate"
 - "./libexec/twenty/up"
-- bin/20
 - bin/twenty
 homepage: https://github.com/0x1eef/twenty#readme
 licenses:
@@ -130,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
-summary: 'twenty: command-line interface'
+summary: Command-line interface
 test_files: []

data/bin/20

@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-Process.wait spawn([File.join(__dir__, "twenty"), "20"], *ARGV)

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class Twenty::Command::Down < Twenty::Command
-  set_banner usage: "twenty down [OPTIONS]",
-             description: "Stop the twenty web server"
-  prepend Twenty::Command::SQLiteMixin
-
-  def run
-    options = parse_options(argv)
-    options.help ? show_help : run_command(options)
-  end
-
-  private
-
-  def run_command(options)
-    warn "[twenty] down..."
-  end
-end

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-class Twenty::Command::Up < Twenty::Command
-  set_banner usage: "twenty up [OPTIONS]",
-             description: "Start the twenty web server"
-  include CommonOptionMixin
-  prepend Twenty::Command::MigrationMixin
-  prepend Twenty::Command::SQLiteMixin
-
-  def run
-    options = parse_options(argv)
-    options.help ? show_help : run_command(options)
-  end
-
-  private
-
-  def run_command(options)
-    server = Twenty::Servlet.server
-    trap(:SIGINT) { server.shutdown }
-    server.start
-  end
-end

data/lib/twenty-cli.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Twenty
-  require "json"
-  require "twenty-backend"
-  require "twenty-frontend"
-  require_relative "twenty-cli/command"
-end