chef-zero 1.5.5 → 1.5.6

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.
@@ -129,10 +129,9 @@ module ChefZero
129
129
  end
130
130
 
131
131
  def stop(wait = 5)
132
+ server.stop(true)
132
133
  if @thread
133
134
  @thread.join(wait)
134
- else
135
- server.stop(true)
136
135
  end
137
136
  rescue
138
137
  ChefZero::Log.error "Server did not stop within #{wait} seconds. Killing..."
@@ -1,3 +1,3 @@
1
1
  module ChefZero
2
- VERSION = '1.5.5'
2
+ VERSION = '1.5.6'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: chef-zero
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.5
4
+ version: 1.5.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-08-08 00:00:00.000000000 Z
12
+ date: 2013-09-13 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: puma