jettywrapper 1.3.2 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0ec0896737d3b6280dd860cf58a545b7d2981a5f
+  data.tar.gz: c07c9985c43d31605ad61466649cdecb62369995
+SHA512:
+  metadata.gz: cea4d28ccafdbc46d26899bc3b28dab6e0880e3d4108e7d78542407e8d1ff5d96ff06305e9db96ef139f887ac4d1a76140a05f465a0c9a97fe3f03e3fa4b0b99
+  data.tar.gz: 49e83df77c93fdd816cd56cc2fba3d98440a9fe20ea9b5d43761803957fb3df9002a854733e9f9b1c7838173cce718afa28b90a7f7c9724a007ffe959850e506

data/.gitignore

@@ -9,3 +9,6 @@ coverage.data
 .yardoc
 doc
 tmp/
+.rvmrc
+jettywrapper.log
+jetty

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "jetty"]
-	path = jetty
-	url = git://github.com/projecthydra/hydra-jetty.git

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+
+notifications:
+  irc: "irc.freenode.org#projecthydra"
+

data/History.txt

@@ -1,3 +1,6 @@
+1.4.0
+  Download jetty from a zip file
+
 1.3.2
   Throw error on start if port already in use
 

data/README.textile

@@ -1,8 +1,16 @@
 h1. jettywrapper
 
+
 This gem is designed to make it easier to integrate a jetty servlet container into a rails project.  
 Jettywrapper provides rake tasks for starting and stopping jetty, as well as a method (Jettywrapper.wrap) that will start the server before the block and stop the server after the block, which is useful for automated testing.
 
+jettywrapper supports 
+  ruby 2.0.0
+  ruby 1.9.3 
+  ruby 1.8.7 
+  ree  1.8.7
+  jruby 1.6.6+
+
 h2. Configuring Jettywrapper
 
 Jettywrapper starts the process with a list of options that you can specify in config/jetty.yml (otherwise a default is used).  You can provide a per environment configuration, or you can have a default configuration which will be used when a per-environment configuration is not specified.

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'bundler'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'yard'
 
 Bundler::GemHelper.install_tasks
@@ -15,15 +15,12 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec => 'jetty:clean') do |spec|
+#  spec.libs << 'lib' << 'spec'
+#  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:coverage) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-
+RSpec::Core::RakeTask.new(:coverage) do |spec|
   ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
   ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
 
@@ -57,4 +54,5 @@ rescue LoadError
   end
 end
 
-task :default => [:coverage, :doc]
+#task :default => [:coverage, :doc]
+task :default => [:spec]

data/config/jetty.yml

@@ -1,5 +1,5 @@
 default:
   jetty_port: 8983
   java_opts:
-    - "-XX:MaxPermSize=128m" 
+    - "-XX:MaxPermSize=256m" 
     - "-Xmx256m"

data/jettywrapper.gemspec

@@ -25,14 +25,11 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n"
   s.add_dependency "activesupport", ">=3.0.0"
   
-  # Bundler will install these gems too if you've checked this out from source from git and run 'bundle install'
-  # 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 "rspec"
   s.add_development_dependency 'rake'
 
   
-  s.add_development_dependency 'yard', '0.6.5'  # Yard > 0.6.5 won't generate docs.
+  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 
                                                 # debug it right now
   

data/lib/jettywrapper.rb

@@ -7,6 +7,7 @@ require 'timeout'
 require 'childprocess'
 require 'active_support/core_ext/hash'
 require 'erb'
+require 'yaml'
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__),"tasks/*.rake"))].each { |ext| load ext } if defined?(Rake)
 
@@ -16,6 +17,8 @@ class Jettywrapper
   
   include Singleton
   include Loggable
+  include ActiveSupport::Benchmarkable
+  
   
   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
@@ -29,7 +32,6 @@ class Jettywrapper
   # configure the singleton with some defaults
   def initialize(params = {})
     self.base_path = self.class.app_root
-    logger.debug 'Initializing jettywrapper'
   end
 
   
@@ -37,6 +39,62 @@ class Jettywrapper
   # Methods outside the class << self block must be called on Jettywrapper.instance, as instance methods.
   class << self
 
