terminalwire-client 0.3.5.alpha2 → 0.3.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71670dcad977bad04159203205f6633a2d58cb69ada42ff31a20020da4cb78da
-  data.tar.gz: 47e09b84bdce4377c8f537fd280fe87b46a472f727067e264132b372f79f4b59
+  metadata.gz: a9be7d471f5b59d1c6ea38379eb86a6775989432e3e77724395ef16b653d40c4
+  data.tar.gz: bcf718fed5322c5e812f4c7ef25f68d332cd84cf1c3ed195751d7376e6b4243a
 SHA512:
-  metadata.gz: 2ea6735db6ec83b7c6102ed269505dc2afe6ea95268b1a33ed4fc4cdd327127f8776d4df8cc798640bb071d4e0e4e23347312edf5590de272e074ce129bfd294
-  data.tar.gz: 3b666212526f3b183ff8f8d4d302ff87edd1f27ddb7ae3f1deda90107eccff6d33898d7422972461b6348c4b4ac658c2fbe4a0933f1a066a96457c47609e3cad
+  metadata.gz: 4f5038358a03b60e9bc40b4d12f581c88a16d1b277663b25d07ffa17ae95652948cadd90ef6fb846e49689490aa44c6b5205f76a961f074c47fac87af9a30742
+  data.tar.gz: a470a342cb59c467b1126363631c0b1765ed66d2d541726ac1ff4f0c7a8230a2aaa9ca2f1970e5217edd14004fd79bc417cf7cb8cdb31e0a653a085e740243b7

data/lib/terminalwire/client/handler.rb

@@ -15,19 +15,14 @@ module Terminalwire::Client
       @adapter = adapter
       @program_arguments = arguments
       @program_name = program_name
-      @entitlement = Entitlement::Policy.resolve(authority: @endpoint.authority)
-
+      @entitlement = Entitlement::Policy.resolve(
+        authority: @endpoint.authority
+      )
+      @resources = Resource::Handler.new(
+        adapter: @adapter,
+        entitlement: @entitlement
+      )
       yield self if block_given?
-
-      @resources = Resource::Handler.new do |it|
-        it << Resource::STDOUT.new("stdout", @adapter, entitlement:)
-        it << Resource::STDIN.new("stdin", @adapter, entitlement:)
-        it << Resource::STDERR.new("stderr", @adapter, entitlement:)
-        it << Resource::Browser.new("browser", @adapter, entitlement:)
-        it << Resource::File.new("file", @adapter, entitlement:)
-        it << Resource::Directory.new("directory", @adapter, entitlement:)
-        it << Resource::EnvironmentVariable.new("environment_variable", @adapter, entitlement:)
-      end
     end
 
     def verify_license

data/lib/terminalwire/client/resource.rb

@@ -6,8 +6,20 @@ module Terminalwire::Client::Resource
   class Handler
     include Enumerable
 
-    def initialize
+    def initialize(adapter:, entitlement:)
+      @adapter = adapter
+      @entitlement = entitlement
       @resources = {}
+      
+      # Register default resources
+      self << STDOUT
+      self << STDIN
+      self << STDERR
+      self << Browser
+      self << File
+      self << Directory
+      self << EnvironmentVariable
+      
       yield self if block_given?
     end
 
@@ -15,12 +27,18 @@ module Terminalwire::Client::Resource
       @resources.values.each(&block)
     end
 
-    def add(resource)
+    def add(resource_class)
+      # Get the resource name from its key
+      resource_name = resource_class.key
+      
+      # Instantiate the resource with proper parameters
+      resource = resource_class.new(resource_name, @adapter, entitlement: @entitlement)
+      
       # Detect if the resource is already registered and throw an error
-      if @resources.key?(resource.name)
-        raise "Resource #{resource.name} already registered"
+      if @resources.key?(resource_name)
+        raise "Resource #{resource_name} already registered"
       else
-        @resources[resource.name] = resource
+        @resources[resource_name] = resource
       end
     end
     alias :<< :add
@@ -36,10 +54,12 @@ module Terminalwire::Client::Resource
 
   # Dispatcher, security, and response macros for resources.
   class Base < Terminalwire::Resource::Base
-    def initialize(*, entitlement:, **)
-      super(*, **)
+    def initialize(name = nil, adapter = nil, entitlement: nil)
+      # Use class key as default name if not provided
+      name ||= self.class.key if self.class.respond_to?(:key)
+      super(name, adapter)
       @entitlement = entitlement
-      connect
+      connect if entitlement # Only connect if entitlement is provided
     end
 
     def command(command, **parameters)
@@ -63,6 +83,10 @@ module Terminalwire::Client::Resource
   end
 
   class EnvironmentVariable < Base
+    def self.key
+      "environment_variable"
+    end
+
     # Accepts a list of environment variables to permit.
     def read(name:)
       ENV[name]
@@ -80,6 +104,10 @@ module Terminalwire::Client::Resource
   end
 
   class STDOUT < Base
+    def self.key
+      "stdout"
+    end
+
     def connect
       @io = $stdout
     end
@@ -100,12 +128,20 @@ module Terminalwire::Client::Resource
   end
 
   class STDERR < STDOUT
+    def self.key
+      "stderr"
+    end
+
     def connect
       @io = $stderr
     end
   end
 
   class STDIN < Base
+    def self.key
+      "stdin"
+    end
+
     def connect
       @io = $stdin
     end
@@ -126,6 +162,10 @@ module Terminalwire::Client::Resource
   end
 
   class File < Base
+    def self.key
+      "file"
+    end
+
     File = ::File
 
     def read(path:)
@@ -160,6 +200,10 @@ module Terminalwire::Client::Resource
   end
 
   class Directory < Base
+    def self.key
+      "directory"
+    end
+
     File = ::File
 
     def list(path:)
@@ -188,6 +232,10 @@ module Terminalwire::Client::Resource
   end
 
   class Browser < Base
+    def self.key
+      "browser"
+    end
+
     def launch(url:)
       Launchy.open(URI(url))
       # TODO: This is a hack to get the `respond` method to work.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: terminalwire-client
 version: !ruby/object:Gem::Version
-  version: 0.3.5.alpha2
+  version: 0.3.5.rc1
 platform: ruby
 authors:
 - Brad Gessler
 bindir: bin
 cert_chain: []
-date: 2025-05-01 00:00:00.000000000 Z
+date: 2025-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.5.alpha2
+        version: 0.3.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.5.alpha2
+        version: 0.3.5.rc1
 description: Stream command-line apps from your server without a web API
 email:
 - brad@terminalwire.com