image_optim 0.7.3 → 0.8.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTcxMThlMmE2OGE1YWYxZjFkODZjY2EyZjYxYWM0MDk0YTZmNGJhMg==
+  data.tar.gz: !binary |-
+    ZDAwNmMyYjc3M2MzN2UzNjZmYmUzMWQwYzg1NTA2NDhmZjU2YTVmNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YmYwYmQ1YWRhYjljNDAwYmQ3OTk3MzFhYTg5YzM2MmMyMDAxOWY1OGNlMmNl
+    NTg2OWI5YWNlNmIyMDQ2NmZmOGZmMzFjYjJmNTJmYjI1M2QxNzk5NjhhMTg5
+    Zjc1MzFhY2FjZjg5YTlhOGY0YWFmOTUxNjY0YzNkODM4OTU1YTQ=
+  data.tar.gz: !binary |-
+    YjJmMWJiZjEzOThiOGQwMzkyNTQxNzRiOGUyZDNkMGY5ZGU5MWJhYzViN2Iy
+    Yjc5N2U1ZWUyNDNlNTgzZmQ0MTU0YjEyYmQ4MDNlMDU0OTJlZjY1NDkyMDg5
+    ZTFjYjZlYjlmZTdiMjkxMmRiMGYwMGMwYjM4MDc0MWIwNGRiODk=

data/README.markdown

@@ -82,7 +82,7 @@ _Note: pngout is free to use even in commercial soft, but you can not redistribu
 
 ### From ruby
 
-Initilize optimizer (options are described in comments for ImageOptim, Worker and all workers):
+Initilize optimizer:
 
     image_optim = ImageOptim.new
 
@@ -108,6 +108,38 @@ Multiple images:
 
     image_optim.optimize_images!(Dir['*.*'])
 
+## Options
+
+Worker can be disabled by passing false instead of options hash.
+
+### pngcrush
+* `:chunks` — List of chunks to remove or 'alla' - all except tRNS/transparency or 'allb' - all except tRNS and gAMA/gamma *(defaults to alla)*
+* `:fix` — Fix otherwise fatal conditions such as bad CRCs *(defaults to false)*
+* `:brute` — Brute force try all methods, very time-consuming and generally not worthwhile *(defaults to false)*
+
+### pngout
+* `:copy_chunks` — Copy optional chunks *(defaults to false)*
+* `:strategy` — Strategy: 0 - xtreme, 1 - intense, 2 - longest Match, 3 - huffman Only, 4 - uncompressed *(defaults to 0)*
+
+### optipng
+* `:level` — Optimization level preset 0 is least, 7 is best *(defaults to 6)*
+* `:interlace` — Interlace, true - interlace on, false - interlace off, nil - as is in original image *(defaults to false)*
+
+### advpng
+* `:level` — Compression level: 0 - don't compress, 1 - fast, 2 - normal, 3 - extra, 4 - extreme *(defaults to 4)*
+
+### jpegoptim
+* `:strip` — List of extra markers to strip: comments, exif, iptc, icc or all *(defaults to all)*
+* `:max_quality` — Maximum image quality factor 0..100 *(defaults to 100)*
+
+### jpegtran
+* `:copy_chunks` — Copy all chunks *(defaults to false)*
+* `:progressive` — Create progressive JPEG file *(defaults to true)*
+* `:jpegrescan` — Use jpegtran through jpegrescan, ignore progressive option *(defaults to true)*
+
+### gifsicle
+* `:interlace` — Turn interlacing on *(defaults to false)*
+
 ## Copyright
 
 Copyright (c) 2012-2013 Ivan Kuchin. See LICENSE.txt for details.

data/bin/image_optim

@@ -8,6 +8,8 @@ require 'find'
 
 options = {}
 
+OptionParser.accept(ImageOptim::TrueFalseNil, OptionParser.top.atype[TrueClass][0].merge('nil' => nil)){ |arg, val| val }
+
 option_parser = OptionParser.new do |op|
   op.banner = <<-TEXT
 #{op.program_name} v#{ImageOptim.version}
@@ -23,26 +25,61 @@ Usege:
 
   op.separator nil
 
-  op.on('--[no-]threads NUMBER', Integer, 'Number of threads or disable (defaults to number of processors)') do |threads|
+  op.on('--[no-]threads N', Integer, 'Number of threads or disable (defaults to number of processors)') do |threads|
     options[:threads] = threads
   end
 
-  op.on('--[no-]nice NUMBER', Integer, 'Nice level (defaults to 10)') do |nice|
+  op.on('--[no-]nice N', Integer, 'Nice level (defaults to 10)') do |nice|
     options[:nice] = nice
   end
 
   op.separator nil
+  op.separator '  Disabling workers:'
 
   ImageOptim::Worker.klasses.each do |klass|
-    bin = klass.underscored_name.to_sym
+    bin = klass.bin_sym
     op.on("--no-#{bin}", "disable #{bin} worker") do |enable|
       options[bin] = enable
     end
   end
 
   op.separator nil
+  op.separator '  Worker options:'
+
+  ImageOptim::Worker.klasses.each_with_index do |klass, i|
+    op.separator nil unless i.zero?
+
+    bin = klass.bin_sym
+    klass.option_definitions.each do |option_definition|
+      name = option_definition.name.to_s.gsub('_', '-')
+      default = option_definition.default
+      type = option_definition.type
+
+      type, marking = case
+      when [TrueClass, FalseClass, ImageOptim::TrueFalseNil].include?(type)
+        [type, 'B']
+      when Integer >= type
+        [Integer, 'N']
+      when Array >= type
+        [Array, 'a,b,c']
+      else
+        raise "Unknown type #{type}"
+      end
 
-  op.on('-v', '--verbose', 'Verbose info') do |verbose|
+      description = "#{option_definition.description.gsub(' - ', ' - ')} (defaults to #{default})"
+      description = description.scan(/(.*?.{1,60})(?:\s|\z)/).flatten.join("\n  ").split("\n")
+
+      op.on("--#{bin}-#{name} #{marking}", type, *description) do |value|
+        options[bin] = {} unless options[bin].is_a?(Hash)
+        options[bin][option_definition.name.to_sym] = value
+      end
+    end
+  end
+
+  op.separator nil
+  op.separator '  Common options:'
+
+  op.on('-v', '--verbose', 'Verbose output') do |verbose|
     options[:verbose] = verbose
   end
 
@@ -63,6 +100,23 @@ rescue OptionParser::ParseError => e
   abort "#{e.to_s}\n\n#{option_parser.help}"
 end
 
+if options[:verbose]
+  def print_options(options, level = 1)
+    prefix = '  ' * level
+    options.each do |key, value|
+      if value.is_a?(Hash)
+        puts "#{prefix}#{key}:"
+        print_options(value, level + 1)
+      else
+        puts "#{prefix}#{key}: #{value.inspect}"
+      end
+    end
+  end
+
+  puts 'Options:'
+  print_options(options)
+end
+
 if ARGV.empty?
   abort "specify image paths to optimize\n\n#{option_parser.help}"
 else
@@ -70,7 +124,7 @@ else
   image_optim = begin
     ImageOptim.new(options)
   rescue ImageOptim::ConfigurationError => e
