ridley 4.0.0 → 4.3.0

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

@@ -8,13 +8,16 @@ describe Ridley::DataBagResource do
     subject { instance.item_resource }
 
     it "returns a DataBagItemResource" do
-      subject.should be_a(Ridley::DataBagItemResource)
+      expect(subject).to be_a(Ridley::DataBagItemResource)
     end
 
-    its(:encrypted_data_bag_secret) { should eql(secret) }
+    describe '#encrypted_data_bag_secret' do
+      subject { super().encrypted_data_bag_secret }
+      it { is_expected.to eql(secret) }
+    end
   end
 
   describe "#find" do
-    pending
+    skip
   end
 end

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

@@ -28,13 +28,13 @@ describe Ridley::EnvironmentResource do
       end
 
       it "returns a Hash" do
-        should be_a(Hash)
+        is_expected.to be_a(Hash)
       end
 
       it "contains a key for each cookbook" do
-        subject.keys.should have(2).items
-        subject.should have_key("hello")
-        subject.should have_key("there")
+        expect(subject.keys.size).to eq(2)
+        expect(subject).to have_key("hello")
+        expect(subject).to have_key("there")
       end
     end
 

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

@@ -3,5 +3,5 @@ require 'spec_helper'
 describe Ridley::RoleResource do
   subject { described_class.new(double) }
 
-  pending
+  skip
 end

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

@@ -22,24 +22,24 @@ describe Ridley::SandboxResource do
     end
 
     it "returns a Ridley::SandboxObject" do
-      subject.create.should be_a(Ridley::SandboxObject)
+      expect(subject.create).to be_a(Ridley::SandboxObject)
     end
 
     it "has a value of 'false' for :is_completed" do
-      subject.create.is_completed.should be_false
+      expect(subject.create.is_completed).to be_falsey
     end
 
     it "has an empty Hash of checksums" do
-      subject.create.checksums.should be_a(Hash)
-      subject.create.checksums.should be_empty
+      expect(subject.create.checksums).to be_a(Hash)
+      expect(subject.create.checksums).to be_empty
     end
 
     it "has a value for :uri" do
-      subject.create.uri.should eql(sandbox_uri)
+      expect(subject.create.uri).to eql(sandbox_uri)
     end
 
     it "has a value for :sandbox_id" do
-      subject.create.sandbox_id.should eql(sandbox_id)
+      expect(subject.create.sandbox_id).to eql(sandbox_id)
     end
 
     context "when given an array of checksums" do
@@ -54,7 +54,7 @@ describe Ridley::SandboxResource do
       let(:checksum_array) { checksums.keys }
 
       it "has a Hash of checksums with each of the given checksum ids" do
-        subject.create(checksum_array).checksums.should have(checksum_array.length).checksums
+        expect(subject.create(checksum_array).checksums.size).to eq(checksum_array.length)
       end
     end
   end

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

@@ -11,8 +11,8 @@ describe Ridley::SearchResource do
       it "contains a 'q' key/value" do
         result = subject.build_query(query_string, options)
 
-        result.should have_key(:q)
-        result[:q].should eql(query_string)
+        expect(result).to have_key(:q)
+        expect(result[:q]).to eql(query_string)
       end
 
       context "when :sort option is set" do
@@ -21,8 +21,8 @@ describe Ridley::SearchResource do
         it "contains a 'sort' key/value" do
           result = subject.build_query(query_string, options)
 
-          result.should have_key(:sort)
-          result[:sort].should eql("DESC")
+          expect(result).to have_key(:sort)
+          expect(result[:sort]).to eql("DESC")
         end
       end
 
@@ -32,8 +32,8 @@ describe Ridley::SearchResource do
         it "contains a 'start' key/value" do
           result = subject.build_query(query_string, options)
 
-          result.should have_key(:start)
-          result[:start].should eql(1)
+          expect(result).to have_key(:start)
+          expect(result[:start]).to eql(1)
         end
       end
 
@@ -43,8 +43,8 @@ describe Ridley::SearchResource do
         it "contains a 'rows' key/value" do
           result = subject.build_query(query_string, options)
 
-          result.should have_key(:rows)
-          result[:rows].should eql(1)
+          expect(result).to have_key(:rows)
+          expect(result[:rows]).to eql(1)
         end
       end
     end
@@ -89,7 +89,7 @@ describe Ridley::SearchResource do
 
     describe "::query_uri" do
       it "returns a URI path containing the search resource path and index" do
-        subject.query_uri(:nodes).should eql("search/nodes")
+        expect(subject.query_uri(:nodes)).to eql("search/nodes")
       end
     end
   end
@@ -118,7 +118,7 @@ describe Ridley::SearchResource do
     end
 
     it "contains a key for each index" do
-      subject.indexes.should have(4).items
+      expect(subject.indexes.size).to eq(4)
     end
   end
 
@@ -179,8 +179,8 @@ describe Ridley::SearchResource do
       it "returns an array of Ridley::NodeObject" do
         result = run
 
-        result.should be_a(Array)
-        result.should each be_a(Ridley::NodeObject)
+        expect(result).to be_a(Array)
+        expect(result).to each be_a(Ridley::NodeObject)
       end
 
       context "after the search has executed and results are returned" do
@@ -188,7 +188,7 @@ describe Ridley::SearchResource do
 
         it "Ridley::NodeObject instances contain the results" do
           first_result = search_results.first
-          first_result.name.should eq("ridley-one")
+          expect(first_result.name).to eq("ridley-one")
         end
       end
     end
@@ -217,8 +217,8 @@ describe Ridley::SearchResource do
       it "returns an array of Ridley::RoleObject" do
         result = run
 
