chef-zero 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a494204cfb5a14c3b259ba81661b4e618fbf88d7
-  data.tar.gz: cbbffbf9c1b738694c84975a51fb37965f0d3fb6
+  metadata.gz: 1b4a6e710f90e47913be43c72b9cc0452443b3d8
+  data.tar.gz: ce7a0c64ab54a3878aee472b1ad4b9bbd27212a4
 SHA512:
-  metadata.gz: ddd3f8df7cb10711dc9098075704dbf4713fd99e035a83739bcaa4b9f463b57ffb6c9c40b70f473f3c9299894b7ff3f457b4721c10c3b27e5abd520b4d4b1314
-  data.tar.gz: b0ce1891ade2af25515236d244fb37e5f4b496909719c3a8e2793a97e8a16ef7c006c5bc369161fd6e34ef142547a32cbe9b588af0492dea6c47ec33609511f4
+  metadata.gz: 9304111f0ee34e491f77e3846efc83e8181fcb8bdf286bff506c088f1cb9601614537ee1ae12b1b4b07932939e81253d1638cb733b650c0d21e4ef3c936363bc
+  data.tar.gz: dde7e1304a4a52d2ccfcc5a0e124038d5cc93d9c03eeeaf6d837514245fd8e529148329cfb570d19e6cd93a14e5c72d298b4e743e6e3f2d1505573e8ebc19ae3

data/lib/chef_zero/rspec.rb

@@ -46,23 +46,25 @@ module ChefZero
         extend WhenTheChefServerClassMethods
         include WhenTheChefServerInstanceMethods
 
+        @@chef_server_options = { port: 8900, signals: false, log_requests: true, server_scope: :each }
+
         def self.chef_server_options
           @@chef_server_options
         end
+
         def chef_server_options
           self.class.chef_server_options
         end
 
-        @@chef_server_options = { port: 8900, signals: false, log_requests: true, server_scope: :each }
-        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
+          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)
+
           Log.debug("Starting Chef server with options #{chef_server_options}")
 
           ChefZero::RSpec.set_server_options(chef_server_options)

data/lib/chef_zero/socketless_server_map.rb

@@ -33,6 +33,10 @@ module ChefZero
       instance.request(port, request_env)
     end
 
+    def self.server_on_port(port)
+      instance.server_on_port(port)
+    end
+
     MUTEX = Mutex.new
 
     include Singleton
@@ -67,6 +71,10 @@ module ChefZero
       @servers_by_port.key?(port)
     end
 
+    def server_on_port(port)
+      @servers_by_port[port]
+    end
+
     def deregister(port)
       MUTEX.synchronize do
         @servers_by_port.delete(port)

data/lib/chef_zero/version.rb

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

data/spec/socketless_server_map_spec.rb

@@ -14,6 +14,11 @@ describe "Socketless Mode" do
     expect(server_map).to have_server_on_port(8889)
   end
 
+  it "retrieves a server by port" do
+    server_map.register_port(8889, server)
+    expect(ChefZero::SocketlessServerMap.server_on_port(8889)).to eq(server)
+  end
+
   context "when a no-listen server is registered" do
 
     let!(:port) { server_map.register_no_listen_server(server) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -239,9 +239,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 test_files: []
+has_rdoc: