shamrock 0.0.4 → 0.0.5

data/README.md

@@ -22,7 +22,7 @@ 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!"]}
+my_rack_app = proc {|env| [200, {"Content-Type" => "text/html"}, ["Hello Rack!"]]}
 @service = Shamrock::Service.new(my_rack_app)
 @service.start
 

data/Rakefile

@@ -2,6 +2,15 @@
 require "bundler/gem_tasks"
 
 require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+namespace :spec do
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.pattern = Dir['spec/*/**/*_spec.rb']
+  end
+
+  RSpec::Core::RakeTask.new(:integration) do |t|
+    t.pattern = "integration_spec/**/*_spec.rb"
+  end
+end
+
+task :default => ["spec:unit", "spec:integration"]

data/integration_spec/service_spec.rb

@@ -0,0 +1,12 @@
+require 'bundler/setup'
+require 'shamrock'
+
+describe "starting a service and making a request" do
+  it "should respond successfully" do
+    rack_app = proc {|env| [200, {"Content-Type" => "text/html"}, ["Hello Rack!"]]}
+    service = Shamrock::Service.new(rack_app)
+    service.start
+    Net::HTTP.get(URI.parse("http://localhost:#{service.port}")).to_s.should == "Hello Rack!"
+    service.stop
+  end
+end

data/lib/shamrock/service.rb

@@ -1,5 +1,3 @@
-require 'logger'
-
 module Shamrock
   class Service
 
@@ -18,7 +16,6 @@ module Shamrock
       options   = DEFAULT_OPTIONS.merge(options)
 
       @handler  = options[:handler]
-      @logger   = logger
 
       @port     = options[:port] || random_port
       @url      = "http://localhost:#{port}"
@@ -27,7 +24,7 @@ module Shamrock
 
     def start
       @thread = Thread.new do
-        @handler.run(@rack_app, Port: port, Logger: @logger)
+        @handler.run(@rack_app, Port: port)
       end
 
       @monitor.wait_until_ready
@@ -39,10 +36,6 @@ module Shamrock
 
     private
 
-    def logger
-      defined? Rails ? Rails.logger : Logger.new(STDOUT)
-    end
-
     def random_port
       Random.rand(PORT_RANGE)
     end

data/lib/shamrock/version.rb

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

data/spec/shamrock/service_spec.rb

@@ -18,20 +18,13 @@ describe Shamrock::Service do
   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: handler, monitor: monitor_class)
-      handler.should_receive(:run).with(@rack_app, Port: service.port, Logger: anything)
+      handler.should_receive(:run).with(@rack_app, Port: service.port)
       service.start
     end
 

data/spec/spec_helper.rb

@@ -4,3 +4,10 @@ require 'simplecov'
 SimpleCov.start
 
 require 'shamrock'
+
+# In-line the service startup for this test
+class Shamrock::Service::Thread
+  def initialize(&block)
+    yield
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shamrock
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -90,6 +90,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- integration_spec/service_spec.rb
 - lib/shamrock.rb
 - lib/shamrock/http.rb
 - lib/shamrock/monitor.rb
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Facilitates setting up stub services in your application