image_optimizer 1.2.1 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2Q4ZWYzYjZjMWMzYTkwMTUxNTExMzBkNTFjNjZkNTBmNGFjODJiZQ==
-  data.tar.gz: !binary |-
-    ODc5MzY0MzA4NjY2YTgzZTYzZDUzZTA2MDBmMzBmY2Q2OGZhZGVkMA==
+SHA1:
+  metadata.gz: 970982e519567a730a3feb024bbed88cfbb837b6
+  data.tar.gz: 92198c8d8fbaa3ce8caa6ef2e270f6872a7b1829
 SHA512:
-  metadata.gz: !binary |-
-    MTM3MjhhYmEwZTJjNTI4Y2MxYTcxOGM3M2ZiZTk5Nzk2NTUzMjA4ZWE1NmU2
-    YmFhMzhjNjRhNzY1NTVkMjk5ZWI0MDNhOTYxNDc5MTU5ZWU3NmJhMWQ4NThh
-    YjYyNjg2YjMyMzhmYjI3ODMxOTdiNzU5OTgxOWFmODBmZWFmYjY=
-  data.tar.gz: !binary |-
-    NDdlZTM1N2Q3YTMwMWNhNGQxZDQ4Mzc3Mjg5ZWIzM2NmYzY2Y2IzOWQzNGVj
-    N2M1YjlkMmU3ZTU0MjQ0N2VjMWVhZTA3NWQ3YTNhYjM2Nzc1YWM4MDUxZWFl
-    Njc2OGMzMDllYThjNGE3NWQzZDU5ZThhMjI2MDc1MmJmNGJhMDU=
+  metadata.gz: cbe10141847ab85f09fc245f813db416448a9ca391b6c8e3f66b26489ce2df423228e8875fea6ff96475518dada29c597d448ce74a69c1e41a793f6b49436a9d
+  data.tar.gz: 17432c5a63ea32496a5442f60e9a53f257d3f338e828558bdc31f4c7aef72c7213d95ea1bd7ec228ac193297586167ef8559365f303c4274ae7729d9ef9704b0

data/README.md

