ridley 0.12.3 → 0.12.4

data/Gemfile

@@ -45,5 +45,5 @@ group :test do
   gem 'fuubar'
   gem 'json_spec'
   gem 'webmock'
-  gem 'chef-zero', '>= 1.0.1'
+  gem 'chef-zero', '~> 1.1.1'
 end

data/lib/ridley.rb

@@ -4,6 +4,7 @@ require 'celluloid'
 require 'chozo'
 require 'faraday'
 require 'forwardable'
+require 'hashie'
 require 'json'
 require 'pathname'
 require 'solve'

data/lib/ridley/client.rb

@@ -67,10 +67,7 @@ module Ridley
     include Celluloid
     include Ridley::Logging
 
-    finalizer do
-      @connection_supervisor.terminate if @connection_supervisor && @connection_supervisor.alive?
-      @resources_supervisor.terminate if @resources_supervisor && @resources_supervisor.alive?
-    end
+    finalizer :finalize_callback
 
     def_delegator :connection, :build_url
     def_delegator :connection, :scheme
@@ -251,5 +248,10 @@ module Ridley
       def connection
         @connection_registry[:connection_pool]
       end
+
+      def finalize_callback
+        @connection_supervisor.terminate if @connection_supervisor && @connection_supervisor.alive?
+        @resources_supervisor.terminate if @resources_supervisor && @resources_supervisor.alive?
+      end
   end
 end

data/lib/ridley/connection.rb

@@ -48,8 +48,6 @@ module Ridley
       @retry_interval = options[:retry_interval]
 
       options[:builder] = Faraday::Builder.new do |b|
-        b.response :json
-        b.response :gzip
         b.request :retry,
           max: @retries,
           interval: @retry_interval,
@@ -58,9 +56,12 @@ module Ridley
             Errno::ETIMEDOUT,
             Faraday::Error::TimeoutError
           ]
-        b.response :chef_response
         b.request :chef_auth, client_name, client_key
 
+        b.response :parse_json
+        b.response :gzip
+        b.response :chef_response
+
         b.adapter :net_http_persistent
       end
 

data/lib/ridley/host_connector/winrm/worker.rb

@@ -22,7 +22,7 @@ module Ridley
         # @return [Array]
         attr_reader :command_uploaders
 
-        finalizer :finalizer
+        finalizer :finalize_callback
 
         EMBEDDED_RUBY_PATH = 'C:\opscode\chef\embedded\bin\ruby'.freeze
 
@@ -42,10 +42,6 @@ module Ridley
           @command_uploaders = Array.new
         end
 
-        def finalizer
-          command_uploaders.map(&:cleanup)
-        end
-
         def run(command)
           response = Ridley::HostConnector::Response.new(host)
           command_uploaders << command_uploader = CommandUploader.new(winrm)
@@ -151,6 +147,12 @@ module Ridley
           command = "#{EMBEDDED_RUBY_PATH} -e \"#{command_lines.join(';')}\""
           run(command)
         end
+
+        private
+
+          def finalize_callback
+            command_uploaders.map(&:cleanup)
+          end
       end
     end
   end

data/lib/ridley/middleware/parse_json.rb

@@ -96,8 +96,6 @@ module Ridley
       end
 
       def on_complete(env)
-        log.debug(env)
-
         if self.class.json_response?(env)
           log.debug { "==> parsing Chef response body as JSON" }
           env[:body] = self.class.parse(env[:body])
@@ -109,4 +107,4 @@ module Ridley
   end
 end
 
-Faraday.register_middleware(:response, json: Ridley::Middleware::ParseJson)
+Faraday.register_middleware(:response, parse_json: Ridley::Middleware::ParseJson)

data/lib/ridley/resources/data_bag_resource.rb

@@ -8,9 +8,7 @@ module Ridley
 
     attr_reader :item_resource
 
-    finalizer do
-      item_resource.terminate if item_resource && item_resource.alive?
-    end
+    finalizer :finalize_callback
 
     # @param [Celluloid::Registry] connection_registry
     # @param [String] data_bag_secret
@@ -30,5 +28,11 @@ module Ridley
       return nil if ex.cause.is_a?(Errors::HTTPNotFound)
       abort(ex.cause)
     end
+
+    private
+
+      def finalize_callback
+        item_resource.terminate if item_resource && item_resource.alive?
+      end
   end
 end

data/lib/ridley/resources/sandbox_resource.rb

@@ -4,9 +4,7 @@ module Ridley
     set_resource_path "sandboxes"
     represented_by Ridley::SandboxObject
 
-    finalizer do
-      uploader.terminate if uploader && uploader.alive?
-    end
+    finalizer :finalize_callback
 
     def initialize(connection_registry, client_name, client_key, options = {})
       super(connection_registry)
@@ -99,5 +97,9 @@ module Ridley
     private
 
       attr_reader :uploader
+
+      def finalize_callback
+        uploader.terminate if uploader && uploader.alive?
+      end
   end
 end

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 end

data/ridley.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'celluloid',               '~> 0.14.0'
   s.add_runtime_dependency 'erubis'
   s.add_runtime_dependency 'faraday',                 '>= 0.8.4'
+  s.add_runtime_dependency 'hashie',                  '>= 2.0.2'
   s.add_runtime_dependency 'mixlib-log',              '>= 1.3.0'
   s.add_runtime_dependency 'mixlib-shellout',         '>= 1.1.0'
   s.add_runtime_dependency 'mixlib-config',           '>= 1.1.0'

data/spec/unit/ridley/middleware/chef_response_spec.rb

@@ -25,7 +25,7 @@ describe Ridley::Middleware::ChefResponse do
         end
       end
 
-      it "returns false if response status is in the 400 range" do        
+      it "returns false if response status is in the 400 range" do
         (400..499).each do |code|
           env.should_receive(:[]).with(:status).and_return(code)
 
@@ -46,7 +46,7 @@ describe Ridley::Middleware::ChefResponse do
   subject do
     Faraday.new(server_url) do |conn|
       conn.response :chef_response
-      conn.response :json
+      conn.response :parse_json
       conn.adapter Faraday.default_adapter
     end
   end
@@ -73,7 +73,7 @@ describe Ridley::Middleware::ChefResponse do
 
   let(:chef_unauthorized) do
     {
-      status: 401, 
+      status: 401,
       body: generate_normalized_json(error: "401 - Unauthorized.  You must properly authenticate your API requests!"),
       headers: {
         content_type: "application/json; charset=utf8"
@@ -83,7 +83,7 @@ describe Ridley::Middleware::ChefResponse do
 
   let(:chef_forbidden) do
     {
-      status: 403, 
+      status: 403,
       body: generate_normalized_json(error: "403 - Forbidden."),
       headers: {
         content_type: "application/json; charset=utf8"
@@ -170,7 +170,7 @@ describe Ridley::Middleware::ChefResponse do
       stub_request(:get, File.join(server_url, 'not_existant_route')).to_return(chef_not_found)
     end
 
-    it "raises a Ridley::Errors::HTTPNotFound" do      
+    it "raises a Ridley::Errors::HTTPNotFound" do
       lambda {
         subject.get('not_existant_route')
       }.should raise_error(Ridley::Errors::HTTPNotFound)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.4
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
@@ -409,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3894427319828211488
+      hash: 744717169722095875
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23