+    def url=(url)
+      @url = url
+    end
+
+    def url
+      @url ||= defined?(ZIP_URL) ? ZIP_URL : 'https://github.com/projecthydra/hydra-jetty/archive/new-solr-schema.zip'
+      @url
+    end
+
+    def tmp_dir=(dir)
+      @tmp_dir = dir
+    end
+
+    def tmp_dir
+      @tmp_dir ||= 'tmp'
+    end
+
+    def zip_file
+      File.join tmp_dir, url.split('/').last
+    end
+
+    def jetty_dir
+      'jetty'
+    end
+
+    def download(url = 'https://github.com/projecthydra/hydra-jetty/archive/new-solr-schema.zip')
+      self.url = url
+      logger.info "Downloading jetty..."
+      FileUtils.mkdir tmp_dir unless File.exists? tmp_dir
+      system "curl -L #{url} -o #{zip_file}"
+      abort "Unable to download jetty from #{url}" unless $?.success?
+    end
+    
+    def unzip
+      download unless File.exists? zip_file
+      logger.info "Unpacking jetty..."
+      tmp_save_dir = File.join tmp_dir, 'jetty_generator'
+      system "unzip -d #{tmp_save_dir} -qo #{zip_file}"
+      abort "Unable to unzip #{zip_file} into tmp_save_dir/" unless $?.success?
+
+      expanded_dir = expanded_zip_dir(tmp_save_dir)
+      system "mv #{expanded_dir} #{jetty_dir}"
+      abort "Unable to move #{expanded_dir} into #{jetty_dir}/" unless $?.success?
+    end
+
+    def expanded_zip_dir(tmp_save_dir)
+      # This old way is more specific, but won't work for blacklight-jetty
+      #expanded_dir = Dir[File.join(tmp_save_dir, "hydra-jetty-*")].first        
+      Dir[File.join(tmp_save_dir, "*")].first        
+    end
+
+    def clean
+      system "rm -rf #{jetty_dir}"
+      unzip
+    end
+
     def reset_config
       @app_root = nil
     end
@@ -146,7 +204,7 @@ class Jettywrapper
         yield
       rescue
         error = $!
-        puts "*** Error starting jetty: #{error}"
+        logger.error "*** Error starting jetty: #{error}"
       ensure
         # puts "stopping jetty server"
         jetty_server.stop
@@ -261,7 +319,6 @@ class Jettywrapper
    def start
      logger.debug "Starting jetty with these values: "
      logger.debug "jetty_home: #{@jetty_home}"
-     logger.debug "solr_home: #{@solr_home}"
      logger.debug "jetty_command: #{jetty_command.join(' ')}"
      
      # Check to see if we can start.
@@ -278,19 +335,21 @@ class Jettywrapper
      if Jettywrapper.is_port_in_use?(self.port)
        raise("Port #{self.port} is already in use.")
      end
-     Dir.chdir(@jetty_home) do
-       process.start
-     end
-     FileUtils.makedirs(pid_dir) unless File.directory?(pid_dir)
-     begin
-       f = File.new(pid_path,  "w")
-     rescue Errno::ENOENT, Errno::EACCES
-       f = File.new(File.join(base_path,'tmp',pid_file),"w")
+     benchmark "Started jetty" do
+       Dir.chdir(@jetty_home) do
+         process.start
+       end
+       FileUtils.makedirs(pid_dir) unless File.directory?(pid_dir)
+       begin
+         f = File.new(pid_path,  "w")
+       rescue Errno::ENOENT, Errno::EACCES
+         f = File.new(File.join(base_path,'tmp',pid_file),"w")
+       end
+       f.puts "#{process.pid}"
+       f.close
+       logger.debug "Wrote pid file to #{pid_path} with value #{process.pid}"
+       startup_wait!
      end
-     f.puts "#{process.pid}"
-     f.close
-     logger.debug "Wrote pid file to #{pid_path} with value #{process.pid}"
-     startup_wait!
    end
 
    # Wait for the jetty server to start and begin listening for requests

data/lib/jettywrapper/version.rb

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

data/lib/tasks/jettywrapper.rake

@@ -2,6 +2,20 @@
 require 'yaml'
 
 namespace :jetty do
+  JETTY_DIR = 'jetty'
+
+  desc "download the jetty zip file"
+  task :download do
+    Jettywrapper.download
+  end
+
+  task :unzip do
+    Jettywrapper.unzip
+  end
+
+  task :clean do
+    Jettywrapper.clean
+  end
   
   desc "Return the status of jetty"
   task :status => :environment do

