From c00ee391d2051ea675c0c8e8e796502d453b40e4 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 7 Feb 2011 08:44:02 -0600
Subject: [PATCH] Support "nodejs" binary name

---
 lib/execjs/external_runtime.rb | 26 +++++++++++++++-----------
 lib/execjs/runtimes.rb         |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/execjs/external_runtime.rb b/lib/execjs/external_runtime.rb
index e0c6161..3b76b2f 100644
--- a/lib/execjs/external_runtime.rb
+++ b/lib/execjs/external_runtime.rb
@@ -8,6 +8,7 @@ module ExecJS
       @runner_path = options[:runner_path]
       @test_args   = options[:test_args]
       @test_match  = options[:test_match]
+      @binary      = locate_binary
     end
 
     def eval(source)
@@ -23,19 +24,22 @@ module ExecJS
     end
 
     def available?
-      command = @command.split(/\s+/).first
-      binary = `which #{command}`.strip
-      if $? == 0
-        if @test_args
-          output = `#{binary} #{@test_args} 2>&1`
-          output.match(@test_match)
-        else
-          true
-        end
-      end
+      @binary ? true : false
     end
 
     protected
+      def locate_binary
+        @command = @command.join(" ") if @command.is_a?(Array)
+        if binary = `which #{@command}`.split("\n").first
+          if @test_args
+            output = `#{binary} #{@test_args} 2>&1`
+            binary if output.match(@test_match)
+          else
+            binary
+          end
+        end
+      end
+
       def compile(source)
         runner_source.sub('#{source}', source)
       end
@@ -54,7 +58,7 @@ module ExecJS
       end
 
       def exec_runtime(filename)
-        output = `#{@command} #{filename} 2>&1`
+        output = `#{@binary} #{filename} 2>&1`
         if $?.success?
           output
         else
diff --git a/lib/execjs/runtimes.rb b/lib/execjs/runtimes.rb
index 04e9617..9100248 100644
--- a/lib/execjs/runtimes.rb
+++ b/lib/execjs/runtimes.rb
@@ -28,7 +28,7 @@ module ExecJS
       :runner_path => runner_path("basic.js")
 
     define_runtime :Node,
-      :command => "node",
+      :command => ["nodejs", "node"],
       :runner_path => runner_path("node.js")
 
     define_runtime :JSC,