-    abort e
+    abort e.to_s
   end
 
   paths = []

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.7.3'
+  s.version     = '0.8.0'
   s.summary     = %q{Optimize (lossless compress) images (jpeg, png, gif) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/image_optim.rb

@@ -3,12 +3,15 @@ require 'shellwords'
 
 require 'image_optim/image_path'
 require 'image_optim/option_helpers'
+require 'image_optim/option_definition'
 require 'image_optim/worker'
 
 class ImageOptim
   class ConfigurationError < StandardError; end
   class BinNotFoundError < StandardError; end
 
+  class TrueFalseNil; end
+
   include OptionHelpers
 
   # Nice level
@@ -62,13 +65,13 @@ class ImageOptim
     else
       threads.to_i
     end
-    @threads = limit_with_range(threads, 1..16)
+    @threads = OptionHelpers.limit_with_range(threads, 1..16)
 
     @verbose = !!options.delete(:verbose)
 
     @workers_by_format = {}
     Worker.klasses.each do |klass|
-      case worker_options = options.delete(klass.underscored_name.to_sym)
+      case worker_options = options.delete(klass.bin_sym)
       when Hash
       when true, nil
         worker_options = {}
@@ -150,7 +153,7 @@ class ImageOptim
 
   # Version of image_optim gem spec loaded
   def self.version
-    Gem.loaded_specs['image_optim'].version.to_s rescue nil
+    Gem.loaded_specs['image_optim'].version.to_s rescue 'DEV'
   end
 
   # Are there workers for file at path?
@@ -184,6 +187,13 @@ class ImageOptim
     @resolved_bins[bin] or raise BinNotFoundError, "`#{bin}` not found"
   end
 
+  VENDOR_PATH = File.expand_path('../../vendor', __FILE__)
+
+  # Join resolve_dir, default path and vendor path for PATH environment variable
+  def env_path
+    "#{resolve_dir}:#{ENV['PATH']}:#{VENDOR_PATH}"
+  end
+
 private
 
   # Run method for each path and yield each path and result if block given
@@ -210,7 +220,7 @@ private
 
   # Check if bin can be accessed
   def bin_accessible?(bin)
-    `which #{bin.to_s.shellescape}` != ''
+    `env PATH=#{env_path.shellescape} which #{bin.to_s.shellescape}` != ''
   end
 
   # http://stackoverflow.com/questions/891537/ruby-detect-number-of-cpus-installed

data/lib/image_optim/option_definition.rb

@@ -0,0 +1,14 @@
+class OptionDefinition
+
+  attr_reader :name, :default, :type, :description, :proc
+
+  def initialize(name, default, type, description, &proc)
+    if type.is_a?(String)
+      type, description = default.class, type
+    end
+
+    @name = name.to_sym
+    @description = description.to_s
+    @default, @type, @proc = default, type, proc
+  end
+end

data/lib/image_optim/option_helpers.rb

@@ -15,7 +15,7 @@ class ImageOptim
     end
 
     # Ensure number is in range
-    def limit_with_range(number, range)
+    def self.limit_with_range(number, range)
       if range.include?(number)
         number
       elsif number < range.first

data/lib/image_optim/worker.rb

@@ -7,7 +7,7 @@ require 'image_optim'
 class ImageOptim
   class Worker
     class << self
-      # List of avaliable workers
+      # List of available workers
       def klasses
         @klasses ||= []
       end
@@ -17,9 +17,18 @@ class ImageOptim
         klasses << base
       end
 
-      # Undercored class name
-      def underscored_name
-        @underscored_name ||= name.split('::').last.gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
+      # Underscored class name symbol
+      def bin_sym
+        @underscored_name ||= name.split('::').last.gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase.to_sym
+      end
+
+      def option_definitions
+        @option_definitions ||= []
+      end
+
+      def option(name, default, type, description = nil, &proc)
+        attr_reader name
+        option_definitions << OptionDefinition.new(name, default, type, description, &proc)
       end
     end
 
@@ -28,7 +37,9 @@ class ImageOptim
     # Configure (raises on extra options)
     def initialize(image_optim, options = {})
       @image_optim = image_optim
-      parse_options(options)
+      self.class.option_definitions.each do |option_definition|
+        get_option!(options, option_definition.name, option_definition.default, &option_definition.proc)
+      end
       assert_options_empty!(options)
     end
 
@@ -60,10 +71,9 @@ class ImageOptim
       resolve_bin!(bin)
 
       command = [bin, *arguments].map(&:to_s).shelljoin
-      env_path = "#{@image_optim.resolve_dir}:#{ENV['PATH']}"
       start = Time.now
 
-      system "env PATH=#{env_path.shellescape} nice -n #{@image_optim.nice} #{command} > /dev/null 2>&1"
+      system "env PATH=#{@image_optim.env_path.shellescape} nice -n #{@image_optim.nice} #{command} > /dev/null 2>&1"
 
       raise SignalException.new($?.termsig) if $?.signaled?
 

data/lib/image_optim/worker/advpng.rb

@@ -3,20 +3,15 @@ require 'image_optim/worker'
 class ImageOptim
   class Worker
     class Advpng < Worker
-      # Compression level: 0 - don't compress, 1 - fast, 2 - normal, 3 - extra, 4 - extreme (defaults to 4)
-      attr_reader :level
+      option(:level, 4, 'Compression level: 0 - don\'t compress, 1 - fast, 2 - normal, 3 - extra, 4 - extreme') do |v|
+        OptionHelpers.limit_with_range(v.to_i, 0..4)
+      end
 
       def optimize(src, dst)
         src.copy(dst)
         args = %W[-#{level} -z -q -- #{dst}]
         execute(:advpng, *args) && optimized?(src, dst)
       end
-
-    private
-
-      def parse_options(options)
-        get_option!(options, :level, 4){ |v| limit_with_range(v.to_i, 0..4) }
-      end
     end
   end
 end

data/lib/image_optim/worker/gifsicle.rb

@@ -3,20 +3,13 @@ require 'image_optim/worker'
 class ImageOptim
   class Worker
     class Gifsicle < Worker
-      # Turn on interlacing (defaults to false)
-      attr_reader :interlace
+      option(:interlace, false, 'Turn interlacing on'){ |v| !!v }
 
       def optimize(src, dst)
         args = %W[-o #{dst} -O3 --no-comments --no-names --same-delay --same-loopcount --no-warnings -- #{src}]
         args.unshift('-i') if interlace
         execute(:gifsicle, *args) && optimized?(src, dst)
       end
-
-    private
-
-      def parse_options(options)
-        get_option!(options, :interlace, false){ |v| !!v }
-      end
     end
   end
 end

data/lib/image_optim/worker/jpegoptim.rb

@@ -3,11 +3,15 @@ require 'image_optim/worker'
 class ImageOptim
   class Worker
     class Jpegoptim < Worker
-      # List of extra markers to strip: comments, exif, iptc, icc (defaults to 'all')
-      attr_reader :strip
+      option(:strip, :all, Array, 'List of extra markers to strip: comments, exif, iptc, icc or all') do |v|
+        values = Array(v).map(&:to_s)
+        known_values = %w[all comments exif iptc icc]
+        unknown_values = values - known_values
+        warn "Unknown markers for jpegoptim: #{unknown_values.join(', ')}" unless unknown_values.empty?
+        values & unknown_values
+      end
 
-      # Maximum image quality factor (defaults to 100)
-      attr_reader :max_quality
+      option(:max_quality, 100, 'Maximum image quality factor 0..100'){ |v| OptionHelpers.limit_with_range(v.to_i, 0..100) }
 
       # Run first if max_quality < 100
       def run_order
@@ -23,19 +27,6 @@ class ImageOptim
         args.unshift "-m#{max_quality}" if max_quality < 100
         execute(:jpegoptim, *args) && optimized?(src, dst)
       end
-
-    private
-
-      def parse_options(options)
-        get_option!(options, :strip, :all) do |v|
-          markers = Array(v).map(&:to_s)
-          possible_markers = %w[all comments exif iptc icc]
-          unknown_markers = markers - possible_markers
-          warn "Unknown markers for jpegoptim: #{unknown_markers.join(', ')}" unless unknown_markers.empty?
-          markers & possible_markers
-        end
-        get_option!(options, :max_quality, 100){ |v| v.to_i }
-      end
     end
   end
 end

data/lib/image_optim/worker/jpegtran.rb

@@ -3,24 +3,24 @@ require 'image_optim/worker'
 class ImageOptim
   class Worker
     class Jpegtran < Worker
-      # Copy all chunks or none (defaults to false)
-      attr_reader :copy_chunks
+      option(:copy_chunks, false, 'Copy all chunks'){ |v| !!v }
 
-      # Create progressive JPEG file (defaults to true)
-      attr_reader :progressive
+      option(:progressive, true, 'Create progressive JPEG file'){ |v| !!v }
 
-      def optimize(src, dst)
-        args = %W[-optimize -outfile #{dst} #{src}]
-        args.unshift '-copy', copy_chunks ? 'all' : 'none'
-        args.unshift '-progressive' if progressive
-        execute(:jpegtran, *args) && optimized?(src, dst)
-      end
+      option(:jpegrescan, false, 'Use jpegtran through jpegrescan, ignore progressive option'){ |v| !!v }
 
-    private
-
-      def parse_options(options)
-        get_option!(options, :copy_chunks, false){ |v| !!v }
-        get_option!(options, :progressive, true){ |v| !!v }
+      def optimize(src, dst)
+        if jpegrescan
+          args = %W[#{src} #{dst}]
+          args.unshift '-s' unless copy_chunks
+          resolve_bin!(:jpegtran)
+          execute(:jpegrescan, *args) && optimized?(src, dst)
+        else
+          args = %W[-optimize -outfile #{dst} #{src}]
+          args.unshift '-copy', copy_chunks ? 'all' : 'none'
+          args.unshift '-progressive' if progressive
+          execute(:jpegtran, *args) && optimized?(src, dst)
+        end
       end
     end
   end

data/lib/image_optim/worker/optipng.rb

@@ -3,11 +3,11 @@ require 'image_optim/worker'
 class ImageOptim
   class Worker
     class Optipng < Worker
-      # Optimization level preset 0..7 (0 is least, 7 is best, defaults to 6)
-      attr_reader :level
+      option(:level, 6, 'Optimization level preset 0 is least, 7 is best'){ |v| OptionHelpers.limit_with_range(v.to_i, 0..7) }
 
-      # Interlace, true - interlace on, false - interlace off, nil - as is in original image (defaults to false)
-      attr_reader :interlace
+      option(:interlace, false, TrueFalseNil, 'Interlace, true - interlace on, false - interlace off, nil - as is in original image') do |v|
+        v && true
+      end
 
       def optimize(src, dst)
         src.copy(dst)
@@ -15,13 +15,6 @@ class ImageOptim
         args.unshift "-i#{interlace ? 1 : 0}" unless interlace.nil?
         execute(:optipng, *args) && optimized?(src, dst)
       end
-
-    private
-
-      def parse_options(options)
-        get_option!(options, :level, 6){ |v| limit_with_range(v.to_i, 0..7) }
-        get_option!(options, :interlace, false){ |v| v && true }
-      end
     end
   end
 end

data/lib/image_optim/worker/pngcrush.rb

@@ -3,14 +3,12 @@ require 'image_optim/worker'
 class ImageOptim
   class Worker
     class Pngcrush < Worker
-      # List of chunks to remove or 'alla' - all except tRNS/transparency or 'allb' - all except tRNS and gAMA/gamma (defaults to 'alla')
-      attr_reader :chunks
+      option(:chunks, :alla, Array, 'List of chunks to remove or \'alla\' - all except tRNS/transparency or '\
+                                '\'allb\' - all except tRNS and gAMA/gamma'){ |v| Array(v).map(&:to_s) }
 
-      # Fix otherwise fatal conditions such as bad CRCs (defaults to false)
-      attr_reader :fix
+      option(:fix, false, 'Fix otherwise fatal conditions such as bad CRCs'){ |v| !!v }
 
-      # Brute force try all methods, very time-consuming and generally not worthwhile (defaults to false)
-      attr_reader :brute
+      option(:brute, false, 'Brute force try all methods, very time-consuming and generally not worthwhile'){ |v| !!v }
 
       # Always run first
       def run_order
@@ -26,14 +24,6 @@ class ImageOptim
         args.unshift '-brute' if brute
         execute(:pngcrush, *args) && optimized?(src, dst)
       end
-
-    private
-
-      def parse_options(options)
-        get_option!(options, :chunks, :alla){ |v| Array(v).map(&:to_s) }
-        get_option!(options, :fix, false){ |v| !!v }
-        get_option!(options, :brute, false){ |v| !!v }
-      end
     end
   end
 end

data/lib/image_optim/worker/pngout.rb

@@ -3,11 +3,11 @@ require 'image_optim/worker'
 class ImageOptim
   class Worker
     class Pngout < Worker
-      # Copy optional chunks (defaults to false)
-      attr_reader :copy_chunks
+      option(:copy_chunks, false, 'Copy optional chunks'){ |v| !!v }
 
-      # Strategy: 0 - xtreme, 1 - intense, 2 - longest Match, 3 - huffman Only, 4 - uncompressed (defaults to 0)
-      attr_reader :strategy
+      option(:strategy, 0, 'Strategy: 0 - xtreme, 1 - intense, 2 - longest Match, 3 - huffman Only, 4 - uncompressed') do |v|
+        OptionHelpers.limit_with_range(v.to_i, 0..4)
+      end
 
       # Always run first
       def run_order
@@ -18,13 +18,6 @@ class ImageOptim
         args = %W[-k#{copy_chunks ? 1 : 0} -s#{strategy} -q -y #{src} #{dst}]
         execute(:pngout, *args) && optimized?(src, dst)
       end
-
-    private
-
-      def parse_options(options)
-        get_option!(options, :copy_chunks, false){ |v| !!v }
-        get_option!(options, :strategy, 0){ |v| limit_with_range(v.to_i, 0..4) }
-      end
     end
   end
 end

data/script/options_for_readme

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.expand_path('../../lib', __FILE__)
+
+require 'image_optim'
+
+ImageOptim::Worker.klasses.each_with_index do |klass, i|
+  puts "### #{klass.bin_sym}"
+  klass.option_definitions.each do |option_definition|
+    puts "* `:#{option_definition.name}` — #{option_definition.description} *(defaults to #{option_definition.default})*"
+  end
+  puts
+end

data/vendor/jpegrescan

@@ -0,0 +1,143 @@
+#!/usr/bin/perl -ws
+# jpegrescan by Loren Merritt
+# Last updated: 2008-11-29 / 2013-03-19
+# This code is public domain.
+
+use File::Slurp;
+use File::Temp qw/ tempfile /;
+
+@ARGV==2 or die "usage: jpegrescan in.jpg out.jpg
+tries various progressive scan orders
+switches:
+  -s strip from all extra markers (`jpegtran -copy none` otherwise `jpegtran -copy all`)
+  -v verbose output
+  -q supress all output
+";
+$fin = $ARGV[0];
+$fout = $ARGV[1];
+(undef, $ftmp) = tempfile(SUFFIX => ".scan");
+$jtmp = $fout;
+$verbose = $v;
+$quiet = $q;
+@strip = $s ? ("-copy","none") : ("-copy","all");
+undef $_ for $v,$q,$s;
+undef $/;
+$|=1;
+
+# convert the input to baseline, just to make all the other conversions faster
+# FIXME there's still a bunch of redundant computation in separate calls to jpegtran
+open $OLDERR, ">&", STDERR;
+open STDERR, ">", $ftmp;
+open TRAN, "-|", "jpegtran", "-v", @strip, "-optimize", $fin or die;
+write_file($jtmp, <TRAN>);
+close TRAN;
+open STDERR, ">&", $OLDERR;
+
+$type = read_file($ftmp);
+$type =~ /components=(\d+)/ or die;
+$rgb = $1==3 ? 1 : $1==1 ? 0 : die "not RGB nor gray\n";
+
+# FIXME optimize order for either progressive transfer or decoding speed
+sub canonize {
+    my $txt = $prefix.$suffix.shift;
+    $txt =~ s/\s*;\s*/;\n/g;
+    $txt =~ s/^\s*//;
+    $txt =~ s/ +/ /g;
+    $txt =~ s/: (\d+) (\d+)/sprintf ": %2d %2d", $1, $2/ge;
+    # treat u and v identically. I shouldn't need to do this, but with jpegtran overhead it saves 9% speed. cost: .008% bitrate.
+    $txt =~ s/^2:.*\n//gm;
+    $txt =~ s/^1:(.+)\n/1:$1\n2:$1\n/gm;
+    # dc before ac, coarse before fine
+    my @txt = sort {"$a\n$b" =~ /: *(\d+) .* (\d);\n.*: *(\d+) .* (\d);/ or die; !$3 <=> !$1 or $4 <=> $2 or $a cmp $b;} split /\n/, $txt;
+    return join "\n", @txt;
+}
+
+sub try {
+    my $txt = canonize(shift);
+    return $memo{$txt} if $memo{$txt};
+    write_file($ftmp, $txt);
+    open TRAN, "-|", "jpegtran", @strip, "-scans", $ftmp, $jtmp or die;
+    $data = <TRAN>;
+    close TRAN;
+    my $s = length $data;
+    $s or die;
+    $memo{$txt} = $s;
+    !$quiet && print $verbose ? "$txt\n$s\n\n" : ".";
+    return $s;
+}
+
+sub triesn {
+    my($bmode, $bsize);
+    my ($limit, @modes) = @_;
+    my $overshoot = 0;
+    for(@modes) {
+        my $s = try($_);
+        if(!$bsize || $s < $bsize) {
+            $bsize = $s;
+            $bmode = $_;
+            $overshoot = 0;
+        } elsif(++$overshoot >= $limit) {
+            last;
+        }
+    }
+    return $bmode;
+}
+
+sub tries { triesn(99, @_); }
+
+$prefix = "";
+$suffix = "";
+
+if($rgb) {
+    # 012 helps very little
+    # 0/12 and 0/1/2 are pretty evenly matched in frequency, but 0/12 wins in total size if every image had to use the same mode
+    # dc refinement passes never help
+    $dc = tries(
+    #           "0: 0 0 0 0; 1 2: 0 0 0 0;", # two scans expose a bug in Opera <= 11.61
+                "0: 0 0 0 0; 1: 0 0 0 0; 2: 0 0 0 0;");
+    # jpegtran won't let me omit dc entirely, but I can at least quantize it away to make the rest of the tests faster.
+    $prefix = "0 1 2: 0 0 0 9;";
+} else {
+    $dc = "0: 0 0 0 0;";
+    $prefix = "0: 0 0 0 9;";
+}
+
+# luma can make use of up to 3 refinement passes.
+# chroma can make use of up to 2 refinement passes.
+# refinement passes have some chance of being split (luma: 4%,4%,4%. chroma: 20%,8%) but the total bit gain is negligible.
+# msb pass should almost always be split (luma: 87%, chroma: 81%).
+# I have no theoretical reason for this list of split positions, they're just the most common in practice.
+# splitting into 3 ections is often slightly better, but the total number of bits saved is negligible.
+# FIXME: penalize lots of refinement passes because it's slower to decode. if so, then also force overwrite if bigger than the input.
+sub try_splits {
+    my $str = shift;
+    my %n = map {$_ => sprintf "$c: 1 %d $str; $c: %d 63 $str;", $_, $_+1} 2,5,8,12,18;
+    my $mode = triesn(2, "$c: 1 63 $str;", @n{2,8,5});
+    return $mode if $mode ne $n{8};
+    return triesn(1, $mode, @n{12,18});
+}
+
+foreach $c (0..$rgb) {
+    my @modes;
+    my $ml = "";
+    for(0..($c?2:3)) {
+        push @modes, "$c: 1 8 0 $_; $c: 9 63 0 $_;".$ml;
+        $ml .= sprintf("$c: 1 63 %d %d;", $_+1, $_);
+    }
+    my $refine = triesn(1, @modes);
+    $refine =~ s/.* (0 \d);//;
+    $ac .= $refine . try_splits($1);
+}
+
+$prefix = "";
+undef %memo;
+$mode = canonize($dc.$ac);
+try($mode);
+$size = $memo{$mode};
+!$quiet && print "\n$mode\n$size\n";
+$old_size = -s $fin;
+!$quiet && printf "%+.2f%%\n", ($size/$old_size-1)*100;
+if($size < $old_size) {
+    write_file($fout, $data);
+}
+unlink $ftmp;

metadata

@@ -1,109 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: image_optim
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 3
-  version: 0.7.3
+version: !ruby/object:Gem::Version
+  version: 0.8.0
 platform: ruby
-authors: 
+authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fspath
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 0
-        - 3
+      - !ruby/object:Gem::Version
         version: 2.0.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: image_size
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: image_size
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: progress
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: progress
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: in_threads
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: in_threads
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
-executables: 
+executables:
 - image_optim
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - LICENSE.txt
 - README.markdown
@@ -112,6 +95,7 @@ files:
 - image_optim.gemspec
 - lib/image_optim.rb
 - lib/image_optim/image_path.rb
+- lib/image_optim/option_definition.rb
 - lib/image_optim/option_helpers.rb
 - lib/image_optim/worker.rb
 - lib/image_optim/worker/advpng.rb
@@ -121,6 +105,7 @@ files:
 - lib/image_optim/worker/optipng.rb
 - lib/image_optim/worker/pngcrush.rb
 - lib/image_optim/worker/pngout.rb
+- script/options_for_readme
 - spec/image_optim_spec.rb
 - spec/images/comparison.png
 - spec/images/decompressed.jpeg
@@ -130,40 +115,33 @@ files:
 - spec/images/transparency1.png
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg
+- vendor/jpegrescan
 homepage: http://github.com/toy/image_optim
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-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 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: image_optim
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Optimize (lossless compress) images (jpeg, png, gif) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout)
-test_files: 
+specification_version: 4
+summary: Optimize (lossless compress) images (jpeg, png, gif) using external utilities
+  (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout)
+test_files:
 - spec/image_optim_spec.rb
 - spec/images/comparison.png
 - spec/images/decompressed.jpeg
@@ -173,4 +151,3 @@ test_files:
 - spec/images/transparency1.png
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg
-has_rdoc: