chefspec 9.2.0 → 9.3.2

data/lib/chefspec/util.rb

@@ -14,10 +14,10 @@ module ChefSpec
     def underscore(string)
       string
         .to_s
-        .gsub(/::/, '/')
-        .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-        .gsub(/([a-z\d])([A-Z])/,'\1_\2')
-        .tr('-', '_')
+        .gsub(/::/, "/")
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr("-", "_")
         .downcase
     end
 
@@ -32,8 +32,8 @@ module ChefSpec
     def camelize(string)
       string
         .to_s
-        .split('_')
-        .map { |e| e.capitalize }
+        .split("_")
+        .map(&:capitalize)
         .join
     end
 
@@ -49,7 +49,7 @@ module ChefSpec
       length = options[:length] || 30
 
       if string.length > length
-        string[0..length-3] + '...'
+        string[0..length - 3] + "..."
       else
         string
       end

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '9.2.0'
+  VERSION = "9.3.2".freeze
 end

data/lib/chefspec/zero_server.rb

@@ -1,4 +1,4 @@
-require 'chef_zero/server'
+require "chef_zero/server"
 
 module ChefSpec
   # Rather than create a ChefZero instance per test case, simply create one
@@ -56,7 +56,7 @@ module ChefSpec
         port: RSpec.configuration.server_runner_port,
 
         # Set the data store
-        data_store: data_store(RSpec.configuration.server_runner_data_store),
+        data_store: data_store(RSpec.configuration.server_runner_data_store)
       )
       @cookbooks_uploaded = false
       @data_loaded = {}
@@ -74,6 +74,7 @@ module ChefSpec
     #
     def upload_cookbooks!
       return if @cookbooks_uploaded
+
       loader = Chef::CookbookLoader.new(Chef::Config[:cookbook_path])
       loader.load_cookbooks
       cookbook_uploader_for(loader).upload_cookbooks
@@ -122,9 +123,8 @@ module ChefSpec
                 require "chef_zero/data_store/memory_store_v2"
                 ChefZero::DataStore::MemoryStoreV2.new
               when :on_disk
-                require "tmpdir"
+                require "tmpdir" unless defined?(Dir.mktmpdir)
                 require "chef_zero/data_store/raw_file_store"
-                tmpdir = Dir.mktmpdir
                 ChefZero::DataStore::RawFileStore.new(Dir.mktmpdir)
               else
                 raise ArgumentError, ":#{option} is not a valid server_runner_data_store option. Please use either :in_memory or :on_disk."

data/lib/chefspec.rb

@@ -1,4 +1,4 @@
-require 'rspec'
+require "rspec"
 
 module ChefSpec
   #
@@ -25,7 +25,7 @@ module ChefSpec
   # @return [Pathname]
   #
   def root
-    @root ||= Pathname.new(File.expand_path('../../', __FILE__))
+    @root ||= Pathname.new(File.expand_path("..", __dir__))
   end
   module_function :root
 
@@ -42,34 +42,34 @@ module ChefSpec
   module_function :matchers
 end
 
-require_relative 'chefspec/extensions'
+require_relative "chefspec/extensions"
 
-require_relative 'chefspec/mixins/normalize'
+require_relative "chefspec/mixins/normalize"
 
-require_relative 'chefspec/stubs/command_registry'
-require_relative 'chefspec/stubs/command_stub'
-require_relative 'chefspec/stubs/data_bag_item_registry'
-require_relative 'chefspec/stubs/data_bag_item_stub'
-require_relative 'chefspec/stubs/data_bag_registry'
-require_relative 'chefspec/stubs/data_bag_stub'
-require_relative 'chefspec/stubs/registry'
-require_relative 'chefspec/stubs/stub'
-require_relative 'chefspec/stubs/search_registry'
-require_relative 'chefspec/stubs/search_stub'
+require_relative "chefspec/stubs/command_registry"
+require_relative "chefspec/stubs/command_stub"
+require_relative "chefspec/stubs/data_bag_item_registry"
+require_relative "chefspec/stubs/data_bag_item_stub"
+require_relative "chefspec/stubs/data_bag_registry"
+require_relative "chefspec/stubs/data_bag_stub"
+require_relative "chefspec/stubs/registry"
+require_relative "chefspec/stubs/stub"
+require_relative "chefspec/stubs/search_registry"
+require_relative "chefspec/stubs/search_stub"
 
-require_relative 'chefspec/api'
-require_relative 'chefspec/cacher'
-require_relative 'chefspec/coverage'
-require_relative 'chefspec/errors'
-require_relative 'chefspec/expect_exception'
-require_relative 'chefspec/formatter'
-require_relative 'chefspec/matchers'
-require_relative 'chefspec/renderer'
-require_relative 'chefspec/rspec'
-require_relative 'chefspec/server_runner'
-require_relative 'chefspec/solo_runner'
-require_relative 'chefspec/runner'
-require_relative 'chefspec/util'
-require_relative 'chefspec/version'
+require_relative "chefspec/api"
+require_relative "chefspec/cacher"
+require_relative "chefspec/coverage"
+require_relative "chefspec/errors"
+require_relative "chefspec/expect_exception"
+require_relative "chefspec/formatter"
+require_relative "chefspec/matchers"
+require_relative "chefspec/renderer"
+require_relative "chefspec/rspec"
+require_relative "chefspec/server_runner"
+require_relative "chefspec/solo_runner"
+require_relative "chefspec/runner"
+require_relative "chefspec/util"
+require_relative "chefspec/version"
 
-require_relative 'chefspec/deprecations'
+require_relative "chefspec/deprecations"

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
-require 'chefspec'
-require 'support/hash'
-
+require "chefspec"
+require "support/hash"
 
 ChefSpec::Coverage.start! do
-  set_template 'table.erb'
+  set_template "table.erb"
 end
 
 RSpec.configure do |config|

data/spec/support/hash.rb

@@ -5,15 +5,15 @@
 #
 class Hash
   # Like, seriously Windows?
-  undef_method(:timeout)
+  undef_method(:timeout) if method_defined?(:timeout)
 
   #
   # Monkey-patch to allow mash-style look ups for tests
   #
   def method_missing(m, *args, &block)
-    if has_key?(m.to_sym)
+    if key?(m.to_sym)
       self[m.to_sym]
-    elsif has_key?(m.to_s)
+    elsif key?(m.to_s)
       self[m.to_s]
     else
       super
@@ -26,7 +26,7 @@ class Hash
   # @see Hash#respond_to?
   #
   def respond_to?(m, include_private = false)
-    if has_key?(m.to_sym) || has_key?(m.to_s)
+    if key?(m.to_sym) || key?(m.to_s)
       true
     else
       super

data/spec/unit/cacher_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'chefspec/cacher'
+require "spec_helper"
+require "chefspec/cacher"
 
 describe ChefSpec::Cacher do
   let(:klass) do
@@ -7,7 +7,7 @@ describe ChefSpec::Cacher do
       extend ChefSpec::Cacher
 
       def self.metadata
-        { parent_example_group: { location: 'spec' } }
+        { parent_example_group: { location: "spec" } }
       end
     end
   end
@@ -17,23 +17,23 @@ describe ChefSpec::Cacher do
 
   before(:each) { described_class.class_variable_set(:@@cache, {}) unless preserve_cache }
 
-  describe 'cached' do
-    it 'lazily defines the results for the cache' do
+  describe "cached" do
+    it "lazily defines the results for the cache" do
       klass.cached(:chef_run)
       expect(klass).to be_method_defined(:chef_run)
     end
 
-    it 'adds the item to the cache when called' do
+    it "adds the item to the cache when called" do
       runner = double(:runner)
       klass.cached(:chef_run) { runner }
       klass.new.chef_run
 
-      expect(cache[Thread.current.object_id]).to have_key('spec.chef_run')
-      expect(cache[Thread.current.object_id]['spec.chef_run']).to eq(runner)
+      expect(cache[Thread.current.object_id]).to have_key("spec.chef_run")
+      expect(cache[Thread.current.object_id]["spec.chef_run"]).to eq(runner)
     end
 
-    context 'when multithreaded environment' do
-      it 'is thread safe' do
+    context "when multithreaded environment" do
+      it "is thread safe" do
         (1..2).each do |n|
           Thread.new do
             klass.cached(:chef_run) { n }
@@ -43,14 +43,14 @@ describe ChefSpec::Cacher do
       end
     end
 
-    context 'when example groups are defined by looping' do
+    context "when example groups are defined by looping" do
       let(:preserve_cache) { true }
 
-      ['first', 'second', 'third'].each do |iteration|
+      %w{first second third}.each do |iteration|
         context "on the #{iteration} iteration" do
-          context 'in caching context' do
+          context "in caching context" do
             cached(:cached_iteration) { iteration }
-            it 'caches the iteration for this context' do
+            it "caches the iteration for this context" do
               expect(cached_iteration).to eq iteration
             end
           end
@@ -59,12 +59,12 @@ describe ChefSpec::Cacher do
     end
   end
 
-  describe 'cached!' do
-    it 'loads the value at runtime' do
+  describe "cached!" do
+    it "loads the value at runtime" do
       expect(klass).to receive(:cached).with(:chef_run).once
       expect(klass).to receive(:before).once
 
-      klass.cached!(:chef_run) { }
+      klass.cached!(:chef_run) {}
     end
   end
 end

data/spec/unit/coverage/filters_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 # Note: These specs don't use Berkshelf code directly as this project doesn't
 # have a direct dependency on Berkshelf and loading it would impact the
@@ -6,51 +6,51 @@ require 'spec_helper'
 # a standin for Berkshelf to exercise the `#matches?` behavior.
 describe ChefSpec::Coverage::BerkshelfFilter do
   let(:dependencies) do
-    [double('Berkshelf::Dependency', metadata?: true, name: "cookbookery")]
+    [double("Berkshelf::Dependency", metadata?: true, name: "cookbookery")]
   end
-  let(:berksfile) { double('Berkshelf::Berksfile', dependencies: dependencies) }
-  let(:resource) { Chef::Resource.new('theone') }
+  let(:berksfile) { double("Berkshelf::Berksfile", dependencies: dependencies) }
+  let(:resource) { Chef::Resource.new("theone") }
   subject { described_class.new(berksfile) }
 
-  describe '#matches?' do
-    it 'returns truthy if resource source_line is nil' do
+  describe "#matches?" do
+    it "returns truthy if resource source_line is nil" do
       expect(subject.matches?(resource)).to be_truthy
     end
 
-    context 'when resource#source_line is under target cookbook' do
-      it 'normal unix path returns truthy' do
+    context "when resource#source_line is under target cookbook" do
+      it "normal unix path returns truthy" do
         resource.source_line =
-          '/path/to/cookbooks/nope/recipes/default.rb:22'
+          "/path/to/cookbooks/nope/recipes/default.rb:22"
         expect(subject.matches?(resource)).to be_truthy
       end
 
-      it 'normal windows path returns truthy' do
+      it "normal windows path returns truthy" do
         resource.source_line =
           'C:\\path\\to\\cookbooks\\nope\\recipes\\default.rb:22'
         expect(subject.matches?(resource)).to be_truthy
       end
 
-      it 'mixed windows path returns truthy' do
+      it "mixed windows path returns truthy" do
         resource.source_line =
           'C:\\path\\to\\cookbooks/nope/recipes/default.rb:22'
         expect(subject.matches?(resource)).to be_truthy
       end
     end
 
-    context 'when resource#source_line is not under target cookbook' do
-      it 'normal unix path returns falsey' do
+    context "when resource#source_line is not under target cookbook" do
+      it "normal unix path returns falsey" do
         resource.source_line =
-          '/path/to/cookbooks/cookbookery/recipes/default.rb:22'
+          "/path/to/cookbooks/cookbookery/recipes/default.rb:22"
         expect(subject.matches?(resource)).to be_falsey
       end
 
-      it 'normal windows path returns falsey' do
+      it "normal windows path returns falsey" do
         resource.source_line =
           'C:\\path\\to\\cookbooks\\cookbookery\\recipes\\default.rb:22'
         expect(subject.matches?(resource)).to be_falsey
       end
 
-      it 'mixed windows path returns falsey' do
+      it "mixed windows path returns falsey" do
         resource.source_line =
           'C:\\path\\to\\cookbooks/cookbookery/recipes/default.rb:22'
         expect(subject.matches?(resource)).to be_falsey

data/spec/unit/deprecations_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe ChefSpec::Runner do
   before do
@@ -8,12 +8,12 @@ describe ChefSpec::Runner do
     allow(ChefSpec::Runner).to receive(:deprecated)
   end
 
-  describe '#define_runner_method' do
+  describe "#define_runner_method" do
     before do
       allow(ChefSpec).to receive(:define_matcher)
     end
 
-    it 'prints a deprecation' do
+    it "prints a deprecation" do
       expect(ChefSpec::Runner).to receive(:deprecated)
         .with("`ChefSpec::Runner.define_runner_method' is deprecated."\
           " It is being used in the my_custom_resource resource matcher." \
@@ -21,7 +21,7 @@ describe ChefSpec::Runner do
       ChefSpec::Runner.define_runner_method(:my_custom_resource)
     end
 
-    it 'calls ChefSpec#define_matcher' do
+    it "calls ChefSpec#define_matcher" do
       expect(ChefSpec).to receive(:define_matcher).with(:my_custom_resource).once
       ChefSpec::Runner.define_runner_method(:my_custom_resource)
     end
@@ -34,19 +34,18 @@ describe ChefSpec::Server do
     allow(ChefSpec::Server).to receive(:deprecated)
   end
 
-  it 'prints a deprecation for any method called' do
+  it "prints a deprecation for any method called" do
     expect(ChefSpec::Server).to receive(:deprecated)
       .with("`ChefSpec::Server.any_method' is deprecated. There is no longer" \
         " a global Chef Server instance. Please use a ChefSpec::SoloRunner" \
-        " instead. More documentation can be found in the ChefSpec README."
-      )
+        " instead. More documentation can be found in the ChefSpec README.")
     expect {
       ChefSpec::Server.any_method
     }.to raise_error(ChefSpec::Error::NoConversionError)
   end
 
