jettywrapper 1.8.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 670aa3d9748338dff690d45e951d95d32a5f7fbe
-  data.tar.gz: eec8044aff83ec8da33c08e08716677ded189dd1
+  metadata.gz: 90d0380f37306e0ca328c5a86d1dd304c7141e65
+  data.tar.gz: 8ee2ed933249ff1a268575048a1d920040566e0e
 SHA512:
-  metadata.gz: 77753335132f0abb583bf0b8df9abf3891e8ce572f9761c535ba8e3867bac2953fcab8a08b7ee63343947bce8d17057e31216bdc6b4da948d43cd2b327174f83
-  data.tar.gz: d85059f5bafa7fa8f1d8bf296edbcb91a5a57bbbbee52b414d2007e45615f348ce1644dbe28375734a31ab0a24fd70f9c3bbfe25a2fbba58b07d76af74ecb7af
+  metadata.gz: a6c80ca97aa9f89f0c76882557f957596735b2f48dd923960a8e5afc68ed47ecf1b1072385a2a56a1e4038d3f1437dbe37262301b352d3470fc5dcbcf944393a
+  data.tar.gz: 8d82e591a1cd4d1a70ad37f449e88ad55dcd79744815b23f457b2d525da5e246b56af77ddc517b450a7f63a1901420c6ae1fe0756ee4a5f76f12bbafd731b71f

data/History.txt

@@ -1,5 +1,9 @@
+2.0.0
+  Jettywrapper.start should trigger unzip [Chris Beer (@cbeer)]
+  Jettywrapper should support Fedora 4 by using hydra-jetty 8.1.1 [Mike Giarlo (@mjgiarlo)]
+
 1.8.0
-  2014-07-16: Removed mediashelf-loggable dependency [Justin Coyne]
+  Removed mediashelf-loggable dependency [Justin Coyne]
 
 1.4.0
   Download jetty from a zip file

data/lib/jettywrapper.rb

@@ -12,14 +12,12 @@ require 'logger'
 
 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 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
   attr_accessor :startup_wait # How many seconds to wait for jetty to spin up. Default is 5.
@@ -34,7 +32,6 @@ class Jettywrapper
     self.base_path = self.class.app_root
   end
 
-
   # Methods inside of the class << self block can be called directly on Jettywrapper, as class methods.
   # Methods outside the class << self block must be called on Jettywrapper.instance, as instance methods.
   class << self
@@ -42,7 +39,7 @@ class Jettywrapper
     attr_writer :hydra_jetty_version, :url, :tmp_dir, :jetty_dir, :env
 
     def hydra_jetty_version
-      @hydra_jetty_version ||= 'v7.0.0'
+      @hydra_jetty_version ||= 'v8.1.1'
     end
 
     def url
@@ -63,6 +60,7 @@ class Jettywrapper
     end
 
     def download(url = nil)
+      return if File.exists? zip_file
       self.url = url if url
       logger.info "Downloading jetty at #{self.url} ..."
       FileUtils.mkdir tmp_dir unless File.exists? tmp_dir
@@ -161,7 +159,6 @@ class Jettywrapper
       config[config_name] || config['default'.freeze]
     end
 
-
     # Set the jetty parameters. It accepts a Hash of symbols.
     # @param [Hash<Symbol>] params
     #  :jetty_home Required. Jetty's home direcotry
@@ -185,7 +182,6 @@ class Jettywrapper
       return jetty_server
     end
 
-
     # Wrap the tests. Startup jetty, yield to the test task, capture any errors, shutdown
     # jetty, and return the error.
     # @example Using this method in a rake task
@@ -230,9 +226,10 @@ class Jettywrapper
     # @example
     #    Jettywrapper.start(:jetty_home => '/path/to/jetty', :jetty_port => '8983')
     def start(params)
-       Jettywrapper.configure(params)
-       Jettywrapper.instance.start
-       return Jettywrapper.instance
+      unzip unless File.exists? jetty_dir
+      Jettywrapper.configure(params)
+      Jettywrapper.instance.start
+      return Jettywrapper.instance
     end
 
     # Convenience method for configuring and starting jetty with one command. Note
@@ -428,7 +425,6 @@ class Jettywrapper
     end
   end
 
-
   # The fully qualified path to the pid_file
   def pid_path
     #need to memoize this, becasuse the base path could be relative and the cwd can change in the yield block of wrap

data/lib/jettywrapper/version.rb

@@ -1,3 +1,3 @@
 class Jettywrapper
-  VERSION = "1.8.3"
+  VERSION = "2.0.0"
 end

data/spec/lib/jettywrapper_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 require 'rubygems'
+require 'fileutils'
 
   describe Jettywrapper do
