chefspec 4.1.1 → 4.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b27856f904afc7828e2ebd18d3b0d6cf445df4c
-  data.tar.gz: c044c2653ce2dd4edea1a9af3be1a279bd10464b
+  metadata.gz: 68b2b322b2293fa631345ed68a61262d0f46d943
+  data.tar.gz: 99a905d8ea24d4c6d20f554c8bc0f42d5f60f14f
 SHA512:
-  metadata.gz: b990fc3a58d92ab8a308ae89fe1f4c354f513d3af9054dc2e328df7fb88313c7a539117ab58ece8775d39f3aff296de8c4c20a6b36e94f6a6a1ad6d4f9832dec
-  data.tar.gz: b4fa0c0393da51a776b26b7c2da7b55cedda9d6c5f27747475feb229797c3d6eaaaf1abf79d70991ff7f6f00256761b91cdb9eff17ef5626db9e2440b29c5670
+  metadata.gz: 07409059ef229f4eb9e2e7f9fe3d4f1d9db2b9e859f0864fbc29df6ed89fddf1e60788e9d7808aae2c853d6ed52163be242ecb99b55ff410327a958b95310883
+  data.tar.gz: 7153ec068c65759290deadf4183d3a57693b092a531118ce4b3f1294f2fa4b2d056202ff2fa4f3c83397db7fc9bb5d2fb92c1a4f5b02fc502d612500c39a8c37

data/.travis.yml

@@ -21,11 +21,10 @@ bundler_args: --jobs 7
 gemfile:
   - gemfiles/chef-11.14.0.gemfile
   - gemfiles/chef-11.16.0.gemfile
-  - gemfiles/chef-12.0.0.alpha.gemfile
+  - gemfiles/chef-12.0.0.rc.gemfile
   - gemfiles/chef-master.gemfile
 
 matrix:
   fast_finish: true
   allow_failures:
-    - gemfile: gemfiles/chef-12.0.0.alpha.gemfile
     - gemfile: gemfiles/chef-master.gemfile

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 CHANGELOG for ChefSpec
 ======================
 
+## 4.2.0.beta.1 (November 5, 2014)
+Bugfixes:
+  - Updated README grep examples
+  - Fix various typographical errors
+  - Improved error message when using a deprecated resource matcher
+
+Improvements:
+  - Add support for Chef 12
+  - Added support for environments in Chef Solo
+
 ## 4.1.1 (October 13, 2014)
 Bugfixes:
   - Fix total fail on my part with deprecations and add test coverage

data/README.md

@@ -81,6 +81,9 @@ RSpec.configure do |config|
   # Specify the path for Chef Solo to find roles (default: [ascending search])
   config.role_path = '/var/roles'
 
+  # Specify the path for Chef Solo to find environments (default: [ascending search])
+  config.environment_path = '/var/environments'
+
   # Specify the Chef log_level (default: :warn)
   config.log_level = :debug
 
@@ -437,18 +440,18 @@ Given a recipe with shell guard:
 
 ```ruby
 template '/tmp/foo.txt' do
-  not_if 'grep /tmp/foo.txt text'
+  not_if 'grep text /tmp/foo.txt'
 end
 ```
 
 ChefSpec will raise an error like:
 
 ```text
-Real commands are disabled. Unregistered command: `grep /tmp/foo.txt text`
+Real commands are disabled. Unregistered command: `grep text /tmp/foo.txt`
 
 You can stub this command with:
 
- stub_command("grep /tmp/foo.txt text").and_return(true)
+ stub_command("grep text /tmp/foo.txt").and_return(true)
 
 ============================================================
 ```
@@ -460,7 +463,7 @@ describe 'example::default' do
   let(:chef_run) { ChefSpec::SoloRunner.new }
 
   before do
-    stub_command("grep /tmp/foo.txt text").and_return(true)
+    stub_command("grep text /tmp/foo.txt").and_return(true)
   end
 end
 ```
@@ -470,7 +473,7 @@ describe 'example::default' do
   let(:chef_run) { ChefSpec::SoloRunner.new }
 
   before do
-    stub_command("grep /tmp/foo.txt text") { rand(50)%2 == 0 }
+    stub_command("grep text /tmp/foo.txt") { rand(50)%2 == 0 }
   end
 end
 ```

data/examples/custom_matcher/libraries/matcher.rb

@@ -6,7 +6,7 @@ if defined?(ChefSpec)
   # documentation indicating how to use the custom matcher.
   #
   # @example This is an example
-  #   expect(chef_run.to install_custom_matcher_thing('foo')
+  #   expect(chef_run).to install_custom_matcher_thing('foo')
   #
   # @param [String] resource_name
   #   the resource name

data/features/inherits.feature

@@ -1,3 +1,4 @@
+@not_chef_12_0_0_rc_0
 Feature: The inherits matcher
   Background:
     * I am using the "inherits" cookbook

data/gemfiles/{chef-12.0.0.alpha.gemfile → chef-12.0.0.rc.gemfile}

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'chef', '~> 12.0.0.alpha'
+gem 'chef', '~> 12.0.0.rc'
 
 gemspec :path => '..'

data/lib/chefspec.rb

@@ -80,3 +80,4 @@ require_relative 'chefspec/util'
 require_relative 'chefspec/version'
 
 require_relative 'chefspec/deprecations'
+require_relative 'chefspec/chef_backwards_compat' if Chef::VERSION.to_f < 12.0

data/lib/chefspec/chef_backwards_compat.rb

@@ -0,0 +1,79 @@
+#
+# This file contains the backwards compatible hacks required to make ChefSpec
+# work with the previous version of Chef. ChefSpec only promises to be backwards
+# compatible with the last major release of Chef, but it may work with earlier
+# versions.
+#
+# The hacks are kept in this file so as to avoid a bunch of branching logic
+# throughout the codebase. It also makes dropping backwards compatability much
+# easier without the risk of breaking things.
+#
+# This file must be loaded AFTER the rest of ChefSpec has been initialized!
+#
+
+module ChefSpec
+  class ServerRunner
+    #
+    # The method airty for the Chef::CookbookUploader used to accept a list of
+    # cookbook paths. This restores that behavior.
+    #
+    def cookbook_uploader_for(loader)
+      Chef::CookbookUploader.new(loader.cookbooks, loader.cookbook_paths)
+    end
+  end
+
+  module RemoveExistingLWRP
+    def self.extended(klass)
+      class << klass
+        alias_method :build_from_file_without_removal, :build_from_file
+        alias_method :build_from_file, :build_from_file_with_removal
+      end
+    end
+
+    #
+    # Override Chef provider to remove any existing LWRPs to suppress constant
+    # re-definition warnings.
+    #
+    # @param [String] cookbook_name
+    #   the name of the cookbook
+    # @param [String] filename
+    #   file to load as a LWRP
+    # @param [Chef::RunContext] run_context
+    #   context of a Chef Run
+    #
+    # @return [Chef::Provider]
+    #
+    def build_from_file_with_removal(cookbook_name, filename, run_context)
+      provider_name = filename_to_qualified_string(cookbook_name, filename)
+      class_name    = convert_to_class_name(provider_name)
+
+      remove_existing_lwrp(class_name)
+      build_from_file_without_removal(cookbook_name, filename, run_context)
+    end
+
+    #
+    # Remove any existing Chef provider or resource with the specified name.
+    #
+    # @param [String] class_name
+    #   The class name. Must be a valid constant name.
+    #
+    def remove_existing_lwrp(class_name)
+      [self, superclass].each do |resource_holder|
+        look_in_parents = false
+        if resource_holder.const_defined?(class_name, look_in_parents)
+          old_class = resource_holder.send(:remove_const, class_name)
+
+          if resource_holder.respond_to?(:resource_classes)
+            resource_holder.resource_classes.delete(old_class)
+          end
+        end
+      end
+    end
+  end
+end
+
+
+# Only remove existing LWRPs for older versions of Chef. Newer versions of
+# Chef do not break things as much...
+Chef::Provider::LWRPBase.extend(ChefSpec::RemoveExistingLWRP)
+Chef::Resource::LWRPBase.extend(ChefSpec::RemoveExistingLWRP)

