ridley 4.0.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcfcaeea81633ef129ccef6ff8f1f2ffe02c3862
-  data.tar.gz: 193f02dd4c48240a88730a325364f7a467a3377e
+  metadata.gz: 1c7d2e45f884fb456322b48859368c420ec0f112
+  data.tar.gz: 0f0e0212abe893d298894fb71f7f2f385b9dd26f
 SHA512:
-  metadata.gz: ff2323596b824efadefe1b9b6e795f07e81464f70a62a53271719662413ab6c195eedff29e499c63e8a6bb454db4235d2818b7fffa028baa1c2daec43522507a
-  data.tar.gz: 7193d8513449c3cef68faaa95776519fcf819c1c17cdf9764ccb3889ca126afc4814a609a1616538bf87795a8ed67c6decf50daeb0151d1db5e3683b7b626938
+  metadata.gz: 0add3e0c899c30e52d0df48041940020c76508382ac622e3b21f8f9df39a59ccb25f5e6b1353e7ce648ba6b11ed34db644528ffad88fabbdabb909329363d066
+  data.tar.gz: 708ec93b537dd61a8443772c855345813af13de9418b9013928036efb35624465b8fd5938cc820ad3d6391ef7ebef1708294325d58e01500f2c5f9e92bac7607

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+# 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
+  * Support 'root_default' files
+
+# 4.1.2
+
+* Fixed: permission denied errors on Windows while uploading cookbooks
+* Fixed: no proc error when evaluating client_key option
+* Bump required version of retryable
+
+# 4.1.1
+
+* Enhancements
+  * Add support for metadata source_url field
+  * Add support for metadata issues_url field
+
+# 4.1.0
+
+* Fix monkey patching issue with options#slice when running under Vagrant
+* Bump required version of Celluloid `~> 0.16.0`
+* Bump required version of Celluloid-IO `~> 0.16.1`
+
 # 4.0.0
 
 * Update many out of date dependencies

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/Rakefile

@@ -0,0 +1 @@
+require 'bundler/gem_tasks'

data/lib/ridley/chef/config.rb

@@ -43,13 +43,13 @@ module Ridley::Chef
     set_assignment_mode :carefree
 
     attribute :node_name,
-      default: Socket.gethostname
+      default: -> { Socket.gethostname }
     attribute :chef_server_url,
       default: 'http://localhost:4000'
     attribute :client_key,
-      default: platform_specific_path('/etc/chef/client.pem')
+      default: -> { platform_specific_path('/etc/chef/client.pem') }
     attribute :validation_key,
-      default: platform_specific_path('/etc/chef/validation.pem')
+      default: -> { platform_specific_path('/etc/chef/validation.pem') }
     attribute :validation_client_name,
       default: 'chef-validator'
 
@@ -70,9 +70,9 @@ module Ridley::Chef
     # deprecated in chef/config.rb but doesn't currently trigger a warning.
     # See also: CHEF-3715
     attribute :syntax_check_cache_path,
-      default: Dir.mktmpdir
+      default: -> { Dir.mktmpdir }
     attribute :cache_options,
-      default: { path: defined?(syntax_check_cache_path) ? syntax_check_cache_path : Dir.mktmpdir }
+      default: -> { { path: defined?(syntax_check_cache_path) ? syntax_check_cache_path : Dir.mktmpdir } }
 
     # Create a new Chef Config object.
     #

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

@@ -47,6 +47,8 @@ module Ridley::Chef
       GROUPINGS        = 'groupings'.freeze
       RECIPES          = 'recipes'.freeze
       VERSION          = 'version'.freeze
+      SOURCE_URL       = 'source_url'.freeze
+      ISSUES_URL       = 'issues_url'.freeze
 
       COMPILED_FILE_NAME = "metadata.json".freeze
       RAW_FILE_NAME      = "metadata.rb".freeze
@@ -55,7 +57,8 @@ module Ridley::Chef
         :name, :description, :long_description, :maintainer,
         :maintainer_email, :license, :platforms, :dependencies,
         :recommendations, :suggestions, :conflicting, :providing,
-        :replacing, :attributes, :groupings, :recipes, :version
+        :replacing, :attributes, :groupings, :recipes, :version,
+        :source_url, :issues_url
       ]
 
       include Ridley::Mixin::ParamsValidate
@@ -92,17 +95,20 @@ module Ridley::Chef
         self.maintainer_email(maintainer_email)
         self.license(license)
         self.description('A fabulous new cookbook')
-        @platforms = Hashie::Mash.new
-        @dependencies = Hashie::Mash.new
+        @platforms       = Hashie::Mash.new
+        @dependencies    = Hashie::Mash.new
         @recommendations = Hashie::Mash.new
-        @suggestions = Hashie::Mash.new
-        @conflicting = Hashie::Mash.new
-        @providing = Hashie::Mash.new
-        @replacing = Hashie::Mash.new
-        @attributes = Hashie::Mash.new
-        @groupings = Hashie::Mash.new
-        @recipes = Hashie::Mash.new
-        @version = Semverse::Version.new("0.0.0")
+        @suggestions     = Hashie::Mash.new
+        @conflicting     = Hashie::Mash.new
+        @providing       = Hashie::Mash.new
+        @replacing       = Hashie::Mash.new
+        @attributes      = Hashie::Mash.new
+        @groupings       = Hashie::Mash.new
+        @recipes         = Hashie::Mash.new
+        @version         = Semverse::Version.new("0.0.0")
+        @source_url      = ''
+        @issues_url      = ''
+
         if cookbook
           @recipes = cookbook.fully_qualified_recipe_names.inject({}) do |r, e|
             e = self.name if e =~ /::default$/
@@ -382,7 +388,9 @@ module Ridley::Chef
             :type => { :equal_to => [ "string", "array", "hash", "symbol", "boolean", "numeric" ], :default => "string" },
             :required => { :equal_to => [ "required", "recommended", "optional", true, false ], :default => "optional" },
             :recipes => { :kind_of => [ Array ], :default => [] },
-            :default => { :kind_of => [ String, Array, Hash, Symbol, Numeric, TrueClass, FalseClass ] }
+            :default => { :kind_of => [ String, Array, Hash, Symbol, Numeric, TrueClass, FalseClass ] },
+            :source_url => { :kind_of => String },
+            :issues_url => { :kind_of => String }
           }
         )
         options[:required] = remap_required_attribute(options[:required]) unless options[:required].nil?
@@ -424,13 +432,18 @@ module Ridley::Chef
           ATTRIBUTES       => self.attributes,
           GROUPINGS        => self.groupings,
           RECIPES          => self.recipes,
-          VERSION          => self.version
+          VERSION          => self.version,
+          SOURCE_URL       => self.source_url,
+          ISSUES_URL       => self.issues_url
         }
       end
 
       # @return [String]
       def to_json
-        JSON.fast_generate(to_hash)
+        # Switched from fast to pretty generate here
+        # to match `knife cookbook metadata from file` format
+        # See https://github.com/RiotGames/ridley/pull/287
+        JSON.pretty_generate(to_hash)
       end
 
       def from_hash(o)
@@ -451,6 +464,8 @@ module Ridley::Chef
         @groupings        = o[GROUPINGS] if o.has_key?(GROUPINGS)
         @recipes          = o[RECIPES] if o.has_key?(RECIPES)
         @version          = o[VERSION] if o.has_key?(VERSION)
+        @source_url       = o[SOURCE_URL] if o.has_key?(SOURCE_URL)
+        @issues_url       = o[ISSUES_URL] if o.has_key?(ISSUES_URL)
         self
       end
 
@@ -458,6 +473,36 @@ module Ridley::Chef
         from_hash JSON.parse(json)
       end
 
