terminalwire-rails 0.3.0.alpha4 → 0.3.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 782349af7d46483481d8d683a4b7ec0488c0ac4863a9db37f08a3b2b2e999993
-  data.tar.gz: f15feb556d260075dab1b544e145a172fe77632700324f2c89918f90538c1313
+  metadata.gz: e3a8838cb0f35c5f951516be431a90b55c8b9f214f990c75afbcb3b4831b92cc
+  data.tar.gz: e1e9def109666144250e0cfcd2d4deb48f9b363b310d5adfb5aa7f66a0cd24f2
 SHA512:
-  metadata.gz: d9b8508ab1ec6922143e78f8699f9376c9743c3d9a11ef0c85ab2c2bfceb6062e9f51ea110f72cc13b3f2a4d1fbc9a238a87febc7b705d5f5bd764de83f8b570
-  data.tar.gz: 9e21c0f28f7f87bab9ab5a3058eba193fb3ad61630fc2c79701c4ce66847704a0d42e7514ca230d1a8008ca3472a6a754a67e657ad153a3181976d3a9c9a1abd
+  metadata.gz: 6c657f110a45428c9cac644afeba5f7f7c57a3eaf545e6cef1b9c5a1ffe52de159bdfb5e8b77f0ebb9835fbaa569e9d5ee806b6669c156f8e3307982e1316cab
+  data.tar.gz: 6f9b7e814bfc445f8dbf4b185443d71ef4bbf0b212bd476396c57345bafa0ad7fcb9df512d98b9f725b937302840c0fdd8839af5961ea8c5ab05ecd3dddb4771

data/lib/generators/terminalwire/install/templates/application_terminal.rb.tt

@@ -16,6 +16,6 @@ class ApplicationTerminal < Thor
   end
 
   def current_user
-    @current_user ||= User.find(session["user_id"])
+    @current_user ||= User.find_by(id: session["user_id"])
   end
 end

data/lib/terminalwire/rails.rb

@@ -84,7 +84,7 @@ module Terminalwire
         "An error occurred. Please try again."
       end
 
-      def handle(adapter)
+      def handle(adapter:, env:)
         logger.info "ThorServer: Running #{@cli_class.inspect}"
         while message = adapter.read
           case message
@@ -92,12 +92,27 @@ module Terminalwire
             context = Terminalwire::Server::Context.new(adapter:, entitlement:)
 
             begin
-              @cli_class.start(arguments, context:)
+              @cli_class.terminalwire arguments:, context: do |cli|
+                cli.default_url_options = { host: env["HTTP_HOST"] }
+              end
               context.exit
             rescue StandardError => e
+              # Log the error
+              handler_error_message = <<~_
+                An error occured handling message in #{self.class.name}: #{e.inspect}
+                Error: #{e.message}
+                Backtrace: #{e.backtrace.join("\n")}
+                Handler: #{self.inspect}
+                Message: #{message.inspect}
+              _
+
+              ::Rails.logger.error(handler_error_message)
+              # Report the error to Rails' notification system
+              ::Rails.error.report(e, handled: true)
+
               if ::Rails.application.config.consider_all_requests_local
                 # Show the full error message with stack trace in development
-                context.stderr.puts "#{e.inspect}\n#{e.backtrace.join("\n")}"
+                context.stderr.puts handler_error_message
               else
                 # Show a generic message in production
                 context.stderr.puts error_message
@@ -110,7 +125,41 @@ module Terminalwire
     end
   end
 
-  # Alias so we can put off breaking `include Terminalwire::Thor`
-  # in the ApplicationTerminal class.
-  Thor = Terminalwire::Server::Thor
+  # If I move this, then the current production integration breaks because
+  # it wants `include Terminalwire::Thor`.
+  module Thor
+    class Shell < Terminalwire::Server::Thor::Shell
+      attr_reader :session
+
+      def initialize(context, *, **, &)
+        @session = Terminalwire::Rails::Session.new(context:)
+        super(context, *,**,&)
+      end
+    end
+
+    def self.included(base)
+      base.include Terminalwire::Server::Thor
+      base.extend ClassMethods
+
+      # I have to do this in a block to deal with some of Thor's DSL
+      base.class_eval do
+        protected
+
+        no_commands do
+          def_delegators :shell,
+            :session
+
+          include ::Rails.application.routes.url_helpers
+        end
+      end
+    end
+
+    module ClassMethods
+      def terminalwire(arguments:, context:)
+        dispatch(nil, arguments.dup, nil, shell: Shell.new(context)) do |instance|
+          yield instance if block_given?
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: terminalwire-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha4
+  version: 0.3.0.alpha5
 platform: ruby
 authors:
 - Brad Gessler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminalwire-server
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.alpha4
+        version: 0.3.0.alpha5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.alpha4
+        version: 0.3.0.alpha5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +74,6 @@ metadata:
   source_code_uri: https://github.com/terminalwire/ruby/tree/main/terminalwire-rails
   changelog_uri: https://github.com/terminalwire/ruby/tags
   funding_uri: https://terminalwire.com/funding
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ship a CLI for your web app. No API required.
 test_files: []