chefspec 9.1.0 → 9.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96c39db8c598b7a40e7fd080c65db3a073a1e8e95f59a2628682587e5de4db56
-  data.tar.gz: a0bc37df1322446f83af4488fa1def9124d821478c0364a40fcce138c10f63cf
+  metadata.gz: d5591af3861eae4ba3b5d9c37d274f38fa0279c9a5d91e2668d923251d1885ae
+  data.tar.gz: 36be14ae6da887efee4516070e3b6884e43950a8b9fddbbc28660d1ea7f6c841
 SHA512:
-  metadata.gz: 354c875c5eb0890aea76c9bb7593dfec11d122157c42ca79842ff8a4264766e6a230fb57a14dfdd6c87887e7c4ba147ee388465e5c2b1fa782ed77a912145844
-  data.tar.gz: 64ff73a7906b1e4ba085a9d5d9182903de2965c9ea4c979ad95363b45677d083868e0f64c30c2637ee7beed85333d309cbe42c26024c6fc7fddc0f6b3b08861d
+  metadata.gz: 24e86fab969faea333b44ab9db94663efe783383c37760ce581bd0a088e1f3dc96927dc8bab7624da966d5e60440cf6c97e31a2b56b3c72a89135b0805d17ebc
+  data.tar.gz: d6b244cc4207077b59a6f53f343b632fe2550549b4e3778bdbfca9848a510861d7fdbe885bc26556c38ba5d74dbb5d619e1073521a2d0a4da3f7d1bd3b94576d

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 if !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.
       #
@@ -111,10 +113,11 @@ module ChefSpec
           before { stubs_for_resource(*args, &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/extensions/chef/resource.rb

@@ -21,7 +21,8 @@ module ChefSpec::Extensions::Chef::Resource
       # If we're directly inside a `load_current_resource`, this is probably
       # something like `new_resource.class.new` so we want to call this a current_resource,
       # Otherwise it's probably a normal resource instantiation.
-      mode = caller[1].include?("`load_current_resource'") ? :current_resource : :resource
+      mode = :resource
+      mode = :current_value if caller.any? { |x| x.include?("`load_current_resource'") || x.include?("`load_after_resource'") }
       ChefSpec::API::StubsFor.setup_stubs_for(self, mode)
     end
   end
@@ -33,7 +34,7 @@ module ChefSpec::Extensions::Chef::Resource
     super.tap do |dup_resource|
       # We're directly inside a load_current_resource, which is probably via
       # the load_current_value DSL system, so call this a current resource.
-      ChefSpec::API::StubsFor.setup_stubs_for(dup_resource, :current_resource) if stack.first.include?("`load_current_resource'")
+      ChefSpec::API::StubsFor.setup_stubs_for(dup_resource, :current_value) if caller.any? { |x| x.include?("`load_current_resource'") || x.include?("`load_after_resource'") }
     end
   end
 
@@ -133,7 +134,7 @@ module ChefSpec::Extensions::Chef::Resource
       super
     end
 
-    def provides(name, *args, &block)
+    def provides(name, **options, &block)
       provides_names << name unless provides_names.include?(name)
       inject_actions(*allowed_actions)
       super

data/lib/chefspec/extensions/chef/run_context/cookbook_compiler.rb

@@ -22,6 +22,15 @@ Chef::RunContext::CookbookCompiler.prepend(Module.new do
     super
   end
 
+  def load_ohai_plugins_from_cookbook(cookbook)
+    return super unless $CHEFSPEC_MODE
+    $CHEFSPEC_OHAI_PRELOAD ||= {}
+    # Already loaded this once.
+    return if $CHEFSPEC_OHAI_PRELOAD[cookbook]
+    $CHEFSPEC_OHAI_PRELOAD[cookbook] = true
+    super
+  end
+
   def load_lwrps_from_cookbook(cookbook)
     return super unless $CHEFSPEC_MODE
     $CHEFSPEC_LWRP_PRELOAD ||= {}

data/lib/chefspec/extensions/ohai/system.rb

@@ -0,0 +1,11 @@
+require 'ohai/system'
+
+Ohai::System.prepend(Module.new do
+  # If an Ohai segment exists, don't actually pull data in for ohai.
+  # (we have fake data for that)
+  # @see Ohai::System#run_additional_plugins
+  def run_additional_plugins(plugin_path)
+    return super unless $CHEFSPEC_MODE
+    # noop
+  end
+end)

data/lib/chefspec/extensions.rb

@@ -18,3 +18,4 @@ require_relative 'extensions/chef/lwrp_base'
 require_relative 'extensions/chef/resource/freebsd_package'
 require_relative 'extensions/chef/run_context/cookbook_compiler'
 require_relative 'extensions/chef/cookbook_loader'
+require_relative 'extensions/ohai/system'

data/lib/chefspec/file_cache_path_proxy.rb

@@ -1,5 +1,5 @@
-require 'fileutils'
-require 'singleton'
+require 'fileutils' unless defined?(FileUtils)
+require 'singleton' unless defined?(Singleton)
 
 module ChefSpec
   class FileCachePathProxy

data/lib/chefspec/formatter.rb

@@ -133,6 +133,18 @@ module ChefSpec
     # Called when LWRPs are finished loading
     def lwrp_load_complete; end
 
+    # Called when an ohai plugin file loading starts
+    def ohai_plugin_load_start(file_count); end
+
+    # Called when an ohai plugin file has been loaded
+    def ohai_plugin_file_loaded(path); end
+
+    # Called when an ohai plugin file has an error on load.
+    def ohai_plugin_file_load_failed(path, exception); end
+
+    # Called when an ohai plugin file loading has finished
+    def ohai_plugin_load_complete; end
+
     # Called before attribute files are loaded
     def attribute_load_start(attribute_file_count); end
 

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '9.1.0'
+  VERSION = '9.2.1'
 end

data/lib/chefspec/zero_server.rb

@@ -122,7 +122,7 @@ 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)

data/spec/unit/solo_runner_spec.rb

@@ -98,7 +98,7 @@ describe ChefSpec::SoloRunner do
       it 'sets the attributes from fauxhai' do
         expect(hash['os']).to eq('linux')
         expect(hash['languages']['ruby']['ruby_bin']).to eq('/usr/local/bin/ruby')
-        expect(hash['os_version']).to match(/4.15.0-.*-.*/) # avoid failing when fauxhai data changes
+        expect(hash['os_version']).to match(/5.3.0-.*-.*/) # avoid failing when fauxhai data changes
         expect(hash['fqdn']).to eq('fauxhai.local')
         expect(hash['domain']).to eq('local')
         expect(hash['ipaddress']).to eq('10.0.0.2')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.2.1
 platform: ruby
 authors:
 - Andrew Crump
 - Seth Vargo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -119,6 +119,7 @@ files:
 - lib/chefspec/extensions/chef/resource/freebsd_package.rb
 - lib/chefspec/extensions/chef/run_context/cookbook_compiler.rb
 - lib/chefspec/extensions/chef/securable.rb
+- lib/chefspec/extensions/ohai/system.rb
 - lib/chefspec/file_cache_path_proxy.rb
 - lib/chefspec/formatter.rb
 - lib/chefspec/librarian.rb
@@ -200,7 +201,7 @@ homepage: https://github.com/chefspec/chefspec
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,8 +216,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Write RSpec examples and generate coverage reports for Chef recipes!
 test_files: []