ridley 0.12.2 → 0.12.3

data/.travis.yml

@@ -4,4 +4,8 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-#  - jruby-19mode # temporarily disable until ChefZero works with JRuby
+  - jruby-19mode
+
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode # Allow failure for now: https://github.com/RiotGames/ridley/issues/143

data/Gemfile

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

data/lib/ridley/bootstrap_bindings/windows_template_binding.rb

@@ -140,7 +140,7 @@ WGET_PS
 
     # @return [String]
     def first_boot
-      escape_and_echo(MultiJson.encode attributes.merge(run_list: run_list))
+      escape_and_echo(JSON.fast_generate(attributes.merge(run_list: run_list)))
     end
 
     # @return [String]

data/lib/ridley/chef/cookbook/metadata.rb

@@ -463,7 +463,7 @@ module Ridley::Chef
       end
 
       def from_json(json)
-        from_hash MultiJson.decode(json)
+        from_hash JSON.parse(json)
       end
 
       private

data/lib/ridley/chef_objects/node_object.rb

@@ -154,7 +154,6 @@ module Ridley
         self.normal = self.normal.deep_merge(options[:attributes])
       end
 
-      self.update
       self
     end
   end

data/lib/ridley/connection.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 require 'retryable'
 require 'tempfile'
+require 'zlib'
 
 module Ridley
   # @author Jamie Winsor <reset@riotgames.com>
@@ -48,6 +49,7 @@ module Ridley
 
       options[:builder] = Faraday::Builder.new do |b|
         b.response :json
+        b.response :gzip
         b.request :retry,
           max: @retries,
           interval: @retry_interval,
@@ -141,7 +143,14 @@ module Ridley
       defer {
         retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
           open(target, 'rb', headers) do |remote|
-            local.write(remote.read)
+            body = remote.read
+            case remote.content_encoding
+            when ['gzip']
+              body = Zlib::GzipReader.new(StringIO.new(body), encoding: 'ASCII-8BIT').read
+            when ['deflate']
+              body = Zlib::Inflate.inflate(body)
+            end
+            local.write(body)
           end
         end
 

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

@@ -87,6 +87,13 @@ module Ridley
         # @return [WinRM::WinRMWebService]
         def winrm
           @winrm_client ||= begin
+            require 'active_support/core_ext/kernel/reporting'
+            # Silencing warnings because not all versions of GSSAPI support all of the GSSAPI methods
+            # the gssapi gem attempts to attach to and these warnings are dumped to STDERR.
+            silence_warnings do
+              require 'winrm'
+            end
+
             client = ::WinRM::WinRMWebService.new(winrm_endpoint, :plaintext,
               user: user, pass: password, disable_sspi: true, basic_auth_only: true)
             client.set_timeout(6000)

data/lib/ridley/middleware/chef_auth.rb

@@ -87,3 +87,5 @@ module Ridley
     end
   end
 end
+
+Faraday.register_middleware(:request, chef_auth: Ridley::Middleware::ChefAuth)

data/lib/ridley/middleware/chef_response.rb

@@ -19,7 +19,7 @@ module Ridley
       def on_complete(env)
         log.debug { "==> handling Chef response" }
         log.debug { "request env: #{env}" }
-        
+
         unless self.class.success?(env)
           log.debug { "** error encounted in Chef response" }
           raise Errors::HTTPError.fabricate(env)
@@ -28,3 +28,5 @@ module Ridley
     end
   end
 end
+
+Faraday.register_middleware(:response, chef_response: Ridley::Middleware::ChefResponse)

data/lib/ridley/middleware/follow_redirects.rb

@@ -131,3 +131,5 @@ module Ridley
     end
   end
 end
+
+Faraday.register_middleware(:response, follow_redirects: Ridley::Middleware::FollowRedirects)

data/lib/ridley/middleware/gzip.rb

@@ -0,0 +1,19 @@
+require 'zlib'
+
+module Ridley
+  module Middleware
+    # @author Jamie Winsor <reset@riotgames.com>
+    class Gzip < Faraday::Response::Middleware
+      def on_complete(env)
+        case env[:response_headers][CONTENT_ENCODING].to_s.downcase
+        when 'gzip'
+          env[:body] = Zlib::GzipReader.new(StringIO.new(env[:body]), encoding: 'ASCII-8BIT').read
+        when 'deflate'
+          env[:body] = Zlib::Inflate.inflate(env[:body])
+        end
+      end
+    end
+  end
+end
+
+Faraday.register_middleware(:response, gzip: Ridley::Middleware::ChefResponse)

data/lib/ridley/middleware/parse_json.rb

@@ -5,8 +5,8 @@ module Ridley
       include Ridley::Logging
 
       JSON_TYPE  = 'application/json'.freeze
-      
-      BRACKETS   = [ 
+
+      BRACKETS   = [
         "[",
         "{"
       ].freeze
@@ -17,10 +17,10 @@ module Ridley
         "\r",
         "\t"
       ].freeze
-      
+
       class << self
         include Ridley::Logging
-        
+
         # Takes a string containing JSON and converts it to a Ruby hash
         # symbols for keys
         #
@@ -28,13 +28,13 @@ module Ridley
         #
         # @return [Hash]
         def parse(body)
-          result = MultiJson.decode(body)
+          result = JSON.parse(body)
           result.is_a?(Hash) ? Hashie::Mash.new(result) : result
         end
 
         # Extracts the type of the response from the response headers
         # of a Faraday request env. 'text/html' will be returned if no
-        # content-type is specified in the response 
+        # content-type is specified in the response
         #
         # @example
         #   env = {
@@ -108,3 +108,5 @@ module Ridley
     end
   end
 end
+
+Faraday.register_middleware(:response, json: Ridley::Middleware::ParseJson)

data/lib/ridley/middleware/retry.rb

@@ -58,3 +58,5 @@ module Ridley
     end
   end
 end
+
+Faraday.register_middleware(:request, retry: Ridley::Middleware::Retry)

data/lib/ridley/middleware.rb

@@ -1,27 +1,11 @@
 module Ridley
   # @author Jamie Winsor <reset@riotgames.com>
   module Middleware
-    CONTENT_TYPE = 'content-type'.freeze
-
-    require_relative 'middleware/parse_json'
-    require_relative 'middleware/chef_response'
-    require_relative 'middleware/chef_auth'
-    require_relative 'middleware/follow_redirects'
-    require_relative 'middleware/retry'
-
-    Faraday.register_middleware :request,
-      chef_auth: -> { Ridley::Middleware::ChefAuth }
-
-    Faraday.register_middleware :request,
-      retry: -> { Ridley::Middleware::Retry }
-
-    Faraday.register_middleware :response,
-      json: -> { Ridley::Middleware::ParseJson }
-
-    Faraday.register_middleware :response,
-      follow_redirects: -> { Ridley::Middleware::FollowRedirects }
-
-    Faraday.register_middleware :response,
-      chef_response: -> { Ridley::Middleware::ChefResponse }
+    CONTENT_TYPE     = 'content-type'.freeze
+    CONTENT_ENCODING = 'content-encoding'.freeze
   end
 end
+
+Dir["#{File.dirname(__FILE__)}/middleware/*.rb"].sort.each do |path|
+  require_relative "middleware/#{File.basename(path, '.rb')}"
+end

data/lib/ridley/mixin/bootstrap_binding.rb

@@ -54,7 +54,7 @@ module Ridley
 
     # @return [String]
     def first_boot
-      MultiJson.encode attributes.merge(run_list: run_list)
+      JSON.fast_generate(attributes.merge(run_list: run_list))
     end
 
     # The validation key to create a new client for the node
@@ -74,4 +74,4 @@ module Ridley
     end
 
   end
-end
+end

data/lib/ridley/resources/environment_resource.rb

@@ -18,7 +18,7 @@ module Ridley
     def cookbook_versions(environment, run_list = [])
       run_list = Array(run_list).flatten
       chef_id  = environment.respond_to?(:chef_id) ? environment.chef_id : environment
-      request(:post, "#{self.class.resource_path}/#{chef_id}/cookbook_versions", MultiJson.encode(run_list: run_list))
+      request(:post, "#{self.class.resource_path}/#{chef_id}/cookbook_versions", JSON.fast_generate(run_list: run_list))
     rescue AbortError => ex
       if ex.cause.is_a?(Errors::HTTPNotFound)
         abort Errors::ResourceNotFound.new(ex)

data/lib/ridley/resources/node_resource.rb

@@ -161,12 +161,16 @@ module Ridley
     # @option options [Hash] :attributes
     #   attributes of normal precedence to merge
     #
-    # @raise [Errors::HTTPNotFound]
+    # @raise [Errors::ResourceNotFound]
     #   if the target node is not found
     #
     # @return [Ridley::NodeResource]
     def merge_data(target, options = {})
-      find(target).merge_data(options)
+      unless node = find(target)
+        abort Errors::ResourceNotFound.new
+      end
+
+      update(node.merge_data(options))
     end
   end
 end

data/lib/ridley/resources/sandbox_resource.rb

@@ -34,7 +34,7 @@ module Ridley
       sumhash = { checksums: Hash.new }.tap do |chks|
         Array(checksums).each { |chk| chks[:checksums][chk] = nil }
       end
-      new(request(:post, self.class.resource_path, MultiJson.encode(sumhash)))
+      new(request(:post, self.class.resource_path, JSON.fast_generate(sumhash)))
     end
 
     # @param [#chef_id] object
@@ -46,7 +46,7 @@ module Ridley
     # @return [Hash]
     def commit(object)
       chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
-      request(:put, "#{self.class.resource_path}/#{chef_id}", MultiJson.encode(is_completed: true))
+      request(:put, "#{self.class.resource_path}/#{chef_id}", JSON.fast_generate(is_completed: true))
     rescue AbortError => ex
       case ex.cause
       when Ridley::Errors::HTTPBadRequest; abort Ridley::Errors::SandboxCommitError.new(ex.message)

data/lib/ridley/version.rb

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

data/lib/ridley.rb

@@ -1,27 +1,13 @@
-require 'active_support/core_ext/kernel/reporting'
-# Silencing warnings because not all versions of GSSAPI support all of the GSSAPI methods
-# the gssapi gem attempts to attach to and these warnings are dumped to STDERR.
-silence_warnings do
-  # Requiring winrm before all other gems because of https://github.com/WinRb/WinRM/issues/39
-  require 'winrm'
-end
-
 require 'active_support/inflector'
 require 'addressable/uri'
 require 'celluloid'
 require 'chozo'
 require 'faraday'
 require 'forwardable'
-require 'multi_json'
+require 'json'
 require 'pathname'
 require 'solve'
 
-if jruby?
-  require 'json/pure'
-else
-  require 'json/ext'
-end
-
 JSON.create_id = nil
 
 # @author Jamie Winsor <reset@riotgames.com>

data/ridley.gemspec

@@ -17,21 +17,18 @@ Gem::Specification.new do |s|
   s.version       = Ridley::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
-  s.add_runtime_dependency 'json', '>= 1.5.0'
-  s.add_runtime_dependency 'multi_json', '>= 1.0.4'
-  s.add_runtime_dependency 'chozo', '>= 0.6.0'
-  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'
-  s.add_runtime_dependency 'mixlib-authentication', '>= 1.3.0'
   s.add_runtime_dependency 'addressable'
-  s.add_runtime_dependency 'faraday', '>= 0.8.4'
-  s.add_runtime_dependency 'activesupport', '>= 3.2.0'
-  s.add_runtime_dependency 'solve', '>= 0.4.4'
-  s.add_runtime_dependency 'celluloid', '~> 0.14.0'
-  s.add_runtime_dependency 'net-ssh'
+  s.add_runtime_dependency 'chozo',                   '>= 0.6.0'
+  s.add_runtime_dependency 'celluloid',               '~> 0.14.0'
   s.add_runtime_dependency 'erubis'
-  s.add_runtime_dependency 'net-http-persistent', '>= 2.8'
+  s.add_runtime_dependency 'faraday',                 '>= 0.8.4'
+  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'
+  s.add_runtime_dependency 'mixlib-authentication',   '>= 1.3.0'
+  s.add_runtime_dependency 'net-http-persistent',     '>= 2.8'
+  s.add_runtime_dependency 'net-ssh'
   s.add_runtime_dependency 'retryable'
-  s.add_runtime_dependency 'winrm', '~> 1.1.0'
+  s.add_runtime_dependency 'solve',                   '>= 0.4.4'
+  s.add_runtime_dependency 'winrm',                   '~> 1.1.0'
 end

data/spec/spec_helper.rb

@@ -19,15 +19,11 @@ def setup_rspec
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
 
+    config.before(:suite) { Ridley::RSpec::ChefServer.start }
+
     config.before(:all) do
-      Celluloid.logger = nil
-      Ridley.logger = nil
+      Ridley.logger = Celluloid.logger = nil
       WebMock.disable_net_connect!(allow_localhost: true, net_http_connect_on_start: true)
-      Ridley::RSpec::ChefServer.start
-    end
-
-    config.after(:all) do
-      Ridley::RSpec::ChefServer.stop
     end
 
     config.before(:each) do
@@ -36,10 +32,6 @@ def setup_rspec
       clean_tmp_path
       Ridley::RSpec::ChefServer.server.clear_data
     end
-
-    config.after(:each) do
-      Ridley::RSpec::ChefServer.server.clear_data
-    end
   end
 end
 

data/spec/support/chef_server.rb

@@ -17,15 +17,14 @@ module Ridley::RSpec
       end
 
       def server
-        @server ||= ChefZero::Server.new(port: PORT, signals: false, log_requests: true)
+        @server ||= ChefZero::Server.new(port: PORT)
       end
 
       def server_url
-        "http://localhost:#{PORT}"
+        (@server && @server.url) || "http://localhost/#{PORT}"
       end
 
       def start
-        Thin::Logging.silent = true
         server.start_background
         server.on_response do |request, response|
           request_log << [ request, response ]
@@ -71,7 +70,7 @@ module Ridley::RSpec
     private
 
       def load_data(key, name, hash)
-        ChefServer.server.load_data(key.to_s => { name => MultiJson.encode(hash) })
+        ChefServer.server.load_data(key.to_s => { name => JSON.fast_generate(hash) })
       end
   end
 end

data/spec/unit/ridley/chef/cookbook_spec.rb

@@ -46,7 +46,7 @@ describe Ridley::Chef::Cookbook do
         before do
           FileUtils.mkdir_p(cookbook_path)
           File.open(File.join(cookbook_path, 'metadata.json'), 'w+') do |f|
-            f.write MultiJson.encode(name: "rspec_test")
+            f.write JSON.fast_generate(name: "rspec_test")
           end
         end
 

data/spec/unit/ridley/chef_objects/node_object_spec.rb

@@ -209,10 +209,7 @@ describe Ridley::NodeObject do
   end
 
   describe "#merge_data" do
-    before(:each) do
-      subject.name = "reset.riotgames.com"
-      subject.should_receive(:update)
-    end
+    before(:each) { subject.name = "reset.riotgames.com" }
 
     it "appends items to the run_list" do
       subject.merge_data(run_list: ["cook::one", "cook::two"])

data/spec/unit/ridley/host_connector/winrm/worker_spec.rb

@@ -25,7 +25,9 @@ describe Ridley::HostConnector::WinRM::Worker do
   describe "#winrm" do
     subject { winrm_worker.winrm }
 
-    it { should be_a(WinRM::WinRMWebService) }
+    it "returns a WinRM::WinRMWebService" do
+      expect(subject).to be_a(::WinRM::WinRMWebService)
+    end
   end
 
   describe "#get_command" do
@@ -83,7 +85,7 @@ describe Ridley::HostConnector::WinRM::Worker do
       it "returns an :error with the response" do
         status, response = run
         expect(status).to eq(:error)
-        expect(response.stderr).to eq("stderr")        
+        expect(response.stderr).to eq("stderr")
       end
     end
 

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

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe Ridley::Middleware::Gzip do
+  let(:env) do
+    Hashie::Mash.new(
+      'response_headers' => {
+        'content-encoding' => nil
+      },
+      'body' => nil
+    )
+  end
+
+  subject { described_class.new }
+
+  describe "#on_complete" do
+    let(:run) { subject.on_complete(env) }
+
+    context "when content-encoding is set to 'gzip'" do
+      let(:secret) { "this is a secret zipped message" }
+
+      before do
+        env['response_headers']['content-encoding'] = 'gzip'
+        io = StringIO.new
+        writer = Zlib::GzipWriter.new(io)
+        writer.write(secret)
+        writer.close
+        env['body'] = io.string
+      end
+
+      it "unzips the commpressed body" do
+        run
+        expect(env['body']).to eq(secret)
+      end
+    end
+
+    context "when content-encoding is set to 'deflate'" do
+      let(:secret) { "this is a secret deflated message" }
+
+      before do
+        env['response_headers']['content-encoding'] = 'deflate'
+        env['body'] = Zlib::Deflate.deflate(secret)
+      end
+
+      it "inflates the compressed body" do
+        run
+        expect(env['body']).to eq(secret)
+      end
+    end
+
+    context "when content-encoding is set to nothing" do
+      before { env['body'] = 'not changed' }
+
+      it "does not manipulate the body of the request" do
+        run
+        expect(env['body']).to eq('not changed')
+      end
+    end
+  end
+end

data/spec/unit/ridley/resources/node_resource_spec.rb

@@ -136,14 +136,31 @@ describe Ridley::NodeResource do
 
   describe "#merge_data" do
     subject { instance }
+    let(:node) { double('node') }
+    let(:data) { double('data') }
 
-    it "finds the target node and sends it the merge_data message" do
-      data = double('data')
-      node = double('node')
-      node.should_receive(:merge_data).with(data)
-      subject.should_receive(:find).and_return(node)
+    before { subject.stub(find: nil) }
 
-      subject.merge_data(node, data)
+    context "when a node with the given name exists" do
+      before { subject.should_receive(:find).and_return(node) }
+
+      it "finds the target node, sends it the merge_data message, and updates it" do
+        updated = double('updated')
+        node.should_receive(:merge_data).with(data).and_return(updated)
+        subject.should_receive(:update).with(updated)
+
+        subject.merge_data(node, data)
+      end
+    end
+
+    context "when a node with the given name does not exist" do
+      before { subject.should_receive(:find).with(node).and_return(nil) }
+
+      it "raises a ResourceNotFound error" do
+        expect {
+          subject.merge_data(node, data)
+        }.to raise_error(Ridley::Errors::ResourceNotFound)
+      end
     end
   end
 end

data/spec/unit/ridley/resources/sandbox_resource_spec.rb

@@ -17,7 +17,7 @@ describe Ridley::SandboxResource do
 
     before(:each) do
       connection.stub(:post).
-        with(subject.class.resource_path, MultiJson.encode(checksums: checksums)).
+        with(subject.class.resource_path, JSON.fast_generate(checksums: checksums)).
         and_return(response)
     end
 
@@ -77,7 +77,7 @@ describe Ridley::SandboxResource do
     end
 
     it "sends a /PUT to the sandbox resource with is_complete set to true" do
-      connection.should_receive(:put).with(sandbox_path, MultiJson.encode(is_completed: true)).and_return(response)
+      connection.should_receive(:put).with(sandbox_path, JSON.fast_generate(is_completed: true)).and_return(response)
 
       subject.commit(sandbox_id)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,32 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chozo
   requirement: !ruby/object:Gem::Requirement
@@ -60,29 +44,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: mixlib-log
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,15 +74,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,9 +90,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
-  name: mixlib-authentication
+  name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,13 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,15 +122,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,15 +138,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,15 +154,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: solve
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,23 +170,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.4
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: retryable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -236,29 +204,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: retryable
+  name: solve
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,7 +218,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
@@ -339,6 +291,7 @@ files:
 - lib/ridley/middleware/chef_auth.rb
 - lib/ridley/middleware/chef_response.rb
 - lib/ridley/middleware/follow_redirects.rb
+- lib/ridley/middleware/gzip.rb
 - lib/ridley/middleware/parse_json.rb
 - lib/ridley/middleware/retry.rb
 - lib/ridley/mixin.rb
@@ -420,6 +373,7 @@ files:
 - spec/unit/ridley/host_connector_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
+- spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
 - spec/unit/ridley/mixin/bootstrap_binding_spec.rb
 - spec/unit/ridley/resource_spec.rb
@@ -455,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1382072884355944447
+      hash: 3894427319828211488
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -524,6 +478,7 @@ test_files:
 - spec/unit/ridley/host_connector_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
+- spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
 - spec/unit/ridley/mixin/bootstrap_binding_spec.rb
 - spec/unit/ridley/resource_spec.rb