closure-compiler 1.1.2 → 1.1.3

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: *"1.1.2":http://gemcutter.org/gems/closure-compiler*
+Latest Version: *"1.1.3":http://gemcutter.org/gems/closure-compiler*
 
 The Closure Compiler's *2011-08-11* JAR-file is included with the gem.
 

data/closure-compiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'closure-compiler'
-  s.version   = '1.1.2'            # Keep version in sync with closure-compiler.rb
+  s.version   = '1.1.3'            # Keep version in sync with closure-compiler.rb
   s.date      = '2011-08-12'
 
   s.homepage    = "http://github.com/documentcloud/closure-compiler/"

data/lib/closure-compiler.rb

@@ -1,6 +1,6 @@
 module Closure
 
-  VERSION           = "1.1.2"
+  VERSION           = "1.1.3"
 
   COMPILER_VERSION  = "20110811"
 
@@ -12,5 +12,4 @@ module Closure
 
 end
 
-require 'stringio'
 require 'closure/compiler'

data/lib/closure/compiler.rb

@@ -1,4 +1,5 @@
-require 'closure/popen'
+require 'stringio'
+require 'tempfile'
 
 module Closure
 
@@ -8,40 +9,42 @@ module Closure
   # The Closure::Compiler is a basic wrapper around the actual JAR. There's not
   # much to see here.
   class Compiler
+    
+    DEFAULT_OPTIONS = {:warning_level => 'QUIET'}
 
     # When you create a Compiler, pass in the flags and options.
     def initialize(options={})
       @java     = options.delete(:java)     || JAVA_COMMAND
       @jar      = options.delete(:jar_file) || COMPILER_JAR
-      @options  = serialize_options(options)
+      @options  = serialize_options(DEFAULT_OPTIONS.merge(options))
     end
 
     # Can compile a JavaScript string or open IO object. Returns the compiled
     # 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
+      tempfile.flush
+
+      begin
+        result = `#{command} --js #{tempfile.path}`
+      rescue Exception
+        raise Error, "compression failed"
+      ensure
+        tempfile.close!
       end
-      raise Error, error unless status.success?
+      unless $?.exitstatus.zero?
+        raise Error, result
+      end
+
+      yield(StringIO.new(result)) if block_given?
       result
     end
     alias_method :compress, :compile
@@ -51,7 +54,13 @@ module Closure
 
     # Serialize hash options to the command-line format.
     def serialize_options(options)
-      options.map {|k, v| ["--#{k}", v.to_s] }.flatten
+      options.map do |k, v|
+        if (v.is_a?(Array))
+          v.map {|v2| ["--#{k}", v2.to_s]}
+        else
+          ["--#{k}", v.to_s]
+        end
+      end.flatten
     end
 
     def command

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: closure-compiler
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -29,7 +29,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/closure/compiler.rb
-- lib/closure/popen.rb
+- lib/closure-compiler-20110322.jar
 - lib/closure-compiler-20110811.jar
 - lib/closure-compiler.rb
 - closure-compiler.gemspec

data/lib/closure/popen.rb

@@ -1,66 +0,0 @@
-module Closure
-
-  # A slightly modified version of Ruby 1.8's Open3, that doesn't use a
-  # grandchild process, and returns the pid of the external process.
-  module Popen
-
-    WINDOWS  = RUBY_PLATFORM.match(/(win|w)32$/)
-    ONE_NINE = RUBY_VERSION >= "1.9"
-    if WINDOWS
-      if ONE_NINE
-        require 'open3'
-      else
-        require 'rubygems'
-        require 'win32/open3'
-      end
-    end
-
-    def self.popen(cmd)
-      if WINDOWS
-        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
-          return wait_thread.value if wait_thread.is_a? Thread
-        end
-      else
-        # pipe[0] for read, pipe[1] for write
-        pw, pr, pe = IO.pipe, IO.pipe, IO.pipe
-
-        pid = fork {
-          pw[1].close
-          STDIN.reopen(pw[0])
-          pw[0].close
-
-          pr[0].close
-          STDOUT.reopen(pr[1])
-          pr[1].close
-
-          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
-        Process.waitpid pid
-      end
-      $?
-    end
-
-  end
-end