+      # Sets the cookbook's source URL, or returns it.
+      #
+      # === Parameters
+      # maintainer<String>:: The source URL
+      #
+      # === Returns
+      # source_url<String>:: Returns the current source URL.
+      def source_url(arg = nil)
+        set_or_return(
+          :source_url,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      # Sets the cookbook's issues URL, or returns it.
+      #
+      # === Parameters
+      # issues_url<String>:: The issues URL
+      #
+      # === Returns
+      # issues_url<String>:: Returns the current issues URL.
+      def issues_url(arg = nil)
+        set_or_return(
+          :issues_url,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
       private
 
         # Verify that the given array is an array of strings

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

@@ -1,5 +1,4 @@
-require 'shellwords'
-require 'buff/shell_out'
+require 'erubis'
 
 module Ridley::Chef
   class Cookbook
@@ -68,7 +67,6 @@ module Ridley::Chef
           end
       end
 
-      include Buff::ShellOut
       include Ridley::Logging
       include Ridley::Mixin::Checksum
 
@@ -131,30 +129,55 @@ module Ridley::Chef
         true
       end
 
+      # Borrowed from: https://github.com/opscode/chef/blob/d111e82/lib/chef/cookbook/syntax_check.rb#L191-L215
       def validate_template(erb_file)
-        result = shell_out("erubis -x #{erb_file.shellescape} | ruby -c")
+        old_stderr = $stderr
 
-        if result.error?
-          file_relative_path = erb_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
-          log.error { "Erb template #{file_relative_path} has a syntax error:" }
-          result.stderr.each_line { |l| Ridley.log.fatal(l.chomp) }
-          return false
-        end
+        engine = Erubis::Eruby.new
+        engine.convert!(IO.read(erb_file))
+
+        ruby_code = engine.src
+
+        # Even when we're compiling the code w/ RubyVM, syntax errors just
+        # print to $stderr. We want to capture this and handle the printing
+        # ourselves, so we must temporarily swap $stderr to capture the output.
+        tmp_stderr = $stderr = StringIO.new
+
+        abs_path = File.expand_path(erb_file)
+        RubyVM::InstructionSequence.new(ruby_code, erb_file, abs_path, 0)
 
         true
+      rescue SyntaxError
+        $stderr = old_stderr
+        invalid_erb_file(erb_file, tmp_stderr.string)
+        false
+      ensure
+        $stderr = old_stderr if defined?(old_stderr) && old_stderr
       end
 
+      # Borrowed from: https://github.com/opscode/chef/blob/d111e82/lib/chef/cookbook/syntax_check.rb#L242-L264
       def validate_ruby_file(ruby_file)
-        result = shell_out("ruby -c #{ruby_file.shellescape}")
-
-        if result.error?
-          file_relative_path = ruby_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
-          log.error { "Cookbook file #{file_relative_path} has a ruby syntax error:" }
-          result.stderr.each_line { |l| Ridley.log.error(l.chomp) }
-          return false
-        end
-
+        # Even when we're compiling the code w/ RubyVM, syntax errors just
+        # print to $stderr. We want to capture this and handle the printing
+        # ourselves, so we must temporarily swap $stderr to capture the output.
+        old_stderr = $stderr
+        tmp_stderr = $stderr = StringIO.new
+        abs_path = File.expand_path(ruby_file)
+        file_content = IO.read(abs_path)
+
+        # We have to wrap this in a block so the user code evaluates in a
+        # similar context as what Chef does normally. Otherwise RubyVM
+        # will reject some common idioms, like using `return` to end evaluation
+        # of a recipe. See also CHEF-5199
+        wrapped_content = "Object.new.instance_eval do\n#{file_content}\nend\n"
+        RubyVM::InstructionSequence.new(wrapped_content, ruby_file, abs_path, 0)
         true
+      rescue SyntaxError
+        $stderr = old_stderr
+        invalid_ruby_file(ruby_file, tmp_stderr.string)
+        false
+      ensure
+        $stderr = old_stderr if defined?(old_stderr) && old_stderr
       end
 
       private
@@ -165,6 +188,21 @@ module Ridley::Chef
         def ignored?(file)
           !!chefignore && chefignore.ignored?(file)
         end
+
+        # Debug a syntax error in a template.
+        def invalid_erb_file(erb_file, error_message)
+          log.error("Erb template #{erb_file} has a syntax error:")
+          error_message.each_line { |l| log.error(l.chomp) }
+          nil
+        end
+
+        # Debugs ruby syntax errors by printing the path to the file and any
+        # diagnostic info given in +error_message+
+        def invalid_ruby_file(ruby_file, error_message)
+          log.error("Cookbook file #{ruby_file} has a ruby syntax error:")
+          error_message.each_line { |l| log.error(l.chomp) }
+          false
+        end
     end
   end
 end

data/lib/ridley/chef/cookbook.rb

@@ -170,7 +170,7 @@ module Ridley::Chef
       case category
       when :files, :templates
         relpath = target.relative_path_from(path).to_s
-        relpath.slice(/(.+)\/(.+)\/.+/, 2)
+        relpath.slice(/(.+)\/(.+)\/.+/, 2) || 'root_default'
       else
         'default'
       end

data/lib/ridley/chef/digester.rb

@@ -40,7 +40,9 @@ module Ridley::Chef
     private
 
       def checksum_file(file, digest)
-        File.open(file, 'rb') { |f| checksum_io(f, digest) }
+        File.open(file, 'rb') do |f|
+          checksum_io(f, digest)
+        end
       end
 
       def checksum_io(io, digest)

data/lib/ridley/client.rb

@@ -1,3 +1,5 @@
+require 'ridley/helpers'
+
 module Ridley
   class Client
     class ConnectionSupervisor < ::Celluloid::SupervisionGroup
@@ -7,7 +9,7 @@ module Ridley
           options[:server_url],
           options[:client_name],
           options[:client_key],
-          options.slice(*Ridley::Connection::VALID_OPTIONS)
+          Ridley::Helpers.options_slice(options, *Ridley::Connection::VALID_OPTIONS)
         ], as: :connection_pool)
       end
     end
@@ -17,14 +19,14 @@ module Ridley
         super(registry)
         supervise_as :client_resource, Ridley::ClientResource, connection_registry
         supervise_as :cookbook_resource, Ridley::CookbookResource, connection_registry,
