haveapi-client 0.26.3 → 0.26.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c599484cf878ff6dd319638b7879c1dff79c6190ef1ab22b2df024222d029a5d
-  data.tar.gz: df2e957bb685693bb8738e28b21d70ea28290fab09264c7c39c9f720729ad142
+  metadata.gz: e1b98aab9f8e937585fa078d6fa5bc38e68f83ed7b70c800dbaa9a0cf1f4ec28
+  data.tar.gz: 2df727132132091b6422d8d4dbc858f6911ed21d96b5e82197a7cb43ad955d9c
 SHA512:
-  metadata.gz: 7d759cd0a3c251e6bcd2ad9beea5b24e672e98d5e3aed4fe4dba52c00d882ea905748d67338513f92c68d6e2b5af681fdb9298fba057bc40ff4579f8976f8aa8
-  data.tar.gz: 8b466e7529c7e9cc2150d198cdbf9a5e51d232294eb1870a6c54775d181dffeefb83171ab0f7af1531a1f805962e5d2e414648336ec490af658eb8406ff6793c
+  metadata.gz: 7baed8b41fd39094bbf765cf6e48d295a7265dd99038cc85a9142a25b34d18369e9676793f396ee5958922d5b0d9a8f7614b41935a4605afb9f35400cef83c6d
+  data.tar.gz: b1c00e04bcc29a60b32e6425c880752eb7c367380366a96662cd64d8de8534393fb7b30a4edf2e592796017e3a9ee2d926115fa75c8bf7e6f1e55552c3ce6f26

data/lib/haveapi/cli/action_state.rb

@@ -26,9 +26,9 @@ module HaveAPI::CLI
       id ||= @id
 
       if cancel
-        puts 'Waiting for the action to cancel (hit Ctrl+C to skip)...'
+        warn 'Waiting for the action to cancel (hit Ctrl+C to skip)...'
       else
-        puts 'Waiting for the action to complete (hit Ctrl+C to skip)...'
+        warn 'Waiting for the action to complete (hit Ctrl+C to skip)...'
       end
 
       last_status = false
@@ -47,11 +47,11 @@ module HaveAPI::CLI
         end
       rescue Interrupt
         @pb && @pb.stop
-        puts
+        warn
 
         cancel_action(timeout: timeout) if can_cancel && !cancel && last_status
 
-        puts
+        warn
         print_help(id)
         exit(false)
       end
@@ -81,7 +81,7 @@ module HaveAPI::CLI
       end
 
       if res.is_a?(HaveAPI::Client::Response) && res.ok?
-        puts 'Cancelled'
+        warn 'Cancelled'
         exit
 
       elsif res
@@ -102,11 +102,11 @@ module HaveAPI::CLI
     def print_help(id = nil)
       id ||= @id
 
-      puts 'Run'
-      puts "  #{$0} action_state show #{id}"
-      puts 'or'
-      puts "  #{$0} action_state wait #{id}"
-      puts "to check the action's progress."
+      warn 'Run'
+      warn "  #{$0} action_state show #{id}"
+      warn 'or'
+      warn "  #{$0} action_state wait #{id}"
+      warn "to check the action's progress."
     end
 
     protected
@@ -121,7 +121,8 @@ module HaveAPI::CLI
                   '%t: [%B]'
                 end,
         starting_at: state.progress.current,
-        autofinish: false
+        autofinish: false,
+        output: $stderr
       )
 
       @pb.title = if state.status

data/lib/haveapi/cli/cli.rb

@@ -112,7 +112,7 @@ module HaveAPI::CLI
       @input_params[:meta] = { includes: includes } if includes
 
       begin
-        ret = action.execute(@input_params, raw: @opts[:raw])
+        ret = action.execute(@input_params)
       rescue HaveAPI::Client::ValidationError => e
         format_errors(action, 'input parameters not valid', e.errors)
         exit(false)
@@ -508,7 +508,7 @@ module HaveAPI::CLI
 
     def format_output(action, response, out = $>)
       if @opts[:raw]
-        puts JSON.generate(response)
+        puts JSON.pretty_generate(response)
         return
       end
 
@@ -641,12 +641,22 @@ module HaveAPI::CLI
       "#{Dir.home}/.haveapi-client.yml"
     end
 
+    def system_config_path
+      '/etc/haveapi-client.yml'
+    end
+
     def write_config
       File.write(config_path, YAML.dump(@config))
     end
 
     def read_config
-      @config = YAML.load_file(config_path) if File.exist?(config_path)
+      path = if File.exist?(config_path)
+               config_path
+             elsif File.exist?(system_config_path)
+               system_config_path
+             end
+
+      @config = YAML.load_file(path) if path
     end
 
     def server_config(url)

data/lib/haveapi/client/action.rb

@@ -16,7 +16,7 @@ module HaveAPI::Client
       "#<#{self.class.name} @name=#{@name}>"
     end
 
-    def execute(data, raw: false)
+    def execute(data)
       params_arg = {}
 
       if input
@@ -29,7 +29,7 @@ module HaveAPI::Client
         params_arg = params.to_api
       end
 
-      ret = @api.call(self, params_arg, raw: raw)
+      ret = @api.call(self, params_arg)
       reset
       ret
     end

data/lib/haveapi/client/communicator.rb

@@ -117,7 +117,7 @@ module HaveAPI::Client
       end
     end
 
-    def call(action, params = {}, raw: false)
+    def call(action, params = {})
       args = []
       input_namespace = action.input && action.namespace(:input)
       meta = nil
@@ -164,11 +164,7 @@ module HaveAPI::Client
       end
 
       if response[:status]
-        if raw
-          ok(JSON.pretty_generate(response[:response]))
-        else
-          ok(response[:response])
-        end
+        ok(response[:response])
 
       else
         error(response[:message], response[:errors])

data/lib/haveapi/client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-client
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.26.5
 platform: ruby
 authors:
 - Jakub Skokan