terminalwire 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd319cc4f277520d44209f8317dabcb9113f1cb925f1ee6090e842ec007770b
-  data.tar.gz: 1a7f2c111dfd9ac6576ae63d52b8342ebaff87e64c7a41202a8baf96cd786434
+  metadata.gz: 0ffa1e8b55e7c09d41b9a57fc645e950e65f6658767022cf67cac994823fb760
+  data.tar.gz: 32fb995746b753eeed71543b954aa2376c2af4b1e61721b14eac8704c9f555f6
 SHA512:
-  metadata.gz: baf4b6ba33de5b317ce0fb52322b5b77c3bdc9cb7804245abf0b4969458024c24d58b08a45df88890d1bd902efdc61fbb7b78aef9a14be8ccde633eb10a7b2c8
-  data.tar.gz: 3b553a00a66b9b6f26fbca86efa973058e6fca4ae3a13a5182772e3f2cfe83db8467ef49d0400e448fb55d70604f3207804aafcb550231fb0bd0decb06d494bd
+  metadata.gz: cb3ca0210a84eb64c924522d4eeb04f75a59bf8d785581a232216c8c417ecc837a66001947449e4da91127ebe942c12bce6ea07f8de1be2fe1fc69e5dcfdc332
+  data.tar.gz: e9e0ea45f77040fc503acf2c09f22671d2a09f26315cad69ce1de8e62d4d0578b96663db13414446b7e99ce4abd3dd792ccb6b9191462ae6f67ff8789750856a

data/LICENSE.txt

@@ -1 +1,9 @@
-Copyright (c) 2024 Brad Gessler. Email brad@terminalwire.com to discuss licensing.
+Copyright (c) 2024 Brad Gessler.
+
+License is propietary. Here's the deal:
+
+* You need to pay for Terminalwire if your business has more than $1m in assets or makes more than $100k/year in revenue.
+* Terminalwire is free for personal use, hobbyists, or businesses that are just starting out, but server licenses still need to be registered at https://terminalwire.com/developers/licenses.
+* You can only use the Terminalwire client with licensed Terminalwire servers.
+
+This list is not exhaustive, please read the full license text at https://terminalwire.com/license.

data/lib/generators/terminalwire/install/install_generator.rb

@@ -7,6 +7,7 @@ class Terminalwire::InstallGenerator < Rails::Generators::Base
 
   def create_terminal_files
     template "application_terminal.rb.tt", Rails.root.join("app/terminal/application_terminal.rb")
+    template "main_terminal.rb", Rails.root.join("app/terminal/main_terminal.rb")
   end
 
   def create_binary_files
@@ -17,7 +18,7 @@ class Terminalwire::InstallGenerator < Rails::Generators::Base
   def add_route
     route <<~ROUTE
       match "/terminal",
-        to: Terminalwire::Server::Thor.new(ApplicationTerminal),
+        to: Terminalwire::Server::Thor.new(MainTerminal),
         via: [:get, :connect]
     ROUTE
   end

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

@@ -1,44 +1,11 @@
 # Learn how to use Thor at http://whatisthor.com.
 class ApplicationTerminal < Thor
+  # Enables IO Streaming.
   include Terminalwire::Thor
 
+  # The name of your binary. Thor uses this for its help output.
   def self.basename = "<%= binary_name %>"
 
-  desc "hello NAME", "say hello to NAME"
-  def hello(name)
-    puts "Hello #{name}"
-  end
-
-  desc "login", "Login to your account"
-  def login
-    print "Email: "
-    email = gets
-
-    print "Password: "
-    password = getpass
-
-    if self.current_user = User.authenticate(email, password)
-      puts "Successfully logged in as #{user.email}."
-    else
-      puts "Could not find a user with that email and password."
-    end
-  end
-
-  desc "whoami", "Displays current user information."
-  def whoami
-    if self.current_user
-      puts "Logged in as #{user.email}."
-    else
-      puts "Not logged in. Run `#{self.class.basename} login` to login."
-    end
-  end
-
-  desc "logout", "Logout of your account"
-  def logout
-    session.reset
-    puts "Successfully logged out."
-  end
-
   private
 
   def current_user=(user)
@@ -49,6 +16,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/generators/terminalwire/install/templates/main_terminal.rb

@@ -0,0 +1,40 @@
+class MainTerminal < ApplicationTerminal
+  desc "hello NAME", "say hello to NAME"
+  def hello(name)
+    puts "Hello #{name}"
+  end
+
+  desc "login", "Login to your account"
+  def login
+    print "Email: "
+    email = gets.chomp
+
+    print "Password: "
+    password = getpass
+
+    # Replace this with your own authentication logic; this is an example
+    # of how you might do this with Devise.
+    user = User.find_for_authentication(email: email)
+    if user && user.valid_password?(password)
+      self.current_user = user
+      puts "Successfully logged in as #{current_user.email}."
+    else
+      puts "Could not find a user with that email and password."
+    end
+  end
+
+  desc "whoami", "Displays current user information."
+  def whoami
+    if self.current_user
+      puts "Logged in as #{current_user.email}."
+    else
+      puts "Not logged in. Run `#{self.class.basename} login` to login."
+    end
+  end
+
+  desc "logout", "Logout of your account"
+  def logout
+    session.reset
+    puts "Successfully logged out."
+  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

@@ -37,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.10"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminalwire
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-28 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
@@ -158,6 +158,7 @@ files:
 - lib/generators/terminalwire/install/install_generator.rb
 - lib/generators/terminalwire/install/templates/application_terminal.rb.tt
 - lib/generators/terminalwire/install/templates/bin/terminalwire
+- lib/generators/terminalwire/install/templates/main_terminal.rb
 - lib/terminalwire.rb
 - lib/terminalwire/adapter.rb
 - lib/terminalwire/client.rb
@@ -175,7 +176,7 @@ files:
 - sig/terminalwire.rbs
 homepage: https://terminalwire.com/ruby
 licenses:
-- Proprietary
+- Proprietary (https://terminalwire.com/license)
 metadata:
   allowed_push_host: https://rubygems.org/
   homepage_uri: https://terminalwire.com/ruby