hirobumi-with_ruby 0.1.1 → 0.1.2

data/lib/with_ruby/version.rb

@@ -3,7 +3,7 @@ module WithRuby
     
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

data/lib/with_ruby.rb

@@ -1,11 +1,13 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'yaml'
+
 module WithRuby
   
   class << self
 
     def run(options = {})
-      bin = options.delete('bin') || '/usr/bin/env ruby -Ku -rrubygems'
+      bin = options.delete('bin') || '/usr/bin/env ruby -Ku'
       
       command = yield.to_s
       
@@ -14,17 +16,24 @@ module WithRuby
         io.puts(build(command, options))
         ret = YAML.load(io.read)
       end
+      
+      raise(ret) if ret.is_a?(Exception)
 
       ret
     end
     
     def build(command, options)
+      "require 'rubygems'\n" +
       "require 'yaml'\n" +
       "def __with_ruby\n" +
       build_params(options) +
       command +
       "end\n" +
-      "STDOUT.puts(YAML.dump(__with_ruby))\n" +
+      "begin\n" +
+      "  STDOUT.puts(YAML.dump(__with_ruby))\n" +
+      "rescue Exception => boom\n" +
+      "  STDOUT.puts(YAML.dump(boom))\n" +
+      "end\n" +
       "__END__"
     end
     

data/test/unit/with_ruby_test.rb

@@ -23,16 +23,27 @@ class WithRubyTest < Test::Unit::TestCase
     should 'be able to handle Hpricot' do
       text = WithRuby.run(:url => 'http://www.google.co.jp/') do
         %q{
+          require 'jcode'
           require 'kconv'
           require 'open-uri'
-          require 'rubygems'
           require 'hpricot'
           doc = Hpricot(open(url).read.toutf8)
           return doc.inner_text
         }
       end
       assert_match(/Google/, text)
-    end 
+    end
+    
+    should 'raise an exception if necessary' do
+      assert_raise(Exception) do
+        WithRuby.run do
+          %q{
+            raise(Exception.new('test'))
+            return nil
+          }
+        end
+      end
+    end
     
   end # context WithRuby do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hirobumi-with_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Hirobumi Hama
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: []