runcible 1.12.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8df7ccd9f3b8a9e1d484476d6d890d4e8497c7ae
-  data.tar.gz: c70c80e4f15a8d196c7c6cc3a418e760e0304650
+  metadata.gz: 44d9bd96294cd3ccccf96e313e19c8c19274593e
+  data.tar.gz: 572787511b74aaeffd569d6f9f56d3af33a1cc5d
 SHA512:
-  metadata.gz: a450cbac839e4806f6b912504a19b5120f0f927701600f6d8571c315ad4cb78115bb1e335a62beaf9d7827a7adac79695eeb3e4a611b9a1e6c161b9d47a5ae96
-  data.tar.gz: b77ab50466149dc00abaeef7c12acc391239ea9e1205af7d32fb268885ed614ec392a310038d76afcf80401e7c301db334ce9ef7757824df611a2c036dcddd82
+  metadata.gz: 6541e2fd3e0971306d45b5e2ece1a6cb31076effc60e48fda2616d58531fb6069cf87a0025c6693facdbee167c6e238cf7bc5f64c3df663d1a040fcb8a1399d7
+  data.tar.gz: fc21049edee2622efc80b522e3b635b9ca099f5439421d81c4cd554adcff1ac0f956041819effc74d92d1ca57f77c16a30d78959d74c503f28a169d80e895369

data/lib/runcible.rb

@@ -5,6 +5,7 @@ resources = Dir[File.dirname(__FILE__) + '/runcible/version.rb']
 resources += Dir[File.dirname(__FILE__) + '/runcible/base.rb']
 resources += Dir[File.dirname(__FILE__) + '/runcible/instance.rb']
 resources += Dir[File.dirname(__FILE__) + '/runcible/resources/*.rb']
+resources += Dir[File.dirname(__FILE__) + '/runcible/response.rb']
 
 resources += Dir[File.dirname(__FILE__) + '/runcible/extensions/unit.rb']
 resources += Dir[File.dirname(__FILE__) + '/runcible/extensions/*.rb']

data/lib/runcible/base.rb

@@ -75,8 +75,8 @@ module Runcible
     end
 
     def get_response(client, path, *args)
-      client[path].send(*args) do |response, request, result, &_block|
-        resp = response.return!(request, result)
+      client[path].send(*args) do |response, _request, _result, &_block|
+        resp = response.return!
         log_debug
         return resp
       end
@@ -132,7 +132,7 @@ module Runcible
             i.respond_to?(:with_indifferent_access) ? i.with_indifferent_access : i
           end
         end
-        response = rest_client_response(body, response.net_http_res, response.args)
+        response = Runcible::Response.new(body, response)
       rescue JSON::ParserError
         log_exception
       end
@@ -140,14 +140,6 @@ module Runcible
       return response
     end
 
-    def rest_client_response(body, net_http_res, args)
-      if Gem.loaded_specs['rest-client'].version < Gem::Version.create('1.8.0')
-        RestClient::Response.create(body, net_http_res, args)
-      else
-        RestClient::Response.create(body, net_http_res, args, nil)
-      end
-    end
-
     def required_params(local_names, binding, keys_to_remove = [])
       local_names = local_names.each_with_object({}) do |v, acc|
         value = binding.eval(v.to_s) unless v == :_

data/lib/runcible/resources/task_group.rb

@@ -32,13 +32,6 @@ module Runcible
         end
         sum == summary_report["total"]
       end
-
-      # cancel a task group
-      # @param  [String] id  the id of the task
-      # @return [RestClient::Response]
-      def cancel(id)
-        call(:delete, path(id))
-      end
     end
   end
 end

data/lib/runcible/response.rb

@@ -0,0 +1,36 @@
+module Runcible
+  class Response
+    attr_accessor :rest_client_response, :parsed_body
+
+    def initialize(parsed_body, rest_client_response)
+      @rest_client_response = rest_client_response
+      @parsed_body = parsed_body
+    end
+
+    def respond_to?(name)
+      @parsed_body.respond_to?(name) || @rest_client_response.respond_to?(name)
+    end
+
+    def ==(other)
+      self.parsed_body == other
+    end
+
+    def is_a?(clazz)
+      self.parsed_body.is_a?(clazz)
+    end
+
+    def body
+      @parsed_body
+    end
+
+    def method_missing(name, *args, &block)
+      if @parsed_body.respond_to?(name)
+        @parsed_body.send(name, *args, &block)
+      elsif @rest_client_response.respond_to?(name)
+        @rest_client_response.send(name, *args, &block)
+      else
+        super
+      end
+    end
+  end
+end

data/lib/runcible/version.rb

@@ -1,3 +1,3 @@
 module Runcible
-  VERSION = '1.12.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runcible
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Eric D Helms, Justin Sherrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -33,7 +33,7 @@ dependencies:
         version: 1.6.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - lib/runcible/resources/task_group.rb
 - lib/runcible/resources/unit.rb
 - lib/runcible/resources/user.rb
+- lib/runcible/response.rb
 - lib/runcible/version.rb
 homepage: https://github.com/Katello/runcible
 licenses: []
@@ -197,9 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: ''
 test_files: []
-has_rdoc: