chef-zero 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d33b522041ae43c415622aa4256a1fdb6e1c12dd
-  data.tar.gz: b9486a52dd93f3ee4e2a27c5195410b61acc486b
+  metadata.gz: a494204cfb5a14c3b259ba81661b4e618fbf88d7
+  data.tar.gz: cbbffbf9c1b738694c84975a51fb37965f0d3fb6
 SHA512:
-  metadata.gz: 7da539d3289e42b8abec5960a9fbb30495410a42f820ae558b9b289e6bfeeae5a037b679d3f7d059482be7d48a45b08bd5032b038488ffeb6461ac3826daac02
-  data.tar.gz: 9d108127793484ae21fb50d87143486ad484ee9035c57391474467be9d3c624ddd23c51ab5a2f8963d8733e376efda52be8072f90e86517fdf964dbf77096d5d
+  metadata.gz: ddd3f8df7cb10711dc9098075704dbf4713fd99e035a83739bcaa4b9f463b57ffb6c9c40b70f473f3c9299894b7ff3f457b4721c10c3b27e5abd520b4d4b1314
+  data.tar.gz: b0ce1891ade2af25515236d244fb37e5f4b496909719c3a8e2793a97e8a16ef7c006c5bc369161fd6e34ef142547a32cbe9b588af0492dea6c47ec33609511f4

data/lib/chef_zero/rspec.rb

@@ -54,16 +54,17 @@ module ChefZero
         end
 
         @@chef_server_options = { port: 8900, signals: false, log_requests: true, server_scope: :each }
-        chef_server_options.merge!(chef_zero_opts) if self.respond_to?(:chef_zero_opts)
-        chef_server_options.merge!(tags.last) if tags.last.is_a?(Hash)
-
-        Log.debug("Starting Chef server with options #{chef_server_options}")
+        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)
 
         old_chef_server_url = nil
         old_node_name = nil
         old_client_key = nil
 
         before chef_server_options[:server_scope] do
+          Log.debug("Starting Chef server with options #{chef_server_options}")
+
           ChefZero::RSpec.set_server_options(chef_server_options)
 
           if chef_server_options[:organization]

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.2.0'
+  VERSION = '4.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log