Merge pull request #174 from sstephenson/rubyrhino

Fix rubyrhino CI

.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - jruby-19mode

Rakefile

@@ -39,6 +39,12 @@ task :test do
 
     begin
       task.invoke
+    rescue SignalException => e
+      if e.message == "2"
+        skipped << task.name
+      else
+        failed << task.name
+      end
     rescue Exception => e
       if e.message[/Command failed with status \((\d+)\)/, 1] == "2"
         skipped << task.name

lib/execjs/external_runtime.rb

@@ -169,6 +169,21 @@ module ExecJS
             arg
           }.join(" ")
         end
+      elsif RUBY_ENGINE == 'jruby'
+        require 'shellwords'
+
+        def exec_runtime(filename)
+          command = "#{Shellwords.join(binary.split(' ') << filename)} 2>&1"
+          io = IO.popen(command, @popen_options)
+          output = io.read
+          io.close
+
+          if $?.success?
+            output
+          else
+            raise RuntimeError, output
+          end
+        end
       else
         def exec_runtime(filename)
           io = IO.popen(binary.split(' ') << filename, @popen_options.merge({err: [:child, :out]}))

lib/execjs/ruby_rhino_runtime.rb

@@ -9,6 +9,8 @@ module ExecJS
         @rhino_context = ::Rhino::Context.new
         fix_memory_limit! @rhino_context
         @rhino_context.eval(source)
+      rescue Exception => e
+        reraise_error(e)
       end
 
       def exec(source, options = {})
@@ -25,22 +27,14 @@ module ExecJS
         if /\S/ =~ source
           unbox @rhino_context.eval("(#{source})")
         end
-      rescue ::Rhino::JSError => e
-        if e.message =~ /^syntax error/
-          raise RuntimeError, e.message
-        else
-          raise ProgramError, e.message
-        end
+      rescue Exception => e
+        reraise_error(e)
       end
 
       def call(properties, *args)
         unbox @rhino_context.eval(properties).call(*args)
-      rescue ::Rhino::JSError => e
-        if e.message == "syntax error"
-          raise RuntimeError, e.message
-        else
-          raise ProgramError, e.message
-        end
+      rescue Exception => e
+        reraise_error(e)
       end
 
       def unbox(value)
@@ -64,6 +58,19 @@ module ExecJS
         end
       end
 
+      def reraise_error(e)
+        case e
+        when ::Rhino::JSError
+          if e.message == "syntax error"
+            raise RuntimeError, e.message
+          else
+            raise ProgramError, e.message
+          end
+        else
+          raise e
+        end
+      end
+
       private
         # Disables bytecode compiling which limits you to 64K scripts
         def fix_memory_limit!(context)