-  it 'raises non-conversion error for any method called' do
-    expect{ChefSpec::Server.any_method}
+  it "raises non-conversion error for any method called" do
+    expect { ChefSpec::Server.any_method }
       .to raise_error(ChefSpec::Error::NoConversionError)
   end
 

data/spec/unit/errors_spec.rb

@@ -1,14 +1,14 @@
-require 'spec_helper'
+require "spec_helper"
 
 module ChefSpec::Error
   describe CommandNotStubbed do
-    let(:instance) { described_class.new(args: ['cat']) }
+    let(:instance) { described_class.new(args: ["cat"]) }
 
-    it 'raises an exception with the correct message' do
+    it "raises an exception with the correct message" do
       instance
-      expect { raise instance }.to raise_error { |error|
+      expect { raise instance }.to( raise_error { |error|
         expect(error).to be_a(described_class)
-        expect(error.message).to eq <<-EOH.gsub(/^ {10}/, '')
+        expect(error.message).to eq <<-EOH.gsub(/^ {10}/, "")
           Executing a real command is disabled. Unregistered command:
 
               command("cat")
@@ -17,32 +17,32 @@ module ChefSpec::Error
 
               stub_command("cat").and_return(...)
         EOH
-      }
+      })
     end
   end
 
   describe CookbookPathNotFound do
     let(:instance) { described_class.new }
 
-    it 'raises an exception with the correct message' do
-      expect { raise instance }.to raise_error { |error|
+    it "raises an exception with the correct message" do
+      expect { raise instance }.to(raise_error { |error|
         expect(error).to be_a(described_class)
-        expect(error.message).to eq <<-EOH.gsub(/^ {10}/, '')
+        expect(error.message).to eq <<-EOH.gsub(/^ {10}/, "")
           I could not find or infer a cookbook_path from your current working directory.
           Please make sure you put your specs (tests) under a directory named 'spec' or
           manually set the cookbook path in the RSpec configuration.
         EOH
-      }
+      })
     end
   end
 
   describe GemLoadError do
-    let(:instance) { described_class.new(gem: 'bacon', name: 'bacon') }
+    let(:instance) { described_class.new(gem: "bacon", name: "bacon") }
 
-    it 'raises an exception with the correct message' do
-      expect { raise instance }.to raise_error { |error|
+    it "raises an exception with the correct message" do
+      expect { raise instance }.to( raise_error { |error|
         expect(error).to be_a(described_class)
-        expect(error.message).to eq <<-EOH.gsub(/^ {10}/, '')
+        expect(error.message).to eq <<-EOH.gsub(/^ {10}/, "")
           I could not load the 'bacon' gem! You must have the gem installed
           on your local system before you can use the bacon plugin.
           You can install bacon by running:
@@ -51,7 +51,7 @@ module ChefSpec::Error
 
           or add bacon to your Gemfile and run the `bundle` command to install.
         EOH
-      }
+      })
     end
   end
 end

data/spec/unit/expect_exception_spec.rb

@@ -1,30 +1,30 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe ChefSpec::ExpectException do
-  context 'when there have been no `raise_error` matchers' do
+  context "when there have been no `raise_error` matchers" do
     subject { described_class.new(Exception) }
 
-    it 'does not match' do
+    it "does not match" do
       allow(RSpec::Matchers::BuiltIn::RaiseError).to receive(:last_run).and_return(nil)
       expect(subject.expected?).to be_falsy
     end
   end
 
-  context 'when the last error does not match the expected type' do
+  context "when the last error does not match the expected type" do
     subject { described_class.new(RuntimeError) }
 
-    it 'does not match' do
-      last_error = double('last error', last_error_for_chefspec: ArgumentError)
+    it "does not match" do
+      last_error = double("last error", last_error_for_chefspec: ArgumentError)
       allow(RSpec::Matchers::BuiltIn::RaiseError).to receive(:last_run).and_return(last_error)
       expect(subject.expected?).to be_falsy
     end
   end
 
-  context 'when the last error matches the expected type' do
+  context "when the last error matches the expected type" do
     subject { described_class.new(RuntimeError) }
 
-    it 'does not match' do
-      last_error = double('last error', last_error_for_chefspec: RuntimeError)
+    it "does not match" do
+      last_error = double("last error", last_error_for_chefspec: RuntimeError)
       allow(RSpec::Matchers::BuiltIn::RaiseError).to receive(:last_run).and_return(last_error)
       expect(subject.expected?).to be_truthy
     end