chefspec 7.3.0 → 7.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4149e5d01cef76e9961206a3c21e026f8d1514c5411d4e736775494e7df2fd5e
-  data.tar.gz: 1c2f041d3734fb0d1b4311652e545753ae93e13ac1d5699287754a2005ab30c5
+  metadata.gz: e61ac80763278adaab322cc1801df9673c5ea2d49df59bc7c26977a9e3405923
+  data.tar.gz: e64079926befe6e129ebfa265f9aa3c9c942f628ea8365cf5bd627ecb09c25ed
 SHA512:
-  metadata.gz: 86b9445a05713b120154104b065300b29944c2178277c0dbaf57271baed0d675b9582272c73044101cc36625b7ff9e1d189efff6f8525dbac2aed5ba225be0fd
-  data.tar.gz: 6dc383647ef0ca7f97c3a4ecfbe68a4323949a95d03c8ee853c80000682a7eab9deebed4db231cedd7ba0765c37d18a3304e145ed012739b6a5283b927f43889
+  metadata.gz: 014e1bbaa47b6a88e6cb5f488d5ea25ff012694c0f7f97d18c12048d7377a9f204cb114ff9e68c7e4d4a575293bed12cc432ac623f516028db48c72cb090dfb8
+  data.tar.gz: e7d54267e71d29d6fb57a1518d38ba4df4959fc6e49b967dc9860f2dbaedc39fcb12fb15704846b544daf3d017514a91ff7526849d1b13bc1869f4f193b84d06

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG for ChefSpec
 
+## 7.3.1 (September 1, 2018)
+
+- Add additional hooks for customizing the runner creation process.
+
 ## 7.3.0 (August 30, 2018)
 
 - Major syntax overhaul and update. Check out the [README](/README.md) for examples of the updated syntax. The older syntax is still present and will be supported at least until ChefSpec 8.0, but documentation has been moved to [README_old](/README_old.md).

data/examples/spec_attributes/spec/default_spec.rb

@@ -51,4 +51,13 @@ describe 'spec_attributes' do
       it { is_expected.to write_log('thing1=un thing2=two version=3.0') }
     end
   end
+
+  context 'before attributes' do
+    before do
+      chefspec_default_attributes['myapp'] ||= {}
+      chefspec_default_attributes['myapp']['version'] = '4.0'
+    end
+
+    it { is_expected.to write_log('version=4.0') }
+  end
 end

data/lib/chefspec/api/core.rb

@@ -14,27 +14,33 @@ module ChefSpec
           # Only run the preload if a platform is configured via the new system
           # since otherwise it will spam warnings about the platform not being
           # set.
-          chef_runner.preload! if chefspec_platform
+          chef_runner_instance.preload! if chefspec_platform
           ex.run
         ensure
           $CHEFSPEC_MODE = old_chefspec_mode
         end
       end
 
-      # Let variables to set the platform in a scoped way. Used below by
+      # Let variables to set data in a scoped way. Used below by
       # {ClassMethods#platform}.
+      let(:chefspec_default_attributes) { chefspec_attributes(:default_attributes) }
+      let(:chefspec_normal_attributes) { chefspec_attributes(:normal_attributes) }
+      let(:chefspec_override_attributes) { chefspec_attributes(:override_attributes) }
+      let(:chefspec_automatic_attributes) { chefspec_attributes(:automatic_attributes) }
       let(:chefspec_platform) { nil }
       let(:chefspec_platform_version) { nil }
 
-      # Set up the runner object but don't actually run anything yet. This can
-      # be overridden if needed to set up very custom things.
-      let(:chef_runner) do
+      # Compute the options for the runner.
+      #
+      # @abstract
+      # @return [Hash<Symbol, Object>]
+      def chef_runner_options
         options = {
           step_into: chefspec_ancestor_gather([], :step_into) {|memo, val| memo | val },
-          default_attributes: chefspec_attributes(:default_attributes),
-          normal_attributes: chefspec_attributes(:normal_attributes),
-          override_attributes: chefspec_attributes(:override_attributes),
-          automatic_attributes: chefspec_attributes(:automatic_attributes),
+          default_attributes: chefspec_default_attributes,
+          normal_attributes: chefspec_normal_attributes,
+          override_attributes: chefspec_override_attributes,
+          automatic_attributes: chefspec_automatic_attributes,
           spec_declaration_locations: self.class.declaration_locations.last[0],
         }
         # Only specify these if set in the example so we don't override the
@@ -43,16 +49,32 @@ module ChefSpec
         options[:version] = chefspec_platform_version if chefspec_platform_version
         # Merge in any final overrides.
         options.update(chefspec_attributes(:chefspec_options).symbolize_keys)
-        # At some point this is probably going to need a flag for ServerRunner
-        # because someone will complain.
-        ChefSpec::SoloRunner.new(options)
+        options
       end
 
-      # By default, run the recipe in the base `describe` block.
-      let(:chef_run) do
-        chef_runner.converge(described_recipe)
+      # Class of runner to use.
+      #
+      # @abstract
+      # @return [Class]
+      def chef_runner_class
+        ChefSpec::SoloRunner
+      end
+
+      # Create an instance of the runner.
+      #
+      # This should only be used in cases where the `let()` cache would be a problem.
+      #
+      # @return [ChefSpec::SoloRunner]
+      def chef_runner_instance
+        chef_runner_class.new(chef_runner_options)
       end
 
+      # Set up the runner object but don't actually run anything yet.
+      let(:chef_runner) { chef_runner_instance }
+
+      # By default, run the recipe in the base `describe` block.
+      let(:chef_run) { chef_runner.converge(described_recipe) }
+
       # Helper method for some of the nestable test value methods like
       # {ClassMethods#default_attributes} and {ClassMethods#step_into}.
       #

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '7.3.0'
+  VERSION = '7.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.3.1
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef