chef-zero 1.5.5 → 1.5.6

data/lib/chef_zero/server.rb

@@ -129,10 +129,9 @@ module ChefZero
     end
 
     def stop(wait = 5)
+      server.stop(true)
       if @thread
         @thread.join(wait)
-      else
-        server.stop(true)
       end
     rescue
       ChefZero::Log.error "Server did not stop within #{wait} seconds. Killing..."

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.5.5'
+  VERSION = '1.5.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma