chefspec 9.1.0 → 9.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96c39db8c598b7a40e7fd080c65db3a073a1e8e95f59a2628682587e5de4db56
-  data.tar.gz: a0bc37df1322446f83af4488fa1def9124d821478c0364a40fcce138c10f63cf
+  metadata.gz: ef97b147dacaeb64bafc2b4825cfdf18eb7e88a898d82231d2aa4924ff6ccf83
+  data.tar.gz: a53dd7fe6e2062efb147f40c364e81022e550cb1a93145a95b8dbb71a677c25e
 SHA512:
-  metadata.gz: 354c875c5eb0890aea76c9bb7593dfec11d122157c42ca79842ff8a4264766e6a230fb57a14dfdd6c87887e7c4ba147ee388465e5c2b1fa782ed77a912145844
-  data.tar.gz: 64ff73a7906b1e4ba085a9d5d9182903de2965c9ea4c979ad95363b45677d083868e0f64c30c2637ee7beed85333d309cbe42c26024c6fc7fddc0f6b3b08861d
+  metadata.gz: 6cceb0d5a03b5960e344570d3db7677adbc4b35c4febf8fae0a6e08f223ecd8b4e102ea212f2afb0b959d9555d3409654a1f5da6c654743c06c1fe9d3739879f
+  data.tar.gz: 635a5a3217295693c973fae336b9516ea4ca5cf0b3f5530366332cb165c3a7bfeeca740296ff1de0477477d2cfa66fae96f9f10cccaf06c8530353f8c98a5fb5

data/Gemfile

@@ -1,21 +1,28 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 group :development do
-  gem 'rake'
-  gem 'redcarpet'
-  gem 'yard'
-  gem 'pry'
-  gem 'pry-byebug'
+  gem "rake"
+  gem "redcarpet"
+  gem "yard"
+  gem "pry"
+  gem "pry-byebug"
+  gem "chefstyle"
 end
 
 if ENV["GEMFILE_MOD"]
-  puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"
+  puts "GEMFILE_MOD: #{ENV["GEMFILE_MOD"]}"
   instance_eval(ENV["GEMFILE_MOD"])
 else
-  gem 'chef', git: "https://github.com/chef/chef"
-  gem 'ohai', git: "https://github.com/chef/ohai"
+  gem "chef", git: "https://github.com/chef/chef"
+  gem "ohai", git: "https://github.com/chef/ohai"
+end
+
+# TODO: remove when we drop ruby 2.5
+if Gem.ruby_version < Gem::Version.new("2.6")
+  # 16.7.23 required ruby 2.6+
+  gem "chef-utils", "< 16.7.23"
 end
 
 # If you want to load debugging tools into the bundle exec sandbox,

data/Rakefile

@@ -1,77 +1,85 @@
-require 'bundler/gem_tasks'
-require 'rspec/core'
-require 'rspec/core/rake_task'
-require 'yard/rake/yardoc_task'
-require 'tmpdir'
-require 'rspec'
-require 'chefspec'
+require "bundler/gem_tasks"
+require "rspec/core"
+require "rspec/core/rake_task"
+require "yard/rake/yardoc_task"
+require "tmpdir"
+require "rspec"
+require "chefspec"
+require "chefstyle"
 
-require 'chef/version'
+require "chef/version"
+
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+  task.options << "--display-cop-names"
+end
 
 YARD::Rake::YardocTask.new
 
 RSpec::Core::RakeTask.new(:unit) do |t|
   t.rspec_opts = [].tap do |a|
-    a.push('--color')
-    a.push('--format progress')
-  end.join(' ')
+    a.push("--color")
+    a.push("--format progress")
+  end.join(" ")
 end
 
 failed = []
 start_time = nil
 
 namespace :acceptance do |ns|
-  begin
-    Dir.foreach("examples") do |dir|
-      next if %w(. .. .DS_Store).include?(dir)
-      desc "#{dir} acceptance tests"
-      task dir.to_sym do
-        start_time ||= Time.now
-        Dir.mktmpdir do |tmp|
-          FileUtils.cp_r("examples/#{dir}", tmp)
-
-          pwd = Dir.pwd
-
-          Dir.chdir "#{tmp}/#{dir}" do
-            puts "rspec examples/#{dir}"
-
-            #
-            # This bit of mildly awful magic below is to load each file into an in-memory
-            # RSpec runner while keeping a persistent ChefZero server alive.
-            #
-            load "#{pwd}/lib/chefspec/rspec.rb"
-
-            RSpec.configure do |config|
-              config.color = true
-              config.run_all_when_everything_filtered = true
-              config.filter_run(:focus)
-              config.before(:suite) do
-                ChefSpec::ZeroServer.setup!
-              end
-              config.after(:each) do
-                ChefSpec::ZeroServer.reset!
-              end
-            end
 
-            RSpec.clear_examples
-            exitstatus = RSpec::Core::Runner.run(["spec"])
-            RSpec.reset
-            failed << dir unless exitstatus == 0
+  Dir.foreach("examples") do |dir|
+    next if %w{. .. .DS_Store}.include?(dir)
+
+    desc "#{dir} acceptance tests"
+    task dir.to_sym do
+      start_time ||= Time.now
+      Dir.mktmpdir do |tmp|
+        FileUtils.cp_r("examples/#{dir}", tmp)
+
+        pwd = Dir.pwd
+
+        Dir.chdir "#{tmp}/#{dir}" do
+          puts "rspec examples/#{dir}"
+
+          #
+          # This bit of mildly awful magic below is to load each file into an in-memory
+          # RSpec runner while keeping a persistent ChefZero server alive.
+          #
+          load "#{pwd}/lib/chefspec/rspec.rb"
+
+          RSpec.configure do |config|
+            config.full_backtrace = true
+            config.color = true
+            config.run_all_when_everything_filtered = true
+            config.filter_run(:focus)
+            config.before(:suite) do
+              ChefSpec::ZeroServer.setup!
+            end
+            config.after(:each) do
+              ChefSpec::ZeroServer.reset!
+            end
           end
+
+          RSpec.clear_examples
+          exitstatus = RSpec::Core::Runner.run(["spec"])
+          RSpec.reset
+          failed << dir unless exitstatus == 0
         end
       end
     end
-  rescue Errno::ENOENT # examples dir is probably missing
-    puts "The rake acceptance tests require a full git checkout of chefspec including all examples files!"
   end
+rescue Errno::ENOENT # examples dir is probably missing
+  puts "The rake acceptance tests require a full git checkout of chefspec including all examples files!"
+
 end
 
 task acceptance: Rake.application.tasks.select { |t| t.name.start_with?("acceptance:") } do
   puts "Acceptance tests took #{Time.now - start_time} seconds"
-  raise "some tests failed: #{failed.join(', ')}" unless failed.empty?
+  raise "some tests failed: #{failed.join(", ")}" unless failed.empty?
 end
 
-desc 'Run all tests'
-task :test => [:unit, :acceptance]
+desc "Run all tests"
+task test: %i{unit acceptance}
 
-task :default => [:test]
+task default: [:test]

data/chefspec.gemspec

