chef-zero 4.2.0 → 4.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d33b522041ae43c415622aa4256a1fdb6e1c12dd
4
- data.tar.gz: b9486a52dd93f3ee4e2a27c5195410b61acc486b
3
+ metadata.gz: a494204cfb5a14c3b259ba81661b4e618fbf88d7
4
+ data.tar.gz: cbbffbf9c1b738694c84975a51fb37965f0d3fb6
5
5
  SHA512:
6
- metadata.gz: 7da539d3289e42b8abec5960a9fbb30495410a42f820ae558b9b289e6bfeeae5a037b679d3f7d059482be7d48a45b08bd5032b038488ffeb6461ac3826daac02
7
- data.tar.gz: 9d108127793484ae21fb50d87143486ad484ee9035c57391474467be9d3c624ddd23c51ab5a2f8963d8733e376efda52be8072f90e86517fdf964dbf77096d5d
6
+ metadata.gz: ddd3f8df7cb10711dc9098075704dbf4713fd99e035a83739bcaa4b9f463b57ffb6c9c40b70f473f3c9299894b7ff3f457b4721c10c3b27e5abd520b4d4b1314
7
+ data.tar.gz: b0ce1891ade2af25515236d244fb37e5f4b496909719c3a8e2793a97e8a16ef7c006c5bc369161fd6e34ef142547a32cbe9b588af0492dea6c47ec33609511f4
@@ -54,16 +54,17 @@ module ChefZero
54
54
  end
55
55
 
56
56
  @@chef_server_options = { port: 8900, signals: false, log_requests: true, server_scope: :each }
57
- chef_server_options.merge!(chef_zero_opts) if self.respond_to?(:chef_zero_opts)
58
- chef_server_options.merge!(tags.last) if tags.last.is_a?(Hash)
59
-
60
- Log.debug("Starting Chef server with options #{chef_server_options}")
57
+ chef_server_options = self.chef_server_options
58
+ chef_server_options = chef_server_options.merge(chef_zero_opts) if self.respond_to?(:chef_zero_opts)
59
+ chef_server_options = chef_server_options.merge(tags.last) if tags.last.is_a?(Hash)
61
60
 
62
61
  old_chef_server_url = nil
63
62
  old_node_name = nil
64
63
  old_client_key = nil
65
64
 
66
65
  before chef_server_options[:server_scope] do
66
+ Log.debug("Starting Chef server with options #{chef_server_options}")
67
+
67
68
  ChefZero::RSpec.set_server_options(chef_server_options)
68
69
 
69
70
  if chef_server_options[:organization]
@@ -1,3 +1,3 @@
1
1
  module ChefZero
2
- VERSION = '4.2.0'
2
+ VERSION = '4.2.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-zero
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.0
4
+ version: 4.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Keiser
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-06 00:00:00.000000000 Z
11
+ date: 2015-04-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-log