@@ -84,6 +84,19 @@ optimization. PNGs will ignore the quality setting.
 ImageOptimizer.new('path/to/file.jpg', quality: 80).optimize
 ```
 
+##### Use identify
+
+Pass an optional `identify` parameter to identify file types using ImageMagick or GraphicsMagick `identify`
+instead of the filename extension, default is false.
+
+```ruby
+ImageOptimizer.new('path/to/file.jpg', identify: true).optimize
+```
+
+## Set bin directories
+
+Optionally set binary directories with the `OPTIPNG_BIN`, `JPEGOPTIM_BIN` and `IDENTIFY_BIN` environment variables.
+
 
 ## Contributing
 

data/certs/jtescher.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdDCCAlygAwIBAgIBATANBgkqhkiG9w0BAQUFADBAMRIwEAYDVQQDDAlqYXRl
+c2NoZXIxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+bTAeFw0xNDA5MjkyMTIzNDhaFw0xNTA5MjkyMTIzNDhaMEAxEjAQBgNVBAMMCWph
+dGVzY2hlcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshN+oQWZWrd06HAk
+Ym6hJrg3ILAaF/BVUhsiw5Pi1Z8+4UrCY1dQKSkoU8rcpAyKlozbiAyiTgpy3rwG
+s9K+++4c3Nq3n4U+TrziwdLYR6O6CceA39HYXgo8sdJNQp/dTrN/UJ9i5XjGVsj5
+EZ/GxVjzFcfaxGhOtRRSxxV8cML2xPO4jdj7s1i2PdD2W8E199pZo6aQGmoViTku
+AtmDOhJBi3RUUtrYPkC2ts74zdrIiRs4sPnqRAwg88ssWHBAInaqskxe8T9JMGhG
+DxQEOU1cI2f6WtngbM3Grqz4zsinXaN5UNJug4MIeMw0ufVS2n9x33tl5TQbqEFE
+R4lgOQIDAQABo3kwdzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU
+iZKdXYDw8pqTJRPmIgL+1fiLQ2YwHgYDVR0RBBcwFYETamF0ZXNjaGVyQGdtYWls
+LmNvbTAeBgNVHRIEFzAVgRNqYXRlc2NoZXJAZ21haWwuY29tMA0GCSqGSIb3DQEB
+BQUAA4IBAQBOhrOaKUTe9WSuIdWMT0EwyKa5nuBGOW+TvbZ722RFb1m/t53JrhZk
+e9fcuBPqP3OP4Sm1zuJApG54g4MfVRoH4VSVXIME8SCVix2AA40Wo/kuKkpusk9o
+DI8YB1wuKHvxz5Dp9TqUhW6U0xflFdBIvMxDYW4cBhBCXMNGIORi1vX2IqpMmTB/
+H1OPGmibxwLAMvjJ9zmMX0JTeNl4vrOMwrqntPCN7wifzRWQQjDpr7FlR35P30jd
+g//+Q17/DxaA78vyZM5fABBBpCg/ds7axx7I2n/CG+4WzyGUK2Lgn5kF5aRY3Ugh
+at/y9WkZyjaptzzmD0bwLUxK3brbGZsC
+-----END CERTIFICATE-----

data/image_optimizer.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/jtescher/image_optimizer"
   gem.license       = 'MIT'
   gem.signing_key   = File.expand_path('~/.ssh/gem-private_key.pem') if $0 =~ /gem\z/
-  gem.cert_chain    = ['gem-public_cert.pem']
+  gem.cert_chain    = ['certs/jtescher.pem']
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/image_optimizer.rb

@@ -1,17 +1,51 @@
 require 'image_optimizer/version'
+require 'image_optimizer/shell'
+require 'image_optimizer/image_optimizer_base'
 require 'image_optimizer/jpeg_optimizer'
 require 'image_optimizer/png_optimizer'
 
 class ImageOptimizer
-  attr_reader :path, :options
+  include Shell
 
+  attr_reader :path, :options
   def initialize(path, options = {})
     @path    = path
     @options = options
   end
 
   def optimize
+    identify_format if options[:identify]
     JPEGOptimizer.new(path, options).optimize
     PNGOptimizer.new(path, options).optimize
   end
+
+private
+
+  def identify_format
+    if identify_bin?
+      match = run_command("#{identify_bin} -ping#{quiet} #{path}").match(/PNG|JPG|TIFF|GIF|JPEG/)
+      if match
+        options[:identified_format] = match[0].downcase
+      end
+    else
+      warn 'Attempting to retrieve image format without identify installed. Using file name extension instead...'
+    end
+  end
+
+  def quiet
+    ' -quiet' if image_magick?
+  end
+
+  def image_magick?
+    !!which('mogrify')
+  end
+
+  def identify_bin?
+    !!identify_bin
+  end
+
+  def identify_bin
+    ENV['IDENTIFY_BIN'] || which('identify')
+  end
+
 end

data/lib/image_optimizer/image_optimizer_base.rb

@@ -0,0 +1,44 @@
+class ImageOptimizer
+  class ImageOptimizerBase
+    include Shell
+
+    attr_reader :path, :options
+    def initialize(path, options = {})
+      @path = path
+      @options = options
+    end
+
+    def optimize
+      return unless correct_format?
+
+      if optimizer_bin?
+        perform_optimizations
+      else
+        warn "Attempting to optimize a #{type} without #{bin_name} installed. Skipping..."
+      end
+    end
+
+  private
+
+    def correct_format?
+      extensions.include?(options[:identified_format] || extension(path))
+    end
+
+    def extension(path)
+      path.split('.').last.downcase
+    end
+
+    def perform_optimizations
+      system(optimizer_bin, *command_options)
+    end
+
+    def optimizer_bin?
+      !!optimizer_bin
+    end
+
+    def optimizer_bin
+      ENV["#{bin_name.upcase}_BIN"] || which(bin_name)
+    end
+
+  end
+end

data/lib/image_optimizer/jpeg_optimizer.rb

@@ -1,36 +1,8 @@
 class ImageOptimizer
-  class JPEGOptimizer
-    attr_reader :path, :options
-
-    def initialize(path, options = {})
-      @path = path
-      @options = options
-    end
-
-    def optimize
-      return unless jpeg_format?
-
-      if jpeg_optimizer_present?
-        optimize_jpeg
-      else
-        warn 'Attempting to optimize a jpeg without jpegoptim installed. Skipping...'
-      end
-    end
+  class JPEGOptimizer < ImageOptimizerBase
 
   private
 
-    def jpeg_format?
-      ['jpeg', 'jpg'].include? extension(path)
-    end
-
-    def extension(path)
-      path.split('.').last.downcase
-    end
-
-    def optimize_jpeg
-      system(jpeg_optimizer_bin, *command_options)
-    end
-
     def command_options
       flags = ['-f', '--strip-all', '--all-progressive']
       flags << max_quantity if (0..100).include?(options[:quality])
@@ -46,12 +18,16 @@ class ImageOptimizer
       '--quiet'
     end
 
-    def jpeg_optimizer_present?
-      !jpeg_optimizer_bin.nil? && !jpeg_optimizer_bin.empty?
+    def extensions
+      %w[jpeg jpg]
+    end
+
+    def type
+      'jpeg'
     end
 
-    def jpeg_optimizer_bin
-      @jpeg_optimizer_bin ||= ENV['JPEGOPTIM_BIN'] || `which jpegoptim`.strip
+    def bin_name
+      'jpegoptim'
     end
 
   end

data/lib/image_optimizer/png_optimizer.rb

@@ -1,36 +1,8 @@
 class ImageOptimizer
-  class PNGOptimizer
-    attr_reader :path, :options
-
-    def initialize(path, options = {})
-      @path = path
-      @options = options
-    end
-
-    def optimize
-      return unless png_format?
-
-      if png_optimizer_present?
-        optimize_png
-      else
-        warn 'Attempting to optimize a png without optipng installed. Skipping...'
-      end
-    end
+  class PNGOptimizer < ImageOptimizerBase
 
   private
 
-    def png_format?
-      ['png', 'gif'].include? extension(path)
-    end
-
-    def extension(path)
-      path.split('.').last.downcase
-    end
-
-    def optimize_png
-      system(png_optimizer_bin, *command_options)
-    end
-
     def command_options
       flags = %w[-o7]
       flags << quiet if options[:quiet]
@@ -41,12 +13,16 @@ class ImageOptimizer
       '-quiet'
     end
 
-    def png_optimizer_present?
-      !png_optimizer_bin.nil? && !png_optimizer_bin.empty?
+    def type
+      'png'
+    end
+
+    def extensions
+      %w[png gif]
     end
 
-    def png_optimizer_bin
-      @png_optimzer_bin ||= ENV['OPTIPNG_BIN'] || `which optipng`.strip
+    def bin_name
+      'optipng'
     end
 
   end

data/lib/image_optimizer/shell.rb

@@ -0,0 +1,36 @@
+class ImageOptimizer
+  module Shell
+    # most of the code from MiniMagick, they didn't write any tests
+
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    def which(cmd)
+      self.class.which(cmd)
+    end
+
+    def run_command(command)
+      self.class.run_command(command)
+    end
+
+    module ClassMethods
+      # Cross-platform way of finding an executable in the $PATH.
+      def which(cmd)
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each do |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable? exe
+          end
+        end
+        nil
+      end
+
+      def run_command(command)
+        `#{command}`
+      end
+    end
+
+  end
+end

