http_server_manager 0.3.0 → 0.4.0

data/lib/http_server_manager/rake/server_tasks.rb

@@ -1,7 +1,6 @@
 require 'rake/tasklib' unless defined? (::Rake::TaskLib)
 
 module HttpServerManager
-
   module Rake
 
     class ServerTasks < ::Rake::TaskLib
@@ -31,5 +30,4 @@ module HttpServerManager
     end
 
   end
-
 end

data/lib/http_server_manager/server.rb

@@ -2,23 +2,24 @@ module HttpServerManager
 
   class Server
 
-    attr_reader :name, :port
+    attr_reader :name, :host, :port
 
     def initialize(options)
       @name = options[:name]
+      @host = options[:host]
       @port = options[:port]
       @deletable_artifacts = [pid_file_path]
     end
 
     def start!
       if running?
-        logger.info "#{@name} already running on port #{@port}"
+        logger.info "#{@name} already running on #{@host}:#{@port}"
       else
         ensure_directories_exist
         pid = Process.spawn(start_command, { [:out, :err] => [log_file_path, "w"] })
         create_pid_file(pid)
         Wait.until_true!("#{@name} is running") { running? }
-        logger.info "#{@name} started on port #{@port}"
+        logger.info "#{@name} started on #{@host}:#{@port}"
       end
     end
 
@@ -42,7 +43,7 @@ module HttpServerManager
     end
 
     def to_s
-      "#{@name} on port #{@port}"
+      "#{@name} on #{@host}:#{@port}"
     end
 
     def logger
@@ -52,7 +53,7 @@ module HttpServerManager
     private
 
     def running?
-      !!Net::HTTP.get_response("localhost", "/", @port) rescue false
+      !!Net::HTTP.get_response(@host, "/", @port) rescue false
     end
 
     def current_pid

data/lib/http_server_manager/version.rb

@@ -1,3 +1,3 @@
 module HttpServerManager
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/lib/http_server_manager/server_integration_spec.rb

@@ -1,7 +1,7 @@
 describe HttpServerManager::Server, "managing a real server" do
   include_context "managed http server integration utilities"
 
-  let(:server) { RackServer.new(port: 4001) }
+  let(:server) { RackServer.new(host: "localhost", port: 4001) }
 
   describe "#start!" do
 
@@ -32,7 +32,7 @@ describe HttpServerManager::Server, "managing a real server" do
       end
 
       it "should log that the server started on the configured port" do
-        logger.should_receive(:info).with(/started on port 4001/)
+        logger.should_receive(:info).with(/started on localhost:4001/)
 
         server.start!
       end
@@ -47,7 +47,7 @@ describe HttpServerManager::Server, "managing a real server" do
       end
 
       it "should log that the server is already running on the configured port" do
-        logger.should_receive(:info).with(/already running on port 4001/)
+        logger.should_receive(:info).with(/already running on localhost:4001/)
 
         server.start!
       end
@@ -160,6 +160,10 @@ describe HttpServerManager::Server, "managing a real server" do
       server.to_s.should match(/rack_server/)
     end
 
+    it "should return a string containing the servers host" do
+      server.to_s.should match(/localhost/)
+    end
+
     it "should return a string containing the servers port" do
       server.to_s.should match(/4001/)
     end

data/spec/lib/http_server_manager/server_spec.rb

@@ -8,7 +8,7 @@ describe HttpServerManager::Server do
 
   end
 
-  let(:server) { HttpServerManager::TestableServer.new(name: "Test Server", port: 8888) }
+  let(:server) { HttpServerManager::TestableServer.new(name: "Test Server", host: "localhost", port: 8888) }
 
   before(:each) do
     server.stub(:start!)

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'simplecov'
 SimpleCov.start do
   add_filter "/spec/"
+  add_filter "/vendor/"
   minimum_coverage 100
   refuse_coverage_drop
 end if ENV["coverage"]

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

@@ -1,5 +1,4 @@
 module HttpServerManager
-
   module Test
 
     module ServerIntegrationUtilities
@@ -35,7 +34,7 @@ module HttpServerManager
 
       def wait_until_started!
         ::Wait.until_true!("#{server.name} starts") do
-          !!Net::HTTP.get_response("localhost", "/", server.port) && pid_file_exists?
+          !!Net::HTTP.get_response(server.host, "/", server.port) && pid_file_exists?
         end
         FileUtils.cp(pid_file_path, pid_file_backup_path)
       end
@@ -43,7 +42,7 @@ module HttpServerManager
       def wait_until_stopped!
         ::Wait.until_true!("#{server.name} stops") do
           begin
-            Net::HTTP.get_response("localhost", "/", server.port)
+            Net::HTTP.get_response(server.host, "/", server.port)
             false
           rescue
             !pid_file_exists?
@@ -95,5 +94,4 @@ module HttpServerManager
     end
 
   end
-
 end

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

@@ -1,5 +1,4 @@
 module HttpServerManager
-
   module Test
 
     class SilentLogger
@@ -11,5 +10,4 @@ module HttpServerManager
     end
 
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_server_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '10.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: sys-proctree
   requirement: !ruby/object:Gem::Requirement
@@ -60,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: metric_fu
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,15 +74,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,15 +90,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: flog
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: travis-lint
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
 description: Manages the lifecycle of HTTP server processes
 email: matthew.ueckerman@myob.com
 executables: []