foobara-sh-cli-connector 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dcda00a8c3db19bc9c8fc042426474b84556ba1194f7e1ed8342f611591a09a
-  data.tar.gz: 9d6eebb26d928a7fa95d37e9212d23a0cf1323d870c0c04f5292de9fbb06155d
+  metadata.gz: 59a7b3a60573d7c637f5526e2a6d028c48906c7b5a865f2d204d64a48a25cf1f
+  data.tar.gz: dfc47f6db70767c09e9cab51c0c569d0ddc291f2d1abe3e29e5c7a4ecb7c9e11
 SHA512:
-  metadata.gz: aab655719d3de0f52e7d0bbce98d25c3351c8f09ac5fb755811748b00c7072c532cbe22d76a650602da993f159e14eeb1a201948e095a5bc4cef19ec3a0a2d0f
-  data.tar.gz: 10f7d27ca54c33198040919acfb1376489b8f2fa1a25b1a264e589179b48cd1c975434b086342f319f82d501bb0e938889d614c8938db2d4309cb960302a12fd
+  metadata.gz: 6846e7d9362da9319f52d7c281feb802511199cdd0000aa6e7f40a161dc44fabc3a7676f66aee4e7795cccd6b29795efffaa2685db4e731d3f49777a9b1b91e6
+  data.tar.gz: 43c0b652981b6b113f92ebaaaa5f639e2915e02cb78a6e930e3e499b5524c1aa674eae9a5d7e99a603af08fff9e70c4cae1fe7c390d22db33f643acdee7cf412

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.0.17] - 2025-05-03
+
+- Deal with recent CommandConnector interface changes
+- Make ParseError a Foobara::Error
+
 ## [0.0.16] - 2025-04-23
 
 - Give a way to force inputs to be fully prefixed even if they don't collide

data/src/sh_cli_connector/action_parser.rb

@@ -14,11 +14,11 @@ module Foobara
           def action=(action)
             if @action
               # :nocov:
-              raise ParseError, "Action already set"
+              raise ParseError.new(message: "Action already set")
               # :nocov:
             elsif argument
               # :nocov:
-              raise ParseError, "Not expecting #{action} to appear after #{argument}"
+              raise ParseError.new(message: "Not expecting #{action} to appear after #{argument}")
               # :nocov:
             else
               @action = action
@@ -28,7 +28,7 @@ module Foobara
           def argument=(argument)
             if @argument
               # :nocov:
-              raise ParseError, "Argument already set"
+              raise ParseError.new(message: "Argument already set")
               # :nocov:
             end
 
@@ -37,17 +37,18 @@ module Foobara
 
           def validate!
             if action.nil?
-              raise ParseError,
-                    "Found invalid option #{remainder.first} but was expecting an action like 'run' or 'help'"
+              raise ParseError.new(
+                message: "Found invalid option #{remainder.first} but was expecting an action like 'run' or 'help'"
+              )
             end
 
             if action == "run"
               unless argument
-                raise ParseError, "Missing command to run"
+                raise ParseError.new(message: "Missing command to run")
               end
             elsif action == "describe"
               unless argument
-                raise ParseError, "Missing command or type to describe"
+                raise ParseError.new(message: "Missing command or type to describe")
               end
             end
           end

data/src/sh_cli_connector/globalish_parser.rb

@@ -93,7 +93,7 @@ module Foobara
           [result.parsed[:input_format], result.parsed[:output_format]].compact.uniq.each do |format|
             if format
               unless Serializer.serializer_from_symbol(format)
-                raise ParseError, "Unknown format: #{format}"
+                raise ParseError.new(message: "Unknown format: #{format}")
               end
             end
           end

data/src/sh_cli_connector/inputs_parser.rb

@@ -13,7 +13,7 @@ module Foobara
             unless remainder.empty?
               # TODO: let's invert the order for single command mode: parse inputs first, then global from remainder,
               # and then raise if there's anything left
-              raise ParseError, "Unexpected argument: #{remainder.first}"
+              raise ParseError.new(message: "Unexpected argument: #{remainder.first}")
             end
           end
         end

data/src/sh_cli_connector/request.rb

@@ -1,7 +1,9 @@
 module Foobara
   module CommandConnectors
     class ShCliConnector < CommandConnector
-      class ParseError < StandardError; end
+      class ParseError < Foobara::Error
+        context({})
+      end
 
       class Request < CommandConnector::Request
         attr_accessor :argv,
@@ -51,7 +53,7 @@ module Foobara
 
             unless serializer_class
               # :nocov:
-              raise ParseError, "Unknown input format: #{input_format}"
+              raise ParseError.new(message: "Unknown input format: #{input_format}")
               # :nocov:
             end
 
@@ -151,7 +153,7 @@ module Foobara
 
             if result.remainder.any?
               # :nocov:
-              raise ParseError, "Found invalid options #{globalish_parser.remainder}"
+              raise ParseError.new(message: "Found invalid options #{globalish_parser.remainder}")
               # :nocov:
             end
 

data/src/sh_cli_connector.rb

@@ -70,7 +70,21 @@ module Foobara
         response
       end
 
-      def request_to_command(request)
+      def request_to_command_class(request)
+        super
+      rescue CommandConnector::NoCommandFoundError, ParseError => e
+        request.error = e
+        nil
+      end
+
+      def request_to_command_inputs(request)
+        super
+      rescue CommandConnector::NoCommandFoundError, ParseError => e
+        request.error = e
+        nil
+      end
+
+      def request_to_command_instance(request)
         super
       rescue CommandConnector::NoCommandFoundError, ParseError => e
         request.error = e

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara-sh-cli-connector
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Command-line connector for Foobara
 test_files: []