haveapi-client 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9360cc54a28c352ca36a156d1cfdfc96eea32959
-  data.tar.gz: c47ae6db07e500c6cf47f1836436349a9634e746
+  metadata.gz: fbf74153c675555c4efe868808662ecba7edab78
+  data.tar.gz: 9841b9182c4585edbb415cc7e9a09637c1b0491b
 SHA512:
-  metadata.gz: 934b2293efe40af87bda6cef7a880ac8b4fdc793b8d675b8d8ee06e4dbe5d818b88b626ce7609ec5b43a228d7d7453e4cb74776f627ce84a34713b852af3c0e6
-  data.tar.gz: e5b17a1f4d8f3367db75579008f0a4fefb6a1e5613b2f030b36951ad0076a2b1aa948a8737d70cbd6b45aae855881d2fda2fbcf91bedeacaa5428a377bc3bcf2
+  metadata.gz: 1dfa2473733340a6650dfa0b76ae94b224f916d4fb66c8c962b5bb28f6ba3d80d3f986562ef1cdfef837001cc3805214ab0b554150b7a9ed5925ce5873a5dc3a
+  data.tar.gz: 1bec8283d80a29b7a70fe9fac8f7b2b51bbdcce62c143a4a325f307d278dc098e1d764d4ae991e45a91c3a9e58f8fe9447247003232413311edf5e3197c008e4

data/CHANGELOG

@@ -1,3 +1,16 @@
+* Thu Nov 24 2016 - version 0.7.0
+- Client.initialize takes two arguments: url and options
+- Authenticate even for actions that do not require it
+- New CLI options --[no-]block and --timeout
+- CLI handles all interrupts
+- Add shortcut method HaveAPI::Client.new
+- Add method Action#meta
+- Fix access to nil associations in ResourceInstance
+- Handle 404 errors when fetching description
+- Handle RestClient::ResourceNotFound
+- Use DateTime.iso8601 to parse dates
+- Do not show examples on action error, just a hint
+
 * Tue Oct 18 2016 - version 0.6.0
 - No changes
 

data/README.md

@@ -40,6 +40,8 @@ Or install it yourself as:
             --utc                        Display Datetime parameters in UTC
             --localtime                  Display Datetime parameters in local timezone
             --date-format FORMAT         Display Datetime in custom format
+            --[no-]block                 Toggle action blocking mode
+            --timeout SEC                Fail when the action does not finish within the timeout
         -v, --[no-]verbose               Run verbosely
             --client-version             Show client version
             --protocol-version           Show protocol version

data/haveapi-client.gemspec

@@ -6,7 +6,7 @@ require 'haveapi/client/version'
 Gem::Specification.new do |spec|
   spec.name          = 'haveapi-client'
   spec.version       = HaveAPI::Client::VERSION
-  spec.date          = '2016-10-18'
+  spec.date          = '2016-11-24'
   spec.authors       = ['Jakub Skokan']
   spec.email         = ['jakub.skokan@vpsfree.cz']
   spec.summary       =
@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rest-client', '~> 1.8.0'
   spec.add_runtime_dependency 'json', '~> 1.8.3'
   spec.add_runtime_dependency 'highline', '~> 1.7.8'
+  spec.add_runtime_dependency 'ruby-progressbar', '~> 1.7.5'
 end

data/lib/haveapi/cli.rb

@@ -1,7 +1,10 @@
 require_relative 'client'
 
 module HaveAPI
-  module CLI ; end
+  module CLI
+    module Commands ; end
+  end
 end
 
 require_rel 'cli'
+require_rel 'cli/commands'

data/lib/haveapi/cli/action_state.rb