-          options[:client_name], options[:client_key], options.slice(*Ridley::Connection::VALID_OPTIONS)
+          options[:client_name], options[:client_key], Ridley::Helpers.options_slice(options, *Ridley::Connection::VALID_OPTIONS)
         supervise_as :data_bag_resource, Ridley::DataBagResource, connection_registry,
           options[:encrypted_data_bag_secret]
         supervise_as :environment_resource, Ridley::EnvironmentResource, connection_registry
         supervise_as :node_resource, Ridley::NodeResource, connection_registry, options
         supervise_as :role_resource, Ridley::RoleResource, connection_registry
         supervise_as :sandbox_resource, Ridley::SandboxResource, connection_registry,
-          options[:client_name], options[:client_key], options.slice(*Ridley::Connection::VALID_OPTIONS)
+          options[:client_name], options[:client_key], Ridley::Helpers.options_slice(options, *Ridley::Connection::VALID_OPTIONS)
         supervise_as :search_resource, Ridley::SearchResource, connection_registry
         supervise_as :user_resource, Ridley::UserResource, connection_registry
       end
@@ -137,6 +139,7 @@ module Ridley
       end
 
       unless verify_client_key(@options[:client_key])
+        @options[:client_key] = @options[:client_key].call if @options[:client_key].kind_of? Proc
         @options[:client_key] = File.expand_path(@options[:client_key])
         raise Errors::ClientKeyFileNotFoundOrInvalid, "client key is invalid or not found at: '#{@options[:client_key]}'" unless File.exist?(@options[:client_key]) && verify_client_key(::IO.read(@options[:client_key]))
       end

data/lib/ridley/connection.rb

@@ -3,6 +3,8 @@ require 'retryable'
 require 'tempfile'
 require 'zlib'
 
+require 'ridley/helpers'
+
 module Ridley
   class Connection < Faraday::Connection
     include Celluloid
@@ -59,13 +61,12 @@ 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 = Addressable::URI.parse(server_url).to_hash.slice(:scheme, :host, :port)
+      uri_hash = Ridley::Helpers.options_slice(Addressable::URI.parse(server_url).to_hash, :scheme, :host, :port)
 
       unless uri_hash[:port]
         uri_hash[:port] = (uri_hash[:scheme] == "https" ? 443 : 80)
@@ -143,7 +144,7 @@ module Ridley
       local = Tempfile.new('ridley-stream')
       local.binmode
 
-      retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
+      Retryable.retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
         open(target, 'rb', headers) do |remote|
           body = remote.read
           case remote.content_encoding

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/helpers.rb

@@ -0,0 +1,10 @@
+module Ridley
+  module Helpers
+    def self.options_slice(options, *keys)
+      keys.inject({}) do |memo, key|
+        memo[key] = options[key] if options.include?(key)
+        memo
+      end
+    end
+  end
+end

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/resources/cookbook_resource.rb

@@ -1,3 +1,5 @@
+require 'ridley/helpers'
+
 module Ridley
   class CookbookResource < Ridley::Resource
     task_class TaskThread
@@ -225,10 +227,20 @@ module Ridley
 
       sandbox.upload(checksums)
       sandbox.commit
-      update(cookbook, options.slice(:force, :freeze))
+      update(cookbook, Ridley::Helpers.options_slice(options, :force, :freeze))
     ensure
       # Destroy the compiled metadata only if it was created
-      File.delete(compiled_metadata) unless compiled_metadata.nil?
+      if compiled_metadata
+        # The garbage collector still has a reference to the file we'd
+        # like to delete. On *nix this isn't a big deal, but on Windows
+        # [ ruby 2.0.0p451 (2014-02-24) [i386-mingw32] ] open files
+        # cannot be deleted, so we're forced to garbage collect to
+        # ensure we can delete the file. This is CRITICAL to ensure that
+        # a stale metadata file isn't left on disk because next time we
+        # would use that file instead of recompiling.
+        GC.start
+        File.delete(compiled_metadata)
+      end
     end
 
     # Return a list of versions for the given cookbook present on the remote Chef server

data/lib/ridley/version.rb

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

data/ridley.gemspec

@@ -23,15 +23,15 @@ Gem::Specification.new do |s|
   s.add_dependency 'buff-extensions',         '~> 1.0'
   s.add_dependency 'buff-ignore',             '~> 1.1'
   s.add_dependency 'buff-shell_out',          '~> 0.1'
-  s.add_dependency 'celluloid',               '~> 0.16.0.pre'
-  s.add_dependency 'celluloid-io',            '~> 0.16.0.pre'
+  s.add_dependency 'celluloid',               '~> 0.16.0'
+  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'
+  s.add_dependency 'retryable',               '~> 2.0'
   s.add_dependency 'semverse',                '~> 1.1'
 
   s.add_development_dependency 'buff-ruby_engine', '~> 0.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