foobara-sh-cli-connector 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df5c4fd103cab9693642c588edfbabbb886b72415744891b49d527777191d502
-  data.tar.gz: 570b3e18e965e139ef7a490c82b45a84e31f59ec5090d8b2762b57e69c94ca5e
+  metadata.gz: 665dbe7ec95119ae45a08a732dd7435b4a95a77a65f9db4fbe886fc682f34a68
+  data.tar.gz: a296ff798f597f90d638ae67b1352a41b4f043e29aef811a00e3f4c084ee4ab2
 SHA512:
-  metadata.gz: b55e725797013e2f711776d0281724ff80fc0cb9d8aa33dfbafcf629e3541e8c9530f5ecf15a115a76aea01c67ed6b6b03157a34e7a15b9b98997c9043bccf40
-  data.tar.gz: 7f0ca76f1e4c4c5711aa0ee20352fd13fbbab793472444b4193df0fe3506a128f0283dc6985ce50e4276372cd82a9b6bdcee558c06b6a8521f1b4ef350eedfd9
+  metadata.gz: af0c874392c53914b85bda8d5513464b725b50cf833207e9ac4b232c921961ce8e62b97d1990319efe3ac6e2dcad6327abe28a618c4b3f63d00928cf82efb9e5
+  data.tar.gz: 4c9d55a9d040971adbd62cddc94560291667385de959460ad63d0d7d0cb7e2c5d19c5068e3ee6f4f6ebc47b1063373d9b335f6718f14749d50e9aa29c576c566

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.14] - 2025-04-11
+
+- Handle newer versions of foobara
+
+## [0.0.13] - 2025-03-28
+
+- Handle recent #request_to_response refactor
+
 ## [0.0.12] - 2025-03-06
 
 - Allow passing a command or connect args to single_command_mode:

data/src/sh_cli_connector/inputs_parser.rb

@@ -11,6 +11,8 @@ module Foobara
 
           def validate!
             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}"
             end
           end

data/src/sh_cli_connector/request.rb

@@ -120,6 +120,7 @@ module Foobara
             # TODO: needs to be the only registered command
             self.argument = command
             self.inputs_argv = argv
+            self.command_class = command.command_class
           end
         end
 

data/src/sh_cli_connector/serializers/cli_result_serializer.rb

@@ -3,9 +3,9 @@ module Foobara
     class ShCliConnector < CommandConnector
       module Serializers
         # Should allow either atomic or aggregate
-        class CliResultSerializer < CommandConnectors::Serializers::AtomicSerializer
+        class CliResultSerializer < CommandConnectors::Serializers::SuccessSerializer
           def serialize(object)
-            serializable = super
+            serializable = atomic_serializer.serialize(object)
 
             if serializable.is_a?(::String)
               serializable
@@ -19,6 +19,10 @@ module Foobara
             end
           end
 
+          def atomic_serializer
+            @atomic_serializer ||= Foobara::CommandConnectors::Serializers::AtomicSerializer.new
+          end
+
           private
 
           def print(io, object, padding = nil, after_colon: false)

data/src/sh_cli_connector/serializers/cli_tabular_serialzier.rb

@@ -172,8 +172,8 @@ module Foobara
 
                     parts_size = parts.size
 
-                    parts.each.with_index do |rows_worth, index|
-                      rows_worth << "-" unless index == parts_size - 1
+                    parts.each.with_index do |rows_worth, inner_index|
+                      rows_worth << "-" unless inner_index == parts_size - 1
                       cell << rows_worth
                     end
                   else

data/src/sh_cli_connector.rb

@@ -40,7 +40,7 @@ module Foobara
                     command_registry.foobara_all_command.first
                   end
 
-        self.class::Request.new(*, **, command:, &)
+        super(*, **, command:, &)
       end
 
       # TODO: this needs a better name... it's doing more than building.
@@ -65,48 +65,54 @@ module Foobara
         nil
       end
 
-      def request_to_response(request)
-        if request.error
-          case request.error
-          when ParseError, CommandConnector::NotFoundError
-            return Response.new(status: 6, body: request.error.message, request:)
-          else
-            # :nocov:
-            raise "Not sure how to handle error: #{request.error}"
-            # :nocov:
-          end
-        end
+      def set_response_status(response)
+        request = response.request
+
+        response.status = if request.error
+                            6
+                          elsif request.success?
+                            0
+                          else
+                            errors = request.error_collection.error_array
+                            error = errors.first
+
+                            case error
+                            when CommandConnector::NotFoundError, Foobara::Entity::NotFoundError
+                              # TODO: we should not be coupled to Entities here...
+                              # :nocov:
+                              2
+                              # :nocov:
+                            when CommandConnector::UnauthenticatedError
+                              # :nocov:
+                              3
+                              # :nocov:
+                            when CommandConnector::NotAllowedError
+                              # :nocov:
+                              4
+                              # :nocov:
+                            when CommandConnector::UnknownError
+                              # :nocov:
+                              5
+                              # :nocov:
+                            end || 1
+                          end
+      end
 
-        body = request.response_body
-
-        status = if request.success?
-                   0
-                 else
-                   errors = request.error_collection.error_array
-                   error = errors.first
-
-                   case error
-                   when CommandConnector::NotFoundError, Foobara::Entity::NotFoundError
-                     # TODO: we should not be coupled to Entities here...
-                     # :nocov:
-                     2
-                   # :nocov:
-                   when CommandConnector::UnauthenticatedError
-                     # :nocov:
-                     3
-                   # :nocov:
-                   when CommandConnector::NotAllowedError
-                     # :nocov:
-                     4
-                   # :nocov:
-                   when CommandConnector::UnknownError
-                     # :nocov:
-                     5
-                     # :nocov:
-                   end || 1
-                 end
-
-        Response.new(status:, body:, request:)
+      def set_response_body(response)
+        request = response.request
+
+        response.body = if request.error
+                          case request.error
+                          when ParseError, CommandConnector::NotFoundError
+                            request.error.message
+                          else
+                            # :nocov:
+                            raise "Not sure how to handle error: #{request.error}"
+                            # :nocov:
+                          end
+                        else
+                          request.response_body
+                        end
       end
     end
   end

metadata

@@ -1,28 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: foobara-sh-cli-connector
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.88
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.88
 email:
 - azimux@gmail.com
 executables: []
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Command-line connector for Foobara
 test_files: []