@@ -0,0 +1,147 @@
+require 'ruby-progressbar'
+
+module HaveAPI::CLI
+  # This class can watch action's state and show it's progress with a progress bar.
+  #
+  # When interrupted, the user is asked whether he wishes to cancel the action,
+  # then it shows the progress of cancellation.
+  #
+  # Methods from this class may invoke `exit()` whenever appropriate.
+  class ActionState
+    # @param opts [Hash]
+    # @param action [HaveAPI::Client::Action]
+    # @param id [Integer]
+    def initialize(opts, client, id)
+      @opts = opts
+      @client = client
+      @id = id
+    end
+
+    # Block until the action is finished or timeout is reached. Progress is shown with
+    # a progress bar. Offers cancellation on interrupt.
+    #
+    # @param timeout [Float]
+    # @param cancel [Boolean] determines whether we're waiting for a cancel to finish
+    def wait_for_completion(id: nil, timeout: nil, cancel: false)
+      id ||= @id
+
+      if cancel
+        puts "Waiting for the action to cancel (hit Ctrl+C to skip)..."
+      else
+        puts "Waiting for the action to complete (hit Ctrl+C to skip)..."
+      end
+      
+      last_status = false
+      can_cancel = false
+    
+      begin
+        ret = HaveAPI::Client::Action.wait_for_completion(
+            @client,
+            id,
+            timeout: timeout,
+        ) do |state|
+          last_status = state.status
+          can_cancel = state.can_cancel?
+          
+          update_progress(state, cancel)
+        end
+
+      rescue Interrupt
+        @pb && @pb.stop
+        puts
+
+        cancel_action(timeout: timeout) if can_cancel && !cancel && last_status
+
+        puts
+        print_help(id)
+        exit(false)
+      end
+
+      if ret
+        @pb && @pb.finish
+      else
+        @pb && @pb.stop
+      end
+
+      ret
+    end
+
+    # Ask the user if he wishes to cancel the action. If so, execute cancel
+    # and call self.wait_for_completion on the cancellation, if it is blocking
+    # operation.
+    def cancel_action(timeout: nil)
+      STDOUT.write("Do you wish to cancel the action? [y/N]: ")
+      STDOUT.flush
+
+      if STDIN.readline.strip.downcase == 'y'
+        begin
+          res = HaveAPI::Client::Action.cancel(@client, @id)
+
+        rescue HaveAPI::Client::ActionFailed => e
+          res = e.response
+        end
+    
+        if res.is_a?(HaveAPI::Client::Response) && res.ok?
+          puts "Cancelled"
+          exit
+
+        elsif res
+          @pb.resume
+
+          wait_for_completion(
+              id: res,
+              timeout: timeout,
+              cancel: true,
+          )
+          exit
+        end
+
+        warn "Cancel failed: #{res.message}"
+        exit(false)
+      end
+    end
+
+    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."
+    end
+
+    protected
+    def update_progress(state, cancel)
+      @pb ||= ProgressBar.create(
+          title: cancel ? 'Cancelling' : 'Executing',
+          total: state.progress.total,
+          format: if state.progress.total && state.progress.total > 0
+                    "%t: [%B] %c/%C #{state.progress.unit}"
+                  else
+                    '%t: [%B]'
+                  end,
+          starting_at: state.progress.current,
+          autofinish: false,
+      )
+
+      if state.status
+        @pb.title = cancel ? 'Cancelling' : 'Executing'
+
+      else
+        @pb.title = 'Failing'
+      end
+
+      if state.progress.total && state.progress.total > 0
+        @pb.progress = state.progress.current
+        @pb.total = state.progress.total
+        @pb.format("%t: [%B] %c/%C #{state.progress.unit}")
+
+      else
+        @pb.total = nil
+        @pb.format("%t: [%B] #{state.progress.unit}")
+        @pb.increment
+      end
+    end
+  end
+end

data/lib/haveapi/cli/cli.rb

@@ -11,6 +11,10 @@ module HaveAPI::CLI
 
       def run
         c = new
+
+      rescue Interrupt
+        warn "Interrupted"
+        exit(false)
       end
 
       def register_auth_method(name, klass)
@@ -89,7 +93,13 @@ module HaveAPI::CLI
       end
 
       if authenticate(action) && !action.unresolved_args?
-        action.update_description(@api.describe_action(action))
+        begin
+          action.update_description(@api.describe_action(action))
+
+        rescue RestClient::ResourceNotFound => e
+          format_errors(action, 'Object not found', {})
+          exit(false)
+        end
       end
 
       @selected_params = @opts[:output] ? @opts[:output].split(',').uniq
@@ -115,6 +125,32 @@ module HaveAPI::CLI
         format_errors(action, ret[:message], ret[:errors])
         exit(false)
       end
+
+      if action.blocking?
+        res = HaveAPI::Client::Response.new(action, ret)
+
+        if res.meta[:action_state_id]
+          state = ActionState.new(
+              @opts,
+              HaveAPI::Client::Client.new(@api.url, communicator: @api, block: false),
+              res.meta[:action_state_id]
+          )
+
+          if @opts[:block]
+            puts
+            action_ret = state.wait_for_completion(timeout: @opts[:timeout])
+
+            if action_ret.nil?
+              warn "Timeout"
+              exit(false)
+            end
+
+          else
+            puts
+            state.print_help
+          end
+        end
+      end
     end
 
     def api_url