@@ -1,30 +1,30 @@
-lib = File.expand_path('../lib/', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $:.unshift lib unless $:.include?(lib)
-require 'chefspec/version'
+require "chefspec/version"
 
 Gem::Specification.new do |s|
-  s.name          = 'chefspec'
+  s.name          = "chefspec"
   s.version       = ChefSpec::VERSION
-  s.authors       = ['Andrew Crump', 'Seth Vargo']
-  s.email         = ['andrew.crump@ieee.org', 'sethvargo@gmail.com']
-  s.summary       = 'Write RSpec examples and generate coverage reports for ' \
-                    'Chef recipes!'
-  s.description   = 'ChefSpec is a unit testing and resource coverage ' \
-                    '(code coverage) framework for testing Chef cookbooks ' \
-                    'ChefSpec makes it easy to write examples and get fast ' \
-                    'feedback on cookbook changes without the need for ' \
-                    'virtual machines or cloud servers.'
-  s.homepage      = 'https://github.com/chefspec/chefspec'
-  s.license       = 'MIT'
+  s.authors       = ["Andrew Crump", "Seth Vargo"]
+  s.email         = ["andrew.crump@ieee.org", "sethvargo@gmail.com"]
+  s.summary       = "Write RSpec examples and generate coverage reports for " \
+                    "Chef recipes!"
+  s.description   = "ChefSpec is a unit testing and resource coverage " \
+                    "(code coverage) framework for testing Chef cookbooks " \
+                    "ChefSpec makes it easy to write examples and get fast " \
+                    "feedback on cookbook changes without the need for " \
+                    "virtual machines or cloud servers."
+  s.homepage      = "https://github.com/chefspec/chefspec"
+  s.license       = "MIT"
 
   # Packaging
   s.files         = %w{LICENSE Rakefile Gemfile chefspec.gemspec} + Dir.glob("{lib,templates,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
-  s.require_paths = ['lib']
+  s.require_paths = ["lib"]
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = ">= 2.5"
 
-  s.add_dependency 'chef',    '>= 14'
-  s.add_dependency 'chef-cli'
-  s.add_dependency 'fauxhai-ng', '>= 7.5'
-  s.add_dependency 'rspec',   '~> 3.0'
+  s.add_dependency "chef", ">= 15"
+  s.add_dependency "chef-cli"
+  s.add_dependency "fauxhai-ng", ">= 7.5"
+  s.add_dependency "rspec",   "~> 3.0"
 end

data/lib/chefspec/api/core.rb

@@ -36,7 +36,7 @@ module ChefSpec
       # @return [Hash<Symbol, Object>]
       def chef_runner_options
         options = {
-          step_into: chefspec_ancestor_gather([], :step_into) {|memo, val| memo | val },
+          step_into: chefspec_ancestor_gather([], :step_into) { |memo, val| memo | val },
           default_attributes: chefspec_default_attributes,
           normal_attributes: chefspec_normal_attributes,
           override_attributes: chefspec_override_attributes,
@@ -85,7 +85,7 @@ module ChefSpec
       # @param block [Proc] Reducer callable.
       # @return [Object]
       def chefspec_ancestor_gather(start, method, &block)
-        candidate_ancestors = self.class.ancestors.select {|cls| cls.respond_to?(method) && cls != ChefSpec::API::Core }
+        candidate_ancestors = self.class.ancestors.select { |cls| cls.respond_to?(method) && cls != ChefSpec::API::Core }
         candidate_ancestors.reverse.inject(start) do |memo, cls|
           block.call(memo, cls.send(method))
         end
@@ -115,7 +115,7 @@ module ChefSpec
         # @param name [String] Platform name to set.
         # @param version [String, nil] Platform version to set.
         # @return [void]
-        def platform(name, version=nil)
+        def platform(name, version = nil)
           let(:chefspec_platform) { name }
           let(:chefspec_platform_version) { version }
         end

data/lib/chefspec/api/described.rb

@@ -20,7 +20,7 @@ module ChefSpec
       # @return [String]
       #
       def described_cookbook
-        described_recipe.split('::').first
+        described_recipe.split("::").first
       end
 
       #
@@ -40,12 +40,10 @@ module ChefSpec
       # @return [String]
       #
       def described_recipe
-        scope = self.is_a?(Class) ? self : self.class
+        scope = is_a?(Class) ? self : self.class
 
         metahash = scope.metadata
-        while metahash.has_key?(:parent_example_group)
-          metahash = metahash[:parent_example_group]
-        end
+        metahash = metahash[:parent_example_group] while metahash.key?(:parent_example_group)
 
         metahash[:description].to_s
       end

data/lib/chefspec/api/stubs.rb

@@ -121,7 +121,7 @@ module ChefSpec
       #
       def stub_node(*args, &block)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        name    = args.first || 'node.example'
+        name    = args.first || "node.example"
 
         fauxhai = Fauxhai.mock(options).data
         fauxhai = fauxhai.merge(options[:ohai] || {})
@@ -165,7 +165,7 @@ module ChefSpec
       #
       # @return [ChefSpec::SearchStub]
       #
-      def stub_search(type, query = '*:*', &block)
+      def stub_search(type, query = "*:*", &block)
         ChefSpec::Stubs::SearchRegistry.register(ChefSpec::Stubs::SearchStub.new(type, query, &block))
       end
 

data/lib/chefspec/api/stubs_for.rb

@@ -1,5 +1,5 @@
 require "chef/version"
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module ChefSpec
   module API
@@ -56,23 +56,25 @@ module ChefSpec
       #     expect(subject.some_method).to eq "asdf"
       #   end
       # @param target [String, nil] Resource name to inject, or nil for all resources.
-      # @param current_resource [Boolean] If true, also register stubs for current_resource objects on the same target.
+      # @param current_value [Boolean] If true, also register stubs for current_value objects on the same target.
       # @param block [Proc] A block taking the resource object as a parameter.
       # @return [void]
-      def stubs_for_resource(target=nil, current_resource: true, &block)
+      def stubs_for_resource(target = nil, current_value: true, current_resource: true, &block)
+        current_value = false unless current_resource
         _chefspec_stubs_for_registry[:resource][target] << block
-        stubs_for_current_resource(target, &block) if current_resource
+        stubs_for_current_value(target, &block) if current_value
       end
 
-      # Register stubs for current_resource objects.
+      # Register stubs for current_value objects.
       #
       # @see #stubs_for_resource
       # @param target [String, nil] Resource name to inject, or nil for all resources.
       # @param block [Proc] A block taking the resource object as a parameter.
       # @return [void]
-      def stubs_for_current_resource(target=nil, &block)
-        _chefspec_stubs_for_registry[:current_resource][target] << block
+      def stubs_for_current_value(target = nil, &block)
+        _chefspec_stubs_for_registry[:current_value][target] << block
       end
+      alias_method :stubs_for_current_resource, :stubs_for_current_value
 
       # Register stubs for provider objects.
       #
@@ -80,15 +82,15 @@ module ChefSpec
       # @param target [String, nil] Resource name to inject, or nil for all providers.
       # @param block [Proc] A block taking the resource object as a parameter.
       # @return [void]
-      def stubs_for_provider(target=nil, &block)
+      def stubs_for_provider(target = nil, &block)
         _chefspec_stubs_for_registry[:provider][target] << block
       end
 
-      def receive_shell_out(*cmd, stdout: '', stderr: '', exitstatus: 0, **opts)
+      def receive_shell_out(*cmd, stdout: "", stderr: "", exitstatus: 0, **opts)
         # Ruby does not allow constructing an actual exitstatus object from Ruby code. Really.
         fake_exitstatus = double(exitstatus: exitstatus)
         fake_cmd = Mixlib::ShellOut.new(*cmd)
-        fake_cmd.define_singleton_method(:run_command) { } # Do nothing, just in case.
+        fake_cmd.define_singleton_method(:run_command) {} # Do nothing, just in case.
         # Inject our canned data.
         fake_cmd.instance_exec do
           @stdout = stdout
@@ -97,24 +99,25 @@ module ChefSpec
         end
         # On newer Chef, we can intercept using the new, better shell_out_compact hook point.
         shell_out_method ||= if HAS_SHELLOUT_COMPACTED.satisfied_by?(Gem::Version.create(Chef::VERSION))
-          :shell_out_compacted
-        else
-          :shell_out
-        end
+                               :shell_out_compacted
+                             else
+                               :shell_out
+                             end
         with_args = cmd + (opts.empty? ? [any_args] : [hash_including(opts)])
         receive(shell_out_method).with(*with_args).and_return(fake_cmd)
       end
 
       module ClassMethods
         # (see StubsFor#stubs_for_resource)
-        def stubs_for_resource(*args, &block)
-          before { stubs_for_resource(*args, &block) }
+        def stubs_for_resource(*args, **kwargs, &block)
+          before { stubs_for_resource(*args, **kwargs, &block) }
         end
 
-        # (see StubsFor#stubs_for_current_resource)
-        def stubs_for_current_resource(*args, &block)
-          before { stubs_for_current_resource(*args, &block) }
+        # (see StubsFor#stubs_for_current_value)
+        def stubs_for_current_value(*args, &block)
+          before { stubs_for_current_value(*args, &block) }
         end
+        alias_method :stubs_for_current_resource, :stubs_for_current_value
 
         # (see StubsFor#stubs_for_provider)
         def stubs_for_provider(*args, &block)

data/lib/chefspec/api.rb

@@ -1,19 +1,19 @@
 module ChefSpec
   module API
-    autoload :Core, 'chefspec/api/core'
-    autoload :Described, 'chefspec/api/described'
-    autoload :DoNothing, 'chefspec/api/do_nothing'
-    autoload :IncludeAnyRecipe, 'chefspec/api/include_any_recipe'
-    autoload :IncludeRecipe, 'chefspec/api/include_recipe'
-    autoload :Link, 'chefspec/api/link'
-    autoload :Notifications, 'chefspec/api/notifications'
-    autoload :Reboot, 'chefspec/api/reboot'
-    autoload :RenderFile, 'chefspec/api/render_file'
-    autoload :StateAttrs, 'chefspec/api/state_attrs'
-    autoload :Stubs, 'chefspec/api/stubs'
-    autoload :StubsFor, 'chefspec/api/stubs_for'
-    autoload :Subscriptions, 'chefspec/api/subscriptions'
-    autoload :User, 'chefspec/api/user'
+    autoload :Core, "chefspec/api/core"
+    autoload :Described, "chefspec/api/described"
+    autoload :DoNothing, "chefspec/api/do_nothing"
+    autoload :IncludeAnyRecipe, "chefspec/api/include_any_recipe"
+    autoload :IncludeRecipe, "chefspec/api/include_recipe"
+    autoload :Link, "chefspec/api/link"
+    autoload :Notifications, "chefspec/api/notifications"
+    autoload :Reboot, "chefspec/api/reboot"
+    autoload :RenderFile, "chefspec/api/render_file"
+    autoload :StateAttrs, "chefspec/api/state_attrs"
+    autoload :Stubs, "chefspec/api/stubs"
+    autoload :StubsFor, "chefspec/api/stubs_for"
+    autoload :Subscriptions, "chefspec/api/subscriptions"
+    autoload :User, "chefspec/api/user"
 
     def self.included(klass)
       # non-resources

data/lib/chefspec/berkshelf.rb

@@ -1,7 +1,7 @@
 begin
-  require 'berkshelf'
+  require "berkshelf"
 rescue LoadError
-  raise ChefSpec::Error::GemLoadError.new(gem: 'berkshelf', name: 'Berkshelf')
+  raise ChefSpec::Error::GemLoadError.new(gem: "berkshelf", name: "Berkshelf")
 end
 
 module ChefSpec
@@ -23,14 +23,14 @@ module ChefSpec
     def setup!
       # Get the list of Berkshelf options
       opts = RSpec.configuration.berkshelf_options
-      if !opts.is_a?(Hash)
+      unless opts.is_a?(Hash)
         raise InvalidBerkshelfOptions(value: opts.inspect)
       end
 
       berksfile = ::Berkshelf::Berksfile.from_options(opts)
 
       # Grab a handle to tmpdir, since Berkshelf 2 modifies it a bit
-      tmpdir = File.join(@tmpdir, 'cookbooks')
+      tmpdir = File.join(@tmpdir, "cookbooks")
 
       ::Berkshelf.ui.mute do
         if ::Berkshelf::Berksfile.method_defined?(:vendor)