chef-zero 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7ed5dd8948e759d7ff44ccbc8eb4c99d55272f1
-  data.tar.gz: f9bb0c1e71bd100f1df405c251da8fcf92908879
+  metadata.gz: 0ef26a6b89b99ff0da1e88ca6fe0296b712150e2
+  data.tar.gz: ec22088976a53a4a0b2aca77921cc74506eb71ab
 SHA512:
-  metadata.gz: af1b4f1e43fa810539c2541fbe5eea52966dcbfb014804672e4075329eb1201f9b89b6d4cd27b48fb68ade9d7e4d19c012af3ca1684de0cd722ab8a57cbf2b4f
-  data.tar.gz: 265e2a81198d21af35f3c5372e8cd3c847913211d9145abb14e060ff62e158847543902df616c80208f4327911a4ba6da2555dea9a25b03780d9252979c6bf2b
+  metadata.gz: ff404f88bed23405ec7f3c06a52a636e3f59fb64ac1e0a493d5fa84a9c874029c2c7bd425b6f72e578ea740cd40b0973bab27da1b3739ac30a46d067941dc81e
+  data.tar.gz: 971fa3de8cb41875d2eb4c724d5b4cae4bfbdcf993cc3504d7eb718b0e439b71bb22d38168a052d2aaf2fbda0aa264b64e3453ce9b4c342889563e0eebe05742

data/lib/chef_zero/data_store/v1_to_v2_adapter.rb

@@ -6,8 +6,8 @@ module ChefZero
       def initialize(real_store, single_org, options = {})
         @real_store = real_store
         @single_org = single_org
-        org_defaults = options[:org_defaults] || {}
-        @defaults = { 'organizations' => { single_org => org_defaults }}
+        @options = options
+        clear
       end
 
       ORG_DEFAULTS = {
@@ -27,7 +27,12 @@ module ChefZero
       attr_reader :single_org
 
       def clear
-        real_store.clear
+        if @options[:org_defaults]
+          @defaults = { 'organizations' => { @single_org => @options[:org_defaults] }}
+        else
+          @defaults = {}
+        end
+        real_store.clear if real_store.respond_to?(:clear)
       end
 
       def create_dir(path, name, *options)

data/lib/chef_zero/rspec.rb

@@ -27,14 +27,19 @@ module ChefZero
       context "When the Chef server #{description}", *tags do
         before :each do
 
-          unless ChefZero::RSpec.server
-            default_opts = {:port => 8889, :signals => false, :log_requests => true}
-            server_opts = if self.respond_to?(:chef_zero_opts)
-              default_opts.merge(chef_zero_opts)
-            else
-              default_opts
-            end
+          default_opts = {:port => 8900, :signals => false, :log_requests => true}
+          server_opts = if self.respond_to?(:chef_zero_opts)
+            default_opts.merge(chef_zero_opts)
+          else
+            default_opts
+          end
 
+          if ChefZero::RSpec.server && server_opts.any? { |opt, value| ChefZero::RSpec.server.options[opt] != value }
+            ChefZero::RSpec.server.stop
+            ChefZero::RSpec.server = nil
+          end
+
+          unless ChefZero::RSpec.server
             # TODO: can this be logged easily?
             # pp :zero_opts => server_opts
 

data/lib/chef_zero/server.rb

@@ -188,12 +188,25 @@ module ChefZero
         :BindAddress => @options[:host],
         :Port        => @options[:port],
         :AccessLog   => [],
-        :Logger      => WEBrick::Log.new(StringIO.new, 7)
+        :Logger      => WEBrick::Log.new(StringIO.new, 7),
+        :StartCallback => proc {
+          @running = true
+        }
       )
       @server.mount('/', Rack::Handler::WEBrick, app)
 
-      @thread = Thread.new { @server.start }
-      @thread.abort_on_exception = true
+      @thread = Thread.new do
+        begin
+          Thread.abort_on_exception = true
+          @server.start
+        ensure
+          @running = false
+        end
+      end
+      # Do not return until the web server is genuinely started.
+      while !@running && @thread.alive?
+        sleep(0.01)
+      end
       @thread
     end
 
@@ -206,16 +219,7 @@ module ChefZero
     #   true if the server is accepting requests, false otherwise
     #
     def running?
-      if @server.nil? || @server.status != :Running
-        return false
-      end
-
-      uri     = URI.join(url, 'cookbooks')
-      headers = { 'Accept' => 'application/json' }
-
-      Timeout.timeout(0.1) { !open(uri, headers).nil? }
-    rescue SocketError, Errno::ECONNREFUSED, Timeout::Error
-      false
+      !@server.nil? && @running && @server.status == :Running
     end
 
     #
@@ -226,7 +230,7 @@ module ChefZero
     #   server
     #
     def stop(wait = 5)
-      if @thread
+      if @running
         @server.shutdown
         @thread.join(wait)
       end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - John Keiser