-    
-    # JETTY1 = 
+
+    # JETTY1 =
     before(:all) do
       @jetty_params = {
         :quiet => false,
@@ -12,7 +13,7 @@ require 'rubygems'
         :solr_home => "/path/to/solr",
         :startup_wait => 0,
         :java_opts => ["-Xmx256m"],
-        :jetty_opts => ["/path/to/jetty_xml", "/path/to/other_jetty_xml"]  
+        :jetty_opts => ["/path/to/jetty_xml", "/path/to/other_jetty_xml"]
       }
 
       Jettywrapper.logger.level=3
@@ -25,7 +26,8 @@ require 'rubygems'
     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/v7.0.0.zip -o tmp/v7.0.0.zip').and_return(system ('true'))
+          FileUtils.rm "tmp/v8.1.1.zip", force: true
+          Jettywrapper.should_receive(:system).with('curl -L https://github.com/projecthydra/hydra-jetty/archive/v8.1.1.zip -o tmp/v8.1.1.zip').and_return(system ('true'))
           Jettywrapper.download
         end
       end
@@ -53,10 +55,10 @@ require 'rubygems'
       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-v7.0.0')
-          Jettywrapper.should_receive(:system).with('unzip -d tmp/jetty_generator -qo tmp/v7.0.0.zip').and_return(system ('true'))
+          Jettywrapper.should_receive(:expanded_zip_dir).and_return('tmp/jetty_generator/hydra-jetty-v8.1.1')
+          Jettywrapper.should_receive(:system).with('unzip -d tmp/jetty_generator -qo tmp/v8.1.1.zip').and_return(system ('true'))
           Jettywrapper.should_receive(:system).with('rm -r jetty').and_return(system ('true'))
-          Jettywrapper.should_receive(:system).with('mv tmp/jetty_generator/hydra-jetty-v7.0.0 jetty').and_return(system ('true'))
+          Jettywrapper.should_receive(:system).with('mv tmp/jetty_generator/hydra-jetty-v8.1.1 jetty').and_return(system ('true'))
           Jettywrapper.unzip
         end
       end
@@ -97,7 +99,7 @@ require 'rubygems'
         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/v7.0.0.zip'}
+        its(:url) {should == 'https://github.com/projecthydra/hydra-jetty/archive/v8.1.1.zip'}
       end
     end
 
@@ -162,46 +164,46 @@ require 'rubygems'
         its(:app_root) {should == '.'}
       end
     end
-    
+
     describe "env" do
       before do
         ENV.delete('JETTYWRAPPER_ENV')
         ENV.delete('RAILS_ENV')
         ENV.delete('environment')
       end
-      
+
       it "should have a setter" do
         Jettywrapper.env = "abc"
-        expect(Jettywrapper.env).to eq "abc"  
+        expect(Jettywrapper.env).to eq "abc"
       end
-      
+
       it "should load the ENV['JETTYWRAPPER_ENV']" do
         ENV['JETTYWRAPPER_ENV'] = 'test'
         ENV['RAILS_ENV'] = 'test2'
         ENV['environment'] = 'test3'
         expect(Jettywrapper.env).to eq "test"
       end
-      
+
       it "should be the Rails environment" do
         Rails = double(env: 'test')
         expect(Jettywrapper.env).to eq "test"
       end
-      
+
       it "should use the ENV['RAILS_ENV']" do
         ENV['RAILS_ENV'] = 'test2'
         ENV['environment'] = 'test3'
         expect(Jettywrapper.env).to eq "test2"
       end
-      
+
       it "should load the ENV['environment']" do
         ENV['environment'] = 'test3'
         expect(Jettywrapper.env).to eq "test3"
       end
-      
+
       it "should default to 'development'" do
         expect(Jettywrapper.env).to eq "development"
       end
-      
+
     end
 
     context "config" do
@@ -245,7 +247,7 @@ require 'rubygems'
         config[:a].should == 1
       end
     end
-    
+
     context "instantiation" do
       it "can be instantiated" do
         ts = Jettywrapper.instance
@@ -253,7 +255,7 @@ require 'rubygems'
       end
 
       it "can be configured with a params hash" do
-        ts = Jettywrapper.configure(@jetty_params) 
+        ts = Jettywrapper.configure(@jetty_params)
         ts.quiet.should == false
         ts.jetty_home.should == "/path/to/jetty"
         ts.port.should == @jetty_params[:jetty_port]
@@ -272,7 +274,7 @@ require 'rubygems'
           :jetty_opts => nil
         }
 
-        ts = Jettywrapper.configure(jetty_params) 
+        ts = Jettywrapper.configure(jetty_params)
         ts.quiet.should == true
         ts.jetty_home.should == "/path/to/jetty"
         ts.port.should == 8888
@@ -280,9 +282,9 @@ require 'rubygems'
         ts.startup_wait.should == 5
         ts.jetty_opts.should == []
       end
-      
+
       it "passes all the expected values to jetty during startup" do