data/lib/chefspec/deprecations.rb

@@ -20,6 +20,7 @@ module ChefSpec
     #   use {ChefSpec.define_runner_method} instead.
     def self.define_runner_method(resource_name)
       deprecated "`ChefSpec::Runner.define_runner_method' is deprecated. " \
+        "It is being used in the #{resource_name} resource matcher." \
         "Please use `ChefSpec.define_matcher' instead."
 
       ChefSpec.define_matcher(resource_name)

data/lib/chefspec/extensions/chef/lwrp_base.rb

@@ -1,59 +1,7 @@
 # Override Chef LWRP creation to remove existing class to avoid redefinition warnings.
 class Chef
-  module RemoveExistingLWRP
-    def self.extended(klass)
-      class << klass
-        alias_method :build_from_file_without_removal, :build_from_file
-        alias_method :build_from_file, :build_from_file_with_removal
-      end
-    end
-
-    #
-    # Override Opscode provider to remove any existing LWRPs to suppress
-    # constant re-definition warnings.
-    #
-    # @param [String] cookbook_name
-    #   the name of the cookbook
-    # @param [String] filename
-    #   file to load as a LWRP
-    # @param [Chef::RunContext] run_context
-    #   context of a Chef Run
-    #
-    # @return [Chef::Provider]
-    #
-    def build_from_file_with_removal(cookbook_name, filename, run_context)
-      provider_name = filename_to_qualified_string(cookbook_name, filename)
-      class_name    = convert_to_class_name(provider_name)
-
-      remove_existing_lwrp(class_name)
-      build_from_file_without_removal(cookbook_name, filename, run_context)
-    end
-
-    #
-    # Remove any existing Chef provider or resource with the specified name.
-    #
-    # @param [String] class_name
-    #   The class name. Must be a valid constant name.
-    #
-    def remove_existing_lwrp(class_name)
-      [self, superclass].each do |resource_holder|
-        look_in_parents = false
-        if resource_holder.const_defined?(class_name, look_in_parents)
-          old_class = resource_holder.send(:remove_const, class_name)
-
-          if resource_holder.respond_to?(:resource_classes)
-            resource_holder.resource_classes.delete(old_class)
-          end
-        end
-      end
-    end
-  end
-
   class Provider
-    # Chef provider for a resource
     class LWRPBase < Provider
-      extend RemoveExistingLWRP
-
       module InlineResources
         module ClassMethods
           #
@@ -72,11 +20,4 @@ class Chef
       end
     end
   end
-
-  class Resource
-    # Chef provider for a resource
-    class LWRPBase < Resource
-      extend RemoveExistingLWRP
-    end
-  end
 end

data/lib/chefspec/rspec.rb

@@ -11,6 +11,7 @@ RSpec.configure do |config|
 
   config.add_setting :cookbook_path
   config.add_setting :role_path
+  config.add_setting :environment_path
   config.add_setting :log_level, default: :warn
   config.add_setting :path
   config.add_setting :platform

data/lib/chefspec/server_runner.rb

@@ -38,9 +38,19 @@ module ChefSpec
     def upload_cookbooks!
       loader = Chef::CookbookLoader.new(Chef::Config[:cookbook_path])
       loader.load_cookbooks
+      cookbook_uploader_for(loader).upload_cookbooks
+    end
 
-      uploader = Chef::CookbookUploader.new(loader.cookbooks, loader.cookbook_paths)
-      uploader.upload_cookbooks
+    #
+    # The uploader for the cookbooks.
+    #
+    # @param [Chef::CookbookLoader] loader
+    #   the Chef cookbook loader
+    #
+    # @return [Chef::CookbookUploader]
+    #
+    def cookbook_uploader_for(loader)
+      Chef::CookbookUploader.new(loader.cookbooks)
     end
 
     # @see (SoloRunner#converge)

