jettywrapper 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,6 @@
+1.3.2
+  Throw error on start if port already in use
+
 1.3.1
   It should use APP_ROOT constant throughout, not APP_ROOT environment variable.
 

data/lib/jettywrapper.rb

@@ -274,9 +274,9 @@ class Jettywrapper
          logger.warn "Removing stale PID file at #{pid_path}"
          File.delete(pid_path)
        end
-       if Jettywrapper.is_port_in_use?(self.port)
-         raise("Port #{self.port} is already in use.")
-       end
+     end
+     if Jettywrapper.is_port_in_use?(self.port)
+       raise("Port #{self.port} is already in use.")
      end
      Dir.chdir(@jetty_home) do
        process.start

data/lib/jettywrapper/version.rb

@@ -1 +1 @@
-GEMVERSION = "1.3.1"
+GEMVERSION = "1.3.2"

data/spec/lib/jettywrapper_integration_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'rubygems'
 require 'uri'
 require 'net/http'
+require 'socket'
 
 module Hydra
   describe Jettywrapper do    
@@ -79,6 +80,24 @@ module Hydra
         ts.stop
       end
 
+      it "raises an error if you try to start a jetty when the port is already in use" do
+        jetty_params = {
+          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
+          :jetty_port => TEST_JETTY_PORTS.first,
+          :startup_wait => 30
+        }
+	socket = TCPServer.new(TEST_JETTY_PORTS.first)
+        begin
+          ts = Jettywrapper.configure(jetty_params) 
+          ts.stop
+          ts.pid_file?.should eql(false)
+          lambda{ ts.start }.should raise_exception
+          ts.stop
+        ensure
+          socket.close
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jettywrapper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Chris Beer
@@ -17,13 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-10 00:00:00 -05:00
-default_executable: 
+date: 2012-07-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: logger
+  type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  requirement: *id001
+  version_requirements: *id001
+  name: logger
 - !ruby/object:Gem::Dependency 
-  name: mediashelf-loggable
+  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  requirement: *id002
+  version_requirements: *id002
+  name: mediashelf-loggable
 - !ruby/object:Gem::Dependency 
-  name: childprocess
+  type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  requirement: *id003
+  version_requirements: *id003
+  name: childprocess
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,12 +73,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  requirement: *id004
+  version_requirements: *id004
+  name: i18n
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  type: :runtime
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,12 +89,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  type: :runtime
-  requirement: *id005
+  version_requirements: *id005
+  name: activesupport
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -105,12 +104,12 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  type: :development
-  requirement: *id006
+  version_requirements: *id006
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  type: :development
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +118,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id007
+  version_requirements: *id007
+  name: mocha
 - !ruby/object:Gem::Dependency 
-  name: rake
+  type: :development
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,12 +132,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id008
+  version_requirements: *id008
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: yard
+  type: :development
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -149,12 +148,12 @@ dependencies:
         - 6
         - 5
         version: 0.6.5
-  type: :development
-  requirement: *id009
+  version_requirements: *id009
+  name: yard
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  type: :development
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,8 +162,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id010
+  version_requirements: *id010
+  name: RedCloth
 description: Spin up a jetty instance (e.g., the one at https://github.com/projecthydra/hydra-jetty) and wrap test in it. This lets us run tests against a real copy of solr and fedora.
 email: 
 - hydra-tech@googlegroups.com
@@ -192,7 +191,6 @@ files:
 - spec/lib/jettywrapper_spec.rb
 - spec/spec_helper.rb
 - tasks/jettywrapper.rake
-has_rdoc: true
 homepage: https://github.com/projecthydra/jettywrapper
 licenses: []
 
@@ -224,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Convenience tasks for working with jetty from within a ruby project.