http_server_manager 0.4.2 → 0.4.3

data/lib/http_server_manager/server.rb

@@ -8,7 +8,7 @@ module HttpServerManager
       @name = options[:name]
       @host = options[:host]
       @port = options[:port]
-      @timeout_in_seconds = options[:timeout_in_seconds] || 20
+      @timeout_in_seconds = options[:timeout_in_seconds] || (ENV["timeout"] ? ENV["timeout"].to_i : 20)
       @deletable_artifacts = [pid_file_path]
     end
 

data/lib/http_server_manager/version.rb

@@ -1,3 +1,3 @@
 module HttpServerManager
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/lib/http_server_manager/server_spec.rb

@@ -8,15 +8,75 @@ describe HttpServerManager::Server do
 
   end
 
-  let(:server) { HttpServerManager::TestableServer.new(name: "Test Server", host: "localhost", port: 8888) }
+  let(:server_options) { { name: "Test Server", host: "localhost", port: 8888 } }
+
+  let(:server) { HttpServerManager::TestableServer.new(server_options) }
+
+  describe "#start!" do
+
+    before(:each) { Wait.stub(:until_true!) }
+
+    context "when the server is not running" do
+
+      let(:env_timeout) { nil }
+
+      before(:each) do
+        ENV.stub(:[]).with("timeout").and_return(env_timeout)
+        server.stub(:running?).and_return(false)
+        Process.stub(:spawn)
+      end
+
+      it "should start the server by spawning a process that executes the start command" do
+        Process.should_receive(:spawn).with("some command", anything).and_return(888)
+
+        server.start!
+      end
+
+      context "when a timeout is provided as a constructor argument" do
+
+        let(:server_options) { { name: "Test Server", host: "localhost", port: 8888, timeout_in_seconds: 3 } }
+
+        it "should wait for the specified amount of time in seconds for the server to start" do
+          Wait.should_receive(:until_true!).with(anything, timeout_in_seconds: 3)
+
+          server.start!
+        end
+
+      end
+
+      context "when a timeout is provided as an environment variable" do
+
+        let(:env_timeout) { "8" }
+
+        it "should wait for the specified amount of time in seconds for the server to start" do
+          Wait.should_receive(:until_true!).with(anything, timeout_in_seconds: 8)
+
+          server.start!
+        end
+
+      end
+
+      context "when no timeout is provided" do
+
+        it "should wait 20 seconds for the server to start" do
+          Wait.should_receive(:until_true!).with(anything, timeout_in_seconds: 20)
+
+          server.start!
+        end
+
+      end
+
+    end
 
-  before(:each) do
-    server.stub(:start!)
-    server.stub(:stop!)
   end
 
   describe "#restart!" do
 
+    before(:each) do
+      server.stub(:start!)
+      server.stub(:stop!)
+    end
+
     it "should first stop the server and then start the server" do
       server.should_receive(:stop!).ordered
       server.should_receive(:start!).ordered

data/spec/lib/http_server_manager/test/server_integration_examples_spec.rb

@@ -0,0 +1,7 @@
+describe "server_integration_examples" do
+
+  let(:server) { RackServer.new(name: "test_server", host: "localhost", port: 4001) }
+
+  it_should_behave_like "a managed http server"
+
+end

data/spec/support/http_server_manager/test/server_integration_examples.rb

@@ -0,0 +1,20 @@
+shared_examples_for "a managed http server" do
+  include_context "managed http server integration utilities"
+
+  it "should be a HttpServerManager::Server" do
+    server.should be_an(HttpServerManager::Server)
+  end
+
+  describe "#start!" do
+
+    after(:each) { force_stop! }
+
+    it "should start the server via the provided command" do
+      server.start!
+
+      wait_until_started!
+    end
+
+  end
+
+end

data/spec/support/http_server_manager/test/silent_logger.rb

@@ -3,7 +3,7 @@ module HttpServerManager
 
     class SilentLogger
 
-      def method_missing(*args)
+      def self.method_missing(*args)
         # Intentionally blank
       end
 

data/spec/support/http_server_manager/test_support.rb

@@ -1,3 +1,4 @@
 require_relative 'test/server_integration_utilities'
 require_relative 'test/server_integration_utilities_spec_context'
+require_relative 'test/server_integration_examples'
 require_relative 'test/silent_logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_server_manager
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -151,6 +151,7 @@ files:
 - ./lib/http_server_manager/stdout_logger.rb
 - ./lib/http_server_manager/version.rb
 - ./lib/http_server_manager.rb
+- ./spec/support/http_server_manager/test/server_integration_examples.rb
 - ./spec/support/http_server_manager/test/server_integration_utilities.rb
 - ./spec/support/http_server_manager/test/server_integration_utilities_spec_context.rb
 - ./spec/support/http_server_manager/test/silent_logger.rb
@@ -159,6 +160,7 @@ files:
 - ./spec/lib/http_server_manager/server_integration_spec.rb
 - ./spec/lib/http_server_manager/server_spec.rb
 - ./spec/lib/http_server_manager/stdout_logger_spec.rb
+- ./spec/lib/http_server_manager/test/server_integration_examples_spec.rb
 - ./spec/lib/http_server_manager_spec.rb
 - ./spec/spec_helper.rb
 homepage: http://github.com/MYOB-Technology/http_server_manager
@@ -192,8 +194,10 @@ test_files:
 - ./spec/lib/http_server_manager/server_integration_spec.rb
 - ./spec/lib/http_server_manager/server_spec.rb
 - ./spec/lib/http_server_manager/stdout_logger_spec.rb
+- ./spec/lib/http_server_manager/test/server_integration_examples_spec.rb
 - ./spec/lib/http_server_manager_spec.rb
 - ./spec/spec_helper.rb
+- ./spec/support/http_server_manager/test/server_integration_examples.rb
 - ./spec/support/http_server_manager/test/server_integration_utilities.rb
 - ./spec/support/http_server_manager/test/server_integration_utilities_spec_context.rb
 - ./spec/support/http_server_manager/test/silent_logger.rb