-        result.should be_a(Array)
-        result.should each be_a(Ridley::RoleObject)
+        expect(result).to be_a(Array)
+        expect(result).to each be_a(Ridley::RoleObject)
       end
 
       context "after the search has executed and results are returned" do
@@ -226,7 +226,7 @@ describe Ridley::SearchResource do
 
         it "Ridley::RoleObject instances contain the results" do
           first_result = search_results.first
-          first_result.name.should eq("ridley-role-one")
+          expect(first_result.name).to eq("ridley-role-one")
         end
       end
     end
@@ -254,8 +254,8 @@ describe Ridley::SearchResource do
       it "returns an array of Ridley::EnvironmentObject" do
         result = run
 
-        result.should be_a(Array)
-        result.should each be_a(Ridley::EnvironmentObject)
+        expect(result).to be_a(Array)
+        expect(result).to each be_a(Ridley::EnvironmentObject)
       end
 
       context "after the search has executed and results are returned" do
@@ -263,7 +263,7 @@ describe Ridley::SearchResource do
 
         it "Ridley::EnvironmentObject instances contain the results" do
           first_result = search_results.first
-          first_result.name.should eq("ridley-env-test")
+          expect(first_result.name).to eq("ridley-env-test")
         end
       end
     end
@@ -292,8 +292,8 @@ describe Ridley::SearchResource do
       it "returns an array of Ridley::ClientObject" do
         result = run
 
-        result.should be_a(Array)
-        result.should each be_a(Ridley::ClientObject)
+        expect(result).to be_a(Array)
+        expect(result).to each be_a(Ridley::ClientObject)
       end
 
       context "after the search has executed and results are returned" do
@@ -301,7 +301,7 @@ describe Ridley::SearchResource do
 
         it "Ridley::ClientObject instances contain the results" do
           first_result = search_results.first
-          first_result.name.should eq("ridley-client-test")
+          expect(first_result.name).to eq("ridley-client-test")
         end
       end
     end

data/spec/unit/ridley/sandbox_uploader_spec.rb

@@ -8,14 +8,14 @@ describe Ridley::SandboxUploader do
       let(:io) { StringIO.new("some long string") }
       subject { described_class.checksum(io) }
 
-      it { should eq("2fb66bbfb88cdf9e07a3f1d1dfad71ab") }
+      it { is_expected.to eq("2fb66bbfb88cdf9e07a3f1d1dfad71ab") }
     end
 
     describe "::checksum64" do
       let(:io) { StringIO.new("some long string") }
       subject { described_class.checksum64(io) }
 
-      it { should eq("L7Zrv7iM354Ho/HR361xqw==") }
+      it { is_expected.to eq("L7Zrv7iM354Ho/HR361xqw==") }
     end
   end
 
@@ -80,7 +80,7 @@ describe Ridley::SandboxUploader do
       end
 
       it "returns nil" do
-        subject.upload(sandbox, chk_id, path).should be_nil
+        expect(subject.upload(sandbox, chk_id, path)).to be_nil
       end
     end
 

data/spec/unit/ridley_spec.rb

@@ -9,9 +9,9 @@ describe Ridley do
     describe "::new" do
       it "creates a new Ridley::Connection" do
         client = double('client')
-        Ridley::Client.should_receive(:new).with(config).and_return(client)
+        expect(Ridley::Client).to receive(:new).with(config).and_return(client)
 
-        subject.new(config).should eql(client)
+        expect(subject.new(config)).to eql(client)
       end
     end
 
@@ -32,12 +32,12 @@ describe Ridley do
       let(:path) { tmp_path.join('config.rb').to_s }
 
       before do
-        Ridley::Client.stub(:new).and_return(client)
+        allow(Ridley::Client).to receive(:new).and_return(client)
         File.open(path, 'w') { |f| f.write(chef_config) }
       end
 
       it "creates a Ridley connection from the Chef config" do
-        Ridley::Client.should_receive(:new).with({
+        expect(Ridley::Client).to receive(:new).with({
           client_key: 'username.pem',
           client_name: 'username',
           validator_client: 'validator',
@@ -58,7 +58,7 @@ describe Ridley do
       end
 
       it "allows the user to override attributes" do
-        Ridley::Client.should_receive(:new).with({
+        expect(Ridley::Client).to receive(:new).with({
           client_key: 'bacon.pem',
           client_name: 'bacon',
           validator_client: 'validator',
@@ -88,7 +88,7 @@ describe Ridley do
         end
 
         it "does a knife.rb search" do
-          Ridley::Client.should_receive(:new).with({
+          expect(Ridley::Client).to receive(:new).with({
             client_key: 'username.pem',
             client_name: 'username',
             validator_client: 'validator',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,250 +9,250 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: varia_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: buff-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: buff-ignore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: buff-shell_out
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: mixlib-authentication
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: semverse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: buff-ruby_engine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 description: A reliable Chef API client with a clean syntax
@@ -263,14 +263,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
+- Rakefile
 - Thorfile
 - lib/ridley.rb
 - lib/ridley/chef.rb
@@ -294,13 +294,13 @@ files:
 - lib/ridley/client.rb
 - lib/ridley/connection.rb
 - lib/ridley/errors.rb
+- lib/ridley/helpers.rb
 - lib/ridley/logger.rb
 - lib/ridley/logging.rb
 - lib/ridley/middleware.rb
 - 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/mixin.rb
 - lib/ridley/mixin/checksum.rb
@@ -378,7 +378,6 @@ files:
 - spec/unit/ridley/logger_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/mixins/from_file_spec.rb
 - spec/unit/ridley/resource_spec.rb
@@ -404,17 +403,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A reliable Chef API client with a clean syntax
@@ -476,7 +475,6 @@ test_files:
 - spec/unit/ridley/logger_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/mixins/from_file_spec.rb
 - spec/unit/ridley/resource_spec.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0-p353