execjs 1.2.4 → 1.2.5

data/lib/execjs/external_runtime.rb

@@ -91,6 +91,7 @@ module ExecJS
       @runner_path = options[:runner_path]
       @test_args   = options[:test_args]
       @test_match  = options[:test_match]
+      @encoding    = options[:encoding]
       @binary      = locate_binary
     end
 
@@ -119,8 +120,7 @@ module ExecJS
       end
 
       def exec_runtime(filename)
-        output = nil
-        IO.popen("#{@binary} #{filename} 2>&1") { |f| output = f.read }
+        output = sh("#{@binary} #{filename} 2>&1")
         if $?.success?
           output
         else
@@ -143,7 +143,7 @@ module ExecJS
         Array(command).each do |name|
           name, args = name.split(/\s+/, 2)
           result = if ExecJS.windows?
-            `#{ExecJS.root}/support/which.bat #{name}`
+            `"#{ExecJS.root}/support/which.bat" #{name}`
           else
             `command -v #{name} 2>/dev/null`
           end
@@ -154,5 +154,28 @@ module ExecJS
         end
         nil
       end
+
+      if "".respond_to?(:force_encoding)
+        def sh(command)
+          output, options = nil, {}
+          options[:external_encoding] = @encoding if @encoding
+          options[:internal_encoding] = Encoding.default_internal || 'UTF-8'
+          IO.popen(command, options) { |f| output = f.read }
+          output
+        end
+      else
+        require "iconv"
+
+        def sh(command)
+          output = nil
+          IO.popen(command) { |f| output = f.read }
+
+          if @encoding
+            Iconv.new('UTF-8', @encoding).iconv(output)
+          else
+            output
+          end
+        end
+      end
   end
 end

data/lib/execjs/runtimes.rb

@@ -35,8 +35,9 @@ module ExecJS
 
     JScript = ExternalRuntime.new(
       :name        => "JScript",
-      :command     => "cscript //E:jscript //Nologo",
-      :runner_path => ExecJS.root + "/support/jscript_runner.js"
+      :command     => "cscript //E:jscript //Nologo //U",
+      :runner_path => ExecJS.root + "/support/jscript_runner.js",
+      :encoding    => 'UTF-16LE' # CScript with //U returns UTF-16LE
     )
 
 

data/lib/execjs/support/node_runner.js

@@ -1,4 +1,4 @@
-(function(program, execJS, module, exports, require) { execJS(program) })(function() { #{source}
+(function(program, execJS) { execJS(program) })(function(module, exports, require) { #{source}
 }, function(program) {
   var output, print = function(string) {
     process.stdout.write('' + string);

data/lib/execjs/version.rb

@@ -1,3 +1,3 @@
 module ExecJS
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,98 +1,125 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: execjs
-version: !ruby/object:Gem::Version
-  version: 1.2.4
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 5
+  version: 1.2.5
 platform: ruby
-authors:
+authors: 
 - Sam Stephenson
 - Josh Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-12 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: multi_json
-  requirement: &70192476050340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70192476050340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: johnson
-  requirement: &70192476049920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70192476049920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: mustang
-  requirement: &70192476049460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70192476049460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70192476078460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70192476078460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: therubyracer
-  requirement: &70192476078040 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70192476078040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: therubyrhino
-  requirement: &70192476077620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70192476077620
-description: ! '    ExecJS lets you run JavaScript code from Ruby.
-
-'
-email:
+  version_requirements: *id006
+description: "    ExecJS lets you run JavaScript code from Ruby.\n"
+email: 
 - sstephenson@gmail.com
 - josh@joshpeek.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/execjs.rb
+
+files: 
+- README.md
+- LICENSE
 - lib/execjs/external_runtime.rb
 - lib/execjs/johnson_runtime.rb
 - lib/execjs/module.rb
-- lib/execjs/version.rb
 - lib/execjs/mustang_runtime.rb
 - lib/execjs/ruby_racer_runtime.rb
 - lib/execjs/ruby_rhino_runtime.rb
@@ -103,30 +130,41 @@ files:
 - lib/execjs/support/json2.js
 - lib/execjs/support/node_runner.js
 - lib/execjs/support/which.bat
-- LICENSE
-- README.md
+- lib/execjs/version.rb
+- lib/execjs.rb
+has_rdoc: true
 homepage: https://github.com/sstephenson/execjs
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Run JavaScript code from Ruby
 test_files: []
+