jettywrapper 1.7.0 → 2.0.0

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

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
   SimpleCov.start
 end
 
-require 'rspec/autorun'
+require 'rspec/its'
 require 'jettywrapper'
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jettywrapper
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -27,7 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mediashelf-loggable
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -41,7 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: childprocess
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,35 +55,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: '2.99'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -139,10 +139,13 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - History.txt
+- LICENSE
 - README.textile
 - Rakefile
 - TODO.txt
 - config/jetty.yml
+- gemfiles/rails4.1.gemfile
+- gemfiles/rails4.2.beta.gemfile
 - jettywrapper.gemspec
 - lib/jettywrapper.rb
 - lib/jettywrapper/version.rb
@@ -152,7 +155,8 @@ files:
 - spec/spec_helper.rb
 - tasks/jettywrapper.rake
 homepage: https://github.com/projecthydra/jettywrapper
-licenses: []
+licenses:
+- APACHE2
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -170,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: