terminalwire 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0eeaa4d2a6f23524e964bbd0fa0e507eca1415f591e71a565a47553411cf916
-  data.tar.gz: 30d9f26ce42e8e5a4f301bd4d99ca5ead398554f737b0ffe693aa921fd8e8bb2
+  metadata.gz: 55ab6e5d0132726c5041fce03026f14963c2de4b60a2bc92cd2560b7f14890cf
+  data.tar.gz: b2f1d360f6135fddf2ab90ca5ad992f1e313ccd4de09cd8bca9314b6af0dbaac
 SHA512:
-  metadata.gz: fb69226b00de7e49c73bcc1383aa5d31645cddd49d40c945131cb2e5b7c8c962a206c97127812278642c08371641e01a9a5d223f01c75551689d50a76257f691
-  data.tar.gz: 62412bf6431e84e49895887ca879045038bc046470b32863056db319f4e69e0f8ecfdfac2e9141543d3ecf0dcbc5d3ba9821046828bd05a40653ab60512db0a5
+  metadata.gz: 5f003df286a23cff8e92c92d5372f81dc7cc0a915b1d32a6ba8c0bd5005a54395286b9a72aad2d6cc9856d0e6ba2c1622757a6bfbf8aba343885e55b42980227
+  data.tar.gz: eb480c644c568de7b6391a4e3310219fbf64869972eaeac7f0d4a7a6365b8fb644edd0193ae3920df604b3044b14fdfc09f05aa39a491be5d634ab084d8058d3

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

@@ -12,13 +12,13 @@ class ApplicationTerminal < Thor
   desc "login", "Login to your account"
   def login
     print "Email: "
-    email = gets
+    email = gets.chomp
 
     print "Password: "
     password = getpass
 
     if self.current_user = User.authenticate(email, password)
-      puts "Successfully logged in as #{user.email}."
+      puts "Successfully logged in as #{current_user.email}."
     else
       puts "Could not find a user with that email and password."
     end
@@ -27,7 +27,7 @@ class ApplicationTerminal < Thor
   desc "whoami", "Displays current user information."
   def whoami
     if self.current_user
-      puts "Logged in as #{user.email}."
+      puts "Logged in as #{current_user.email}."
     else
       puts "Not logged in. Run `#{self.class.basename} login` to login."
     end
@@ -49,6 +49,6 @@ class ApplicationTerminal < Thor
   end
 
   def current_user
-    @current_user ||= User.find(session.fetch("user_id"))
+    @current_user ||= User.find(session["user_id"])
   end
 end

data/lib/terminalwire/adapter.rb

@@ -17,7 +17,7 @@ module Terminalwire::Adapter
       @transport.write(packed_data)
     end
 
-    def recv
+    def read
       logger.debug "Adapter: Reading"
       packed_data = @transport.read
       return nil if packed_data.nil?

data/lib/terminalwire/client/resource.rb

@@ -1,4 +1,5 @@
 require "fileutils"
+require "io/console"
 
 module Terminalwire::Client::Resource
   # Dispatches messages from the Client::Handler to the appropriate resource.

data/lib/terminalwire/client.rb

@@ -17,8 +17,6 @@ module Terminalwire
         @program_arguments = arguments
         @program_name = program_name
 
-        FileUtils.mkdir_p entitlement.storage_path
-
         @resources = Resource::Handler.new do |it|
           it << Resource::STDOUT.new("stdout", @adapter, entitlement:)
           it << Resource::STDIN.new("stdin", @adapter, entitlement:)
@@ -39,7 +37,7 @@ module Terminalwire
          })
 
         loop do
-          handle @adapter.recv
+          handle @adapter.read
         end
       end
 

data/lib/terminalwire/server/resource.rb

@@ -12,7 +12,7 @@ module Terminalwire::Server
           parameters: parameters
         )
 
-        response = @adapter.recv
+        response = @adapter.read
         case response.fetch(:status)
         when "success"
           response.fetch(:response)

data/lib/terminalwire/server.rb

@@ -53,13 +53,15 @@ module Terminalwire
       private
 
       def run(adapter)
-        while message = adapter.recv
+        while message = adapter.read
           puts message
         end
       end
     end
 
     class Thor < WebSocket
+      Rails = ::Rails
+
       include Logging
 
       def initialize(cli_class)
@@ -70,13 +72,29 @@ module Terminalwire
         end
       end
 
+      def error_message
+        "An error occurred. Please try again."
+      end
+
       def run(adapter)
         logger.info "ThorServer: Running #{@cli_class.inspect}"
-        while message = adapter.recv
+        while message = adapter.read
           case message
           in { event: "initialization", protocol:, program: { arguments: }, entitlement: }
-            Terminalwire::Server::Context.new(adapter:, entitlement:) do |context|
+            context = Terminalwire::Server::Context.new(adapter:, entitlement:)
+
+            begin
               @cli_class.start(arguments, context:)
+              context.exit
+            rescue StandardError => e
+              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")}"
+              else
+                # Show a generic message in production
+                context.stderr.puts error_message
+              end
+              context.exit 1
             end
           end
         end
@@ -93,7 +111,7 @@ module Terminalwire
       def run
         logger.info "Server Handler: Running"
         loop do
-          message = @adapter.recv
+          message = @adapter.read
           case message
           in { event: "initialization", protocol:, program: { arguments: }, entitlement: }
             Context.new(adapter: @adapter) do |context|

data/lib/terminalwire/thor.rb

@@ -35,7 +35,7 @@ module Terminalwire
           def_delegators :stdout,
             :puts, :print
           def_delegators :stdin,
-            :gets
+            :gets, :getpass
 
           # Feels more naturual to call `client.files` etc. from
           # the serve since it's more apparent that it's a client.

data/lib/terminalwire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Terminalwire
-  VERSION = "0.1.9"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminalwire
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-28 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket