haveapi-client 0.14.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e057fb019eb27f25b11bfeae4459672d87429111c49d57573a4071dc117bc731
-  data.tar.gz: def4beeeaaef2272452641faeee82f5fa9383e06c892c9f38ab3dcbbdce7775c
+  metadata.gz: b6e5b127dccda20aa750bc4b96439e60ed9b3187d35a75ded882c3ee5f3ae848
+  data.tar.gz: 1d666724640a558352d3f19d18e3de5c0fc3d5185d472f4d21993540d34ca214
 SHA512:
-  metadata.gz: 996154c2f4e58ac56014240871205b7815326b11bcdb5c5f16708f318c6960698edbae2a08dcca19c6668848bbea871559d602be6cdf17c99fb4b2875bbf92cc
-  data.tar.gz: 18ad80e51d76b2a17ec31e4739b0d192438d5b43846c335f167ba23b3c0c1592a95f13737555864127624fb0cf81d2ad34d1c5434b9173d72ab96939dbc08182
+  metadata.gz: edd9c2b63c6276f27306bc7da23f8b1fd124aa8415cc7a4bc63177a82e56fd7174f9dea13e5956cad4ec8cf8c9f912aeda5b57235f985be7000b0f60db9e57bd
+  data.tar.gz: e4c7b696131b8ac85fc66e5937394a247ca71545033358e22bf12ba563a79b0b3b21134db5c1e38552d513aa6af69915c6aa52fce80ddba645deebb31f2b9dab

data/lib/haveapi/cli/output_formatter.rb

@@ -5,8 +5,8 @@ module HaveAPI::CLI
       f.format
     end
 
-    def self.print(*args)
-      f = new(*args)
+    def self.print(*args, **kwargs)
+      f = new(*args, **kwargs)
       f.print
     end
 
@@ -84,7 +84,7 @@ module HaveAPI::CLI
     def generate
       return if @cols.empty?
       prepare
-      
+
       case @layout
       when :columns
         columns
@@ -113,7 +113,7 @@ module HaveAPI::CLI
         i += 1
         ret
       end.join('  ')
-      
+
       line sprintf(formatters, * @cols.map { |c| c[:label] }) if @header
 
       @str_objects.each do |o|
@@ -128,7 +128,7 @@ module HaveAPI::CLI
       @str_objects.each do |o|
         @cols.each_index do |i|
           c = @cols[i]
-        
+
           if o[i].is_a?(::String) && o[i].index("\n")
             lines = o[i].split("\n")
             v = ([lines.first] + lines[1..-1].map { |l| (' ' * (w+3)) + l }).join("\n")
@@ -139,7 +139,7 @@ module HaveAPI::CLI
 
           line sprintf("%#{w}s:  %s", c[:label], v)
         end
-        
+
         line
       end
     end
@@ -155,10 +155,10 @@ module HaveAPI::CLI
 
     def prepare
       @str_objects = []
-      
+
       each_object do |o|
         arr = []
-        
+
         @cols.each do |c|
           v = o[ c[:name] ]
           str = (c[:display] ? c[:display].call(v) : v)
@@ -190,7 +190,7 @@ module HaveAPI::CLI
 
     def col_width(i, c)
       w = c[:label].to_s.length
-      
+
       @str_objects.each do |o|
         len = o[i].to_s.length
         w = len if len > w

data/lib/haveapi/client/action.rb

@@ -12,8 +12,8 @@ module HaveAPI::Client
       apply_args(args)
     end
 
-    def execute(data, *_)
-      args = [self]
+    def execute(data, raw: false)
+      params_arg = {}
 
       if input
         params = Params.new(self, data)
@@ -22,10 +22,10 @@ module HaveAPI::Client
           raise ValidationError.new(self, params.errors)
         end
 
-        args << params.to_api << {}
+        params_arg = params.to_api
       end
 
-      ret = @api.call(*args)
+      ret = @api.call(self, params_arg, raw: raw)
       reset
       ret
     end

data/lib/haveapi/client/client.rb

@@ -49,8 +49,8 @@ class HaveAPI::Client::Client
   end
 
   # See Communicator#authenticate.
-  def authenticate(*args, &block)
-    @api.authenticate(*args, &block)
+  def authenticate(auth_method, **options, &block)
+    @api.authenticate(auth_method, options, &block)
   end
 
   # Get uthentication provider

data/lib/haveapi/client/resource.rb

@@ -76,7 +76,7 @@ module HaveAPI::Client
       action.aliases(true).each do |name|
         next unless define_method?(action, name)
 
-        define_singleton_method(name) do |*args, &block|
+        define_singleton_method(name) do |*args, **kwargs, &block|
           client_opts = @client.opts(:block, :block_interval, :block_timeout)
           all_args = @prepared_args + args
 
@@ -89,28 +89,42 @@ module HaveAPI::Client
             end
 
             if action.unresolved_args?
-              raise ArgumentError.new('One or more object ids missing')
+              raise ArgumentError, 'one or more object ids missing'
             end
           end
 
-          if all_args.empty?
-            all_args << default_action_input_params(action)
+          if all_args.length > 1 || (kwargs.any? && all_args.any?)
+            raise ArgumentError, "too many arguments for action #{@name}##{action.name}"
+          end
+
+          arg = all_args.shift
 
-          elsif all_args.last.is_a?(Hash)
-            last = all_args.pop
+          user_params =
+            if kwargs.any? && arg
+              raise ArgumentError,
+                    'pass the input parameters either as a hash or keyword arguments'
+            elsif kwargs.any?
+              kwargs
+            elsif arg
+              arg
+            end
 
-            if last.has_key?(:meta)
-              meta = last[:meta]
+          if user_params.nil?
+            input_params = default_action_input_params(action)
+
+          else
+            if user_params.has_key?(:meta)
+              meta = user_params[:meta]
 
               %i(block block_interval block_timeout).each do |p|
                 client_opts[p] = meta.delete(p) if meta.has_key?(p)
               end
             end
 
-            all_args << default_action_input_params(action).update(last)
+            input_params = default_action_input_params(action).update(user_params)
           end
 
-          ret = Response.new(action, action.execute(*all_args))
+          ret = Response.new(action, action.execute(input_params))
 
           raise ActionFailed.new(ret) unless ret.ok?
 
@@ -137,8 +151,8 @@ module HaveAPI::Client
             }.each do |k, v|
               wait_opts[v] = client_opts[k] if client_opts.has_key?(k)
             end
-            
-            ret.wait_for_completion(wait_opts) do |state|
+
+            ret.wait_for_completion(**wait_opts) do |state|
               block.call(return_value, state) if block
             end
           end

data/lib/haveapi/client/response.rb

@@ -61,10 +61,10 @@ class HaveAPI::Client::Response
   # it is regularly called with the action's state.
   #
   # @see HaveAPI::Client::Action#wait_for_completion
-  def wait_for_completion(*args, &block)
+  def wait_for_completion(**kwargs, &block)
     id = meta[:action_state_id]
     return nil unless id
 
-    HaveAPI::Client::Action.wait_for_completion(@action.client, id, *args, &block)
+    HaveAPI::Client::Action.wait_for_completion(@action.client, id, **kwargs, &block)
   end
 end

data/lib/haveapi/client/version.rb

@@ -1,6 +1,6 @@
 module HaveAPI
   module Client
     PROTOCOL_VERSION = '2.0'
-    VERSION = '0.14.0'
+    VERSION = '0.15.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-client
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Jakub Skokan
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.24
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: Ruby API and CLI for HaveAPI