chefspec 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd833d7dcb6a3d973ccd35a43a0f606142244b8f
-  data.tar.gz: c2c2d2832263d9868c542d7cc005b4f626bfe863
+  metadata.gz: 4b356cb25522616e55756a68cffb0fee6bbac9bb
+  data.tar.gz: 587c6da791e7fdac91ba470e47ba9ec182858874
 SHA512:
-  metadata.gz: 02158758eeff60f14350d2084279b07046c1534e04f20f7392700471b79bd44316ddd57af76a21420e613ca7c115c33870fbcec3de4ea027e20a8575bef1e529
-  data.tar.gz: 62660485d2405c57a6e17a1b566f7a344ef86fad27fba8520a5aea451a304bd5429d5a72aab869c37c4c7cebd869b8e8f16a6311cdce9466826ee7b04ff03691
+  metadata.gz: bc83045236dca71e9627037bda4fb8288326daaaccae04d08ba09dfc30b02af46d2026b86cd7160752ad5c1f3968daa28455d6bdc5f0b732f526690e1e78b43b
+  data.tar.gz: 511164cffb5fa1e6b7f0f6ca1f3b2a24badd219448f4034e3b9b8c8f22d0b68d8c195a6d60084038ea92e4341e01c05d5e0bd31469a8ca28ca1fe3938006a114

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 CHANGELOG for ChefSpec
 ======================
 
+## 4.0.1 (June 27, 2014)
+Bugfixes:
+  - Fix class comparisons
+  - Update ChefZero API to work again
+  - Use proper cookbook in the template_finder
+  - Fix Ruby deprecations
+  - Various documentation updates
+
 ## 4.0.0 (June 2, 2014)
 Breaking Changes:
   - **Upgraded to RSpec 3!** RSpec 3 brings many new API changes and syntaxes

data/README.md

@@ -90,9 +90,6 @@ RSpec.configure do |config|
   # the location of the calling spec file])
   config.cookbook_path = '/var/cookbooks'
 
-  # Set the organization for Chef Zero (default: 'chefspec')
-  config.organization = 'sweetsauce'
-
   # Specify the path for Chef Solo to find roles (default: [ascending search])
   config.role_path = '/var/roles'
 
@@ -488,7 +485,7 @@ data_bag('users').each do |user|
 end
 ```
 
-ChefSpec will rails an error like:
+ChefSpec will raise an error like:
 
 ```text
 Real data_bags are disabled. Unregistered data_bag: data_bag(:users)

data/features/server.feature

@@ -6,10 +6,10 @@ Feature: The ChefSpec server
     * I am using the "server" cookbook
 
   Scenario Outline: Running specs
-    * I successfully run `rspec spec/<Compontent>_spec.rb`
+    * I successfully run `rspec spec/<Component>_spec.rb`
     * the output should contain "0 failures"
   Examples:
-    | Compontent         |
+    | Component          |
     | client             |
     | data_bag           |
     | environment        |

data/lib/chefspec/berkshelf.rb

@@ -46,7 +46,7 @@ module ChefSpec
     # Destroy the installed Berkshelf at the temporary directory.
     #
     def teardown!
-      FileUtils.rm_rf(@tmpdir) if File.exists?(@tmpdir)
+      FileUtils.rm_rf(@tmpdir) if File.exist?(@tmpdir)
     end
   end
 end

data/lib/chefspec/librarian.rb

@@ -38,8 +38,8 @@ module ChefSpec
     def teardown!
       env = ::Librarian::Chef::Environment.new(project_path: Dir.pwd)
       env.config_db.local['path'] = @originalpath
-      
-      FileUtils.rm_rf(@tmpdir) if File.exists?(@tmpdir)
+
+      FileUtils.rm_rf(@tmpdir) if File.exist?(@tmpdir)
     end
   end
 end

data/lib/chefspec/matchers/resource_matcher.rb

@@ -111,11 +111,15 @@ module ChefSpec::Matchers
     end
 
     def matches_parameter?(parameter, expected)
-      # Chef 11+ stores the source parameter internally as an Array
+      value = safe_send(parameter)
       if parameter == :source
-        Array(expected) == Array(safe_send(parameter))
+        # Chef 11+ stores the source parameter internally as an Array
+        Array(expected) == Array(value)
+      elsif expected.kind_of?(Class)
+        # Ruby can't compare classes with ===
+        expected == value
       else
-        expected === safe_send(parameter)
+        expected === value
       end
     end
 

data/lib/chefspec/renderer.rb

@@ -68,7 +68,7 @@ module ChefSpec
         template_context = Chef::Mixin::Template::TemplateContext.new([])
         template_context.update({
           :node => chef_run.node,
-          :template_finder => template_finder(chef_run, cookbook_name),
+          :template_finder => template_finder(chef_run, template.cookbook_name),
         }.merge(template.variables))
         if template.respond_to?(:helper_modules) # Chef 11.4+
           template.helper_modules.each do |helper_module|

data/lib/chefspec/rspec.rb

@@ -10,7 +10,6 @@ RSpec.configure do |config|
   end
 
   config.add_setting :cookbook_path
-  config.add_setting :organization, default: 'chefspec'
   config.add_setting :role_path
   config.add_setting :log_level, default: :warn
   config.add_setting :path

data/lib/chefspec/runner.rb

@@ -285,7 +285,7 @@ module ChefSpec
     def default_role_path
       Pathname.new(Dir.pwd).ascend do |path|
         possible = File.join(path, 'roles')
-        return possible if File.exists?(possible)
+        return possible if File.exist?(possible)
       end
 
       nil

data/lib/chefspec/server.rb

@@ -152,8 +152,7 @@ module ChefSpec
 
     #
     # Create a new instance of the +ChefSpec::Server+ singleton. This method
-    # also starts the Chef Zero server in the background under the organization
-    # "chefspec".
+    # also starts the Chef Zero server in the background.
     #
     def initialize
       @server = ChefZero::Server.new(
@@ -233,12 +232,12 @@ module ChefSpec
     end
 
     #
-    # The URL where ChefZero is listening (including the organization).
+    # The URL where ChefZero is listening.
     #
     # @return [String]
     #
     def chef_server_url
-      @chef_server_url ||= File.join(@server.url, 'organizations', organization)
+      @chef_server_url ||= File.join(@server.url)
     end
 
     #
@@ -257,7 +256,6 @@ module ChefSpec
     #
     def reset!
       @server.clear_data
-      @server.data_store.create_dir(['organizations'], organization)
     end
 
     #
@@ -271,15 +269,6 @@ module ChefSpec
 
     private
 
-    #
-    # The name of the Chef organization.
-    #
-    # @return [String]
-    #
-    def organization
-      RSpec.configuration.organization
-    end
-
     #
     # The directory where any cache information (such as private keys) should
     # be stored. This cache is destroyed at the end of the run.
@@ -303,7 +292,7 @@ module ChefSpec
     #   to the server
     #
     def load_data(name, key, data = {})
-      @server.load_data({ key => { name => data } }, organization)
+      @server.load_data({ key => { name => data } })
     end
 
     #
@@ -311,22 +300,12 @@ module ChefSpec
     #
     def get(*args)
       if args.size == 1
-        @server.data_store.list(with_organization(*args))
+        @server.data_store.list(args)
       else
-        @server.data_store.get(with_organization(*args))
+        @server.data_store.get(args)
       end
     end
 
-    #
-    # Prefix the given args with the organization. This is used by the data
-    # store to fetch elements.
-    #
-    # @return [Array<String>]
-    #
-    def with_organization(*args)
-      ['organizations', organization, *args]
-    end
-
     #
     # A randomly assigned, open port for run the Chef Zero server.
     #

data/lib/chefspec/version.rb

@@ -1,3 +1,3 @@
 module ChefSpec
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef