ridley 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c13d1d47eeb614454e357f42ed41e60d16fe1287
-  data.tar.gz: 2e48d517a5fd6d1aa51327eb2c050207132b315e
+  metadata.gz: 1c7d2e45f884fb456322b48859368c420ec0f112
+  data.tar.gz: 0f0e0212abe893d298894fb71f7f2f385b9dd26f
 SHA512:
-  metadata.gz: a7f9d49e3cff824cfdc0725ae925ffb205024474b037a44b3dcbcde037f63d8c6bd95cdc346191f10592a6d4ea72404c72aaea959d63566fa051e8e8d5ca0c98
-  data.tar.gz: 0d0234d3ef23f7942e18c3c54c4c1f0528870259cf9fa89a5d5b5b3ce58d1f9faba59330394d1248335cba20f20adeb45d8e9c3805765a17b06d9abbc8f61e2b
+  metadata.gz: 0add3e0c899c30e52d0df48041940020c76508382ac622e3b21f8f9df39a59ccb25f5e6b1353e7ce648ba6b11ed34db644528ffad88fabbdabb909329363d066
+  data.tar.gz: 708ec93b537dd61a8443772c855345813af13de9418b9013928036efb35624465b8fd5938cc820ad3d6391ef7ebef1708294325d58e01500f2c5f9e92bac7607

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 4.3.0
+
+* Enhancements
+  * Switch internal HTTP client from `net_http_persistent` to `httpclient`
+  * Loosen constraint on Hashie to allow for both the 2.x and 3.x line
+* Bug Fixes
+  * Fix missiong constant ValidationFailed when performing a params validation
+
 # 4.2.0
 
 * Enhancements

data/Gemfile

@@ -41,7 +41,7 @@ end
 group :test do
   gem 'thor'
   gem 'rake', '>= 0.9.2.2'
-  gem 'rspec', '~> 2.14.0'
+  gem 'rspec', '~> 3.0'
   gem 'fuubar'
   gem 'json_spec'
   gem 'webmock'

data/README.md

