image_optim 0.6.0 → 0.7.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_optim
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-15 00:00:00 Z
+date: 2013-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fspath
@@ -112,15 +112,14 @@ files:
 - lib/image_optim.rb
 - lib/image_optim/image_path.rb
 - lib/image_optim/option_helpers.rb
-- lib/image_optim/util.rb
 - lib/image_optim/worker.rb
-- lib/image_optim/workers/advpng.rb
-- lib/image_optim/workers/gifsicle.rb
-- lib/image_optim/workers/jpegoptim.rb
-- lib/image_optim/workers/jpegtran.rb
-- lib/image_optim/workers/optipng.rb
-- lib/image_optim/workers/pngcrush.rb
-- lib/image_optim/workers/pngout.rb
+- lib/image_optim/worker/advpng.rb
+- lib/image_optim/worker/gifsicle.rb
+- lib/image_optim/worker/jpegoptim.rb
+- lib/image_optim/worker/jpegtran.rb
+- lib/image_optim/worker/optipng.rb
+- lib/image_optim/worker/pngcrush.rb
+- lib/image_optim/worker/pngout.rb
 - spec/image_optim_spec.rb
 - spec/images/comparison.png
 - spec/images/decompressed.jpeg

data/lib/image_optim/util.rb

@@ -1,27 +0,0 @@
-require 'shellwords'
-
-class ImageOptim
-  module Util
-    # http://stackoverflow.com/questions/891537/ruby-detect-number-of-cpus-installed
-    def self.processor_count
-      @processor_count ||= case host_os = RbConfig::CONFIG['host_os']
-      when /darwin9/
-        `hwprefs cpu_count`
-      when /darwin/
-        (`which hwprefs` != '') ? `hwprefs thread_count` : `sysctl -n hw.ncpu`
-      when /linux/
-        `grep -c processor /proc/cpuinfo`
-      when /freebsd/
-        `sysctl -n hw.ncpu`
-      when /mswin|mingw/
-        require 'win32ole'
-        wmi = WIN32OLE.connect('winmgmts://')
-        cpu = wmi.ExecQuery('select NumberOfLogicalProcessors from Win32_Processor')
-        cpu.to_enum.first.NumberOfLogicalProcessors
-      else
-        warn "Unknown architecture (#{host_os}) assuming one processor."
-        1
-      end.to_i
-    end
-  end
-end

data/lib/image_optim/workers/advpng.rb

@@ -1,19 +0,0 @@
-require 'image_optim'
-
-class ImageOptim
-  class Advpng < Worker
-    # Compression level: 0 - don't compress, 1 - fast, 2 - normal, 3 - extra, 4 - extreme (defaults to 4)
-    attr_reader :level
-
-  private
-
-    def parse_options(options)
-      get_option!(options, :level, 4){ |v| limit_with_range(v.to_i, 0..4) }
-    end
-
-    def command_args(src, dst)
-      src.copy(dst)
-      %W[-#{level} -z -q -- #{dst}]
-    end
-  end
-end

data/lib/image_optim/workers/gifsicle.rb

@@ -1,20 +0,0 @@
-require 'image_optim'
-
-class ImageOptim
-  class Gifsicle < Worker
-    # Turn on interlacing (defaults to false)
-    attr_reader :interlace
-
-  private
-
-    def parse_options(options)
-      get_option!(options, :interlace, false){ |v| !!v }
-    end
-
-    def command_args(src, dst)
-      args = %W[-o #{dst} -O3 --no-comments --no-names --same-delay --same-loopcount --no-warnings -- #{src}]
-      args.unshift('-i') if interlace
-      args
-    end
-  end
-end

data/lib/image_optim/workers/jpegoptim.rb

@@ -1,50 +0,0 @@
-require 'image_optim'
-
-class ImageOptim
-  class Jpegoptim < Worker
-    # Strip Comment markers from output file (defaults to true)
-    attr_reader :strip_comments
-
-    # Strip Exif markers from output file (defaults to true)
-    attr_reader :strip_exif
-
-    # Strip IPTC markers from output file (defaults to true)
-    attr_reader :strip_iptc
-
-    # Strip ICC profile markers from output file (defaults to true)
-    attr_reader :strip_icc
-
-    # Maximum image quality factor (defaults to 100)
-    attr_reader :max_quality
-
-    # Run first if max_quality < 100
-    def run_first?
-      max_quality < 100
-    end
-
-  private
-
-    def parse_options(options)
-      get_option!(options, :strip_comments, true){ |v| !!v }
-      get_option!(options, :strip_exif, true){ |v| !!v }
-      get_option!(options, :strip_iptc, true){ |v| !!v }
-      get_option!(options, :strip_icc, true){ |v| !!v }
-      get_option!(options, :max_quality, 100){ |v| v.to_i }
-    end
-
-    def command_args(src, dst)
-      src.copy(dst)
-      args = %W[-q -- #{dst}]
-      if strip_comments && strip_exif && strip_iptc && strip_icc
-        args.unshift '--strip-all'
-      else
-        args.unshift '--strip-com' if strip_comments
-        args.unshift '--strip-exif' if strip_exif
-        args.unshift '--strip-iptc' if strip_iptc
-        args.unshift '--strip-icc' if strip_icc
-      end
-      args.unshift "-m#{max_quality}" if max_quality < 100
-      args
-    end
-  end
-end

data/lib/image_optim/workers/jpegtran.rb

@@ -1,25 +0,0 @@
-require 'image_optim'
-
-class ImageOptim
-  class Jpegtran < Worker
-    # Copy all chunks or none (defaults to false)
-    attr_reader :copy
-
-    # Create progressive JPEG file (defaults to true)
-    attr_reader :progressive
-
-  private
-
-    def parse_options(options)
-      get_option!(options, :copy, false){ |v| !!v }
-      get_option!(options, :progressive, true){ |v| !!v }
-    end
-
-    def command_args(src, dst)
-      args = %W[-optimize -outfile #{dst} #{src}]
-      args.unshift '-copy', copy ? 'all' : 'none'
-      args.unshift '-progressive' if progressive
-      args
-    end
-  end
-end

data/lib/image_optim/workers/optipng.rb

@@ -1,27 +0,0 @@
-require 'image_optim'
-
-class ImageOptim
-  class Optipng < Worker
-    # Optimization level preset 0..7 (0 is least, 7 is best, defaults to 6)
-    attr_reader :level
-
-    # Interlace, true - interlace on, false - interlace off, nil - as is in original image (defaults to false)
-    attr_reader :interlace
-
-  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
-
-    def command_args(src, dst)
-      src.copy(dst)
-      args = %W[-o#{level} -quiet -- #{dst}]
-      unless interlace.nil?
-        args.unshift "-i#{interlace ? 1 : 0}"
-      end
-      args
-    end
-  end
-end

data/lib/image_optim/workers/pngcrush.rb

@@ -1,37 +0,0 @@
-require 'image_optim'
-
-class ImageOptim
-  class Pngcrush < Worker
-    # List of chunks to remove or 'alla' or 'allb' (defaults to 'alla')
-    attr_reader :chunks
-
-    # Fix otherwise fatal conditions such as bad CRCs (defaults to false)
-    attr_reader :fix
-
-    # Brute force try all methods, very time-consuming and generally not worthwhile (defaults to false)
-    attr_reader :brute
-
-    # Always run first
-    def run_first?
-      true
-    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
-
-    def command_args(src, dst)
-      args = %W[-reduce -cc -q -- #{src} #{dst}]
-      Array(chunks).each do |chunk|
-        args.unshift '-rem', chunk
-      end
-      args.unshift '-fix' if fix
-      args.unshift '-brute' if brute
-      args
-    end
-  end
-end

data/lib/image_optim/workers/pngout.rb

@@ -1,27 +0,0 @@
-require 'image_optim'
-
-class ImageOptim
-  class Pngout < Worker
-    # Keep optional chunks (defaults to false)
-    attr_reader :keep_chunks
-
-    # Strategy: 0 - xtreme, 1 - intense, 2 - longest Match, 3 - huffman Only, 4 - uncompressed (defaults to 0)
-    attr_reader :strategy
-
-    # Always run first
-    def run_first?
-      true
-    end
-
-  private
-
-    def parse_options(options)
-      get_option!(options, :keep_chunks, false){ |v| !!v }
-      get_option!(options, :strategy, 0){ |v| limit_with_range(v.to_i, 0..4) }
-    end
-
-    def command_args(src, dst)
-      %W[-k#{keep_chunks ? 1 : 0} -s#{strategy} -q -y #{src} #{dst}]
-    end
-  end
-end