data/spec/lib/jettywrapper_integration_spec.rb

@@ -9,12 +9,14 @@ module Hydra
     context "integration" do
       before(:all) do
         $stderr.reopen("/dev/null", "w")
+        Jettywrapper.logger.level=3
       end
       
       it "starts" do
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
-          :startup_wait => 30,
+          :startup_wait => 45,
+          :java_opts => ["-Xmx256m", '-XX:MaxPermSize=256m'],
           :jetty_port => TEST_JETTY_PORTS.first
         }
         Jettywrapper.configure(jetty_params) 
@@ -28,7 +30,7 @@ module Hydra
       
         # Can we connect to solr?
         require 'net/http' 
-        response = Net::HTTP.get_response(URI.parse("http://localhost:#{jetty_params[:jetty_port]}/solr/development/admin/"))
+        response = Net::HTTP.get_response(URI.parse("http://localhost:#{jetty_params[:jetty_port]}/solr/"))
         response.code.should eql("200")
         ts.stop
       
@@ -37,7 +39,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 => 45,
+          :java_opts => ["-Xmx256m", '-XX:MaxPermSize=256m'],
           :jetty_port => TEST_JETTY_PORTS.first
         }
         Jettywrapper.configure(jetty_params) 
@@ -46,24 +49,27 @@ 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:#{jetty_params[:jetty_port]}/solr/development/admin/"))
+        response = Net::HTTP.get_response(URI.parse("http://localhost:#{jetty_params[:jetty_port]}/solr/"))
         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
-        jetty_params = {
-          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
-          :jetty_port => TEST_JETTY_PORTS.last,
-          :startup_wait => 30
-        }
-        Jettywrapper.stop(jetty_params) 
-        sleep 10
-        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) 
+      describe "is_port_in_use?" do
+        describe "when a server is running on the port" do
+          before do
+            @s = TCPServer.new('127.0.0.1', TEST_JETTY_PORTS.last)
+          end
+          after do
+            @s.close
+          end
+          it "can check to see whether a port is already in use" do
+            Jettywrapper.is_port_in_use?(TEST_JETTY_PORTS.last).should eql(true)
+          end
+        end
+        it "should be false when nothing is running" do
+          Jettywrapper.is_port_in_use?(TEST_JETTY_PORTS.last).should eql(false)
+        end
       end
       
       it "raises an error if you try to start a jetty that is already running" do
@@ -86,7 +92,7 @@ module Hydra
           :jetty_port => TEST_JETTY_PORTS.first,
           :startup_wait => 30
         }
-	socket = TCPServer.new(TEST_JETTY_PORTS.first)
+	      socket = TCPServer.new(TEST_JETTY_PORTS.first)
         begin
           ts = Jettywrapper.configure(jetty_params) 
           ts.stop

data/spec/lib/jettywrapper_spec.rb

@@ -11,9 +11,98 @@ require 'rubygems'
         :jetty_port => TEST_JETTY_PORTS.first,
         :solr_home => "/path/to/solr",
         :startup_wait => 0,
-        :java_opts => ["-Xmx256mb"],
+        :java_opts => ["-Xmx256m"],
         :jetty_opts => ["/path/to/jetty_xml", "/path/to/other_jetty_xml"]  
       }
+
+      Jettywrapper.logger.level=3
+    end
+
+    context "downloading" do
+      context "with default file" do
+        it "should download the zip file" do
+          Jettywrapper.should_receive(:system).with('curl -L https://github.com/projecthydra/hydra-jetty/archive/new-solr-schema.zip -o tmp/new-solr-schema.zip').and_return(system ('true'))
+          Jettywrapper.download
+        end
+      end
+
+      context "specifying the file" do
+        it "should download the zip file" do
+          Jettywrapper.should_receive(:system).with('curl -L http://example.co/file.zip -o tmp/file.zip').and_return(system ('true'))
+          Jettywrapper.download('http://example.co/file.zip')
+          Jettywrapper.url.should == 'http://example.co/file.zip'
+        end
+      end
+    end
+
+    context "unzip" do
+      before do
+        Jettywrapper.url = nil
+      end
+      context "with default file" do
+        it "should download the zip file" do
+          File.should_receive(:exists?).and_return(true)
+          Jettywrapper.should_receive(:expanded_zip_dir).and_return('tmp/jetty_generator/hydra-jetty-new-solr-schema')
+          Jettywrapper.should_receive(:system).with('unzip -d tmp/jetty_generator -qo tmp/new-solr-schema.zip').and_return(system ('true'))
+          Jettywrapper.should_receive(:system).with('mv tmp/jetty_generator/hydra-jetty-new-solr-schema jetty').and_return(system ('true'))
+          Jettywrapper.unzip
+        end
+      end
+
+      context "specifying the file" do
+        before do
+          Jettywrapper.url = 'http://example.co/file.zip'
+        end
+        it "should download the zip file" do
+          File.should_receive(:exists?).and_return(true)
+          Jettywrapper.should_receive(:expanded_zip_dir).and_return('tmp/jetty_generator/interal_dir')
+          Jettywrapper.should_receive(:system).with('unzip -d tmp/jetty_generator -qo tmp/file.zip').and_return(system ('true'))
+          Jettywrapper.should_receive(:system).with('mv tmp/jetty_generator/interal_dir jetty').and_return(system ('true'))
+          Jettywrapper.unzip
+        end
+      end
+    end
+
+    context ".url" do
+      before do
+        subject.url = nil
+      end
+      subject {Jettywrapper}
+      context "When a constant is set" do
+        before do
+          ZIP_URL = 'http://example.com/foo.zip'
+        end
+        after do
+          Object.send(:remove_const, :ZIP_URL)
+        end
+        its(:url) {should == 'http://example.com/foo.zip'}
+      end
+      context "when a url is set" do
+        before do
+          subject.url = 'http://example.com/bar.zip'
+        end
+        its(:url) {should == 'http://example.com/bar.zip'}
+      end
+      context "when url is not set" do
+        its(:url) {should == 'https://github.com/projecthydra/hydra-jetty/archive/new-solr-schema.zip'}
+      end
+    end
+
+    context ".tmp_dir" do
+      subject {Jettywrapper}
+      context "when a dir is set" do
+        before do
+          subject.tmp_dir = '/opt/tmp'
+        end
+        its(:tmp_dir) {should == '/opt/tmp'}
+      end
+      context "when dir is not set" do
+        before do
+          subject.tmp_dir = nil
+        end
+        its(:tmp_dir) {should == 'tmp'}
+      end
+
     end
 
     context "app_root" do
@@ -50,33 +139,32 @@ require 'rubygems'
 
     context "config" do
       it "loads the application jetty.yml first" do
-        IO.expects(:read).with('./config/jetty.yml').once.returns("default:\n")
+        IO.should_receive(:read).with('./config/jetty.yml').and_return("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 %>")
+        IO.should_receive(:read).with('./config/jetty.yml').and_return("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')
-        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")
+        File.should_receive(:exists?).with('./config/jetty.yml').and_return(false)
+        IO.should_receive(:read).with { |value| value =~ /jetty.yml/ }.and_return("default:\n")
         config = Jettywrapper.load_config
       end
 
       it "supports per-environment configuration" do
         ENV['environment'] = 'test'
-        IO.expects(:read).with('./config/jetty.yml').once.returns("default:\n  a: 1\ntest:\n  a: 2")
+        IO.should_receive(:read).with('./config/jetty.yml').and_return("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'
-        IO.expects(:read).with('./config/jetty.yml').once.returns("default:\n  a: 1")
+        IO.should_receive(:read).with('./config/jetty.yml').and_return("default:\n  a: 1")
         config = Jettywrapper.load_config
         config[:a].should == 1
       end
@@ -127,7 +215,7 @@ require 'rubygems'
         command = ts.jetty_command
         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("-Xmx256m")
         command.should include("start.jar")
         command.slice(command.index('start.jar')+1, 2).should == @jetty_params[:jetty_opts]
       end
@@ -143,7 +231,7 @@ require 'rubygems'
           :jetty_home => '/tmp'
         }
         ts = Jettywrapper.configure(jetty_params) 
-        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>5454))
+        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>5454))
         ts.stop
         ts.start
         ts.pid.should eql(5454)
@@ -156,21 +244,19 @@ require 'rubygems'
         }
         ts = Jettywrapper.configure(jetty_params) 
         ts.stop
-        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>2323))
+        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
         swp.pid.should eql(2323)
         swp.pid_file.should eql("_tmp.pid")
         swp.stop
       end
       
-      it "checks to see if its pid files are stale" do
-        @pending
-      end
+      it "checks to see if its pid files are stale"
       
       # return true if it's running, otherwise return false
       it "can get the status for a given jetty instance" do
         # Don't actually start jetty, just fake it
-        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>12345))
+        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>12345))
         
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
@@ -184,7 +270,7 @@ require 'rubygems'
       
       it "can get the pid for a given jetty instance" do
         # Don't actually start jetty, just fake it
-        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>54321))
+        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>54321))
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
         }
@@ -199,7 +285,7 @@ require 'rubygems'
         jetty_params = {
           :jetty_home => '/tmp', :jetty_port => 8777
         }
-        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>2323))
+        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
         (File.file? swp.pid_path).should eql(true)
         
@@ -222,7 +308,7 @@ require 'rubygems'
           :jetty_home => '/tmp'
         }
         ts = Jettywrapper.configure(jetty_params) 
-        Jettywrapper.any_instance.stubs(:process).returns(stub('proc', :start => nil, :pid=>2222))
+        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>2222))
         ts.stop
         ts.pid_file?.should eql(false)
         ts.start
@@ -244,16 +330,16 @@ require 'rubygems'
     
     context "wrapping a task" do
       it "wraps another method" do
-        Jettywrapper.any_instance.stubs(:start).returns(true)
-        Jettywrapper.any_instance.stubs(:stop).returns(true)
+        Jettywrapper.any_instance.stub(:start).and_return(true)
+        Jettywrapper.any_instance.stub(:stop).and_return(true)
         error = Jettywrapper.wrap(@jetty_params) do            
         end
         error.should eql(false)
       end
       
       it "configures itself correctly when invoked via the wrap method" do
-        Jettywrapper.any_instance.stubs(:start).returns(true)
-        Jettywrapper.any_instance.stubs(:stop).returns(true)
+        Jettywrapper.any_instance.stub(:start).and_return(true)
+        Jettywrapper.any_instance.stub(:stop).and_return(true)
         error = Jettywrapper.wrap(@jetty_params) do 
           ts = Jettywrapper.instance 
           ts.quiet.should == @jetty_params[:quiet]
@@ -266,8 +352,9 @@ require 'rubygems'
       end
       
       it "captures any errors produced" do
-        Jettywrapper.any_instance.stubs(:start).returns(true)
-        Jettywrapper.any_instance.stubs(:stop).returns(true)
+        Jettywrapper.any_instance.stub(:start).and_return(true)
+        Jettywrapper.any_instance.stub(:stop).and_return(true)
+        Jettywrapper.instance.logger.should_receive(:error).with("*** Error starting jetty: this is an expected error message")
         expect { error = Jettywrapper.wrap(@jetty_params) do 
           raise "this is an expected error message"
         end }.to raise_error "this is an expected error message"

data/spec/spec_helper.rb

@@ -8,12 +8,10 @@ if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
   SimpleCov.start
 end
 
-require 'spec/autorun'
-# require 'spec/rails'
+require 'rspec/autorun'
 require 'jettywrapper'
 
-Spec::Runner.configure do |config|
-  config.mock_with :mocha
+RSpec.configure do |config|
 end
 
 unless ENV.select { |k,v| k =~ /TEST_JETTY_PORT/ }.empty?

metadata

@@ -1,182 +1,154 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jettywrapper
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 2
-  version: 1.3.2
+version: !ruby/object:Gem::Version
+  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Chris Beer
 - Justin Coyne
 - Bess Sadler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2013-03-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: logger
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mediashelf-loggable
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: childprocess
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: i18n
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activesupport
-- !ruby/object:Gem::Dependency 
-  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  version_requirements: *id006
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id007
-  name: mocha
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id008
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 6
-        - 5
-        version: 0.6.5
-  version_requirements: *id009
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yard
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id010
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   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: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    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:
 - hydra-tech@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .gitmodules
-- .rvmrc
+- .travis.yml
 - Gemfile
 - History.txt
 - README.textile
@@ -193,38 +165,26 @@ files:
 - tasks/jettywrapper.rake
 homepage: https://github.com/projecthydra/jettywrapper
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Convenience tasks for working with jetty from within a ruby project.
 test_files: []
-
+has_rdoc: 

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ree-1.8.7@jettywrapper --create