@@ -1,8 +1,8 @@
 # Ridley
 [![Gem Version](https://badge.fury.io/rb/ridley.png)](http://badge.fury.io/rb/ridley)
-[![Build Status](https://secure.travis-ci.org/RiotGames/ridley.png?branch=master)](http://travis-ci.org/RiotGames/ridley)
-[![Dependency Status](https://gemnasium.com/RiotGames/ridley.png?travis)](https://gemnasium.com/RiotGames/ridley)
-[![Code Climate](https://codeclimate.com/github/RiotGames/ridley.png)](https://codeclimate.com/github/RiotGames/ridley)
+[![Build Status](https://secure.travis-ci.org/reset/ridley.png?branch=master)](http://travis-ci.org/reset/ridley)
+[![Dependency Status](https://gemnasium.com/reset/ridley.png?travis)](https://gemnasium.com/reset/ridley)
+[![Code Climate](https://codeclimate.com/github/reset/ridley.png)](https://codeclimate.com/github/reset/ridley)
 
 A reliable Chef API client with a clean syntax
 
@@ -430,4 +430,4 @@ Authors and Contributors
 - Jamie Winsor (<jamie@vialstudios.com>)
 - Kyle Allan (<kallan@riotgames.com>)
 
-Thank you to all of our [Contributors](https://github.com/RiotGames/ridley/graphs/contributors), testers, and users.
+Thank you to all of our [Contributors](https://github.com/reset/ridley/graphs/contributors), testers, and users.

data/lib/ridley/connection.rb

@@ -61,10 +61,9 @@ module Ridley
         b.request :chef_auth, client_name, client_key
 
         b.response :parse_json
-        b.response :gzip
         b.response :chef_response
 
-        b.adapter :net_http_persistent
+        b.adapter :httpclient
       end
 
       uri_hash = Ridley::Helpers.options_slice(Addressable::URI.parse(server_url).to_hash, :scheme, :host, :port)

data/lib/ridley/errors.rb

@@ -10,6 +10,7 @@ module Ridley
 
     class ResourceNotFound < RidleyError; end
     class ValidatorNotFound < RidleyError; end
+    class ValidationFailed < RidleyError; end
 
     class InvalidResource < RidleyError
       attr_reader :errors

data/lib/ridley/mixin/params_validate.rb

@@ -1,3 +1,5 @@
+require 'ridley/errors'
+
 module Ridley::Mixin
   # Borrowed and modified from: {https://raw.github.com/opscode/chef/11.4.0/lib/chef/mixin/params_validate.rb}
   #
@@ -15,6 +17,8 @@ module Ridley::Mixin
   # See the License for the specific language governing permissions and
   # limitations under the License.
   module ParamsValidate
+    include Ridley::Errors
+
     # Takes a hash of options, along with a map to validate them.  Returns the original
     # options hash, plus any changes that might have been made (through things like setting
     # default values in the validation map)

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "4.2.0"
+  VERSION = "4.3.0"
 end

data/ridley.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'celluloid-io',            '~> 0.16.1'
   s.add_dependency 'erubis'
   s.add_dependency 'faraday',                 '~> 0.9.0'
-  s.add_dependency 'hashie',                  '>= 2.0.2', '< 3.0.0'
+  s.add_dependency 'hashie',                  '>= 2.0.2', '< 4.0.0'
+  s.add_dependency 'httpclient',              '~> 2.6'
   s.add_dependency 'json',                    '>= 1.7.7'
   s.add_dependency 'mixlib-authentication',   '>= 1.3.0'
-  s.add_dependency 'net-http-persistent',     '>= 2.8'
   s.add_dependency 'retryable',               '~> 2.0'
   s.add_dependency 'semverse',                '~> 1.1'
 

data/spec/acceptance/client_resource_spec.rb

@@ -11,30 +11,30 @@ describe "Client API operations", type: "acceptance" do
       before { chef_client("reset", admin: false) }
 
       it "returns a ClientObject" do
-        connection.client.find("reset").should be_a(Ridley::ClientObject)
+        expect(connection.client.find("reset")).to be_a(Ridley::ClientObject)
       end
     end
 
     context "when the server does not have the client" do
       it "returns a nil value" do
-        connection.client.find("not_there").should be_nil
+        expect(connection.client.find("not_there")).to be_nil
       end
     end
   end
 
   describe "creating a client" do
     it "returns a Ridley::ClientObject" do
-      connection.client.create(name: "reset").should be_a(Ridley::ClientObject)
+      expect(connection.client.create(name: "reset")).to be_a(Ridley::ClientObject)
     end
 
     it "adds a client to the chef server" do
       old = connection.client.all.length
       connection.client.create(name: "reset")
-      connection.client.all.should have(old + 1).items
+      expect(connection.client.all.size).to eq(old + 1)
     end
 
     it "has a value for #private_key" do
-      connection.client.create(name: "reset").private_key.should_not be_nil
+      expect(connection.client.create(name: "reset").private_key).not_to be_nil
     end
   end
 
@@ -42,13 +42,13 @@ describe "Client API operations", type: "acceptance" do
     before { chef_client("reset", admin: false) }
 
     it "returns a Ridley::ClientObject object" do
-      connection.client.delete("reset").should be_a(Ridley::ClientObject)
+      expect(connection.client.delete("reset")).to be_a(Ridley::ClientObject)
     end
 
     it "removes the client from the server" do
       connection.client.delete("reset")
 
-      connection.client.find("reset").should be_nil
+      expect(connection.client.find("reset")).to be_nil
     end
   end
 
@@ -59,12 +59,12 @@ describe "Client API operations", type: "acceptance" do
     end
 
     it "returns an array of Ridley::ClientObject objects" do
-      connection.client.delete_all.should each be_a(Ridley::ClientObject)
+      expect(connection.client.delete_all).to each be_a(Ridley::ClientObject)
     end
 
     it "deletes all clients from the remote" do
       connection.client.delete_all
-      connection.client.all.should have(0).clients
+      expect(connection.client.all.size).to eq(0)
     end
   end
 
@@ -75,11 +75,11 @@ describe "Client API operations", type: "acceptance" do
     end
 
     it "returns an array of Ridley::ClientObject objects" do
-      connection.client.all.should each be_a(Ridley::ClientObject)
+      expect(connection.client.all).to each be_a(Ridley::ClientObject)
     end
 
     it "returns all of the clients on the server" do
-      connection.client.all.should have(4).items
+      expect(connection.client.all.size).to eq(4)
     end
   end
 
@@ -87,7 +87,7 @@ describe "Client API operations", type: "acceptance" do
     before { chef_client("reset", admin: false) }
 
     it "returns a Ridley::ClientObject object with a value for #private_key" do
-      connection.client.regenerate_key("reset").private_key.should match(/^-----BEGIN RSA PRIVATE KEY-----/)
+      expect(connection.client.regenerate_key("reset").private_key).to match(/^-----BEGIN RSA PRIVATE KEY-----/)
     end
   end
 end

data/spec/acceptance/cookbook_resource_spec.rb

@@ -18,7 +18,7 @@ describe "Client API operations", type: "acceptance" do
       before { subject.download(name, version, destination) }
 
       it "downloads the cookbook to the destination" do
-        expect(File.exist?(destination.join("metadata.json"))).to be_true
+        expect(File.exist?(destination.join("metadata.json"))).to be_truthy
       end
     end
   end
@@ -30,23 +30,23 @@ describe "Client API operations", type: "acceptance" do
       subject.upload(path)
       cookbook = subject.find("example_cookbook", "0.1.0")
 
-      cookbook.attributes.should have(1).item
-      cookbook.definitions.should have(1).item
-      cookbook.files.should have(2).items
-      cookbook.libraries.should have(1).item
-      cookbook.providers.should have(1).item
-      cookbook.recipes.should have(1).item
-      cookbook.resources.should have(1).item
-      cookbook.templates.should have(1).item
-      cookbook.root_files.should have(1).items
+      expect(cookbook.attributes.size).to eq(1)
+      expect(cookbook.definitions.size).to eq(1)
+      expect(cookbook.files.size).to eq(2)
+      expect(cookbook.libraries.size).to eq(1)
+      expect(cookbook.providers.size).to eq(1)
+      expect(cookbook.recipes.size).to eq(1)
+      expect(cookbook.resources.size).to eq(1)
+      expect(cookbook.templates.size).to eq(1)
+      expect(cookbook.root_files.size).to eq(1)
     end
 
     it "does not contain a raw metadata.rb but does contain a compiled metadata.json" do
       subject.upload(path)
       cookbook = subject.find("example_cookbook", "0.1.0")
 
-      expect(cookbook.root_files.any? { |f| f[:name] == "metadata.json" }).to be_true
-      expect(cookbook.root_files.any? { |f| f[:name] == "metadata.rb" }).to be_false
+      expect(cookbook.root_files.any? { |f| f[:name] == "metadata.json" }).to be_truthy
+      expect(cookbook.root_files.any? { |f| f[:name] == "metadata.rb" }).to be_falsey
     end
   end
 
@@ -60,9 +60,9 @@ describe "Client API operations", type: "acceptance" do
 
     it "returns all of the cookbooks on the server" do
       all_cookbooks = subject.all
-      expect(all_cookbooks).to have(2).items
-      expect(all_cookbooks["ruby"]).to have(2).items
-      expect(all_cookbooks["elixir"]).to have(2).items
+      expect(all_cookbooks.size).to eq(2)
+      expect(all_cookbooks["ruby"].size).to eq(2)
+      expect(all_cookbooks["elixir"].size).to eq(2)
     end
   end
 end

data/spec/acceptance/data_bag_item_resource_spec.rb

@@ -14,7 +14,7 @@ describe "DataBag API operations", type: "acceptance" do
   describe "listing data bag items" do
     context "when the data bag has no items" do
       it "returns an empty array" do
-        data_bag.item.all.should have(0).items
+        expect(data_bag.item.all.size).to eq(0)
       end
     end
 
@@ -25,7 +25,7 @@ describe "DataBag API operations", type: "acceptance" do
       end
 
       it "returns an array with each item" do
-        data_bag.item.all.should have(2).items
+        expect(data_bag.item.all.size).to eq(2)
       end
     end
   end
@@ -34,7 +34,7 @@ describe "DataBag API operations", type: "acceptance" do
     it "adds a data bag item to the collection of data bag items" do
       data_bag.item.create(id: "appconfig", host: "host.local", port: 80, admin: false, servers: ["one"])
 
-      data_bag.item.all.should have(1).item
+      expect(data_bag.item.all.size).to eq(1)
     end
 
     context "when an 'id' field is missing" do
@@ -59,7 +59,7 @@ describe "DataBag API operations", type: "acceptance" do
       }
       data_bag.item.create(attributes)
 
-      data_bag.item.find("appconfig").to_hash.should eql(attributes)
+      expect(data_bag.item.find("appconfig").to_hash).to eql(attributes)
     end
   end
 
@@ -76,14 +76,14 @@ describe "DataBag API operations", type: "acceptance" do
     it "returns the deleted data bag item" do
       dbi = data_bag.item.delete(attributes["id"])
 
-      dbi.should be_a(Ridley::DataBagItemObject)
-      dbi.attributes.should eql(attributes)
+      expect(dbi).to be_a(Ridley::DataBagItemObject)
+      expect(dbi.attributes).to eql(attributes)
     end
 
     it "deletes the data bag item from the server" do
       data_bag.item.delete(attributes["id"])
 
-      data_bag.item.find(attributes["id"]).should be_nil
+      expect(data_bag.item.find(attributes["id"])).to be_nil
     end
   end
 
@@ -94,13 +94,13 @@ describe "DataBag API operations", type: "acceptance" do
     end
 
     it "returns the array of deleted data bag items" do
-      data_bag.item.delete_all.should each be_a(Ridley::DataBagItemObject)
+      expect(data_bag.item.delete_all).to each be_a(Ridley::DataBagItemObject)
     end
 
     it "removes all data bag items from the data bag" do
       data_bag.item.delete_all
 
-      data_bag.item.all.should have(0).items
+      expect(data_bag.item.all.size).to eq(0)
     end
   end
 
@@ -110,7 +110,7 @@ describe "DataBag API operations", type: "acceptance" do
     it "returns the updated data bag item" do
       dbi = data_bag.item.update(id: "one", name: "brooke")
 
-      dbi[:name].should eql("brooke")
+      expect(dbi[:name]).to eql("brooke")
     end
   end
 
@@ -120,14 +120,14 @@ describe "DataBag API operations", type: "acceptance" do
 
       it "returns true if successful" do
         dbi[:name] = "brooke"
-        dbi.save.should be_true
+        expect(dbi.save).to be_truthy
       end
 
       it "creates a new data bag item on the remote" do
         dbi[:name] = "brooke"
         dbi.save
 
-        data_bag.item.all.should have(1).item
+        expect(data_bag.item.all.size).to eq(1)
       end
     end
 
@@ -136,7 +136,7 @@ describe "DataBag API operations", type: "acceptance" do
         dbi = data_bag.item.new
 
         dbi.attributes = { id: "not-there", name: "brooke" }
-        dbi.save.should be_true
+        expect(dbi.save).to be_truthy
       end
 
       it "creates a new data bag item on the remote" do
@@ -144,7 +144,7 @@ describe "DataBag API operations", type: "acceptance" do
         dbi.attributes = { id: "not-there", name: "brooke" }
         dbi.save
 
-        data_bag.item.all.should have(1).item
+        expect(data_bag.item.all.size).to eq(1)
       end
     end
   end

data/spec/acceptance/data_bag_resource_spec.rb

@@ -9,7 +9,7 @@ describe "DataBag API operations", type: "acceptance" do
   describe "listing data bags" do
     context "when no data bags exist" do
       it "returns an empty array" do
-        connection.data_bag.all.should have(0).items
+        expect(connection.data_bag.all.size).to eq(0)
       end
     end
 
@@ -20,18 +20,18 @@ describe "DataBag API operations", type: "acceptance" do
       end
 
       it "returns an array of data bags" do
-        connection.data_bag.all.should each be_a(Ridley::DataBagObject)
+        expect(connection.data_bag.all).to each be_a(Ridley::DataBagObject)
       end
 
       it "returns all of the data bags on the server" do
-        connection.data_bag.all.should have(2).items
+        expect(connection.data_bag.all.size).to eq(2)
       end
     end
   end
 
   describe "creating a data bag" do
     it "returns a Ridley::DataBagObject" do
-      connection.data_bag.create(name: "ridley-one").should be_a(Ridley::DataBagObject)
+      expect(connection.data_bag.create(name: "ridley-one")).to be_a(Ridley::DataBagObject)
     end
   end
 end

data/spec/acceptance/environment_resource_spec.rb

@@ -10,7 +10,7 @@ describe "Environment API operations", type: "acceptance" do
     before { chef_environment("ridley-test-env") }
 
     it "returns a valid Ridley::EnvironmentObject object" do
-      connection.environment.find("ridley-test-env").should be_a(Ridley::EnvironmentObject)
+      expect(connection.environment.find("ridley-test-env")).to be_a(Ridley::EnvironmentObject)
     end
   end
 
@@ -18,13 +18,13 @@ describe "Environment API operations", type: "acceptance" do
     it "returns a valid Ridley::EnvironmentObject object" do
       obj = connection.environment.create(name: "ridley-test-env", description: "a testing env for ridley")
 
-      obj.should be_a(Ridley::EnvironmentObject)
+      expect(obj).to be_a(Ridley::EnvironmentObject)
     end
 
     it "adds an environment to the chef server" do
       old = connection.environment.all.length
       connection.environment.create(name: "ridley")
-      connection.environment.all.should have(old + 1).item
+      expect(connection.environment.all.size).to eq(old + 1)
     end
   end
 
@@ -32,19 +32,19 @@ describe "Environment API operations", type: "acceptance" do
     before { chef_environment("ridley-env") }
 
     it "returns a Ridley::EnvironmentObject object" do
-      connection.environment.delete("ridley-env").should be_a(Ridley::EnvironmentObject)
+      expect(connection.environment.delete("ridley-env")).to be_a(Ridley::EnvironmentObject)
     end
 
     it "removes the environment from the server" do
       connection.environment.delete("ridley-env")
 
-      connection.environment.find("ridley-env").should be_nil
+      expect(connection.environment.find("ridley-env")).to be_nil
     end
 
     it "raises Ridley::Errors::HTTPMethodNotAllowed when attempting to delete the '_default' environment" do
-      lambda {
+      expect {
         connection.environment.delete("_default")
-      }.should raise_error(Ridley::Errors::HTTPMethodNotAllowed)
+      }.to raise_error(Ridley::Errors::HTTPMethodNotAllowed)
     end
   end
 
@@ -55,19 +55,19 @@ describe "Environment API operations", type: "acceptance" do
     end
 
     it "returns an array of Ridley::EnvironmentObject objects" do
-      connection.environment.delete_all.should each be_a(Ridley::EnvironmentObject)
+      expect(connection.environment.delete_all).to each be_a(Ridley::EnvironmentObject)
     end
 
     it "deletes all environments but '_default' from the remote" do
       connection.environment.delete_all
 
-      connection.environment.all.should have(1).item
+      expect(connection.environment.all.size).to eq(1)
     end
   end
 
   describe "listing all environments" do
     it "should return an array of Ridley::EnvironmentObject objects" do
-      connection.environment.all.should each be_a(Ridley::EnvironmentObject)
+      expect(connection.environment.all).to each be_a(Ridley::EnvironmentObject)
     end
   end
 
@@ -79,7 +79,7 @@ describe "Environment API operations", type: "acceptance" do
       target.description = description = "ridley testing environment"
 
       connection.environment.update(target)
-      target.reload.description.should eql(description)
+      expect(target.reload.description).to eql(description)
     end
 
     it "saves a new set of 'default_attributes'" do
@@ -92,7 +92,7 @@ describe "Environment API operations", type: "acceptance" do
 
       connection.environment.update(target)
       obj = connection.environment.find(target)
-      obj.default_attributes.should eql(default_attributes)
+      expect(obj.default_attributes).to eql(default_attributes)
     end
 
     it "saves a new set of 'override_attributes'" do
@@ -105,7 +105,7 @@ describe "Environment API operations", type: "acceptance" do
 
       connection.environment.update(target)
       obj = connection.environment.find(target)
-      obj.override_attributes.should eql(override_attributes)
+      expect(obj.override_attributes).to eql(override_attributes)
     end
 
     it "saves a new set of 'cookbook_versions'" do
@@ -116,7 +116,7 @@ describe "Environment API operations", type: "acceptance" do
 
       connection.environment.update(target)
       obj = connection.environment.find(target)
-      obj.cookbook_versions.should eql(cookbook_versions)
+      expect(obj.cookbook_versions).to eql(cookbook_versions)
     end
   end
 end