jettywrapper 0.0.3 → 0.0.4

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.8.7@hydra-testing --create
+rvm use ree-1.8.7@jettywrapper --create

data/README.textile

@@ -13,7 +13,7 @@ bc..
         :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty'), 
         :quiet => false, 
         :jetty_port => 8983, 
-        :solr_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/solr'),
+        :solr_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/solr/test-core'),
         :fedora_home => File.expand_path(File.dirname(__FILE__) + '/../../jetty/fedora/default'),
         :startup_wait => 30
         }
@@ -29,5 +29,36 @@ bc..
       raise "test failures: #{error}" if error
     else
       system("rake hudson RAILS_ENV=test")
+      fail unless $?.success?
     end
   end
+
+h2. Important note on creating nested rake tasks:
+
+When creating your rake tasks, keep in mind that rake does not by default propogate up errors raised from system commands.  
+If you use system(), the return value will be false for any exit codes other than 0.  If you use backticks or %x(), you must use $? to check the exit status code 
+after the call.  Failure to do so could result in false successes.
+
+h3. Example 1: Checking return value from system()
+
+bc.. 
+  #retval should return false for non-zero exit codes 
+  retval = system("rake hudson RAILS_ENV=test")
+  fail unless retval
+
+h3. Example 2: Checking $? with system()
+
+bc.. 
+  system("rake hudson RAILS_ENV=test")
+  raise "rake hudson encoutered errors" unless $?.success?
+
+h3. Example 3: An alternative method: using %x[] or backticks with $?
+
+bc.. 
+  # %x[] or `` will return everything sent to stdout from the command
+  puts %x[cucumber --tags ~@pending --tags ~@overwritten features]
+  raise "Cucumber failed." unless $?.success?
+
+
+
+

data/lib/jettywrapper.rb

@@ -5,6 +5,7 @@ class Jettywrapper
   require 'singleton'
   include Singleton
   
+  attr_accessor :pid          # If Jettywrapper is running, what pid is it running as? 
   attr_accessor :port         # What port should jetty start on? Default is 8888
   attr_accessor :jetty_home   # Where is jetty located? 
   attr_accessor :startup_wait # After jetty starts, how long to wait until starting the tests? 
@@ -13,9 +14,9 @@ class Jettywrapper
   attr_accessor :fedora_home  # Where is fedora located? Default is jetty_home/fedora
   
   # configure the singleton with some defaults
-  def initialize
-    @pid = nil
-  end
+  # def initialize
+  #   @pid = nil
+  # end
   
   class << self
     
@@ -109,8 +110,9 @@ class Jettywrapper
    if RUBY_PLATFORM =~ /mswin32/
      require 'win32/process'
    
-     # start the solr server
+     # start jetty for windows
      def platform_specific_start
+       puts "Starting Jetty on windows"
        Dir.chdir(@jetty_home) do
          @pid = Process.create(
                :app_name         => jetty_command,
@@ -122,7 +124,7 @@ class Jettywrapper
        end
      end
    
-     # stop a running solr server
+     # stop jetty for windows
      def platform_specific_stop
        Process.kill(1, @pid)
        Process.wait
@@ -133,21 +135,18 @@ class Jettywrapper
        raise 'JRuby requires that you start solr manually, then run "rake spec" or "rake features"' if defined?(JRUBY_VERSION)
      end
    
-     # start the solr server
+     # start jetty for *nix
      def platform_specific_start
-   
-       jruby_raise_error?
-   
-       puts self.inspect
+       jruby_raise_error?   
        Dir.chdir(@jetty_home) do
-         @pid = fork do
+         self.pid = fork do
            STDERR.close if @quiet
            exec jetty_command
          end
        end
      end
    
-     # stop a running solr server
+     # stop jetty for *nix
      def platform_specific_stop
        jruby_raise_error?
        Process.kill('TERM', @pid)

data/lib/jettywrapper/version.rb

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

data/spec/lib/jettywrapper_spec.rb

@@ -64,6 +64,16 @@ module Hydra
         
       end
       
+      it "has a pid if it has been started" do
+        jetty_params = {
+          :jetty_home => '/tmp'
+        }
+        ts = Jettywrapper.configure(jetty_params) 
+        Jettywrapper.any_instance.stubs(:fork).returns(5454)
+        ts.start
+        ts.pid.should eql(5454)
+      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: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Bess Sadler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -07:00
+date: 2011-06-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id001
-  prerelease: false
+  type: :development
   name: ruby-debug
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -42,10 +42,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id002
-  prerelease: false
+  type: :development
   name: ruby-debug-base
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,10 +57,10 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  type: :development
   requirement: *id003
-  prerelease: false
+  type: :development
   name: rspec
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -73,10 +73,10 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  type: :development
   requirement: *id004
-  prerelease: false
+  type: :development
   name: rspec-rails
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -87,10 +87,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id005
-  prerelease: false
+  type: :development
   name: mocha
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -103,10 +103,10 @@ dependencies:
         - 8
         - 5
         version: 0.8.5
-  type: :development
   requirement: *id006
-  prerelease: false
+  type: :development
   name: cucumber
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -117,10 +117,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id007
-  prerelease: false
+  type: :development
   name: cucumber-rails
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -131,10 +131,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id008
-  prerelease: false
+  type: :development
   name: gherkin
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -145,10 +145,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id009
-  prerelease: false
+  type: :development
   name: rcov
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -161,10 +161,10 @@ dependencies:
         - 6
         - 5
         version: 0.6.5
-  type: :development
   requirement: *id010
-  prerelease: false
+  type: :development
   name: yard
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -175,10 +175,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id011
-  prerelease: false
+  type: :development
   name: RedCloth
+  prerelease: false
 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: 
 - bess@stanford.edu