execjs 1.2.7 → 1.2.8

data/lib/execjs/external_runtime.rb

@@ -21,8 +21,9 @@ module ExecJS
 
       def exec(source, options = {})
         source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = "#{@source}\n#{source}" if @source
 
-        compile_to_tempfile([@source, source].join("\n")) do |file|
+        compile_to_tempfile(source) do |file|
           extract_result(@runtime.send(:exec_runtime, file.path))
         end
       end
@@ -121,7 +122,7 @@ module ExecJS
       end
 
       def exec_runtime(filename)
-        output = sh("#{Shellwords.join([@binary, filename])} 2>&1")
+        output = sh("#{shell_escape(*(@binary.split(' ') << filename))} 2>&1")
         if $?.success?
           output
         else
@@ -132,7 +133,7 @@ module ExecJS
       def locate_binary
         if binary = which(@command)
           if @test_args
-            output = `#{Shellwords.join([binary, @test_args])} 2>&1`
+            output = `#{shell_escape(binary, @test_args)} 2>&1`
             binary if output.match(@test_match)
           else
             binary
@@ -144,9 +145,9 @@ module ExecJS
         Array(command).each do |name|
           name, args = name.split(/\s+/, 2)
           result = if ExecJS.windows?
-            `#{Shellwords.join(["#{ExecJS.root}/support/which.bat", name])}`
+            `#{shell_escape("#{ExecJS.root}/support/which.bat", name)}`
           else
-            `#{Shellwords.join(['command', '-v', name])} 2>/dev/null`
+            `#{shell_escape('command', '-v', name)} 2>/dev/null`
           end
 
           if path = result.strip.split("\n").first
@@ -178,5 +179,16 @@ module ExecJS
           end
         end
       end
+
+      if ExecJS.windows?
+        def shell_escape(*args)
+          # see http://technet.microsoft.com/en-us/library/cc723564.aspx#XSLTsection123121120120
+          args.map { |arg| arg.gsub(/([&|()<>^ "])/,'^\1') }.join(" ")
+        end
+      else
+        def shell_escape(*args)
+          Shellwords.join(args)
+        end
+      end
   end
 end

data/lib/execjs/version.rb

@@ -1,3 +1,3 @@
 module ExecJS
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: execjs
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 2
-  - 7
-  version: 1.2.7
+  - 8
+  version: 1.2.8
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 -05:00
+date: 2011-09-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Run JavaScript code from Ruby