squeezem 0.1.4 → 0.1.5

data/README

@@ -10,6 +10,10 @@ On Mac:
 
   sudo port install pngcrush jpeg
 
+On Ubuntu:
+
+  sudo apt-get install pngcrush libjpeg-progs
+
 Install
 
   sudo gem install squeezem

data/bin/squeezem

@@ -8,6 +8,7 @@ def parse_options
   options = OpenStruct.new
   options.squeezem = false
   options.ignorecache = false
+  options.verbose = false
   
   opts = OptionParser.new do |opts|
     opts.banner = <<BANNER
@@ -20,6 +21,7 @@ Options:
 BANNER
     opts.on("-s", "--squeezem", "Squeeze files") { options.squeezem = true }
     opts.on("-i", "--ignore-cache", "Ignore file cache") { options.ignorecache = true }
+    opts.on("-v", "--verbose", "Verbose output") { options.verbose = true }
     opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
   end
   begin

data/lib/squeezem.rb

@@ -55,19 +55,24 @@ class Squeezem
   end
 
   def squeeze(path)
+    log("Considering #{path}")
     file_type = get_file_type(path)
     unless valid_file_type?(file_type)
+      log("Ignoring, #{file_type} not a valid file type")
       @files_ignored += 1
       return
     end
     @files_seen += 1
     @path = path
     @size = File.size(path)
+    log("File size #{@size}")
     canonical_path = File.expand_path(path)
     unless @options.ignorecache
       cache = @files[canonical_path]
+      log("Read cache #{cache}")
       if cache && cache.size == @size
         unless @options.squeezem && cache.saving > 0
+          log("Skipping file, already processed")
           record_saving(cache.saving)
           return
         end
@@ -77,7 +82,7 @@ class Squeezem
     if File.exist?(@output_path)
       new_size = File.size(@output_path)
       if new_size == 0
-        $stderr.puts "Empty output for #{path}"
+        report_error(path, output)
         return
       end
       saving = @size - new_size
@@ -92,10 +97,15 @@ class Squeezem
       end
       @files[canonical_path] = OpenStruct.new(:size => cache_size, :saving => cache_saving)
     else
-      $stderr.puts "Error processing #{path}:", output
+      report_error(path, output)
     end
   end
 
+  def report_error(path, output)
+    $stderr.print "Error processing #{path}"
+    $stderr.puts ": #{output}" if output
+  end
+
   def get_file_type(path)
     extension = File.extname(path).sub('.', '')
     if extension.empty?
@@ -113,12 +123,17 @@ class Squeezem
     output = ''
     case file_type
     when :png
-      Open3.popen3('pngcrush', '-quiet', '-rem', 'alla', '-reduce', '-brute', path, @output_path) do |stdin, stdout, stderr|
+      cmd = ['pngcrush', '-quiet', '-rem', 'alla', '-reduce', '-brute', path, @output_path]
+      log("Calling #{cmd.join(' ')}")
+      Open3.popen3(*cmd) do |stdin, stdout, stderr|
         output = stdout.read
+        output += stderr.read
       end
     when :jpg
       File.open(@output_path, "w") do |out|
-        Open3.popen3('jpegtran', '-copy', 'none', '-optimize', '-perfect', path) do |stdin, stdout, stderr|
+        cmd = ['jpegtran', '-copy', 'none', '-optimize', '-perfect', path]
+        log("Calling #{cmd.join(' ')}")
+        Open3.popen3(*cmd) do |stdin, stdout, stderr|
           out.write(stdout.read)
           output = stderr.read
         end
@@ -172,4 +187,8 @@ class Squeezem
       f.puts Marshal.dump(@files)
     end
   end
+
+  def log(message)
+    puts message if @options.verbose
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: squeezem
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Steve Woodcock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +01:00
+date: 2010-08-29 00:00:00 +01:00
 default_executable: 
 dependencies: []