jettywrapper 1.2.1 → 1.3.0

data/Gemfile

@@ -1,3 +1,6 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec  
+gem 'rcov', :platform => :mri_18
+gem 'simplecov', :platform => :mri_19
+gem 'simplecov-rcov', :platform => :mri_19

data/Rakefile

@@ -20,11 +20,17 @@ Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
+Spec::Rake::SpecTask.new(:coverage) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts = %w{--exclude spec\/*,gems\/*,ruby\/* --aggregate coverage.data}
+
+  ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+  ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
+
+  if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/
+    spec.rcov = true
+    spec.rcov_opts = %w{--exclude spec\/*,gems\/*,ruby\/* --aggregate coverage.data}
+  end
 end
 
 task :clean do
@@ -51,4 +57,4 @@ rescue LoadError
   end
 end
 
-task :default => [:rcov, :doc]
+task :default => [:coverage, :doc]

data/jettywrapper.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |s|
   # It will not add these as dependencies if you require lyber-core for other projects
   s.add_development_dependency "rspec", "< 2.0" # We're not ready to upgrade to rspec 2
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'rcov'
+  s.add_development_dependency 'rake'
+
   
   s.add_development_dependency 'yard', '0.6.5'  # Yard > 0.6.5 won't generate docs.
                                                 # I don't know why & don't have time to 

data/lib/jettywrapper.rb

@@ -1,4 +1,3 @@
-# Jettywrapper is a Singleton class, so you can only create one jetty instance at a time.
 require 'loggable'
 require 'singleton'
 require 'fileutils'
@@ -7,23 +6,25 @@ require 'socket'
 require 'timeout'
 require 'childprocess'
 require 'active_support/core_ext/hash'
+require 'erb'
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__),"tasks/*.rake"))].each { |ext| load ext } if defined?(Rake)
 
 
+# Jettywrapper is a Singleton class, so you can only create one jetty instance at a time.
 class Jettywrapper
   
   include Singleton
   include Loggable
   
-  attr_accessor :port         # What port should jetty start on? Default is 8888
-  attr_accessor :jetty_home   # Where is jetty located? 
-  attr_accessor :startup_wait # After jetty starts, how long to wait until starting the tests? 
-  attr_accessor :quiet        # Keep quiet about jetty output?
-  attr_accessor :solr_home    # Where is solr located? Default is jetty_home/solr
+  attr_accessor :jetty_home   # Jetty's home directory 
+  attr_accessor :port         # Jetty's port.  Default is 8888.  Note that attribute is named port, but params passed in expect :jetty_port
+  attr_accessor :startup_wait # How many seconds to wait for jetty to spin up. Default is 5.
+  attr_accessor :quiet        # true (default) to reduce Jetty's output
+  attr_accessor :solr_home    # Solr's home directory. Default is jetty_home/solr
   attr_accessor :base_path    # The root of the application. Used for determining where log files and PID files should go.
   attr_accessor :java_opts    # Options to pass to java (ex. ["-Xmx512mb", "-Xms128mb"])
-  attr_accessor :port         # The port jetty should listen on
+  attr_accessor :jetty_opts   # Options to pass to jetty (ex. ["etc/my_jetty.xml", "etc/other.xml"] as in http://wiki.eclipse.org/Jetty/Reference/jetty.xml_usage
   
   # configure the singleton with some defaults
   def initialize(params = {})
@@ -49,27 +50,44 @@ class Jettywrapper
         app_root = ENV['APP_ROOT']
         app_root ||= '.'
       end
-      filename = "#{app_root}/config/jetty.yml"
+
+      jetty_file = "#{app_root}/config/jetty.yml"
+
+      unless File.exists?(jetty_file)
+        logger.warn "Didn't find expected jettywrapper config file at #{jetty_file}, using default file instead."
+        jetty_file = File.expand_path("../config/jetty.yml", File.dirname(__FILE__))
+      end
+
       begin
-        file = YAML.load_file(filename)
+        @jetty_erb = ERB.new(IO.read(jetty_file)).result(binding)
       rescue Exception => e
-        logger.warn "Didn't find expected jettywrapper config file at #{filename}, using default file instead."
-        file ||= YAML.load_file(File.join(File.dirname(__FILE__),"../config/jetty.yml"))
-        #raise "Unable to load: #{file}" unless file
+        raise("jetty.yml was found, but could not be parsed with ERB. \n#{$!.inspect}")
       end
-      config = file.with_indifferent_access
+
+      begin
+        @jetty_yml = YAML::load(@jetty_erb)
+      rescue StandardError => e
+        raise("jetty.yml was found, but could not be parsed.\n")
+      end
+
+      if @jetty_yml.nil? || !@jetty_yml.is_a?(Hash)
+        raise("jetty.yml was found, but was blank or malformed.\n")
+      end
+
+      config = @jetty_yml.with_indifferent_access
       config[config_name] || config[:default]
     end
     
 
     # Set the jetty parameters. It accepts a Hash of symbols. 
     # @param [Hash<Symbol>] params
-    # @param [Symbol] :jetty_home Required. Where is jetty located? 
-    # @param [Symbol] :jetty_port What port should jetty start on? Default is 8888
-    # @param [Symbol] :startup_wait After jetty starts, how long to wait before running tests? If you don't let jetty start all the way before running the tests, they'll fail because they can't reach jetty.
-    # @param [Symbol] :solr_home Where is solr? Default is jetty_home/solr
-    # @param [Symbol] :quiet Keep quiet about jetty output? Default is true. 
-    # @param [Symbol] :java_opts A list of options to pass to the jvm 
+    #  :jetty_home Required. Jetty's home direcotry
+    #  :jetty_port  Jetty's port.  Default is 8888.   Note that attribute is named port, but params passed in expect :jetty_port
+    #  :startup_wait How many seconds to wait for jetty to spin up.  Default is 5. If jetty doesn't finish spinning up, tests can fail because they can't reach jetty.
+    #  :solr_home Solr's home directory. Default is jetty_home/solr
+    #  :quiet Keep True(default) to reduce jetty's output 
+    #  :java_opts options to pass to the jvm (ex. ["-Xmx512mb", "-Xms128mb"])
+    #  :jetty_opts options to pass to jetty (ex. ["etc/my_jetty.xml", "etc/other.xml"] as in http://wiki.eclipse.org/Jetty/Reference/jetty.xml_usage
     def configure(params = {})
       jetty_server = self.instance
       jetty_server.reset_process!
@@ -86,6 +104,7 @@ class Jettywrapper
       jetty_server.port = params[:jetty_port] || 8888
       jetty_server.startup_wait = params[:startup_wait] || 5
       jetty_server.java_opts = params[:java_opts] || []
+      jetty_server.jetty_opts = params[:jetty_opts] || []
       return jetty_server
     end
    
@@ -100,7 +119,8 @@ class Jettywrapper
     #       :jetty_home => "/path/to/jetty", 
     #       :quiet => false, 
     #       :jetty_port => 8983, 
-    #       :startup_wait => 30
+    #       :startup_wait => 30,
+    #       :jetty_opts => "/etc/jetty.xml"
     #     }
     #     error = Jettywrapper.wrap(jetty_params) do   
     #       Rake::Task["rake:spec"].invoke 
@@ -123,6 +143,8 @@ class Jettywrapper
         jetty_server.stop
       end
 
+      raise error if error
+
       return error
     end
     
@@ -211,7 +233,7 @@ class Jettywrapper
         
    # What command is being run to invoke jetty? 
    def jetty_command
-     ["java", java_variables, java_opts, "-jar", "start.jar"].flatten
+     ["java", java_variables, java_opts, "-jar", "start.jar", jetty_opts].flatten
    end
 
    def java_variables

data/lib/jettywrapper/version.rb

@@ -1 +1 @@
-GEMVERSION = "1.2.1"
+GEMVERSION = "1.3.0"

data/spec/lib/jettywrapper_integration_spec.rb

@@ -13,7 +13,8 @@ module Hydra
       it "starts" do
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
-          :startup_wait => 30
+          :startup_wait => 30,
+          :jetty_port => TEST_JETTY_PORTS.first
         }
         Jettywrapper.configure(jetty_params) 
         ts = Jettywrapper.instance
@@ -26,7 +27,7 @@ module Hydra
       
         # Can we connect to solr?
         require 'net/http' 
-        response = Net::HTTP.get_response(URI.parse("http://localhost:8888/solr/development/admin/"))
+        response = Net::HTTP.get_response(URI.parse("http://localhost:#{jetty_params[:jetty_port]}/solr/development/admin/"))
         response.code.should eql("200")
         ts.stop
       
@@ -35,7 +36,8 @@ module Hydra
       it "won't start if it's already running" do
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
-          :startup_wait => 30
+          :startup_wait => 30,
+          :jetty_port => TEST_JETTY_PORTS.first
         }
         Jettywrapper.configure(jetty_params) 
         ts = Jettywrapper.instance
@@ -43,30 +45,30 @@ module Hydra
         ts.stop
         ts.start
         ts.logger.debug "Jetty started from rspec at #{ts.pid}"
-        response = Net::HTTP.get_response(URI.parse("http://localhost:8888/solr/development/admin/"))
+        response = Net::HTTP.get_response(URI.parse("http://localhost:#{jetty_params[:jetty_port]}/solr/development/admin/"))
         response.code.should eql("200")
         lambda { ts.start }.should raise_exception(/Server is already running/)
         ts.stop
       end
       
       it "can check to see whether a port is already in use" do
-        params = {
+        jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
-          :jetty_port => '9999',
+          :jetty_port => TEST_JETTY_PORTS.last,
           :startup_wait => 30
         }
-        Jettywrapper.stop(params) 
+        Jettywrapper.stop(jetty_params) 
         sleep 10
-        Jettywrapper.is_port_in_use?(params[:jetty_port]).should eql(false)
-        Jettywrapper.start(params) 
-        Jettywrapper.is_port_in_use?(params[:jetty_port]).should eql(true)
-        Jettywrapper.stop(params) 
+        Jettywrapper.is_port_in_use?(jetty_params[:jetty_port]).should eql(false)
+        Jettywrapper.start(jetty_params) 
+        Jettywrapper.is_port_in_use?(jetty_params[:jetty_port]).should eql(true)
+        Jettywrapper.stop(jetty_params) 
       end
       
       it "raises an error if you try to start a jetty that is already running" do
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
-          :jetty_port => '8983',
+          :jetty_port => TEST_JETTY_PORTS.first,
           :startup_wait => 30
         }
         ts = Jettywrapper.configure(jetty_params) 

data/spec/lib/jettywrapper_spec.rb

@@ -9,36 +9,43 @@ require 'rubygems'
       @jetty_params = {
         :quiet => false,
         :jetty_home => "/path/to/jetty",
-        :jetty_port => 8888,
+        :jetty_port => TEST_JETTY_PORTS.first,
         :solr_home => "/path/to/solr",
         :startup_wait => 0,
-        :java_opts => ["-Xmx256mb"]
+        :java_opts => ["-Xmx256mb"],
+        :jetty_opts => ["/path/to/jetty_xml", "/path/to/other_jetty_xml"]  
       }
     end
 
     context "config" do
       it "loads the application jetty.yml first" do
-        YAML.expects(:load_file).with('./config/jetty.yml').once.returns({})
+        IO.expects(:read).with('./config/jetty.yml').once.returns("default:\n")
         config = Jettywrapper.load_config
       end
 
+      it "loads the application jetty.yml using erb parsing" do
+        IO.expects(:read).with('./config/jetty.yml').once.returns("default:\n  a: <%= 123 %>")
+        config = Jettywrapper.load_config
+        config[:a] == 123
+      end
+
       it "falls back on the distributed jetty.yml" do
         fallback_seq = sequence('fallback sequence')
-        YAML.expects(:load_file).in_sequence(fallback_seq).with('./config/jetty.yml').raises(Exception)
-        YAML.expects(:load_file).in_sequence(fallback_seq).with { |value| value =~ /jetty.yml/ }.returns({})
+        File.expects(:exists?).in_sequence(fallback_seq).with('./config/jetty.yml').returns(false)
+        IO.expects(:read).in_sequence(fallback_seq).with { |value| value =~ /jetty.yml/ }.returns("default:\n")
         config = Jettywrapper.load_config
       end
 
       it "supports per-environment configuration" do
         ENV['environment'] = 'test'
-        YAML.expects(:load_file).with('./config/jetty.yml').once.returns({:test => {:a => 2 }, :default => { :a => 1 }})
+        IO.expects(:read).with('./config/jetty.yml').once.returns("default:\n  a: 1\ntest:\n  a: 2")
         config = Jettywrapper.load_config
         config[:a].should == 2
       end
 
       it "falls back on a 'default' environment configuration" do
         ENV['environment'] = 'test'
-        YAML.expects(:load_file).with('./config/jetty.yml').once.returns({:default => { :a => 1 }})
+        IO.expects(:read).with('./config/jetty.yml').once.returns("default:\n  a: 1")
         config = Jettywrapper.load_config
         config[:a].should == 1
       end
@@ -54,9 +61,10 @@ require 'rubygems'
         ts = Jettywrapper.configure(@jetty_params) 
         ts.quiet.should == false
         ts.jetty_home.should == "/path/to/jetty"
-        ts.port.should == 8888
+        ts.port.should == @jetty_params[:jetty_port]
         ts.solr_home.should == '/path/to/solr'
         ts.startup_wait.should == 0
+        ts.jetty_opts.should == @jetty_params[:jetty_opts]
       end
 
       # passing in a hash is no longer optional
@@ -70,7 +78,8 @@ require 'rubygems'
           :jetty_home => '/path/to/jetty',
           :jetty_port => nil,
           :solr_home => nil,
-          :startup_wait => nil
+          :startup_wait => nil,
+          :jetty_opts => nil
         }
 
         ts = Jettywrapper.configure(jetty_params) 
@@ -79,6 +88,7 @@ require 'rubygems'
         ts.port.should == 8888
         ts.solr_home.should == File.join(ts.jetty_home, "solr")
         ts.startup_wait.should == 5
+        ts.jetty_opts.should == []
       end
       
       it "passes all the expected values to jetty during startup" do
@@ -87,6 +97,8 @@ require 'rubygems'
         command.should include("-Dsolr.solr.home=#{@jetty_params[:solr_home]}")
         command.should include("-Djetty.port=#{@jetty_params[:jetty_port]}")
         command.should include("-Xmx256mb")
+        command.should include("start.jar")
+        command.slice(command.index('start.jar')+1, 2).should == @jetty_params[:jetty_opts]
       end
 
       it "escapes the :solr_home parameter" do
@@ -215,9 +227,9 @@ require 'rubygems'
           ts = Jettywrapper.instance 
           ts.quiet.should == @jetty_params[:quiet]
           ts.jetty_home.should == "/path/to/jetty"
-          ts.port.should == 8888
+          ts.port.should == @jetty_params[:jetty_port]
           ts.solr_home.should == "/path/to/solr"
-          ts.startup_wait.should == 0     
+          ts.startup_wait.should == 0   
         end
         error.should eql(false)
       end
@@ -225,11 +237,9 @@ require 'rubygems'
       it "captures any errors produced" do
         Jettywrapper.any_instance.stubs(:start).returns(true)
         Jettywrapper.any_instance.stubs(:stop).returns(true)
-        error = Jettywrapper.wrap(@jetty_params) do 
+        expect { error = Jettywrapper.wrap(@jetty_params) do 
           raise "this is an expected error message"
-        end
-        error.class.should eql(RuntimeError)
-        error.message.should eql("this is an expected error message")
+        end }.to raise_error "this is an expected error message"
       end
       
     end # end of wrapping context

data/spec/spec_helper.rb

@@ -1,4 +1,13 @@
 $: << File.join(File.dirname(__FILE__), "/../../lib")
+
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start
+end
+
 require 'spec/autorun'
 # require 'spec/rails'
 require 'jettywrapper'
@@ -6,3 +15,9 @@ require 'jettywrapper'
 Spec::Runner.configure do |config|
   config.mock_with :mocha
 end
+
+unless ENV.select { |k,v| k =~ /TEST_JETTY_PORT/ }.empty?
+  TEST_JETTY_PORTS = ENV.select { |k,v| k =~ /TEST_JETTY_PORT/ }.sort_by { |k,v| k }.map { |k,v| v }
+else
+  TEST_JETTY_PORTS = [8983, 8984,9999,8888]
+end

metadata

@@ -1,178 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jettywrapper
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - Bess Sadler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-11 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: logger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mediashelf-loggable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: rcov
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.5
   type: :development
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 6
-        - 5
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.6.5
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
-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: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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:
 - bess@stanford.edu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .gitmodules
 - .rvmrc
@@ -190,41 +196,31 @@ files:
 - spec/lib/jettywrapper_spec.rb
 - spec/spec_helper.rb
 - tasks/jettywrapper.rake
-has_rdoc: true
 homepage: https://github.com/projecthydra/jettywrapper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 463771772989334870
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Convenience tasks for working with jetty from within a ruby project.
 test_files: []
-