shamrock 0.0.1 → 0.0.2

data/README.md

@@ -39,6 +39,7 @@ Thanks to Mike Barinek for writing up an example of this code that used Threads
 the rack application - this gem draws from code in his blog post at
 http://pivotallabs.com/users/mbarinek/blog/articles/2043-testing-ruby-services-without-mocks
 
+Thanks to Kurt Eldridge (http://github.com/truk) for pair programming on a test problem with Threads.
 
 ## Contributing
 

data/lib/shamrock/monitor.rb

@@ -13,13 +13,11 @@ module Shamrock
 
     def wait_until_ready
       Timeout::timeout(DEFAULT_TIMEOUT) do
-        until server_started? do
+        until ready? do
           sleep RE_CHECK_WAIT
         end
       end
 
-      puts "Started server #{server_name} on #{port.number}."
-
     rescue Timeout::Error => error
       abort "Server never started!"
     end
@@ -33,11 +31,5 @@ module Shamrock
       end
     end
 
-    private
-
-    def server_name
-      @rack_app.class.name
-    end
-
   end
 end

data/lib/shamrock/service.rb

@@ -24,5 +24,11 @@ module Shamrock
     def stop
       Thread.kill(@thread)
     end
+
+    private
+
+    def server_name
+      @rack_app.class.name
+    end
   end
 end

data/lib/shamrock/version.rb

@@ -1,3 +1,3 @@
 module Shamrock
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/shamrock/monitor_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Shamrock::Monitor do
+  describe "#wait_until_ready" do
+    it "should check to see if the given url is available" do
+      monitor = Shamrock::Monitor.new('http://example.com')
+      monitor.should_receive(:ready?).and_return(true)
+      monitor.wait_until_ready
+    end
+  end
+end

data/spec/shamrock/service_spec.rb

@@ -3,22 +3,33 @@ require 'spec_helper'
 describe Shamrock::Service do
   before do
     @rack_app = proc {|env| [200, {"Content-Type" => "text/html"}, "Hello Rack!"]}
-    @monitor = mock('monitor', wait_until_ready: true)
-    @monitor_class = mock('monitor class', new: @monitor)
+  end
+
+  class Shamrock::Service::Thread
+    def initialize(&block)
+      yield
+    end
   end
 
   describe "#start" do
     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)
+      service = Shamrock::Service.new(@rack_app, handler, monitor_class)
       handler.should_receive(:run).with(@rack_app, Port: service.port.number)
       service.start
     end
 
     it "should wait for the server to become available" do
-      @monitor.should_receive(:wait_until_ready).once
+      monitor = mock('monitor')
+      monitor_class = mock('monitor class', new: monitor)
+
+      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, 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.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -94,6 +94,7 @@ files:
 - lib/shamrock/service.rb
 - lib/shamrock/version.rb
 - shamrock.gemspec
+- spec/shamrock/monitor_spec.rb
 - spec/shamrock/port_spec.rb
 - spec/shamrock/service_spec.rb
 - spec/spec_helper.rb
@@ -122,6 +123,7 @@ signing_key:
 specification_version: 3
 summary: Facilitates setting up stub services in your application
 test_files:
+- spec/shamrock/monitor_spec.rb
 - spec/shamrock/port_spec.rb
 - spec/shamrock/service_spec.rb
 - spec/spec_helper.rb