shamrock 0.0.3 → 0.0.4

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+  - 1.9.3

data/lib/shamrock/service.rb

@@ -1,22 +1,33 @@
+require 'logger'
+
 module Shamrock
   class Service
 
     attr_reader :port, :url
 
-    def initialize(rack_app,
-                   handler = Rack::Handler::WEBrick,
-                   monitor = Shamrock::Monitor)
+    PORT_RANGE = 9220..9260
+
+    DEFAULT_OPTIONS = {
+      handler: Rack::Handler::WEBrick,
+      monitor: Shamrock::Monitor
+    }
 
+    def initialize(rack_app, options = {})
       @rack_app = rack_app
-      @handler  = handler
-      @port     = Port.new
-      @url      = "http://localhost:#{port.number}"
-      @monitor  = monitor.new(Shamrock::Http.new(url))
+
+      options   = DEFAULT_OPTIONS.merge(options)
+
+      @handler  = options[:handler]
+      @logger   = logger
+
+      @port     = options[:port] || random_port
+      @url      = "http://localhost:#{port}"
+      @monitor  = options[:monitor].new(Http.new(url))
     end
 
     def start
       @thread = Thread.new do
-        @handler.run(@rack_app, Port: port.number)
+        @handler.run(@rack_app, Port: port, Logger: @logger)
       end
 
       @monitor.wait_until_ready
@@ -28,6 +39,14 @@ module Shamrock
 
     private
 
+    def logger
+      defined? Rails ? Rails.logger : Logger.new(STDOUT)
+    end
+
+    def random_port
+      Random.rand(PORT_RANGE)
+    end
+
     def server_name
       @rack_app.class.name
     end

data/lib/shamrock/version.rb

@@ -1,3 +1,3 @@
 module Shamrock
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/shamrock.rb

@@ -1,7 +1,6 @@
 require 'rack'
 
 require 'shamrock/version'
-require 'shamrock/port'
-require 'shamrock/service'
 require 'shamrock/monitor'
+require 'shamrock/service'
 require 'shamrock/http'

data/spec/shamrock/service_spec.rb

@@ -5,20 +5,33 @@ describe Shamrock::Service do
     @rack_app = proc {|env| [200, {"Content-Type" => "text/html"}, "Hello Rack!"]}
   end
 
-  class Shamrock::Service::Thread
-    def initialize(&block)
-      yield
+  describe "initialization" do
+    it "should use a specific port if one is given in the initializer" do
+      service = Shamrock::Service.new(@rack_app, port: 8080)
+      service.port.should == 8080
+    end
+
+    it "should assign a random port of none is given to initializer" do
+      service = Shamrock::Service.new(@rack_app)
+      service.port.should_not be_nil
     end
   end
 
   describe "#start" do
+    # In-line the service startup for this test
+    class Shamrock::Service::Thread
+      def initialize(&block)
+        yield
+      end
+    end
+
     it "should start the server" 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, monitor_class)
-      handler.should_receive(:run).with(@rack_app, Port: service.port.number)
+      service = Shamrock::Service.new(@rack_app, handler: handler, monitor: monitor_class)
+      handler.should_receive(:run).with(@rack_app, Port: service.port, Logger: anything)
       service.start
     end
 
@@ -29,7 +42,7 @@ describe Shamrock::Service do
       monitor.should_receive(:wait_until_ready).once
 
       handler = mock('handler', run: true)
-      Shamrock::Service.new(@rack_app, handler, monitor_class).start
+      Shamrock::Service.new(@rack_app, handler: handler, monitor: monitor_class).start
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shamrock
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -85,6 +85,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -92,13 +93,11 @@ files:
 - lib/shamrock.rb
 - lib/shamrock/http.rb
 - lib/shamrock/monitor.rb
-- lib/shamrock/port.rb
 - lib/shamrock/service.rb
 - lib/shamrock/version.rb
 - shamrock.gemspec
 - spec/shamrock/http_spec.rb
 - spec/shamrock/monitor_spec.rb
-- spec/shamrock/port_spec.rb
 - spec/shamrock/service_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/jsl/shamrock
@@ -128,6 +127,5 @@ summary: Facilitates setting up stub services in your application
 test_files:
 - spec/shamrock/http_spec.rb
 - spec/shamrock/monitor_spec.rb
-- spec/shamrock/port_spec.rb
 - spec/shamrock/service_spec.rb
 - spec/spec_helper.rb

data/lib/shamrock/port.rb

@@ -1,9 +0,0 @@
-module Shamrock
-  class Port
-    attr_reader :number
-
-    def initialize
-      @number = Random.rand(9220...9239)
-    end
-  end
-end

data/spec/shamrock/port_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Shamrock::Port do
-  describe "initialization" do
-    it "should set a number" do
-      subject.number.should be_a(Integer)
-    end
-  end
-end