yui-compressor 0.10.0 → 0.11.0

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Ruby-YUI Compressor provides a Ruby interface to the {YUI Compressor Java library}[http://developer.yahoo.com/yui/compressor/] for minifying JavaScript and CSS assets.
 
-<b>Latest version:</b> 0.10.0 (includes YUI Compressor 2.4.7)
+<b>Latest version:</b> 0.11.0 (includes YUI Compressor 2.4.7)
 
 * {API documentation}[http://yui.rubyforge.org/]
 * {Source code}[http://github.com/sstephenson/ruby-yui-compressor/]
@@ -21,7 +21,7 @@ Ruby-YUI Compressor is distributed as a Ruby Gem (<tt>yui-compressor</tt>). Beca
 
 You can also install Ruby-YUI Compressor with the {Rip package manager}[http://hellorip.com/]:
 
-  $ rip install git://github.com/sstephenson/ruby-yui-compressor.git 0.10.0
+  $ rip install git://github.com/sstephenson/ruby-yui-compressor.git 0.11.0
   $ irb -rrip
   >> require "yui/compressor"
   => true

data/Rakefile

@@ -1,6 +1,6 @@
 require "rubygems"
-require "rubygems/package_task"
-require "rdoc/task"
+require "rake/gempackagetask"
+require "rake/rdoctask"
 require "rake/testtask"
 
 task :default => :test
@@ -15,7 +15,7 @@ Rake::RDocTask.new do |t|
   t.rdoc_files.include("README.rdoc", "lib/**/*.rb")
 end
 
-Gem::PackageTask.new(eval(IO.read(File.join(File.dirname(__FILE__), "yui-compressor.gemspec")))) do |pkg|
+Rake::GemPackageTask.new(eval(IO.read(File.join(File.dirname(__FILE__), "yui-compressor.gemspec")))) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
 end

data/lib/yui/compressor.rb

@@ -1,10 +1,11 @@
-require "popen4"
 require "shellwords"
 require "stringio"
+require "tempfile"
+require "rbconfig"
 
 module YUI #:nodoc:
   class Compressor
-    VERSION = "0.10.0"
+    VERSION = "0.11.0"
 
     class Error < StandardError; end
     class OptionError   < Error; end
@@ -31,7 +32,21 @@ module YUI #:nodoc:
     end
 
     def command #:nodoc:
-      @command.map { |word| Shellwords.escape(word) }.join(" ")
+      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+        # Shellwords is only for bourne shells, so windows shells get this
+        # extremely remedial escaping
+        escaped_cmd = @command.map do |word|
+          if word =~ / /
+            word = "\"%s\"" % word
+          end
+
+          word
+        end
+      else
+        escaped_cmd = @command.map { |word| Shellwords.escape(word) }
+      end
+
+      escaped_cmd.join(" ")
     end
 
     # Compress a stream or string of code with YUI Compressor. (A stream is
@@ -69,27 +84,27 @@ module YUI #:nodoc:
     #
     def compress(stream_or_string)
       streamify(stream_or_string) do |stream|
-        output = true
-        status = POpen4.popen4(command, "b") do |stdout, stderr, stdin, pid|
-          begin
-            stdin.binmode
-            transfer(stream, stdin)
-
-            if block_given?
-              yield stdout
-            else
-              output = stdout.read
-            end
-
-          rescue Exception => e
-            raise RuntimeError, "compression failed"
-          end
+        tempfile = Tempfile.new('yui_compress')
+        tempfile.write stream.read
+        tempfile.flush
+        full_command = "%s %s" % [command, tempfile.path]
+
+        begin
+          output = `#{full_command}`
+        rescue Exception => e
+          # windows shells tend to blow up here when the command fails
+          raise RuntimeError, "compression failed: %s" % e.message
+        ensure
+          tempfile.close!
         end
 
-        if status.exitstatus.zero?
+        if $?.exitstatus.zero?
           output
         else
-          raise RuntimeError, "compression failed"
+          # Bourne shells tend to blow up here when the command fails, usually
+          # because java is missing
+          raise RuntimeError, "Command '%s' returned non-zero exit status" %
+            full_command
         end
       end
     end
@@ -127,14 +142,6 @@ module YUI #:nodoc:
         end
       end
 
-      def transfer(from_stream, to_stream)
-        while buffer = from_stream.read(4096)
-          to_stream.write(buffer)
-        end
-        from_stream.close
-        to_stream.close
-      end
-
       def command_option_for_type
         ["--type", self.class.compressor_type.to_s]
       end

metadata

@@ -1,86 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yui-compressor
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: 0.11.0
   prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 0
-  version: 0.10.0
 platform: ruby
-authors: 
+authors:
 - Sam Stephenson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: POpen4
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
-  type: :runtime
-  version_requirements: *id001
+date: 2013-07-14 00:00:00.000000000 Z
+dependencies: []
 description: A Ruby interface to YUI Compressor for minifying JavaScript and CSS assets.
 email: sstephenson@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.rdoc
 - Rakefile
 - lib/yui/compressor.rb
 - lib/yuicompressor-2.4.7.jar
 - test/compressor_test.rb
 homepage: http://github.com/sstephenson/ruby-yui-compressor/
-licenses: 
+licenses:
 - MIT
 - BSD-3-clause
 - MPL
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: yui
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: JavaScript and CSS minification library
-test_files: 
+test_files:
 - test/compressor_test.rb
+has_rdoc: true