chef-zero 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13b5f1b8b65f66c0f47d494f444c9488750ed83e
-  data.tar.gz: 929a8f003e5f5b93fd3b245637b9934bee28bce7
+  metadata.gz: 0dc5c43b56067f314638042d649640166f83afde
+  data.tar.gz: c4dfa634c2d1a8293f19a890357f61d9419026c1
 SHA512:
-  metadata.gz: 84035bcef117adc8873de173e81adfb329a84fdf3860aed896617924447d36d87be09aa4b5973778636c22346baefe5958123d0360f55f18becd9523a899b35c
-  data.tar.gz: 3d725c50bc7c135e16152784180aed5c9c6fd76d08a6d6a20a2a0238877ef3688ece4843e12557a1a9340a74e44a1f8e3b9f606dc5481f6edd1a57972579ad48
+  metadata.gz: 51cd4eea5333d328bfae4577e3a69aa02d8b5f7ca92308954eaac265f77a851d4fd9c3df3e7c0243e74a026fc6c2bbcf25df6b4f43d0d14829f0e07bc2bd518f
+  data.tar.gz: 2fd500a4c7e70b64a99e3cfaca2f717190358944eaf3830689d51a030509cdccdb40cf4bc944b2ebe5422c1030cd3c953205fa6df71613068cb491092b978873

data/lib/chef_zero/rspec.rb

@@ -26,9 +26,20 @@ module ChefZero
     def when_the_chef_server(description, *tags, &block)
       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
+
+            # TODO: can this be logged easily?
+            # pp :zero_opts => server_opts
+
             # Set up configuration so that clients will point to the server
-            ChefZero::RSpec.server = ChefZero::Server.new(:port => 8889, :signals => false, :log_requests => true)
+            ChefZero::RSpec.server = ChefZero::Server.new(server_opts)
             ChefZero::RSpec.client_key = Tempfile.new(['chef_zero_client_key', '.pem'])
             ChefZero::RSpec.client_key.write(ChefZero::PRIVATE_KEY)
             ChefZero::RSpec.client_key.close

data/lib/chef_zero/server.rb

@@ -69,7 +69,8 @@ module ChefZero
     def initialize(options = {})
       options = DEFAULT_OPTIONS.merge(options)
       @options = options
-      @url = "http://#{options[:host]}:#{options[:port]}"
+      uri_safe_host = options[:host].include?(":") ? "[#{options[:host]}]" : options[:host]
+      @url = "http://#{uri_safe_host}:#{options[:port]}"
       @generate_real_keys = options[:generate_real_keys]
 
       ChefZero::Log.level = options[:log_level].to_sym

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log