@@ -124,6 +160,7 @@ module HaveAPI::CLI
     def options
       options = {
           client: default_url,
+          block: true,
           verbose: false,
       }
 
@@ -208,6 +245,18 @@ module HaveAPI::CLI
           options[:date_format] = f
         end
 
+        opts.on('--[no-]block', 'Toggle action blocking mode') do |v|
+          options[:block] = v
+        end
+        
+        opts.on(
+            '--timeout SEC',
+            Float,
+            'Fail when the action does not finish within the timeout'
+        ) do |v|
+          options[:timeout] = v.to_f
+        end
+
         opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
           options[:verbose] = v
         end
@@ -549,8 +598,6 @@ module HaveAPI::CLI
     end
 
     def authenticate(action = nil)
-      return false if !action.nil? && !action.auth?
-
       if @auth
         @auth.communicator = @api
         @auth.validate
@@ -606,14 +653,14 @@ module HaveAPI::CLI
     def format_errors(action, msg, errors)
       warn "Action failed: #{msg}"
 
-      if errors.any?
+      if errors && errors.any?
         puts 'Errors:'
         errors.each do |param, e|
           puts "\t#{param}: #{e.join('; ')}"
         end
       end
 
-      print_examples(action)
+      puts "\nUse --help to see available parameters and example usage."
     end
 
     def find_command(resource, action)

data/lib/haveapi/cli/commands/action_state_wait.rb

@@ -0,0 +1,28 @@
+module HaveAPI::CLI::Commands
+  class ActionStateWait < HaveAPI::CLI::Command
+    cmd :action_state, :wait
+    args '<STATE ID>'
+    desc 'Block until the action is finished'
+
+    def exec(args)
+      if args.size < 1
+        warn "Provide argument STATE ID"
+        exit(false)
+      end
+
+      @api.set_opts(block: false)
+
+      state = HaveAPI::CLI::ActionState.new(
+          @global_opts,
+          @api,
+          args.first.to_i
+      )
+      ret = state.wait_for_completion(timeout: @global_opts[:timeout])
+
+      if ret.nil?
+        warn "Timeout"
+        exit(false)
+      end
+    end
+  end
+end

data/lib/haveapi/cli/example_formatter.rb

@@ -7,20 +7,27 @@ module HaveAPI::CLI
         # request
         out << "$ #{$0} #{action.resource_path.join('.')} #{action.name}"
 
-        params = example[:request][action.namespace(:input).to_sym]
+        params = example[:request]
 
         if params
           out << ' --' unless params.empty?
 
           params.each do |k, v|
-            out << ' ' << example_param(k, v, action.param_description(:input, k))
+            desc = action.param_description(:input, k)
+            next unless desc
+
+            out << ' ' << example_param(k, v, desc)
           end
         end
 
         out << "\n"
 
         # response
-        cli.format_output(action, example[:response], out)
+        cli.format_output(
+            action,
+            {action.namespace(:output).to_sym => example[:response]},
+            out
+        )
       end
     end
 

data/lib/haveapi/client.rb

@@ -2,7 +2,12 @@ require 'require_all'
 require 'date'
 
 module HaveAPI
-  module Client ; end
+  module Client
+    # Shortcut to HaveAPI::Client::Client.new
+    def self.new(*args)
+      HaveAPI::Client::Client.new(*args)
+    end
+  end
 end
 
 require_rel 'client'

data/lib/haveapi/client/action.rb

@@ -1,8 +1,10 @@
 module HaveAPI::Client
   class Action
+    attr_reader :client, :api, :name
     attr_accessor :resource_path
 
-    def initialize(api, name, spec, args)
+    def initialize(client, api, name, spec, args)
+      @client = client
       @api = api
       @name = name
       @spec = spec
@@ -18,8 +20,7 @@ module HaveAPI::Client
       end
 
       ret = @api.call(self, params.to_api)
-      @prepared_url = nil
-      @prepared_help = nil
+      reset
       ret
     end
 
@@ -31,6 +32,10 @@ module HaveAPI::Client
       @spec[:auth]
     end
 
+    def blocking?
+      @spec[:blocking]
+    end
+
     def aliases(include_name = false)
       if include_name
         [@name] + @spec[:aliases]
@@ -83,6 +88,10 @@ module HaveAPI::Client
       @spec[dir][:parameters][name]
     end
 
+    def meta(scope)
+      @spec[:meta][scope]
+    end
+
     def url
       @spec[:url]
     end
@@ -117,9 +126,103 @@ module HaveAPI::Client
       @prepared_help = help
     end
 
+    def reset
+      @prepared_url = nil
+      @prepared_help = nil
+    end
+
     def update_description(spec)
       @spec = spec
     end
+  
+    # Block until the action is completed or timeout occurs. If the block is given,
+    # it is regularly called with the action's state.
+    # @param interval [Float] how often should the action state be checked
+    # @param timeout [Integer] timeout in seconds
+    # @yieldparam state [ActionState]
+    # @return [Boolean] when the action is finished
+    # @return [nil] when timeout occurs
+    # @return [Response] if the action was cancelled and the cancel itself isn't blocking
+    # @return [Integer] id of cancellation if the action was cancelled, cancel is blocking
+    #                   and no cancel block is provided
+    def self.wait_for_completion(client, id, interval: 15, update_in: 3, timeout: nil)
+      res = client.action_state.show(id)
+      state = ActionState.new(res)
+
+      yield(state) if block_given?
+      return state.status if state.finished?
+
+      last = {}
+      t = Time.now if timeout
+
+      loop do
+        res = client.action_state.poll(
+            id,
+            timeout: interval,
+            update_in: update_in,
+            status: last[:status],
+            current: last[:current],
+            total: last[:total],
+        )
+
+        state = ActionState.new(res)
+
+        last[:status] = res.response[:status]
+        last[:current] = res.response[:current]
+        last[:total] = res.response[:total]
+
+        yield(state) if block_given?
+        break if state.finished?
+
+        if state.cancel?
+          state.stop
+          cancel_block = state.cancel_block
+
+          ret = cancel(client, id)
+          
+          if ret.is_a?(Response)
+            # The cancel is not a blocking operation, return immediately
+            raise ActionFailed, ret unless ret.ok?
+            return ret
+          end
+
+          # Cancel is a blocking operation
+          if cancel_block
+            return wait_for_completion(
+                client,
+                ret,
+                interval: interval,
+                timeout: timeout,
+                update_in: update_in,
+                &cancel_block
+            )
+          end
+          
+          return ret
+        end
+
+        return nil if (timeout && (Time.now - t) >= timeout) || state.stop?
+      end
+
+      state.status
+
+    rescue Interrupt => e
+      %i(show poll).each do |action|
+        client.action_state.actions[action].reset
+      end
+      raise e
+    end
+
+    def self.cancel(client, id)
+      res = client.action_state.cancel(id, meta: {block: false})
+
+      if res.ok? && res.action.blocking? && res.meta[:action_state_id]
+        res.meta[:action_state_id]
+
+      else
+        res
+      end
+    end
 
     private
     def apply_args(args)

data/lib/haveapi/client/action_state.rb

@@ -0,0 +1,68 @@
+module HaveAPI::Client
+  # Represents action's state as returned from API resource ActionState.Show/Poll.
+  class ActionState
+    Progress = Struct.new(:current, :total, :unit) do
+      def percent
+        100.0 / total * current
+      end
+
+      def to_s
+        "#{current}/#{total} #{unit}"
+      end
+    end
+
+    attr_reader :progress
+
+    def initialize(response)
+      @data = response.response
+
+      @progress = Progress.new(@data[:current], @data[:total], @data[:unit])
+    end
+
+    def label
+      @data[:label]
+    end
+
+    def status
+      @data[:status] === true
+    end
+    
+    def finished?
+      @data[:finished] === true
+    end
+
+    def can_cancel?
+      @data[:can_cancel] === true
+    end
+
+    # Stop monitoring the action's state and attempt to cancel it. The `block`
+    # is given to Action.wait_for_completion for the cancel operation. The block
+    # is used only if the cancel operation is blocking.
+    def cancel(&block)
+      unless can_cancel?
+        fail "action ##{@data[:id]} (#{label}) cannot be cancelled"
+      end
+
+      @cancel = true
+      @cancel_block = block
+    end
+
+    def cancel?
+      @cancel === true
+    end
+
+    def cancel_block
+      @cancel_block
+    end
+    
+    # Stop monitoring the action's state, the call from Action.wait_for_completion
+    # will return.
+    def stop
+      @stop = true
+    end
+
+    def stop?
+      !@stop.nil? && @stop
+    end
+  end
+end

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