data/lib/image_optimizer/version.rb

@@ -1,3 +1,3 @@
 class ImageOptimizer
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/spec/image_optimizer/jpeg_optimizer_spec.rb

@@ -2,43 +2,68 @@ require 'spec_helper'
 
 describe ImageOptimizer::JPEGOptimizer do
   describe '#optimize' do
-    let(:jpeg_optimizer) { ImageOptimizer::JPEGOptimizer.new('/path/to/file.jpg') }
+    let(:options) { {} }
+    let(:jpeg_optimizer) { ImageOptimizer::JPEGOptimizer.new('/path/to/file.jpg', options) }
+    after { ImageOptimizer::JPEGOptimizer.instance_variable_set(:@bin, nil) }
+    subject { jpeg_optimizer.optimize }
 
-    it 'optimizes the jpeg' do
-      jpeg_optimizer.stub(:jpeg_optimizer_bin => '/usr/local/bin/jpegoptim')
-      optimizer_options = %w[-f --strip-all --all-progressive /path/to/file.jpg]
-      jpeg_optimizer.should_receive(:system).with('/usr/local/bin/jpegoptim', *optimizer_options)
-      jpeg_optimizer.optimize
-    end
+    context 'jpeg optimizing utility is installed' do
+      before do
+        allow(ImageOptimizer::JPEGOptimizer).to receive(:which).and_return('/usr/local/bin/jpegoptim')
+      end
 
-    it 'warns the user if the jpeg optimizing utility is not installed' do
-      jpeg_optimizer.stub(:jpeg_optimizer_bin => '')
-      jpeg_optimizer.should_receive(:warn).with('Attempting to optimize a jpeg without jpegoptim installed. Skipping...')
-      jpeg_optimizer.optimize
-    end
+      it 'optimizes the jpeg' do
+        optimizer_options = %w[-f --strip-all --all-progressive /path/to/file.jpg]
+        expect(jpeg_optimizer).to receive(:system).with('/usr/local/bin/jpegoptim', *optimizer_options)
+        subject
+      end
 
-    it 'detects if there is an ENV variable path to jpegoptim' do
-      image_optim_jpegoptim_bin_path = '/app/vendor/bundle/ruby/2.0.0/gems/image_optim_bin-0.0.2/bin/jpegoptim'
-      ENV['JPEGOPTIM_BIN'] = image_optim_jpegoptim_bin_path
-      optimizer_options = %w[-f --strip-all --all-progressive /path/to/file.jpg]
-      jpeg_optimizer.should_receive(:system).with(image_optim_jpegoptim_bin_path, *optimizer_options)
-      jpeg_optimizer.optimize
-    end
+      context 'ENV variable path to jpegoptim' do
+        let(:image_optim_jpegoptim_bin_path) { '/app/vendor/bundle/ruby/2.0.0/gems/image_optim_bin-0.0.2/bin/jpegoptim' }
+        before do
+          ENV['JPEGOPTIM_BIN'] = image_optim_jpegoptim_bin_path
+        end
+        after do
+          ENV['JPEGOPTIM_BIN'] = nil
+        end
+
+        it 'should optimize using the given path' do
+          optimizer_options = %w[-f --strip-all --all-progressive /path/to/file.jpg]
+          expect(jpeg_optimizer).to receive(:system).with(image_optim_jpegoptim_bin_path, *optimizer_options)
+          subject
+        end
+      end
 
-    it 'accepts an optional quality parameter' do
-      jpeg_optimizer = ImageOptimizer::JPEGOptimizer.new('/path/to/file.jpg', :quality => 50)
-      jpeg_optimizer.stub(:jpeg_optimizer_bin => '/usr/local/bin/jpegoptim')
-      optimizer_options = %w[-f --strip-all --all-progressive --max=50 /path/to/file.jpg]
-      jpeg_optimizer.should_receive(:system).with('/usr/local/bin/jpegoptim', *optimizer_options)
-      jpeg_optimizer.optimize
+      context 'with quality parameter' do
+        let(:options) { { :quality => 50 } }
+
+        it 'optimizes the jpeg with the quality' do
+          optimizer_options = %w[-f --strip-all --all-progressive --max=50 /path/to/file.jpg]
+          expect(jpeg_optimizer).to receive(:system).with('/usr/local/bin/jpegoptim', *optimizer_options)
+          subject
+        end
+      end
+
+      context 'with quiet parameter' do
+        let(:options) { { :quiet => true } }
+
+        it 'accepts an optional quiet parameter' do
+          optimizer_options = %w[-f --strip-all --all-progressive --quiet /path/to/file.jpg]
+          expect(jpeg_optimizer).to receive(:system).with('/usr/local/bin/jpegoptim', *optimizer_options)
+          subject
+        end
+      end
     end
 
-    it 'accepts an optional quiet parameter' do
-      jpeg_optimizer = ImageOptimizer::JPEGOptimizer.new('/path/to/file.jpg', :quiet => true)
-      jpeg_optimizer.stub(:jpeg_optimizer_bin => '/usr/local/bin/jpegoptim')
-      optimizer_options = %w[-f --strip-all --all-progressive --quiet /path/to/file.jpg]
-      jpeg_optimizer.should_receive(:system).with('/usr/local/bin/jpegoptim', *optimizer_options)
-      jpeg_optimizer.optimize
+    context 'optimizing utility is not installed' do
+      before do
+        allow(ImageOptimizer::JPEGOptimizer).to receive(:which).and_return(nil)
+      end
+
+      it 'warns the user if the jpeg' do
+        expect(jpeg_optimizer).to receive(:warn).with('Attempting to optimize a jpeg without jpegoptim installed. Skipping...')
+        subject
+      end
     end
   end
-end
+end

data/spec/image_optimizer/png_optimizer_spec.rb

@@ -2,32 +2,54 @@ require 'spec_helper'
 
 describe ImageOptimizer::PNGOptimizer do
   describe '#optimize' do
-    let(:png_optimizer) { ImageOptimizer::PNGOptimizer.new('/path/to/file.png') }
+    let(:options) { {} }
+    let(:png_optimizer) { ImageOptimizer::PNGOptimizer.new('/path/to/file.png', options) }
+    after { ImageOptimizer::PNGOptimizer.instance_variable_set(:@bin, nil) }
+    subject { png_optimizer.optimize }
 
-    it 'optimizes the png' do
-      png_optimizer.stub(:png_optimizer_bin => '/usr/local/bin/optipng')
-      png_optimizer.should_receive(:system).with('/usr/local/bin/optipng', '-o7', '/path/to/file.png')
-      png_optimizer.optimize
-    end
+    context 'with png optimizing utility installed' do
+      before do
+        allow(ImageOptimizer::PNGOptimizer).to receive(:which).and_return('/usr/local/bin/optipng')
+      end
 
-    it 'warns the user if the png optimizing utility is not installed' do
-      png_optimizer.stub(:png_optimizer_bin => '')
-      png_optimizer.should_receive(:warn).with('Attempting to optimize a png without optipng installed. Skipping...')
-      png_optimizer.optimize
-    end
+      it 'optimizes the png' do
+        expect(png_optimizer).to receive(:system).with('/usr/local/bin/optipng', '-o7', '/path/to/file.png')
+        subject
+      end
+
+      context 'ENV variable path to optipng' do
+        let(:image_optim_optipng_bin_path) { '/app/vendor/bundle/ruby/2.0.0/gems/image_optim_bin-0.0.2/bin/optipng' }
+        before do
+          ENV['OPTIPNG_BIN'] = image_optim_optipng_bin_path
+        end
+        after do
+          ENV['OPTIPNG_BIN'] = nil
+        end
 
-    it 'detects if there is an ENV variable path to optipng' do
-      image_optim_optipng_bin_path = '/app/vendor/bundle/ruby/2.0.0/gems/image_optim_bin-0.0.2/bin/optipng'
-      ENV['OPTIPNG_BIN'] = image_optim_optipng_bin_path
-      png_optimizer.should_receive(:system).with(image_optim_optipng_bin_path, '-o7', '/path/to/file.png')
-      png_optimizer.optimize
+        it 'detects if there is an ENV variable path to optipng' do
+          expect(png_optimizer).to receive(:system).with(image_optim_optipng_bin_path, '-o7', '/path/to/file.png')
+          subject
+        end
+      end
+
+      context 'with quiet parameter' do
+        let(:options) { { :quiet => true } }
+        it 'optimizes the png' do
+          expect(png_optimizer).to receive(:system).with('/usr/local/bin/optipng', '-o7', '-quiet', '/path/to/file.png')
+          subject
+        end
+      end
     end
 
-    it 'accepts an optional quiet parameter' do
-      png_optimizer = ImageOptimizer::PNGOptimizer.new('/path/to/file.png', :quiet => true)
-      png_optimizer.stub(:png_optimizer_bin => '/usr/local/bin/optipng')
-      png_optimizer.should_receive(:system).with('/usr/local/bin/optipng', '-o7', '-quiet', '/path/to/file.png')
-      png_optimizer.optimize
+    context 'with png optimizing utility not installed' do
+      before do
+        allow(ImageOptimizer::PNGOptimizer).to receive(:which).and_return(nil)
+      end
+
+      it 'warns the user' do
+        expect(png_optimizer).to receive(:warn).with('Attempting to optimize a png without optipng installed. Skipping...')
+        subject
+      end
     end
   end
 end

data/spec/image_optimizer/shell_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+class TestShell
+  include ImageOptimizer::Shell
+end
+
+describe ImageOptimizer::Shell do
+  subject { TestShell.new }
+
+  describe '#which' do
+    it 'should find ruby' do
+      expect(subject.which('ruby')).to_not be_nil
+    end
+
+    it 'should not find it' do
+      expect(subject.which('something_that_should_not_exist_ever')).to be_nil
+    end
+  end
+
+  describe '#run_command' do
+    it 'run the command successfully' do
+      expect(subject.run_command('ruby -v')).to_not be_nil
+    end
+  end
+end

data/spec/image_optimizer/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe ImageOptimizer do
   it 'should have a VERSION constant' do
-    ImageOptimizer::VERSION.should_not be_empty
+    expect(ImageOptimizer::VERSION).to_not be_empty
   end
 end

data/spec/image_optimizer_spec.rb

@@ -1,11 +1,129 @@
 require 'spec_helper'
 
 describe ImageOptimizer do
+  let(:options) { {} }
+  let(:image_path) { '/path/to/file.jpg' }
+
   describe '#optimize' do
+    subject { ImageOptimizer.new(File.join(image_path), options) }
+
     it 'delegates to jpeg and png optimizers' do
