closure-compiler 0.2.2 → 0.3.0

data/README.textile

@@ -2,9 +2,9 @@ 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.2.2":http://gemcutter.org/gems/closure-compiler*
+Latest Version: *"0.3.0":http://gemcutter.org/gems/closure-compiler*
 
-The Closure Compiler's *2010-02-01* JAR-file is included with the gem, so you'll need *Java 6* installed in order to run the 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.
 
 h2. Installation
 

data/closure-compiler.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'closure-compiler'
-  s.version   = '0.2.2'            # Keep version in sync with closure-compiler.rb
-  s.date      = '2010-4-1'
+  s.version   = '0.3.0'            # Keep version in sync with closure-compiler.rb
+  s.date      = '2010-6-10'
 
   s.homepage    = "http://github.com/documentcloud/closure-compiler/"
   s.summary     = "Ruby Wrapper for the Google Closure Compiler"
@@ -20,8 +20,6 @@ Gem::Specification.new do |s|
                          '--exclude'  << 'test' <<
                          '--all'
 
-  s.add_dependency 'POpen4', ['>= 0.1.4']
-
   s.files = Dir['lib/**/*', 'vendor/**/*', 'closure-compiler.gemspec', 'README.textile', 'LICENSE', 'COPYING']
 
 end

data/lib/closure-compiler.rb

@@ -1,13 +1,17 @@
-require File.expand_path(File.dirname(__FILE__) + '/closure/compiler')
-
 module Closure
 
-  VERSION           = "0.2.2"
+  VERSION           = "0.3.0"
 
-  COMPILER_VERSION  = "20100201"
+  COMPILER_VERSION  = "20100514"
 
   JAVA_COMMAND      = 'java'
 
-  COMPILER_JAR      = File.expand_path(File.dirname(__FILE__) + "/../vendor/closure-compiler-#{COMPILER_VERSION}.jar")
+  COMPILER_ROOT     = File.expand_path(File.dirname(__FILE__))
+
+  COMPILER_JAR      = COMPILER_ROOT + "/../vendor/closure-compiler-#{COMPILER_VERSION}.jar"
+
+end
 
-end
+require 'stringio'
+require Closure::COMPILER_ROOT + '/closure/popen'
+require Closure::COMPILER_ROOT + '/closure/compiler'

data/lib/closure/compiler.rb

@@ -1,7 +1,3 @@
-require 'rubygems'
-require 'popen4'
-require 'stringio'
-
 module Closure
 
   # We raise a Closure::Error when compilation fails for any reason.
@@ -23,7 +19,7 @@ module Closure
     # block, for streaming.
     def compile(io)
       result, error = nil, nil
-      status = POpen4.popen4(*command) do |stdout, stderr, stdin, pid|
+      pid = Closure::Popen.popen(*command) do |stdin, stdout, stderr|
         if io.respond_to? :read
           while buffer = io.read(4096) do
             stdin.write(buffer)
@@ -37,7 +33,8 @@ module Closure
         out_thread.join and err_thread.join
         yield(StringIO.new(result)) if block_given?
       end
-      raise Error, error unless status.success?
+      Process.waitpid pid
+      raise Error, error unless $?.success?
       result
     end
     alias_method :compress, :compile

data/lib/closure/popen.rb

@@ -0,0 +1,43 @@
+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
+
+    def self.popen(*cmd)
+      # 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
+        if block_given?
+          yield(*pi)
+        end
+      ensure
+        pi.each{|p| p.close unless p.closed?}
+      end
+      pid
+    end
+
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -15,23 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-06-10 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: POpen4
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: "    A Ruby Wrapper for the Google Closure Compiler.\n"
 email: jeremy@documentcloud.org
 executables: []
@@ -42,8 +29,9 @@ extra_rdoc_files: []
 
 files: 
 - lib/closure/compiler.rb
+- lib/closure/popen.rb
 - lib/closure-compiler.rb
-- vendor/closure-compiler-20100201.jar
+- vendor/closure-compiler-20100514.jar
 - closure-compiler.gemspec
 - README.textile
 - LICENSE