@@ -36,7 +36,13 @@ module HaveAPI::Client::Authentication
 
     protected
     def request_token
-      a = HaveAPI::Client::Action.new(@communicator, :request, @desc[:resources][:token][:actions][:request], [])
+      a = HaveAPI::Client::Action.new(
+          nil,
+          @communicator,
+          :request,
+          @desc[:resources][:token][:actions][:request],
+          []
+      )
       ret = a.execute({
                           login: @opts[:user],
                           password: @opts[:password],

data/lib/haveapi/client/client.rb

@@ -8,16 +8,27 @@ class HaveAPI::Client::Client
   # The client by default uses the default version of the API.
   # API is asked for description only when needed or by calling #setup.
   # +identity+ is sent in each request to the API in User-Agent header.
-  def initialize(url, v = nil, identity: 'haveapi-client', communicator: nil)
+  # @param url [String] API URL
+  # @param opts [Hash]
+  # @option opts [String] version
+  # @option opts [String] identity
+  # @option opts [HaveAPI::Client::Communicator] communicator
+  # @option opts [Boolean] block
+  # @option opts [Integer] block_interval
+  # @option opts [Integer] block_timeout
+  def initialize(url, opts = {})
     @setup = false
-    @version = v
+    @opts = opts
+    @version = @opts[:version]
+    @opts[:identity] ||= 'haveapi-client'
+    @opts[:block] = true if @opts[:block].nil?
 
-    if communicator
-      @api = communicator
+    if @opts[:communicator]
+      @api = @opts[:communicator]
 
     else
-      @api = HaveAPI::Client::Communicator.new(url, v)
-      @api.identity = identity
+      @api = HaveAPI::Client::Communicator.new(url, @version)
+      @api.identity = @opts[:identity]
     end
   end
 
@@ -54,6 +65,22 @@ class HaveAPI::Client::Client
     @api.compatible?
   end
 
+  # return [Boolean] true if global blocking mode is enabled
+  def blocking?
+    @opts[:block]
+  end
+
+  # Override selected client options
+  # @param opts [Hash] options
+  def set_opts(opts)
+    @opts.update(opts)
+  end
+
+  # @return [Hash] client options
+  def opts(*keys)
+    keys.empty? ? @opts.clone : @opts.select { |k, _| keys.include?(k) }
+  end
+
   # Initialize the client if it is not yet initialized and call the resource
   # if it exists.
   def method_missing(symbol, *args)

data/lib/haveapi/client/communicator.rb

@@ -97,7 +97,7 @@ module HaveAPI::Client
       end
 
       if a
-        obj = Action.new(self, action, a, args)
+        obj = Action.new(nil, self, action, a, args)
         obj.resource_path = resources
         obj
       else
@@ -144,6 +144,9 @@ module HaveAPI::Client
       rescue RestClient::Forbidden
         return error('Access forbidden. Bad user name or password? Not authorized?')
 
+      rescue RestClient::ResourceNotFound => e
+        response = parse(e.http_body)
+
       rescue => e
         return error("Fatal API error: #{e.inspect}")
       end

data/lib/haveapi/client/parameters/typed.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module HaveAPI::Client
   class Parameters::Typed
     module Boolean
@@ -52,7 +54,7 @@ module HaveAPI::Client
 
       elsif type == 'Datetime'
         begin
-          Time.iso8601(raw)
+          DateTime.iso8601(raw).to_time
 
         rescue ArgumentError
           @errors << 'not in ISO 8601 format'

data/lib/haveapi/client/resource.rb

@@ -17,7 +17,7 @@ module HaveAPI::Client
       @description = description
 
       description[:actions].each do |name, desc|
-        action = HaveAPI::Client::Action.new(@api, name, desc, [])
+        action = HaveAPI::Client::Action.new(@client, @api, name, desc, [])
         define_action(action)
         @actions[name] = action
       end
@@ -74,7 +74,8 @@ module HaveAPI::Client
       action.aliases(true).each do |name|
         next unless define_method?(action, name)
 
-        define_singleton_method(name) do |*args|
+        define_singleton_method(name) do |*args, &block|
+          client_opts = @client.opts(:block, :block_interval, :block_timeout)
           all_args = @prepared_args + args
 
           if action.unresolved_args?
@@ -96,6 +97,14 @@ module HaveAPI::Client
           elsif all_args.last.is_a?(Hash)
             last = all_args.pop
 
+            if last.has_key?(:meta)
+              meta = last[: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)
           end
 
@@ -103,7 +112,7 @@ module HaveAPI::Client
 
           raise ActionFailed.new(ret) unless ret.ok?
 
-          case action.output_layout
+          return_value = case action.output_layout
             when :object
               ResourceInstance.new(@client, @api, self, action: action, response: ret)
 
@@ -116,6 +125,23 @@ module HaveAPI::Client
             else
               ret
           end
+
+          if action.blocking? && client_opts[:block]
+            wait_opts = {}
+
+            {
+                block_interval: :interval,
+                block_timeout: :timeout
+            }.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|
+              block.call(return_value, state) if block
+            end
+          end
+
+          return_value
         end
       end
     end

data/lib/haveapi/client/resource_instance.rb

@@ -22,11 +22,13 @@ module HaveAPI::Client
         if response.is_a?(Hash)
           @params = response
           @prepared_args = response[:_meta][:url_params]
+          @meta = response[:_meta] unless @meta
 
         else
           @response = response
           @params = response.response
           @prepared_args = response.meta[:url_params]
+          @meta = response.meta unless @meta
         end
 
         setup_from_clone(resource)
@@ -112,10 +114,13 @@ module HaveAPI::Client
             @resource_instances[name] = find_association(param, @params[name])
 
             # id reader
-            ensure_method(:"#{name}_id") { @params[name][ param[:value_id].to_sym ] }
+            ensure_method(:"#{name}_id") do
+              @params[name] && @params[name][ param[:value_id].to_sym ]
+            end
 
             # id writer
             ensure_method(:"#{name}_id=") do |id|
+              @params[name] ||= {}
               @params[name][ param[:value_id].to_sym ] = id
 
               @resource_instances[name] = find_association(
@@ -139,6 +144,7 @@ module HaveAPI::Client
 
             # value writer
             ensure_method(:"#{name}=") do |obj|
+              @params[name] ||= {}
               @params[name][ param[:value_id].to_sym ] = obj.method(param[:value_id]).call
               @params[name][ param[:value_label].to_sym ] = obj.method(param[:value_label]).call
 

data/lib/haveapi/client/response.rb

@@ -56,4 +56,15 @@ class HaveAPI::Client::Response
 
     @response[:response][@action.namespace(:output).to_sym].each
   end
+
+  # Block until the action is completed or timeout occurs. If the block is given,
+  # it is regularly called with the action's state.
+  #
+  # @see HaveAPI::Client::Action#wait_for_completion
+  def wait_for_completion(*args, &block)
+    id = meta[:action_state_id]
+    return nil unless id
+
+    HaveAPI::Client::Action.wait_for_completion(@action.client, id, *args, &block)
+  end
 end

data/lib/haveapi/client/version.rb

@@ -1,6 +1,6 @@
 module HaveAPI
   module Client
-    PROTOCOL_VERSION = '1.0'
-    VERSION = '0.6.0'
+    PROTOCOL_VERSION = '1.1'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jakub Skokan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.8
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.5
 description: Ruby API and CLI for HaveAPI
 email:
 - jakub.skokan@vpsfree.cz
@@ -124,15 +138,18 @@ files:
 - bin/haveapi-cli
 - haveapi-client.gemspec
 - lib/haveapi/cli.rb
+- lib/haveapi/cli/action_state.rb
 - lib/haveapi/cli/authentication/base.rb
 - lib/haveapi/cli/authentication/basic.rb
 - lib/haveapi/cli/authentication/token.rb
 - lib/haveapi/cli/cli.rb
 - lib/haveapi/cli/command.rb
+- lib/haveapi/cli/commands/action_state_wait.rb
 - lib/haveapi/cli/example_formatter.rb
 - lib/haveapi/cli/output_formatter.rb
 - lib/haveapi/client.rb
 - lib/haveapi/client/action.rb
+- lib/haveapi/client/action_state.rb
 - lib/haveapi/client/authentication/base.rb
 - lib/haveapi/client/authentication/basic.rb
 - lib/haveapi/client/authentication/noauth.rb
@@ -186,4 +203,3 @@ signing_key:
 specification_version: 4
 summary: Ruby API and CLI for HaveAPI
 test_files: []
-has_rdoc: