haveapi-client 0.13.2 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f393b4bd598933fa86daf57b825b87c570ba476206a22495eddb3dfe5a560801
-  data.tar.gz: 67e329583d2c9482522bee0d1a837a7d2ee39fc6e4a353cc625340e1c63fd10a
+  metadata.gz: f9bcb523f6bbbc83aed043d934bed405204f944da508ce27bbbc187789ad2592
+  data.tar.gz: 577821fa05de46f248506925c8d2b50a2da7a6d21dd16f463b0cb6d4873f4c5b
 SHA512:
-  metadata.gz: b454405a2afe95220f02977e1864ac179f135005055f3cdfac76b913f3c177aed0a7574bedc236d6e09ef1c174a3250b1e42d884d3c5e9f3f93b578f5f222835
-  data.tar.gz: baf5e025143dac440e303ee0238d2d509d90f851222d54c7a94e1ce6f3a693119a0bf6f887f156c64c3fa273e75165a47a0278e0abc29f206e60697d566f526b
+  metadata.gz: 9985388b53763b4ce873c02b113c9e3b3577ebf7328993acca91cdbdaee0025a865fb4b7feb65dd55b774c98c5f88d475a8c532c2c94b0d1dfccb72862ef0526
+  data.tar.gz: '0835beabb9c0212930238f502c4f2d2c314321dc1ba080c13e2bcd68261a05053ad74cdd4a9a29d2c4b3707b907610a9f4a517e5458d8ee2f77e5692ec2d0134'

data/haveapi-client.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '>= 4.0'
   spec.add_runtime_dependency 'require_all', '~> 2.0.0'
-  spec.add_runtime_dependency 'rest-client', '~> 2.0.2'
+  spec.add_runtime_dependency 'rest-client', '~> 2.1.0'
   spec.add_runtime_dependency 'json'
-  spec.add_runtime_dependency 'highline', '~> 1.7.8'
-  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.7.5'
+  spec.add_runtime_dependency 'highline', '~> 2.0.3'
+  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.11.0'
 end

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

@@ -13,7 +13,7 @@ module HaveAPI::Client
     end
 
     def execute(data, *_)
-      args = [self]
+      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)
       reset
       ret
     end

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

@@ -112,12 +112,8 @@ module HaveAPI::Client::Authentication
     end
 
     def check_validity
-      if @valid_to && @valid_to < Time.now
-        if @opts[:user] && @opts[:password]
-          request_token
-        else
-          raise AuthenticationFailed.new('token expired')
-        end
+      if @valid_to && @valid_to < Time.now && @opts[:user] && @opts[:password]
+        request_token
       end
     end
 

data/lib/haveapi/client/communicator.rb

@@ -153,6 +153,9 @@ module HaveAPI::Client
       rescue RestClient::ResourceNotFound => e
         response = parse(e.http_body)
 
+      rescue RestClient::BadRequest => e
+        response = parse(e.http_body)
+
       rescue => e
         return error("Fatal API error: #{e.inspect}")
       end

data/lib/haveapi/client/version.rb

@@ -1,6 +1,6 @@
 module HaveAPI
   module Client
     PROTOCOL_VERSION = '2.0'
-    VERSION = '0.13.2'
+    VERSION = '0.14.2'
   end
 end

data/shell.nix

@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
   name = "haveapi-client";
 
   buildInputs = with pkgs;[
-    ruby
+    ruby_2_7
     git
     openssl
   ];

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-client
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.2
 platform: ruby
 authors:
 - Jakub Skokan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.11.0
 description: Ruby API and CLI for HaveAPI
 email:
 - jakub.skokan@vpsfree.cz
@@ -183,7 +183,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,9 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.2.26
+signing_key:
 specification_version: 4
 summary: Ruby API and CLI for HaveAPI
 test_files: []