closure-compiler 0.3.1 → 0.3.2

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.1":http://gemcutter.org/gems/closure-compiler*
+Latest Version: *"0.3.2":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.1'            # Keep version in sync with closure-compiler.rb
-  s.date      = '2010-6-11'
+  s.version   = '0.3.2'            # Keep version in sync with closure-compiler.rb
+  s.date      = '2010-6-14'
 
   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.1"
+  VERSION           = "0.3.2"
 
   COMPILER_VERSION  = "20100514"
 

data/lib/closure/compiler.rb

@@ -19,7 +19,7 @@ module Closure
     # block, for streaming.
     def compile(io)
       result, error = nil, nil
-      Closure::Popen.popen(command) do |stdin, stdout, stderr|
+      status = Closure::Popen.popen(command) do |stdin, stdout, stderr|
         if io.respond_to? :read
           while buffer = io.read(4096) do
             stdin.write(buffer)
@@ -39,7 +39,7 @@ module Closure
         end
         yield(StringIO.new(result)) if block_given?
       end
-      raise Error, error unless $?.success?
+      raise Error, error unless status.success?
       result
     end
     alias_method :compress, :compile

data/lib/closure/popen.rb

@@ -4,24 +4,28 @@ module Closure
   # grandchild process, and returns the pid of the external process.
   module Popen
 
-    WINDOWS = RUBY_PLATFORM.match(/mswin32/)
+    WINDOWS  = RUBY_PLATFORM.match(/(win|w)32$/)
+    ONE_NINE = RUBY_VERSION >= "1.9"
     if WINDOWS
-      require 'rubygems'
-      require 'win32/open3'
+      if ONE_NINE
+        require 'open3'
+      else
+        require 'rubygems'
+        require 'win32/open3'
+      end
     end
 
     def self.popen(cmd)
-      pid = nil
       if WINDOWS
-        error, pid = nil, nil
-        Open4.popen4(cmd) do |stdin, stdout, stderr, win_pid|
+        error = nil
+        Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thread|
           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
+          return wait_thread.value if wait_thread.is_a? Thread
         end
       else
         # pipe[0] for read, pipe[1] for write
@@ -55,7 +59,7 @@ module Closure
         end
         Process.waitpid pid
       end
-      pid
+      $?
     end
 
   end

metadata

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