chefspec 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b356cb25522616e55756a68cffb0fee6bbac9bb
-  data.tar.gz: 587c6da791e7fdac91ba470e47ba9ec182858874
+  metadata.gz: 42b8dc074521cc846b3577e67be0b31cefbd11bd
+  data.tar.gz: b49ec85da25e784e7688674100a675842d92448d
 SHA512:
-  metadata.gz: bc83045236dca71e9627037bda4fb8288326daaaccae04d08ba09dfc30b02af46d2026b86cd7160752ad5c1f3968daa28455d6bdc5f0b732f526690e1e78b43b
-  data.tar.gz: 511164cffb5fa1e6b7f0f6ca1f3b2a24badd219448f4034e3b9b8c8f22d0b68d8c195a6d60084038ea92e4341e01c05d5e0bd31469a8ca28ca1fe3938006a114
+  metadata.gz: 5f5fbfb4a6746c897e50bccc8207bfcbbbaee688849eb6ffa28db24b88b9fa594b9b8fe9c5a745305f96440d21bf2a2ea2d137da1b7bd9a0ae154e5591706fc5
+  data.tar.gz: 6ab6c2840dcec33358b7d507fd16147e99eaa3d0f9e8c0efbfa52e854c3977b056f91d31488223871032ee5ad057da236100cf858fd4c00c449bc78b68b2466c

data/.travis.yml

@@ -20,6 +20,7 @@ bundler_args: --jobs 7
 
 gemfile:
   - gemfiles/chef-11.12.0.gemfile
+  - gemfiles/chef-11.14.0.gemfile
   - gemfiles/chef-master.gemfile
 
 matrix:

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 CHANGELOG for ChefSpec
 ======================
 
+## 4.0.2 (August 13, 2014)
+Bugfixes:
+  - Fix a regression caused by a new version of Chef Zero in single_org mode
+
+Improvements:
+  - Test against Chef 11.14.0 in the Travis matrix
+
 ## 4.0.1 (June 27, 2014)
 Bugfixes:
   - Fix class comparisons

data/examples/heavy_provider_light_resource/spec/provider_service_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../libraries/resource_service'
 
 describe 'heavy_provider_light_resource::default' do
-  it "does not bomb (because the resource was not wiped out when the provider was encountered" do
+  it "does not bomb (because the resource was not wiped out when the provider was encountered)" do
     ChefSpec::Runner.new.converge(described_recipe)
   end
 end

data/examples/server/spec/node_spec.rb

@@ -15,26 +15,29 @@ describe 'server::node' do
       .with_message('node[bacon], node[chefspec]')
   end
 
-  it 'loads ohai data' do
-    chef_run = ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04')
-                 .converge(described_recipe)
-
-    expect(ChefSpec::Server).to have_node('chefspec')
-
-    node = ChefSpec::Server.node('chefspec')
-    expect(node['kernel']['name']).to eq('Linux')
-    expect(node['kernel']['release']).to eq('3.2.0-26-generic')
-    expect(node['kernel']['machine']).to eq('x86_64')
+  context 'with custom Ohai data' do
+    it 'has the node data' do
+      ChefSpec::Runner.new(platform: 'ubuntu', version: '12.04')
+        .converge(described_recipe)
+
+      expect(ChefSpec::Server).to have_node('chefspec')
+
+      node = ChefSpec::Server.node('chefspec')
+      expect(node['kernel']['name']).to eq('Linux')
+      expect(node['kernel']['release']).to eq('3.2.0-26-generic')
+      expect(node['kernel']['machine']).to eq('x86_64')
+    end
   end
 
-  it 'uses overridden ohai data' do
-    chef_run = ChefSpec::Runner.new do |node|
-                 node.set['breakfast']['bacon'] = true
-               end.converge(described_recipe)
+  context 'with overridden node data' do
+    it 'has the node data' do
+      ChefSpec::Runner.new { |node| node.set['breakfast']['bacon'] = true }
+        .converge(described_recipe)
 
-    expect(ChefSpec::Server).to have_node('chefspec')
+      expect(ChefSpec::Server).to have_node('chefspec')
 
-    node = ChefSpec::Server.node('chefspec')
-    expect(node['breakfast']['bacon']).to be_truthy
+      node = ChefSpec::Server.node('chefspec')
+      expect(node['breakfast']['bacon']).to be_truthy
+    end
   end
 end

data/gemfiles/chef-11.14.0.gemfile

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

data/lib/chefspec/server.rb

@@ -161,9 +161,6 @@ module ChefSpec
 
         # Set a random port so ChefSpec may be run in multiple jobs
         port: port,
-
-        # Disable the "old" way - this is actually +multi_tenant: true+
-        single_org: false,
       )
     end
 
@@ -299,6 +296,26 @@ module ChefSpec
     # Get the path to an item in the data store.
     #
     def get(*args)
+      # This is a real-life "what in the actual fuck!?". Since some engineers
+      # cannot seem to understand the importance of an unchanging public API,
+      # we have to implement crazy, outlandish checks like this.
+      #
+      # In the 2.0 series of Chef Zero, the DataStore did not prefix values.
+      # In the 2.1+ series, DataStore values are nested under
+      # +organizations/chef+, for some ridiciously reason.
+      #
+      # Oh, and for the record, there was no CHANGELOG entry or anything. They
+      # just decided it would be a good idea to change one of the main APIs in
+      # the system.
+      if ChefZero::VERSION.to_f == 2.0
+        get_without_prefix(*args)
+      else
+        get_with_prefix(*args)
+      end
+    end
+
+    # @see {get}
+    def get_without_prefix(*args)
       if args.size == 1
         @server.data_store.list(args)
       else
@@ -306,6 +323,17 @@ module ChefSpec
       end
     end
 
+    # @see {get}
+    def get_with_prefix(*args)
+      args.unshift('organizations', 'chef')
+
+      if args.size == 3
+        @server.data_store.list(args)
+      else
+        @server.data_store.get(args)
+      end
+    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.1'
+  VERSION = '4.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chefspec
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Andrew Crump
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -605,6 +605,7 @@ files:
 - features/user.feature
 - features/yum_package.feature
 - gemfiles/chef-11.12.0.gemfile
+- gemfiles/chef-11.14.0.gemfile
 - gemfiles/chef-master.gemfile
 - lib/chefspec.rb
 - lib/chefspec/api.rb
@@ -753,7 +754,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Write RSpec examples and generate coverage reports for Chef recipes!