terminalwire-rails 0.3.0.alpha3 → 0.3.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69eeceaeae26063a0039adb4e8da3291e292d09e555d2d61b46726d78953b57f
-  data.tar.gz: ff993fe288abe17ca0f61393acbfb684cebf720b573dc607584c75296a4e313e
+  metadata.gz: e3a8838cb0f35c5f951516be431a90b55c8b9f214f990c75afbcb3b4831b92cc
+  data.tar.gz: e1e9def109666144250e0cfcd2d4deb48f9b363b310d5adfb5aa7f66a0cd24f2
 SHA512:
-  metadata.gz: accfc6aac85614e0ea8462814d3b44443819f36eb726a541e6319372a75c29618a50c2406375894b26fc71cc414862990510bc4d1e977a89b2077be83929c171
-  data.tar.gz: 58c9a8189d0d1d36ff45c7fc14ea5ad7a44993a0598d783611f8d1efb5b9bc8847406ce77869e769e743565d31aabe4b61efd59865ab0cdf59eeaa3ff9298b58
+  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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: terminalwire-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha3
+  version: 0.3.0.alpha5
 platform: ruby
 authors:
 - Brad Gessler
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminalwire-server
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.alpha3
+        version: 0.3.0.alpha5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0.alpha3
+        version: 0.3.0.alpha5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement