cwninja-drunit 0.1 → 0.2

data/Rakefile

@@ -17,7 +17,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{drunit}
-  s.version     = "0.1"
+  s.version     = "0.2"
   s.summary     = %q{A library for running tests across multiple applications from a single test case.}
   s.description = %q{A library for running tests across multiple applications from a single test case.}
 

data/bin/drunit_remote

@@ -3,13 +3,11 @@
 require File.join(File.dirname(__FILE__), *%w[.. lib drunit remote_test])
 
 include Drunit
-require ARGV.first
+require ARGV.first if ARGV.first
 
 DRb.start_service nil, RemoteTest.new
 
-STDOUT.puts DRb.uri
+STDOUT.puts "DRUNIT:URI #{DRb.uri}"
 STDOUT.reopen(STDERR)
 
-load ARGV.shift
-
 DRb.thread.join

data/lib/drunit/remote_app.rb

@@ -29,11 +29,18 @@ module Drunit
       raise e
     end
 
+    def get_url(pipe)
+      pipe.each_line do |line|
+        return $1 if line =~ /^DRUNIT:URI (.*)$/
+        STDERR.puts "From drunit_remote>> #{line}"
+      end
+    end
+
     def start_app!
       drb_server = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "bin", "drunit_remote"))
       pipe = IO.popen("#{drb_server} #{@boot}")
       pid = pipe.pid
-      url = pipe.gets.chomp
+      url = get_url(pipe) or raise "Could not establish connection to the remote drunit instance."
       remote_object = DRbObject.new(nil, url)
       ObjectSpace.define_finalizer(remote_object, proc{|id| Process.kill("KILL", pid) && Process.wait})
       return remote_object

data/lib/drunit.rb

@@ -28,6 +28,7 @@ module Drunit
 
   def in_app(name, *args, &block)
     file, line, method = caller(2).first.split(":")
+    method ||= "unknown_method"
     remote_app_for(name).run(method.gsub(/^in /, "").gsub(/[^a-zA-Z0-9_?!]/, ""), file, line.to_i, *args, &block)
   ensure
     remote_app_for(name).last_assertion_count.times{ add_assertion } rescue nil

data/test/unit/exception_handling_test.rb

@@ -0,0 +1,13 @@
+require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+
+class ExceptionHandlingTest < Test::Unit::TestCase
+  include Drunit
+  RemoteApp(:fake_app, FAKE_APP_PATH + "/fake_app.rb")
+  def InApp(*args, &block)
+    in_app(:fake_app, *args, &block)
+  end
+
+  def test_should_raise_a_generic_exception
+    assert_raise(Drunit::RemoteError) { InApp{ raise MyModule::SomeOtherException} }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cwninja-drunit
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Tom Lea
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -08:00
+date: 2009-04-07 00:00:00 -07:00
 default_executable: drunit_remote
 dependencies: []
 
@@ -29,6 +29,7 @@ files:
 - lib/drunit.rb
 - test/fake_app/fake_app.rb
 - test/test_helper.rb
+- test/unit/exception_handling_test.rb
 - test/unit/main_test.rb
 - bin/drunit_remote
 has_rdoc: true
@@ -61,4 +62,5 @@ signing_key:
 specification_version: 2
 summary: A library for running tests across multiple applications from a single test case.
 test_files: 
+- test/unit/exception_handling_test.rb
 - test/unit/main_test.rb