data/lib/chefspec/solo_runner.rb

@@ -77,6 +77,7 @@ module ChefSpec
       Chef::Config[:role_path]       = Array(@options[:role_path])
       Chef::Config[:force_logger]    = true
       Chef::Config[:solo]            = true
+      Chef::Config[:environment_path] = @options[:environment_path]
 
       yield node if block_given?
     end
@@ -301,6 +302,7 @@ module ChefSpec
       {
         cookbook_path: config.cookbook_path || calling_cookbook_path(caller),
         role_path:     config.role_path || default_role_path,
+        environment_path: config.environment_path || default_environment_path,
         log_level:     config.log_level,
         path:          config.path,
         platform:      config.platform,
@@ -340,6 +342,20 @@ module ChefSpec
       nil
     end
 
+    #
+    # The inferred path to environments.
+    #
+    # @return [String, nil]
+    #
+    def default_environment_path
+      Pathname.new(Dir.pwd).ascend do |path|
+        possible = File.join(path, 'environments')
+        return possible if File.exist?(possible)
+      end
+
+      nil
+    end
+
     #
     # The +Chef::Client+ for this runner.
     #

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '4.1.1'
+  VERSION = '4.2.0.beta.1'
 end

data/spec/unit/deprecations_spec.rb

@@ -16,6 +16,7 @@ describe ChefSpec::Runner 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." \
           "Please use `ChefSpec.define_matcher' instead.")
       ChefSpec::Runner.define_runner_method(:my_custom_resource)
     end

data/spec/unit/extensions/lwrp_base_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 
-# Don't run this test on older versions of Chef
-if Chef::VERSION >= '11.0.0'
-
+# Chef 12 fixed resource inheritance issues
+if Chef::VERSION.to_f < 12.0
   module ChefSpec
     module Extensions
       describe :LWRPBase do

data/spec/unit/solo_runner_spec.rb

@@ -104,6 +104,7 @@ describe ChefSpec::SoloRunner do
     context 'RSpec global configuration' do
       before do
         allow(RSpec.configuration).to receive(:cookbook_path).and_return('./path')
+        allow(RSpec.configuration).to receive(:environment_path).and_return('./env-path')
         allow(RSpec.configuration).to receive(:log_level).and_return(:fatal)
         allow(RSpec.configuration).to receive(:path).and_return('ohai.json')
         allow(RSpec.configuration).to receive(:platform).and_return('ubuntu')
@@ -113,6 +114,7 @@ describe ChefSpec::SoloRunner do
       it 'uses the RSpec values' do
         options = described_class.new.options
         expect(options[:cookbook_path]).to eq('./path')
+        expect(options[:environment_path]).to eq('./env-path')
         expect(options[:log_level]).to eq(:fatal)
         expect(options[:path]).to eq('ohai.json')
         expect(options[:platform]).to eq('ubuntu')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0.beta.1
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -606,7 +606,7 @@ files:
 - features/yum_package.feature
 - gemfiles/chef-11.14.0.gemfile
 - gemfiles/chef-11.16.0.gemfile
-- gemfiles/chef-12.0.0.alpha.gemfile
+- gemfiles/chef-12.0.0.rc.gemfile
 - gemfiles/chef-master.gemfile
 - lib/chefspec.rb
 - lib/chefspec/api.rb
@@ -662,6 +662,7 @@ files:
 - lib/chefspec/api/yum_package.rb
 - lib/chefspec/berkshelf.rb
 - lib/chefspec/cacher.rb
+- lib/chefspec/chef_backwards_compat.rb
 - lib/chefspec/coverage.rb
 - lib/chefspec/coverage/filters.rb
 - lib/chefspec/deprecations.rb
@@ -755,12 +756,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Write RSpec examples and generate coverage reports for Chef recipes!