-      ImageOptimizer::JPEGOptimizer.any_instance.should_receive(:optimize)
-      ImageOptimizer::PNGOptimizer.any_instance.should_receive(:optimize)
-      ImageOptimizer.new('/path/to/image.jpg').optimize
+      expect_any_instance_of(ImageOptimizer::JPEGOptimizer).to receive(:optimize)
+      expect_any_instance_of(ImageOptimizer::PNGOptimizer).to receive(:optimize)
+      subject.optimize
+    end
+  end
+
+  describe '#identify_format' do
+
+    context 'with identify option off' do
+      subject { ImageOptimizer.new(File.join(image_path), options) }
+
+      it 'does nothing' do
+        expect(subject).to_not receive(:identify_format)
+        subject.optimize
+      end
+    end
+
+    context 'with identify option on' do
+      let(:image_magick_data) do
+        {
+          :output => 'rose.jpg JPEG 640x480 sRGB 87kb 0.050u 0:01',
+          :command => " -ping -quiet #{image_path}"
+        }
+      end
+      let(:graphics_magick_data) do
+        {
+          :output => "Image: images/aquarium.jpg\nclass: PseudoClass\ncolors: 256\n" +
+            "signature: eb5dca81dd93ae7e6ffae99a527eb5dca8...\nmatte: False\ngeometry: 640x480\ndepth: 8\nbytes: 308135" +
+            "format: JPEG\ncomments:\nImported from MTV raster image: aquarium.mtv",
+          :command => " -ping #{image_path}"
+        }
+      end
+
+      subject { ImageOptimizer.new(File.join(image_path), options.merge(:identify => true)) }
+
+      context 'with identify found thorough `which`' do
+        let(:identify_bin_path) { '/usr/local/bin/identify' }
+        before { allow(subject).to receive(:which).with('identify').and_return(identify_bin_path) }
+
+        context 'for ImageMagick' do
+          before { allow(subject).to receive(:which).with('mogrify').and_return('/usr/local/bin/mogrify') }
+
+          it 'detects jpegs' do
+            allow(subject).to receive(:run_command).and_return(image_magick_data[:output])
+            subject.optimize
+            expect(subject.options[:identified_format]).to eq('jpeg')
+          end
+
+          it 'calls the correct identify command' do
+            expect(subject).to receive(:run_command).with(identify_bin_path + image_magick_data[:command]).and_return('')
+            subject.optimize
+          end
+        end
+
+        context 'for GraphicsMagick' do
+          before { allow(subject).to receive(:which).with('mogrify').and_return(nil) }
+
+          it 'detects jpegs' do
+            allow(subject).to receive(:run_command).and_return(graphics_magick_data[:output])
+            subject.optimize
+            expect(subject.options[:identified_format]).to eq('jpeg')
+          end
+
+          it 'calls the correct identify command' do
+            expect(subject).to receive(:run_command).with(identify_bin_path + graphics_magick_data[:command]).and_return('')
+            subject.optimize
+          end
+        end
+      end
+
+      context 'with identify found in ENV' do
+        let(:identify_bin_path) { '~/bin/identify' }
+        before { ENV['IDENTIFY_BIN'] = identify_bin_path }
+        after {  ENV['IDENTIFY_BIN'] = nil}
+
+        context 'for ImageMagick' do
+          before { allow(subject).to receive(:which).with('mogrify').and_return('/usr/local/bin/mogrify') }
+
+          it 'detects jpegs' do
+            allow(subject).to receive(:run_command).and_return(image_magick_data[:output])
+            subject.optimize
+            expect(subject.options[:identified_format]).to eq('jpeg')
+          end
+
+          it 'calls the correct identify command' do
+            expect(subject).to receive(:run_command).with(identify_bin_path + image_magick_data[:command]).and_return('')
+            subject.optimize
+          end
+        end
+
+        context 'for GraphicsMagick' do
+          before { allow(subject).to receive(:which).with('mogrify').and_return(nil) }
+
+          it 'detects jpegs' do
+            allow(subject).to receive(:run_command).and_return(graphics_magick_data[:output])
+            subject.optimize
+            expect(subject.options[:identified_format]).to eq('jpeg')
+          end
+
+          it 'calls the correct identify command' do
+            expect(subject).to receive(:run_command).with(identify_bin_path + graphics_magick_data[:command]).and_return('')
+            subject.optimize
+          end
+        end
+      end
+
+      context 'with identify not installed' do
+        it 'warns the user' do
+          allow(subject).to receive(:which).with('identify').and_return(nil)
+          allow(subject).to receive(:identify_bin?).and_return(false)
+          expect(subject).to receive(:warn).with('Attempting to retrieve image format without identify installed.' +
+                                         ' Using file name extension instead...')
+          subject.optimize
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,110 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: image_optimizer
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Julian Tescher
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLakNDQWhLZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE3TVEwd0N3WURWUVFEREFSNWIz
-  VnkKTVJVd0V3WUtDWkltaVpQeUxHUUJHUllGWlcxaGFXd3hFekFSQmdvSmtp
-  YUprL0lzWkFFWkZnTmpiMjB3SGhjTgpNVE13TmpFME1Ua3hNalE0V2hjTk1U
-  UXdOakUwTVRreE1qUTRXakE3TVEwd0N3WURWUVFEREFSNWIzVnlNUlV3CkV3
-  WUtDWkltaVpQeUxHUUJHUllGWlcxaGFXd3hFekFSQmdvSmtpYUprL0lzWkFF
-  WkZnTmpiMjB3Z2dFaU1BMEcKQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dF
-  S0FvSUJBUUM5V2p2SmluV1Y3aDlWZUxsZjQreUh4cjFMRi84LwpISEZDS1lF
-  cy9aclVKTHJwbXVVV1Vya2dwd0liVjVGVXZxa1hvQ2NDdlIyejY1bEFPTlp0
-  ZHZnM3lnQkJYZmw3CnJRYU5iL0VNTXp1bG1mMjZ6dEF0VVAwSXBhejBwWC9x
-  bHpETGtEa2hYeFVCMXJVY3h1WjJSaWYwSHNPdFFPNWQKTXpRZlJFc1lEdFdN
-  aWxlTHhjSW1DeHRvRTVyK3RHMnNiSjcyZ3hQMFF5Z0F3TCtta2UvL0Mwd1BW
-  Q0JDOXpJMgpmd2habVREMmRteXgwSlc4QzBZUiszOGtxdE1sZENjSVFPUFJI
-  NnVlL0pBeWZ4YW9zWXlOTEs1enVVb1cxTVNSCmwxUE1XYjNmRURYcHJibmt1
-  NDk2ZjAyNkZBZ0RuOFRGc1dERncrS2hId1RnSVlBU2Jnb3BZcVdUQWdNQkFB
-  R2oKT1RBM01Ba0dBMVVkRXdRQ01BQXdIUVlEVlIwT0JCWUVGTTBLQ1FMTWlP
-  am5zTDFURXU1SUZGUkNhcjRDTUFzRwpBMVVkRHdRRUF3SUVzREFOQmdrcWhr
-  aUc5dzBCQVFVRkFBT0NBUUVBc2NXMzNxOGcwakxrQUU4alpuSVlqYk8zCmho
-  TnBTeVhPMUptSkVibTVxOXY1ckRxaGo4UlRiZGQxMDB0RndHYzJ0SVZpUjll
-  ZFE4WjcyczlnRUFkVTZONFAKSHBvWWNOT3FFVDhGcXMrbzE2bGJrNzRvbjZH
-  djlTNUxaakJRMVV1SXFEYkVOdVR6b2d4WTI1WXg1ZElHSHlJbwo3cnpvcmY0
-  ZTRLQ05GdzE5Qkc1TTNpamxNdmNpU0d4SVBibUpvYVNhN202MnN1ZEdyM0Ny
-  RXBSZ01aQnZwMUVhCklMYVBpSTFQaFZ1cmZvdjJ5MCtZVDByYk9ydjRjV29C
-  V3NaK2F3dzJpU05DNVhGaEEvOHhzSzBCbHRZUkY5blAKSEE0MVV0RHhySmtI
-  TDNOMXo4Z1BNWFNyRlQ0MUZSMndnazgrbDE0UCs3ZzFVVFBpZDJFSXdmdDJ4
-  T2JGZUE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-12-30 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDdDCCAlygAwIBAgIBATANBgkqhkiG9w0BAQUFADBAMRIwEAYDVQQDDAlqYXRl
+  c2NoZXIxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+  bTAeFw0xNDA5MjkyMTIzNDhaFw0xNTA5MjkyMTIzNDhaMEAxEjAQBgNVBAMMCWph
+  dGVzY2hlcjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
+  Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshN+oQWZWrd06HAk
+  Ym6hJrg3ILAaF/BVUhsiw5Pi1Z8+4UrCY1dQKSkoU8rcpAyKlozbiAyiTgpy3rwG
+  s9K+++4c3Nq3n4U+TrziwdLYR6O6CceA39HYXgo8sdJNQp/dTrN/UJ9i5XjGVsj5
+  EZ/GxVjzFcfaxGhOtRRSxxV8cML2xPO4jdj7s1i2PdD2W8E199pZo6aQGmoViTku
+  AtmDOhJBi3RUUtrYPkC2ts74zdrIiRs4sPnqRAwg88ssWHBAInaqskxe8T9JMGhG
+  DxQEOU1cI2f6WtngbM3Grqz4zsinXaN5UNJug4MIeMw0ufVS2n9x33tl5TQbqEFE
+  R4lgOQIDAQABo3kwdzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU
+  iZKdXYDw8pqTJRPmIgL+1fiLQ2YwHgYDVR0RBBcwFYETamF0ZXNjaGVyQGdtYWls
+  LmNvbTAeBgNVHRIEFzAVgRNqYXRlc2NoZXJAZ21haWwuY29tMA0GCSqGSIb3DQEB
+  BQUAA4IBAQBOhrOaKUTe9WSuIdWMT0EwyKa5nuBGOW+TvbZ722RFb1m/t53JrhZk
+  e9fcuBPqP3OP4Sm1zuJApG54g4MfVRoH4VSVXIME8SCVix2AA40Wo/kuKkpusk9o
+  DI8YB1wuKHvxz5Dp9TqUhW6U0xflFdBIvMxDYW4cBhBCXMNGIORi1vX2IqpMmTB/
+  H1OPGmibxwLAMvjJ9zmMX0JTeNl4vrOMwrqntPCN7wifzRWQQjDpr7FlR35P30jd
+  g//+Q17/DxaA78vyZM5fABBBpCg/ds7axx7I2n/CG+4WzyGUK2Lgn5kF5aRY3Ugh
+  at/y9WkZyjaptzzmD0bwLUxK3brbGZsC
+  -----END CERTIFICATE-----
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.1
 description: A simple image optimizer
@@ -114,20 +109,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gem-public_cert.pem
+- certs/jtescher.pem
 - image_optimizer.gemspec
 - lib/image_optimizer.rb
+- lib/image_optimizer/image_optimizer_base.rb
 - lib/image_optimizer/jpeg_optimizer.rb
 - lib/image_optimizer/png_optimizer.rb
+- lib/image_optimizer/shell.rb
 - lib/image_optimizer/version.rb
 - spec/image_optimizer/jpeg_optimizer_spec.rb
 - spec/image_optimizer/png_optimizer_spec.rb
+- spec/image_optimizer/shell_spec.rb
 - spec/image_optimizer/version_spec.rb
 - spec/image_optimizer_spec.rb
 - spec/spec_helper.rb
@@ -141,23 +139,24 @@ require_paths:
 - lib
 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: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Simply optimize images via jpegoptim or OptiPNG
 test_files:
 - spec/image_optimizer/jpeg_optimizer_spec.rb
 - spec/image_optimizer/png_optimizer_spec.rb
+- spec/image_optimizer/shell_spec.rb
 - spec/image_optimizer/version_spec.rb
 - spec/image_optimizer_spec.rb
 - spec/spec_helper.rb

data/gem-public_cert.pem

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDKjCCAhKgAwIBAgIBADANBgkqhkiG9w0BAQUFADA7MQ0wCwYDVQQDDAR5b3Vy
-MRUwEwYKCZImiZPyLGQBGRYFZW1haWwxEzARBgoJkiaJk/IsZAEZFgNjb20wHhcN
-MTMwNjE0MTkxMjQ4WhcNMTQwNjE0MTkxMjQ4WjA7MQ0wCwYDVQQDDAR5b3VyMRUw
-EwYKCZImiZPyLGQBGRYFZW1haWwxEzARBgoJkiaJk/IsZAEZFgNjb20wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9WjvJinWV7h9VeLlf4+yHxr1LF/8/
-HHFCKYEs/ZrUJLrpmuUWUrkgpwIbV5FUvqkXoCcCvR2z65lAONZtdvg3ygBBXfl7
-rQaNb/EMMzulmf26ztAtUP0Ipaz0pX/qlzDLkDkhXxUB1rUcxuZ2Rif0HsOtQO5d
-MzQfREsYDtWMileLxcImCxtoE5r+tG2sbJ72gxP0QygAwL+mke//C0wPVCBC9zI2
-fwhZmTD2dmyx0JW8C0YR+38kqtMldCcIQOPRH6ue/JAyfxaosYyNLK5zuUoW1MSR
-l1PMWb3fEDXprbnku496f026FAgDn8TFsWDFw+KhHwTgIYASbgopYqWTAgMBAAGj
-OTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFM0KCQLMiOjnsL1TEu5IFFRCar4CMAsG
-A1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAscW33q8g0jLkAE8jZnIYjbO3
-hhNpSyXO1JmJEbm5q9v5rDqhj8RTbdd100tFwGc2tIViR9edQ8Z72s9gEAdU6N4P
-HpoYcNOqET8Fqs+o16lbk74on6Gv9S5LZjBQ1UuIqDbENuTzogxY25Yx5dIGHyIo
-7rzorf4e4KCNFw19BG5M3ijlMvciSGxIPbmJoaSa7m62sudGr3CrEpRgMZBvp1Ea
-ILaPiI1PhVurfov2y0+YT0rbOrv4cWoBWsZ+aww2iSNC5XFhA/8xsK0BltYRF9nP
-HA41UtDxrJkHL3N1z8gPMXSrFT41FR2wgk8+l14P+7g1UTPid2EIwft2xObFeA==
------END CERTIFICATE-----