Merge pull request #12 from kares/master

JRuby compatibility - replace popen with a tempfile

Author: jashkenas

lib/closure-compiler.rb

@@ -12,5 +12,4 @@ module Closure
 
 end
 
-require 'stringio'
 require 'closure/compiler'

lib/closure/compiler.rb

@@ -1,4 +1,5 @@
-require 'closure/popen'
+require 'stringio'
+require 'tempfile'
 
 module Closure
 
@@ -20,28 +21,28 @@ def initialize(options={})
     # JavaScript as a string or yields an IO object containing the response to a
     # block, for streaming.
     def compile(io)
-      result, error = nil, nil
-      status = Closure::Popen.popen(command) do |stdin, stdout, stderr|
-        if io.respond_to? :read
-          while buffer = io.read(4096) do
-            stdin.write(buffer)
-          end
-        else
-          stdin.write(io.to_s)
-        end
-        stdin.close
-        if Closure::Popen::WINDOWS
-          stderr.close
-          result = stdout.read
-          error = "Stderr cannot be read on Windows."
-        else
-          out_thread = Thread.new { result = stdout.read }
-          err_thread = Thread.new { error  = stderr.read }
-          out_thread.join and err_thread.join
+      tempfile = Tempfile.new('closure_compiler')
+      if io.respond_to? :read
+        while buffer = io.read(4096) do
+          tempfile.write(buffer)
         end
-        yield(StringIO.new(result)) if block_given?
+      else
+        tempfile.write(io.to_s)
       end
-      raise Error, error unless status.success?
+      tempfile.flush
+
+      begin
+        result = `#{command} --js #{tempfile.path}`
+      rescue Exception
+        raise Error, "compression failed"
+      ensure
+        tempfile.close!
+      end
+      unless $?.exitstatus.zero?
+        raise Error, result
+      end
+
+      yield(StringIO.new(result)) if block_given?
       result
     end
     alias_method :compress, :compile

lib/closure/popen.rb

@@ -34,12 +34,10 @@ def test_block_syntax
   end
 
   def test_jar_and_java_specifiation
-    if !Closure::Popen::WINDOWS
-      jar = Dir['vendor/closure-compiler-*.jar'].first
-      java = `which java`.strip
-      compiler = Compiler.new(:java => java, :jar_file => jar)
-      assert compiler.compress(ORIGINAL) == COMPILED_SIMPLE
-    end
+    jar = Dir['vendor/closure-compiler-*.jar'].first
+    java = `which java`.strip
+    compiler = Compiler.new(:java => java, :jar_file => jar)
+    assert compiler.compress(ORIGINAL) == COMPILED_SIMPLE
   end
 
   def test_exceptions