-        ts = Jettywrapper.configure(@jetty_params) 
+        ts = Jettywrapper.configure(@jetty_params)
         command = ts.jetty_command
         command.should include("-Dsolr.solr.home=#{@jetty_params[:solr_home]}")
         command.should include("-Djetty.port=#{@jetty_params[:jetty_port]}")
@@ -296,24 +298,24 @@ require 'rubygems'
         command = ts.jetty_command
         command.should include("-Dsolr.solr.home=/path\\ with\\ spaces/to/solr")
       end
-      
+
       it "has a pid if it has been started" do
         jetty_params = {
           :jetty_home => '/tmp'
         }
-        ts = Jettywrapper.configure(jetty_params) 
+        ts = Jettywrapper.configure(jetty_params)
         Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>5454))
         ts.stop
         ts.start
         ts.pid.should eql(5454)
         ts.stop
       end
-      
+
       it "can pass params to a start method" do
         jetty_params = {
           :jetty_home => '/tmp', :jetty_port => 8777
         }
-        ts = Jettywrapper.configure(jetty_params) 
+        ts = Jettywrapper.configure(jetty_params)
         ts.stop
         Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
@@ -321,11 +323,11 @@ require 'rubygems'
         swp.pid_file.should eql("_tmp_test.pid")
         swp.stop
       end
-      
+
       it "can get the status for a given jetty instance" do
         # Don't actually start jetty, just fake it
         Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>12345))
-        
+
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
         }
@@ -335,7 +337,7 @@ require 'rubygems'
         Jettywrapper.is_jetty_running?(jetty_params).should eql(true)
         Jettywrapper.stop(jetty_params)
       end
-      
+
       it "can get the pid for a given jetty instance" do
         # Don't actually start jetty, just fake it
         Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>54321))
@@ -348,7 +350,7 @@ require 'rubygems'
         Jettywrapper.pid(jetty_params).should eql(54321)
         Jettywrapper.stop(jetty_params)
       end
-      
+
       it "can pass params to a stop method" do
         jetty_params = {
           :jetty_home => '/tmp', :jetty_port => 8777
@@ -356,11 +358,11 @@ require 'rubygems'
         Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
         (File.file? swp.pid_path).should eql(true)
-        
+
         swp = Jettywrapper.stop(jetty_params)
         (File.file? swp.pid_path).should eql(false)
       end
-      
+
       describe "creates a pid file" do
         let(:ts) { Jettywrapper.configure(@jetty_params) }
         describe "when the environment isn't set" do
@@ -376,17 +378,17 @@ require 'rubygems'
           end
         end
       end
-      
+
       it "knows where its pid file should be written" do
-        ts = Jettywrapper.configure(@jetty_params) 
+        ts = Jettywrapper.configure(@jetty_params)
         ts.pid_dir.should eql(File.expand_path("#{ts.base_path}/tmp/pids"))
       end
-      
+
       it "writes a pid to a file when it is started" do
         jetty_params = {
           :jetty_home => '/tmp'
         }
-        ts = Jettywrapper.configure(jetty_params) 
+        ts = Jettywrapper.configure(jetty_params)
         Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>2222))
         ts.stop
         ts.pid_file?.should eql(false)
@@ -396,49 +398,49 @@ require 'rubygems'
         pid_from_file = File.open( ts.pid_path ) { |f| f.gets.to_i }
         pid_from_file.should eql(2222)
       end
-      
+
     end # end of instantiation context
-    
+
     context "logging" do
       it "has a logger" do
-        ts = Jettywrapper.configure(@jetty_params) 
+        ts = Jettywrapper.configure(@jetty_params)
         ts.logger.should be_kind_of(Logger)
       end
-      
-    end # end of logging context 
-    
+
+    end # end of logging context
+
     context "wrapping a task" do
       it "wraps another method" do
         Jettywrapper.any_instance.stub(:start).and_return(true)
         Jettywrapper.any_instance.stub(:stop).and_return(true)
-        error = Jettywrapper.wrap(@jetty_params) do            
+        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.stub(:start).and_return(true)
         Jettywrapper.any_instance.stub(:stop).and_return(true)
-        error = Jettywrapper.wrap(@jetty_params) do 
-          ts = Jettywrapper.instance 
+        error = Jettywrapper.wrap(@jetty_params) do
+          ts = Jettywrapper.instance
           ts.quiet.should == @jetty_params[:quiet]
           ts.jetty_home.should == "/path/to/jetty"
           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
-      
+
       it "captures any errors produced" do
         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 
+        expect { error = Jettywrapper.wrap(@jetty_params) do
           raise "this is an expected error message"
         end }.to raise_error "this is an expected error message"
       end
-      
+
     end # end of wrapping context
 
     context "quiet mode", :quiet => true do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jettywrapper
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -174,9 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Convenience tasks for working with jetty from within a ruby project.
 test_files: []
-has_rdoc: