jettywrapper 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6643f2b0f438bad3aa59c4eb32e4e499dc0287cf
-  data.tar.gz: 1edd1684c627c4631646c21709bcd2ab231fdf16
+  metadata.gz: b12e576520a009e9adb542062694b56d04b43c90
+  data.tar.gz: c8457e8e27503f15772bf164cd30dc066c1a06ec
 SHA512:
-  metadata.gz: 2e23ce23bdd43c788090de4771a2db874233885835a6656900ebdd18e5abe9578102b39ab0519754fa1c110333cf77ef68e47987e6bb1f2ae577c6b9e3dc295b
-  data.tar.gz: 5a91eeabf34b9fb225c4618a68717ce0534c4363b226eaa59b5a3316c97c4c6c2708dc25a7b1316da0a8dd0c98acac47f7a2566b37e0a481015abd1c8fcde16f
+  metadata.gz: b3c49d92028f96b1d15db964f83f6cf87bfe06c397262dcad6a1a2441644801eae350b28b92770f162492f57697a39253c7f67becb234e0517603ec70bea6193
+  data.tar.gz: 5c8bd9fda2a2017a27e3d82409d93051278034dd9290497e90b4c473bac2ba9db857a047e414ad97628c8cd591b4b2d88c3b5a0afab2ccd31019b0457e49bfb8

data/lib/jettywrapper.rb

@@ -39,19 +39,16 @@ class Jettywrapper
   # Methods outside the class << self block must be called on Jettywrapper.instance, as instance methods.
   class << self
 
-    def url=(url)
-      @url = url
+    attr_writer :hydra_jetty_version, :url, :tmp_dir
+    def hydra_jetty_version
+      @hydra_jetty_version ||= 'v7.0.0'
     end
 
     def url
-      @url ||= defined?(ZIP_URL) ? ZIP_URL : 'https://github.com/projecthydra/hydra-jetty/archive/v5.2.0.zip'
+      @url ||= defined?(ZIP_URL) ? ZIP_URL : "https://github.com/projecthydra/hydra-jetty/archive/#{hydra_jetty_version}.zip"
       @url
     end
 
-    def tmp_dir=(dir)
-      @tmp_dir = dir
-    end
-
     def tmp_dir
       @tmp_dir ||= 'tmp'
     end
@@ -101,6 +98,8 @@ class Jettywrapper
 
     def reset_config
       @app_root = nil
+      @url = nil
+      @hydra_jetty_version = nil
     end
 
     def app_root

data/lib/jettywrapper/version.rb

@@ -1,3 +1,3 @@
 class Jettywrapper
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

data/spec/lib/jettywrapper_integration_spec.rb

@@ -15,7 +15,7 @@ module Hydra
       it "starts" do
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
-          :startup_wait => 45,
+          :startup_wait => 90,
           :java_opts => ["-Xmx256m", '-XX:MaxPermSize=256m'],
           :jetty_port => TEST_JETTY_PORTS.first
         }
@@ -39,7 +39,7 @@ 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 => 45,
+          :startup_wait => 90,
           :java_opts => ["-Xmx256m", '-XX:MaxPermSize=256m'],
           :jetty_port => TEST_JETTY_PORTS.first
         }

data/spec/lib/jettywrapper_spec.rb

@@ -19,9 +19,13 @@ require 'rubygems'
     end
 
     context "downloading" do
+      after do
+        Jettywrapper.reset_config
+      end
+
       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/v5.2.0.zip -o tmp/v5.2.0.zip').and_return(system ('true'))
+          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'))
           Jettywrapper.download
         end
       end
@@ -33,6 +37,13 @@ require 'rubygems'
           Jettywrapper.url.should == 'http://example.co/file.zip'
         end
       end
+      context "specifying the version" do
+        it "should download the zip file" do
+          Jettywrapper.should_receive(:system).with('curl -L https://github.com/projecthydra/hydra-jetty/archive/v9.9.9.zip -o tmp/v9.9.9.zip').and_return(system ('true'))
+          Jettywrapper.hydra_jetty_version = 'v9.9.9'
+          Jettywrapper.download
+        end
+      end
     end
 
     context "unzip" do
@@ -42,10 +53,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-v5.2.0')
-          Jettywrapper.should_receive(:system).with('unzip -d tmp/jetty_generator -qo tmp/v5.2.0.zip').and_return(system ('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(:system).with('rm -r jetty').and_return(system ('true'))
-          Jettywrapper.should_receive(:system).with('mv tmp/jetty_generator/hydra-jetty-v5.2.0 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.unzip
         end
       end
@@ -86,7 +97,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/v5.2.0.zip'}
+        its(:url) {should == 'https://github.com/projecthydra/hydra-jetty/archive/v7.0.0.zip'}
       end
     end
 
@@ -228,7 +239,7 @@ require 'rubygems'
           :jetty_home => '/tmp'
         }
         ts = Jettywrapper.configure(jetty_params) 
-        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>5454))
+        Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>5454))
         ts.stop
         ts.start
         ts.pid.should eql(5454)
@@ -241,7 +252,7 @@ require 'rubygems'
         }
         ts = Jettywrapper.configure(jetty_params) 
         ts.stop
-        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>2323))
+        Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
         swp.pid.should eql(2323)
         swp.pid_file.should eql("_tmp.pid")
@@ -253,7 +264,7 @@ require 'rubygems'
       # 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.stub(:process).and_return(stub('proc', :start => nil, :pid=>12345))
+        Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>12345))
         
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
@@ -267,7 +278,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.stub(:process).and_return(stub('proc', :start => nil, :pid=>54321))
+        Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>54321))
         jetty_params = {
           :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
         }
@@ -282,7 +293,7 @@ require 'rubygems'
         jetty_params = {
           :jetty_home => '/tmp', :jetty_port => 8777
         }
-        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>2323))
+        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)
         
@@ -305,7 +316,7 @@ require 'rubygems'
           :jetty_home => '/tmp'
         }
         ts = Jettywrapper.configure(jetty_params) 
-        Jettywrapper.any_instance.stub(:process).and_return(stub('proc', :start => nil, :pid=>2222))
+        Jettywrapper.any_instance.stub(:process).and_return(double('proc', :start => nil, :pid=>2222))
         ts.stop
         ts.pid_file?.should eql(false)
         ts.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jettywrapper
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger