chef-zero 2.1.5 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 322a85c869fafa6c722e5b54697fc5daa9aa669e
-  data.tar.gz: 4b436b5ea2f219f7b17988d4832a2aa9f72bf64d
+  metadata.gz: 1e812fceafd51d3dbba1d43446f13c67c12dfbee
+  data.tar.gz: e6ec4a6756763c7fc69d10e4e76c309e91ad469e
 SHA512:
-  metadata.gz: 89a0555f5a959b8593d27f07783ba18e297e6f7f76ae9915775abdcb82adc2e159a4bc10968797aebc25a1dc4ebadf9c3179248bf90cc732a701608c624bda83
-  data.tar.gz: cd000b0a319f0ac6cab623f93fd306678ea1dbd7aa5f41e3b3f44f711a738cde5616c5d178afa00449cd13a0f6498c7374535b6e19453222dd59ff225334bcee
+  metadata.gz: bdb9632a016a53427b3d1a977d7fa8ddb6a50f1e02c73001bfbdc192ef0b368798dda5beca6cb18e81394e63fc8132c5db125e08f5b4bb45155fca5dbf839f10
+  data.tar.gz: 3b01505e14cefdee548abf5324d742742159a3d66ceaa604d2463095eed7b96c8f1eb5ae9c8ad93a90eea082e91b19d5008074b053926062a2ad42f48ad07874

data/Rakefile

@@ -3,7 +3,13 @@ require 'bundler/gem_tasks'
 
 require 'chef_zero/version'
 
+task :default => :pedant
+
 task :spec do
+  system('rspec spec/*_spec.rb')
+end
+
+task :pedant do
   require File.expand_path('spec/run')
 end
 

data/bin/chef-zero

@@ -10,6 +10,19 @@ require 'chef_zero/version'
 require 'chef_zero/server'
 require 'optparse'
 
+def parse_port(port)
+  array = []
+  port.split(',').each do |part|
+    a,b = part.split('-',2)
+    if b
+      array = array.concat(a.to_i.upto(b.to_i).to_a)
+    else
+      array = array.concat([a.to_i])
+    end
+  end
+  array
+end
+
 options = {}
 
 OptionParser.new do |opts|
@@ -19,8 +32,9 @@ OptionParser.new do |opts|
     options[:host] = value
   end
 
-  opts.on("-p", "--port PORT", Integer, "Port to listen on") do |value|
-    options[:port] = value
+  opts.on("-p", "--port PORT", "Port to listen on (e.g. 8889, or 8500-8600 or 8885,8888)") do |value|
+    options[:port] ||= []
+    options[:port] += parse_port(value)
   end
 
   opts.on("--[no-]generate-keys", "Whether to generate actual keys or fake it (faster).  Default: false.") do |value|

data/lib/chef_zero/server.rb

@@ -80,6 +80,17 @@ module ChefZero
     # @return [Hash]
     attr_reader :options
 
+    # @return [Integer]
+    def port
+      if @port
+        @port
+      elsif !options[:port].respond_to?(:each)
+        options[:port]
+      else
+        raise "port cannot be determined until server is started"
+      end
+    end
+
     # @return [WEBrick::HTTPServer]
     attr_reader :server
 
@@ -95,9 +106,9 @@ module ChefZero
     #
     def url
       @url ||= if @options[:host].include?(':')
-                 URI("http://[#{@options[:host]}]:#{@options[:port]}").to_s
+                 URI("http://[#{@options[:host]}]:#{port}").to_s
                else
-                 URI("http://#{@options[:host]}:#{@options[:port]}").to_s
+                 URI("http://#{@options[:host]}:#{port}").to_s
                end
     end
 
@@ -153,14 +164,20 @@ module ChefZero
         output = publish.respond_to?(:puts) ? publish : STDOUT
         output.puts <<-EOH.gsub(/^ {10}/, '')
           >> Starting Chef Zero (v#{ChefZero::VERSION})...
+        EOH
+      end
+
+      thread = start_background
+
+      if publish
+        output = publish.respond_to?(:puts) ? publish : STDOUT
+        output.puts <<-EOH.gsub(/^ {10}/, '')
           >> WEBrick (v#{WEBrick::VERSION}) on Rack (v#{Rack.release}) is listening at #{url}
           >> Press CTRL+C to stop
 
         EOH
       end
 
-      thread = start_background
-
       %w[INT TERM].each do |signal|
         Signal.trap(signal) do
           puts "\n>> Stopping Chef Zero..."
@@ -185,8 +202,7 @@ module ChefZero
     #
     def start_background(wait = 5)
       @server = WEBrick::HTTPServer.new(
-        :BindAddress => @options[:host],
-        :Port        => @options[:port],
+        :DoNotListen => true,
         :AccessLog   => [],
         :Logger      => WEBrick::Log.new(StringIO.new, 7),
         :StartCallback => proc {
@@ -195,18 +211,41 @@ module ChefZero
       )
       @server.mount('/', Rack::Handler::WEBrick, app)
 
+      # Pick a port
+      if options[:port].respond_to?(:each)
+        options[:port].each do |port|
+          begin
+            @server.listen(options[:host], port)
+            @port = port
+            break
+          rescue Errno::EADDRINUSE
+            ChefZero::Log.info("Port #{port} in use: #{$!}")
+          end
+        end
+        if !@port
+          raise Errno::EADDRINUSE, "No port in :port range #{options[:port]} is available"
+        end
+      else
+        @server.listen(options[:host], options[:port])
+        @port = options[:port]
+      end
+
+      # Start the server in the background
       @thread = Thread.new do
         begin
           Thread.current.abort_on_exception = true
           @server.start
         ensure
+          @port = nil
           @running = false
         end
       end
+
       # Do not return until the web server is genuinely started.
       while !@running && @thread.alive?
         sleep(0.01)
       end
+
       @thread
     end
 

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '2.1.5'
+  VERSION = '2.2'
 end

data/spec/server_spec.rb

@@ -0,0 +1,28 @@
+require 'chef_zero/server'
+
+describe ChefZero::Server do
+  context 'with a server bound to port 8889' do
+    before :each do
+      @server = ChefZero::Server.new(:port => 8889)
+      @server.start_background
+    end
+    after :each do
+      @server.stop
+    end
+
+    it 'a second server bound to port 8889 throws EADDRINUSE' do
+      expect { ChefZero::Server.new(:port => 8889).start }.to raise_error Errno::EADDRINUSE
+    end
+
+    it 'a server bound to range 8889-9999 binds to a port > 8889' do
+      server = ChefZero::Server.new(:port => 8889.upto(9999))
+      server.start_background
+      expect(server.port).to be > 8889
+      expect(URI(server.url).port).to be > 8889
+    end
+
+    it 'a server bound to range 8889-8889 throws an exception' do
+      expect { ChefZero::Server.new(:port => 8889.upto(8889)).start_background }.to raise_error Errno::EADDRINUSE
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: '2.2'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -166,6 +166,7 @@ files:
 - lib/chef_zero/version.rb
 - spec/run.rb
 - spec/search_spec.rb
+- spec/server_spec.rb
 - spec/support/pedant.rb
 - spec/support/stickywicket.pem
 homepage: http://www.opscode.com