shamrock 0.0.5 → 0.0.6

data/README.md

@@ -22,13 +22,13 @@ You can then easily start the stub service either for the spec examples that nee
 globally in your spec_helper file. You can replace the Proc below with any Rack application.
 In some cases, we use Sinatra for stub services.
 
-my_rack_app = proc {|env| [200, {"Content-Type" => "text/html"}, ["Hello Rack!"]]}
-@service = Shamrock::Service.new(my_rack_app)
-@service.start
+    my_rack_app = proc {|env| [200, {"Content-Type" => "text/html"}, ["Hello Rack!"]]}
+    @service = Shamrock::Service.new(my_rack_app)
+    @service.start
 
 After you are done with the service:
 
-@service.stop
+    @service.stop
 
 ## Credits
 

data/lib/shamrock/service.rb

@@ -3,8 +3,6 @@ module Shamrock
 
     attr_reader :port, :url
 
-    PORT_RANGE = 9220..9260
-
     DEFAULT_OPTIONS = {
       handler: Rack::Handler::WEBrick,
       monitor: Shamrock::Monitor
@@ -13,18 +11,18 @@ module Shamrock
     def initialize(rack_app, options = {})
       @rack_app = rack_app
 
-      options   = DEFAULT_OPTIONS.merge(options)
+      @options  = DEFAULT_OPTIONS.merge(options)
 
-      @handler  = options[:handler]
+      @handler  = @options.delete(:handler)
 
-      @port     = options[:port] || random_port
+      @port     = @options.delete(:port) || find_available_port
       @url      = "http://localhost:#{port}"
-      @monitor  = options[:monitor].new(Http.new(url))
+      @monitor  = @options.delete(:monitor).new(Http.new(url))
     end
 
     def start
       @thread = Thread.new do
-        @handler.run(@rack_app, Port: port)
+        @handler.run(@rack_app, @options.merge(Port: port))
       end
 
       @monitor.wait_until_ready
@@ -36,12 +34,15 @@ module Shamrock
 
     private
 
-    def random_port
-      Random.rand(PORT_RANGE)
+    def find_available_port
+      server = TCPServer.new('127.0.0.1', 0)
+      server.addr[1]
+    ensure
+      server.close if server
     end
 
     def server_name
       @rack_app.class.name
     end
   end
-end
+end

data/lib/shamrock/version.rb

@@ -1,3 +1,3 @@
 module Shamrock
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/shamrock/service_spec.rb

@@ -11,7 +11,7 @@ describe Shamrock::Service do
       service.port.should == 8080
     end
 
-    it "should assign a random port of none is given to initializer" do
+    it "should assign an available port if none is given to initializer" do
       service = Shamrock::Service.new(@rack_app)
       service.port.should_not be_nil
     end
@@ -28,6 +28,16 @@ describe Shamrock::Service do
       service.start
     end
 
+    it "should start the server with custom handler options" do
+      monitor = mock('monitor', wait_until_ready: true)
+      monitor_class = mock('monitor class', new: monitor)
+
+      handler = mock('handler')
+      service = Shamrock::Service.new(@rack_app, handler: handler, monitor: monitor_class, foo: 'bar')
+      handler.should_receive(:run).with(@rack_app, Port: service.port, foo: 'bar')
+      service.start
+    end
+
     it "should wait for the server to become available" do
       monitor = mock('monitor')
       monitor_class = mock('monitor class', new: monitor)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shamrock
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70120244957380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70120244957380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70120244956820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
+  version_requirements: *70120244956820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70120244956220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.10.0
+  version_requirements: *70120244956220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70120244955700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,12 +54,7 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.4
+  version_requirements: *70120244955700
 description: Shamrock helps you to use stub services in your application by starting
   a rack service in a Thread
 email:
@@ -121,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Facilitates setting up stub services in your application