haveapi-client 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27e77fcc6b09abb1256fc690f810b3a2b2e6414f7c05b1700fba1c1265b740a3
-  data.tar.gz: d5b67f3dfa43b10abc7f19ce949db3848d6dd498a768ac115209a155baae9bde
+  metadata.gz: 05b1882ec03471aaac2e24887a5d8e79566790d4320c8325407a8317c3e18a16
+  data.tar.gz: a741e6ceacd43b667325dc7e857c19b0df5b913a08b0574b15a9233ec697d867
 SHA512:
-  metadata.gz: 305088bba08a3dd5eb76ee4e9efd8206b07a30a2ebeb8fb5aab456142bb9ae10770a1f5eff0b5cae4465a1a1f19dd06918a10a7b87942eea5b5eea28be1fc742
-  data.tar.gz: 16b373b4ca92362e161db123500e0c306d5b50e37d8d424b246985e3547ae1ad91d2e89a27094c9e280dbb8998858f79887ce4b77787c54e186c4960cc897d9c
+  metadata.gz: bfbb1976f6269371c4bdb63bd3f47d608f97abf1c055b6bfc2c437dbb838a83b0dc29bb1a9a00d082f102e66833f5dd59fb04b7f22d3d09814f02791632704ec
+  data.tar.gz: ac3faa2328d45ef0986e98001a8fd046632c24c32614f9003912b6f8e59a3e9fa395459cd53d4b83047715c676fa0b4811b5b5a94f93a9798d1778bcd85563df

data/lib/haveapi/cli/cli.rb

@@ -160,6 +160,7 @@ module HaveAPI::CLI
     def options
       options = {
           client: default_url,
+          raw_values: false,
           block: true,
           verbose: false
       }
@@ -173,7 +174,7 @@ module HaveAPI::CLI
 
         opts.on('-a', '--auth METHOD', Cli.auth_methods.keys, 'Authentication method') do |m|
           options[:auth] = m
-          connect_api(url: options[:client], version: options[:version])
+          connect_api(url: options[:client], version: options[:version], verify_ssl: options[:verify_ssl])
 
           @auth = Cli.auth_methods[m].new(
             @api,
@@ -237,6 +238,10 @@ module HaveAPI::CLI
           options[:raw] = true
         end
 
+        opts.on('--[no-]raw-values', 'Toggle parameter processing') do |v|
+          options[:raw_values] = v
+        end
+
         opts.on('--timestamp', 'Display Datetime parameters as timestamp') do
           options[:datetime] = :timestamp
         end
@@ -281,6 +286,10 @@ module HaveAPI::CLI
           @action = [:check_compat]
         end
 
+        opts.on('--[no-]verify-ssl', 'Toggle SSL peer verification') do |v|
+          options[:verify_ssl] = v
+        end
+
         opts.on('-h', '--help', 'Show this message') do
           options[:help] = true
         end
@@ -298,7 +307,10 @@ module HaveAPI::CLI
 
       unless options[:auth]
         cfg = server_config(options[:client])
-        connect_api(url: options[:client], version: options[:version]) unless @api
+
+        unless @api
+          connect_api(url: options[:client], version: options[:version], verify_ssl: options[:verify_ssl])
+        end
 
         if (m = cfg[:last_auth])
           @auth = Cli.auth_methods[m].new(
@@ -326,9 +338,8 @@ module HaveAPI::CLI
 
               options[name] = if arg.nil?
                                 read_param(name, p)
-
                               else
-                                args.first
+                                parse_action_param(name, args.first)
                               end
             end
           end
@@ -652,14 +663,33 @@ module HaveAPI::CLI
       @config[:servers].last
     end
 
-    def connect_api(url: nil, version: nil)
+    def connect_api(url: nil, version: nil, verify_ssl: nil)
+      verify_ssl = @opts && @opts[:verify_ssl] if verify_ssl.nil?
+
       @api = HaveAPI::Client::Communicator.new(
         url || api_url,
-        version || (@opts && @opts[:version])
+        version || (@opts && @opts[:version]),
+        verify_ssl: verify_ssl
       )
       @api.identity = $0.split('/').last
     end
 
+    def parse_action_param(name, value)
+      if @opts[:raw_values] || !value.start_with?('@')
+        value
+      elsif value.start_with?('@@')
+        value[1..]
+      else
+        file_path = value[1..]
+
+        begin
+          File.read(file_path)
+        rescue SystemCallError => e
+          raise "Unable to read parameter #{name} from file '#{file_path}': #{e.message}"
+        end
+      end
+    end
+
     def format_errors(action, msg, errors)
       warn "Action failed: #{msg}"
 

data/lib/haveapi/cli/output_formatter.rb

@@ -137,9 +137,7 @@ module HaveAPI::CLI
             v = o[i]
           end
 
-          # rubocop:disable Lint/FormatParameterMismatch
           line format("%#{w}s:  %s", c[:label], v)
-          # rubocop:enable Lint/FormatParameterMismatch
         end
 
         line

data/lib/haveapi/client/authentication/basic.rb

@@ -5,7 +5,12 @@ module HaveAPI::Client::Authentication
     register :basic
 
     def resource
-      RestClient::Resource.new(@communicator.url, @opts[:user], @opts[:password])
+      RestClient::Resource.new(
+        @communicator.url,
+        user: @opts[:user],
+        password: @opts[:password],
+        verify_ssl: @communicator.verify_ssl
+      )
     end
 
     def user = @opts.[](:user)

data/lib/haveapi/client/client.rb

@@ -14,6 +14,7 @@ class HaveAPI::Client::Client
   # @option opts [Boolean] block
   # @option opts [Integer] block_interval
   # @option opts [Integer] block_timeout
+  # @option opts [Boolean] verify_ssl
   def initialize(url, opts = {})
     @setup = false
     @opts = opts
@@ -25,7 +26,11 @@ class HaveAPI::Client::Client
       @api = @opts[:communicator]
 
     else
-      @api = HaveAPI::Client::Communicator.new(url, @version)
+      @api = HaveAPI::Client::Communicator.new(
+        url,
+        @version,
+        **{ verify_ssl: opts[:verify_ssl] }.compact
+      )
       @api.identity = @opts[:identity]
     end
   end
@@ -80,7 +85,7 @@ class HaveAPI::Client::Client
 
   # @return [Hash] client options
   def opts(*keys)
-    keys.empty? ? @opts.clone : @opts.select { |k, _| keys.include?(k) }
+    keys.empty? ? @opts.clone : @opts.slice(*keys)
   end
 
   # @return [HaveAPI::Client::Communicator]

data/lib/haveapi/client/communicator.rb

@@ -15,14 +15,15 @@ module HaveAPI::Client
       end
     end
 
-    attr_reader :url, :auth
+    attr_reader :url, :auth, :verify_ssl
     attr_accessor :identity
 
-    def initialize(url, v = nil)
+    def initialize(url, v = nil, verify_ssl: true)
       @url = url
       @auth = Authentication::NoAuth.new(self, {}, {})
-      @rest = RestClient::Resource.new(@url)
+      @rest = RestClient::Resource.new(@url, verify_ssl: verify_ssl)
       @version = v
+      @verify_ssl = verify_ssl
       @identity = 'haveapi-client-ruby'
     end
 

data/lib/haveapi/client/version.rb

@@ -1,6 +1,6 @@
 module HaveAPI
   module Client
     PROTOCOL_VERSION = '2.0'.freeze
-    VERSION = '0.25.0'.freeze
+    VERSION = '0.26.0'.freeze
   end
 end

metadata

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