jettywrapper 0.0.2 → 0.0.3

data/README.textile

@@ -6,23 +6,28 @@ h2. Instructions for the impatient:
 
 bc.. 
   require 'jettywrapper'
-  desc "New way of running tests"
-  task :newtest do
-    Rake::Task["rake:db:test:clone_structure"].invoke
-    Rake::Task["rake:hydra:jetty:config_fedora"].invoke
-    Rake::Task["rake:hydra:jetty:config"].invoke
-    jetty_params = { 
-      :jetty_home => "/usr/local/projects/hydra-hydrus/jetty", 
-      :quiet => false, 
-      :jetty_port => 8983, 
-      :solr_home => "/usr/local/projects/hydra-hydrus/jetty/solr/test-core",
-      :startup_wait => 30
-      }
-    error = Jettywrapper.wrap(jetty_params) do   
-      # Rake::Task["libra_oa:default_fixtures:refresh"].invoke 
-      Rake::Task["rake:hydra:default_fixtures:load"].invoke       
-      Rake::Task["rake:spec"].invoke 
-      Rake::Task["rake:cucumber"].invoke 
-    end 
-    raise "test failures: #{error}" if error
+  desc "Hudson build"
+  task :hudson do
+    if (ENV['RAILS_ENV'] == "test")
+      jetty_params = { 
+        :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty'), 
+        :quiet => false, 
+        :jetty_port => 8983, 
+        :solr_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/solr'),
+        :fedora_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/fedora/default'),
+        :startup_wait => 30
+        }
+      Rake::Task["db:drop"].invoke
+      Rake::Task["db:migrate"].invoke
+      Rake::Task["db:migrate:plugins"].invoke
+      error = Jettywrapper.wrap(jetty_params) do  
+        Rake::Task["libra_oa:default_fixtures:refresh"].invoke
+        Rake::Task["hydra:fixtures:refresh"].invoke
+        Rake::Task["spec"].invoke
+        Rake::Task["cucumber"].invoke
+      end
+      raise "test failures: #{error}" if error
+    else
+      system("rake hudson RAILS_ENV=test")
+    end
   end

data/jettywrapper.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Bess Sadler"]
   s.email       = ["bess@stanford.edu"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/projecthydra/jettywrapper"
   s.summary     = %q{Convenience tasks for working with jetty from within a ruby project.}
   s.description = %q{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.}
   s.files         = `git ls-files`.split("\n")

data/lib/jettywrapper.rb

@@ -25,7 +25,7 @@ class Jettywrapper
     # @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] :fedora_home Where is fedora? Default is jetty_home/fedora
+    # @param [Symbol] :fedora_home Where is fedora? Default is jetty_home/fedora/default
     # @param [Symbol] :quiet Keep quiet about jetty output? Default is true. 
     def configure(params = {})
       hydra_server = self.instance
@@ -91,12 +91,13 @@ class Jettywrapper
    
    # What command is being run to invoke jetty? 
    def jetty_command
-     "java -Djetty.port=#{@port} -Dsolr.solr.home=#{@solr_home} -jar start.jar"
+     "java -Djetty.port=#{@port} -Dsolr.solr.home=#{@solr_home} -Dfedora.home=#{@fedora_home} -jar start.jar"
    end
    
    def start
      puts "jetty_home: #{@jetty_home}"
      puts "solr_home: #{@solr_home}"
+     puts "fedora_home: #{@fedora_home}"
      puts "jetty_command: #{jetty_command}"
      platform_specific_start
    end

data/lib/jettywrapper/version.rb

@@ -1 +1 @@
-GEMVERSION = "0.0.2"
+GEMVERSION = "0.0.3"

data/spec/lib/jettywrapper_spec.rb

@@ -54,6 +54,16 @@ module Hydra
         ts.fedora_home.should == File.join(ts.jetty_home, "fedora","default")
         ts.startup_wait.should == 5
       end
+      
+      it "passes all the expected values to jetty during startup" do
+        ts = Jettywrapper.configure(@jetty_params) 
+        command = ts.jetty_command
+        command.should include("-Dfedora.home=#{@jetty_params[:fedora_home]}")
+        command.should include("-Dsolr.solr.home=#{@jetty_params[:solr_home]}")
+        command.should include("-Djetty.port=#{@jetty_params[:jetty_port]}")
+        
+      end
+      
     end # end of instantiation context
     
     context "wrapping a task" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jettywrapper
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Bess Sadler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 -07:00
+date: 2011-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,7 +200,7 @@ files:
 - spec/lib/jettywrapper_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: ""
+homepage: https://github.com/projecthydra/jettywrapper
 licenses: []
 
 post_install_message: