foobara-sh-cli-connector 0.0.10 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b947cee595a654d406a661d30431063454d79f6c6af716e98be1ac6dc710884c
-  data.tar.gz: b5738adbb22bde8105ba81a5e72672c4de819cb7db897b01e920ac51be3c9329
+  metadata.gz: baee3b1690dc7108efe1763f106088b5c60ec44bee67f9e5e973af806dc23dcb
+  data.tar.gz: ff4692056eed0949ef1c4f1b0ece541e3c5805ed9afd1fb282feb35727c48780
 SHA512:
-  metadata.gz: c8c99d022c86899d8cbdb0d026a6db3073d3ec85e9cae677a1a6ec34e1233897e7688992b6e7ab138442f8ba2670a5398771e5b3f23f726e5f1095ab226135a3
-  data.tar.gz: ed5e06abe72c37b470ed73946411c368076d7e6dc9cdcd99e38fb49adca133ed5023a2be71414019e19839759e0ede6366a51020f6481848c3c98e98b67916fa
+  metadata.gz: c45bc3cb9f0d47d3ec1dce2cc6fb7ce34712905f9f2c8895d03c56ba5e3bc1a285bc5f325740d17c5d7f6403e17892836b71829f0d065e1c4e0d124823e5c97d
+  data.tar.gz: 7de22a9ff9f3f780b08eb8cb4587204232d7d5e8bd00ccedfead314d737401acd31a51c26a13bc68ad518ec336003e1332aabf2ff40040b336ed70b897fb555a

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [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:
+
+## [0.0.11] - 2025-01-07
+
+- Bump Ruby to 3.4.1
+
 ## [0.0.10] - 2024-12-09
 
 - Do not explode when serializing an empty table

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
 
@@ -144,9 +145,9 @@ module Foobara
         end
 
         def validate_parse_result!
-          if action == "help" || action == "list"
+          if %w[help list].include?(action)
             # This gives some leniency around where the global options are when there's no command
-            result  = globalish_parser.parse(inputs_argv)
+            result = globalish_parser.parse(inputs_argv)
 
             if result.remainder.any?
               # :nocov:

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

@@ -7,10 +7,22 @@ module Foobara
 
       def initialize(*, program_name: File.basename($PROGRAM_NAME), single_command_mode: false, **, &)
         self.program_name = program_name
-        self.single_command_mode = single_command_mode
+
+        connect_args = if single_command_mode
+                         self.single_command_mode = true
+
+                         if single_command_mode.is_a?(::Array)
+                           single_command_mode
+                         elsif single_command_mode.is_a?(::Class) && single_command_mode < Foobara::Command
+                           [single_command_mode]
+                         end
+                       end
+
         super(*, **, &)
 
-        #        add_default_inputs_transformer ModelsToAttributesInputsTransformer
+        if connect_args
+          connect(*connect_args)
+        end
       end
 
       def connect(...)
@@ -53,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,30 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: foobara-sh-cli-connector
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.13
 platform: ruby
 authors:
 - Miles Georgi
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2025-03-28 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'
-description:
+        version: 0.0.88
 email:
 - azimux@gmail.com
 executables: []
@@ -64,7 +62,6 @@ metadata:
   source_code_uri: https://github.com/foobara/sh-cli-connector
   changelog_uri: https://github.com/foobara/sh-cli-connector/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,15 +69,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.2
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Command-line connector for Foobara
 test_files: []