chef-zero 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b4a6e710f90e47913be43c72b9cc0452443b3d8
-  data.tar.gz: ce7a0c64ab54a3878aee472b1ad4b9bbd27212a4
+  metadata.gz: 98e9181d735cbb6ad5981b436498ff4dce7e279c
+  data.tar.gz: b81547d1267102697646f4bab429f47d48717383
 SHA512:
-  metadata.gz: 9304111f0ee34e491f77e3846efc83e8181fcb8bdf286bff506c088f1cb9601614537ee1ae12b1b4b07932939e81253d1638cb733b650c0d21e4ef3c936363bc
-  data.tar.gz: dde7e1304a4a52d2ccfcc5a0e124038d5cc93d9c03eeeaf6d837514245fd8e529148329cfb570d19e6cd93a14e5c72d298b4e743e6e3f2d1505573e8ebc19ae3
+  metadata.gz: 1aaf959db02e1ef2c2dadbcace84a159becdd37081b56c472d4231b4c44bdd0a5f7a42c74c0c96c9fa3af8f6e74052b9ea90d79b512ef7b898c82374a4fd0aa6
+  data.tar.gz: c1fe2d7f33df8ccd501374f69769cb057af2766bb35d8d536c24052961f4523df131a7e646c50616abf9e7f39a41d37b1559c47bab3b01c4883e8c6100f7a30e

data/lib/chef_zero/rspec.rb

@@ -46,25 +46,27 @@ module ChefZero
         extend WhenTheChefServerClassMethods
         include WhenTheChefServerInstanceMethods
 
-        @@chef_server_options = { port: 8900, signals: false, log_requests: true, server_scope: :each }
+        # Take the passed-in options
 
-        def self.chef_server_options
-          @@chef_server_options
-        end
+        define_singleton_method(:chef_server_options) {
+          @chef_server_options ||= begin
+            _chef_server_options = { port: 8900, signals: false, log_requests: true }
+            _chef_server_options = _chef_server_options.merge(tags.last) if tags.last.is_a?(Hash)
+            _chef_server_options = _chef_server_options.freeze
+          end
+        }
 
+        # Merge in chef_server_options from let(:chef_server_options)
         def chef_server_options
-          self.class.chef_server_options
+          chef_server_options = self.class.chef_server_options.dup
+          chef_server_options = chef_server_options.merge(chef_zero_opts) if self.respond_to?(:chef_zero_opts)
+          chef_server_options
         end
 
-        old_chef_server_url = nil
-        old_node_name = nil
-        old_client_key = nil
-
         before chef_server_options[:server_scope] do
-          chef_server_options = self.chef_server_options
-          chef_server_options = chef_server_options.merge(chef_zero_opts) if self.respond_to?(:chef_zero_opts)
-          chef_server_options = chef_server_options.merge(tags.last) if tags.last.is_a?(Hash)
-
+          if chef_server_options[:server_scope] != self.class.chef_server_options[:server_scope]
+            raise "server_scope: #{chef_server_options[:server_scope]} will not be honored: it can only be set on when_the_chef_server!"
+          end
           Log.debug("Starting Chef server with options #{chef_server_options}")
 
           ChefZero::RSpec.set_server_options(chef_server_options)
@@ -74,9 +76,9 @@ module ChefZero
           end
 
           if defined?(Chef::Config)
-            old_chef_server_url = Chef::Config.chef_server_url
-            old_node_name = Chef::Config.node_name
-            old_client_key = Chef::Config.client_key
+            @old_chef_server_url = Chef::Config.chef_server_url
+            @old_node_name = Chef::Config.node_name
+            @old_client_key = Chef::Config.client_key
             if chef_server_options[:organization]
               Chef::Config.chef_server_url = "#{ChefZero::RSpec.server.url}/organizations/#{chef_server_options[:organization]}"
             else
@@ -90,9 +92,9 @@ module ChefZero
 
         if defined?(Chef::Config)
           after chef_server_options[:server_scope] do
-            Chef::Config.chef_server_url = old_chef_server_url
-            Chef::Config.node_name = old_node_name
-            Chef::Config.client_key = old_client_key
+            Chef::Config.chef_server_url = @old_chef_server_url
+            Chef::Config.node_name = @old_node_name
+            Chef::Config.client_key = @old_client_key
           end
         end
 

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.2.2'
+  VERSION = '4.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing