closure-compiler 0.3.0 → 0.3.1

data/README.textile

@@ -2,7 +2,7 @@ h1. The Closure Compiler (as a Ruby Gem)
 
 The *closure-compiler* gem is a svelte wrapper around the "Google Closure Compiler":http://code.google.com/closure/compiler/ for JavaScript compression.
 
-Latest Version: *"0.3.0":http://gemcutter.org/gems/closure-compiler*
+Latest Version: *"0.3.1":http://gemcutter.org/gems/closure-compiler*
 
 The Closure Compiler's *2010-05-15* JAR-file is included with the gem, so you'll need *Java 6* installed in order to run the compiler.
 

data/closure-compiler.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'closure-compiler'
-  s.version   = '0.3.0'            # Keep version in sync with closure-compiler.rb
-  s.date      = '2010-6-10'
+  s.version   = '0.3.1'            # Keep version in sync with closure-compiler.rb
+  s.date      = '2010-6-11'
 
   s.homepage    = "http://github.com/documentcloud/closure-compiler/"
   s.summary     = "Ruby Wrapper for the Google Closure Compiler"

data/lib/closure-compiler.rb

@@ -1,6 +1,6 @@
 module Closure
 
-  VERSION           = "0.3.0"
+  VERSION           = "0.3.1"
 
   COMPILER_VERSION  = "20100514"
 

data/lib/closure/compiler.rb

@@ -19,7 +19,7 @@ module Closure
     # block, for streaming.
     def compile(io)
       result, error = nil, nil
-      pid = Closure::Popen.popen(*command) do |stdin, stdout, stderr|
+      Closure::Popen.popen(command) do |stdin, stdout, stderr|
         if io.respond_to? :read
           while buffer = io.read(4096) do
             stdin.write(buffer)
@@ -28,12 +28,17 @@ module Closure
           stdin.write(io.to_s)
         end
         stdin.close
-        out_thread = Thread.new { result = stdout.read }
-        err_thread = Thread.new { error  = stderr.read }
-        out_thread.join and err_thread.join
+        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
+        end
         yield(StringIO.new(result)) if block_given?
       end
-      Process.waitpid pid
       raise Error, error unless $?.success?
       result
     end
@@ -48,7 +53,7 @@ module Closure
     end
 
     def command
-      [@java, '-jar', @jar, @options].flatten.join(' ')
+      [@java, '-jar', "\"#{@jar}\"", @options].flatten.join(' ')
     end
 
   end

data/lib/closure/popen.rb

@@ -4,37 +4,56 @@ module Closure
   # grandchild process, and returns the pid of the external process.
   module Popen
 
-    def self.popen(*cmd)
-      # pipe[0] for read, pipe[1] for write
-      pw, pr, pe = IO.pipe, IO.pipe, IO.pipe
+    WINDOWS = RUBY_PLATFORM.match(/mswin32/)
+    if WINDOWS
+      require 'rubygems'
+      require 'win32/open3'
+    end
 
-      pid = fork {
-        pw[1].close
-        STDIN.reopen(pw[0])
-        pw[0].close
+    def self.popen(cmd)
+      pid = nil
+      if WINDOWS
+        error, pid = nil, nil
+        Open4.popen4(cmd) do |stdin, stdout, stderr, win_pid|
+          yield(stdin, stdout, stderr) if block_given?
+          stdout.read unless stdout.closed? or stdout.eof?
+          unless stderr.closed?
+            stderr.rewind
+            error = stderr.read
+          end
+          pid = win_pid
+        end
+      else
+        # pipe[0] for read, pipe[1] for write
+        pw, pr, pe = IO.pipe, IO.pipe, IO.pipe
 
-        pr[0].close
-        STDOUT.reopen(pr[1])
-        pr[1].close
+        pid = fork {
+          pw[1].close
+          STDIN.reopen(pw[0])
+          pw[0].close
 
-        pe[0].close
-        STDERR.reopen(pe[1])
-        pe[1].close
+          pr[0].close
+          STDOUT.reopen(pr[1])
+          pr[1].close
 
-        exec(*cmd)
-      }
-
-      pw[0].close
-      pr[1].close
-      pe[1].close
-      pi = [pw[1], pr[0], pe[0]]
-      pw[1].sync = true
-      begin
-        if block_given?
-          yield(*pi)
+          pe[0].close
+          STDERR.reopen(pe[1])
+          pe[1].close
+
+          exec(cmd)
+        }
+
+        pw[0].close
+        pr[1].close
+        pe[1].close
+        pi = [pw[1], pr[0], pe[0]]
+        pw[1].sync = true
+        begin
+          yield(*pi) if block_given?
+        ensure
+          pi.each{|p| p.close unless p.closed?}
         end
-      ensure
-        pi.each{|p| p.close unless p.closed?}
+        Process.waitpid pid
       end
       pid
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -04:00
+date: 2010-06-11 00:00:00 -04:00
 default_executable: 
 dependencies: []