image_optim 0.11.2 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTcxZTdkMDdlYjUwYTg1MDQ4ODcwYTU0YTk3ODUyNjVjODhkMzFhMw==
+    NDA2NmMyODM2ZTg1ZDUzMTA3NjBjYjIzYWIyZTEwODQyZmRmOGNmMQ==
   data.tar.gz: !binary |-
-    MWExOGIwNzY3NGZhYjE2YTE1YmZkM2U3ODQ0YTQwYzMwMWMwZDdhMw==
+    MWZlMWVhNGE5MzNiOGE0YWZhODMxNWJiNzRkOGU4YTVmN2NlNWU5Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDg3NmY1ZTc2MDhkY2U2MDA2ODI3MzdlZDMzODRhNjM4MGFlZDQ1YTk0YjQw
-    NTdkNzRjNjIxZGFjNGMzYWIwOGYyOWFmOTRmMDc0NWY0ZDU1ZDM5MGQ4ZjI2
-    ODk1M2Y4NTU5NDIzYjhhOGVjZWZjNTc4ZjdlMWI0YjU0MDRjM2M=
+    ZDcyMjNlNDFmNmE3ODQ5ZGEwMmE5MTk0OTc1NDkzY2FmNzY3ZjczMzA2NTEy
+    ZDE2Y2NhODlkMjRiYzVjYTA2OTE2NTUzYzhmODU3YWE0ZWQxMmZjNzk5YTlj
+    Y2JkM2ViYTMzMzVmNjNhMzFhZDQzYjU1ZjNlMWIyODdhYzFhMDE=
   data.tar.gz: !binary |-
-    ODE4MzBjMTU2NjQyODM5MThiMmMzZGNkZDU2ZTdhN2NhNmY5OTljNzIyYWY5
-    ZTNlOWU1NzVhNmVhNDgwODM0YWJjMGZjYWFiMzQxNThiY2U3MzUzNzJiZDhl
-    MmVmMDRjYzYzZGVhN2EwZTBjZmU1NzM2YTJjMzMyZjI3MmQ0M2M=
+    MTBhMzNjMTgzZGU2NTA5NTc3ZTA1OThlODU4Yzk3OGQ3ZDE1ZDM0OTM0MDg5
+    ZGU4ODQwNGMyNjRhZDIwMjU5YzRlMjQ2NzZjM2I1MzhlZTNiYThmMTE5YWVk
+    YzFkYjllN2I1MWEzNTJjOTNjMGMwZDUxZmNkNzBiYTQ3MzQ2YmE=

data/.travis.yml

@@ -5,8 +5,11 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - ruby-head
   - jruby-18mode
   - jruby-19mode
+  - jruby-head
   - ree
 script: bundle exec rspec
 before_install:
@@ -18,3 +21,7 @@ before_install:
   - npm install -g svgo
 env:
   - PATH=pngout-linux/x86_64:$PATH
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/image_optim.gemspec

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

data/lib/image_optim/bin_resolver.rb

@@ -1,23 +1,40 @@
-require 'image_optim/bin_not_found_error'
 require 'thread'
 require 'fspath'
 
 class ImageOptim
+  class BinNotFoundError < StandardError; end
+  class BadBinVersion < StandardError; end
+
   class BinResolver
+    class Bin
+      attr_reader :name, :version
+      def initialize(name, version)
+        @name, @version = name, version
+      end
+
+      def to_s
+        "#{@name} #{@version || '-'}"
+      end
+    end
+
     attr_reader :dir
     def initialize
       @bins = {}
       @lock = Mutex.new
     end
 
-    def resolve!(bin)
-      bin = bin.to_sym
-      unless @bins.include?(bin)
-        @lock.synchronize do
-          @bins[bin] = resolve?(bin) unless @bins.include?(bin)
-        end
+    def resolve!(name)
+      name = name.to_sym
+
+      resolving(name) do
+        @bins[name] = resolve?(name) && Bin.new(name, version(name))
+      end
+
+      if @bins[name]
+        check!(@bins[name])
+      else
+        raise BinNotFoundError, "`#{name}` not found"
       end
-      @bins[bin] or raise BinNotFoundError, "`#{bin}` not found"
     end
 
     VENDOR_PATH = File.expand_path('../../../vendor', __FILE__)
@@ -28,20 +45,62 @@ class ImageOptim
 
   private
 
-    def resolve?(bin)
-      if path = ENV["#{bin}_bin".upcase]
+    def resolving(name)
+      unless @bins.include?(name)
+        @lock.synchronize do
+          unless @bins.include?(name)
+            yield
+          end
+        end
+      end
+    end
+
+    def resolve?(name)
+      if path = ENV["#{name}_bin".upcase]
         unless @dir
           @dir = FSPath.temp_dir
           at_exit{ FileUtils.remove_entry_secure @dir }
         end
-        symlink = @dir / bin
+        symlink = @dir / name
         symlink.make_symlink(File.expand_path(path))
       end
-      accessible?(bin)
+      accessible?(name)
+    end
+
+    def accessible?(name)
+      capture_output("which #{name.to_s.shellescape}") != ''
+    end
+
+    def version(name)
+      case name.to_sym
+      when :advpng, :gifsicle, :jpegoptim, :optipng
+        capture_output("#{name} --version")[/\d+(\.\d+){1,}/]
+      when :svgo
+        capture_output("#{name} --version 2>&1")[/\d+(\.\d+){1,}/]
+      when :jhead
+        capture_output("#{name} -V")[/\d+(\.\d+){1,}/]
+      when :jpegtran
+        capture_output("#{name} -v - 2>&1")[/version (\d+\S*)/, 1]
+      when :pngcrush
+        capture_output("#{name} -version 2>&1")[/\d+(\.\d+){1,}/]
+      when :pngout
+        date_str = capture_output("#{name} 2>&1")[/[A-Z][a-z]{2} (?: |\d)\d \d{4}/]
+        Date.parse(date_str).strftime('%Y%m%d')
+      end
+    end
+
+    def check!(bin)
+      case bin.name
+      when :pngcrush
+        case bin.version
+        when '1.7.60'..'1.7.65'
+          raise BadBinVersion, "`#{bin}` is known to produce broken pngs"
+        end
+      end
     end
 
-    def accessible?(bin)
-      `env PATH=#{env_path.shellescape} which #{bin.to_s.shellescape}` != ''
+    def capture_output(command)
+      `env PATH=#{env_path.shellescape} #{command}`
     end
   end
 end

data/spec/image_optim/bin_resolver_spec.rb

@@ -17,7 +17,7 @@ describe ImageOptim::BinResolver do
       FSPath.should_not_receive(:temp_dir)
 
       5.times do
-        resolver.resolve!(:ls).should be_true
+        resolver.resolve!(:ls)
       end
       resolver.env_path.should == "#{ENV['PATH']}:#{ImageOptim::BinResolver::VENDOR_PATH}"
     end
@@ -41,7 +41,7 @@ describe ImageOptim::BinResolver do
       end
 
       5.times do
-        resolver.resolve!(:image_optim).should be_true
+        resolver.resolve!(:image_optim)
       end
       resolver.env_path.should == "#{tmpdir.to_str}:#{ENV['PATH']}:#{ImageOptim::BinResolver::VENDOR_PATH}"
 
@@ -93,4 +93,33 @@ describe ImageOptim::BinResolver do
       at_exit_blocks.each(&:call)
     end
   end
+
+  it "should resolve bin only once" do
+    with_env 'LS_BIN', nil do
+      resolver = ImageOptim::BinResolver.new
+      resolver.should_receive(:resolve?).once.with(:ls){ sleep 0.1; true }
+
+      10.times.map do
+        Thread.new do
+          resolver.resolve!(:ls)
+        end
+      end.each(&:join)
+    end
+  end
+
+  it "should raise on detection of problematic version" do
+    with_env 'PNGCRUSH_BIN', nil do
+      resolver = ImageOptim::BinResolver.new
+      resolver.should_receive(:accessible?).with(:pngcrush).once.and_return(true)
+      resolver.should_receive(:version).with(:pngcrush).once.and_return('1.7.60')
+      FSPath.should_not_receive(:temp_dir)
+
+      5.times do
+        expect do
+          resolver.resolve!(:pngcrush)
+        end.to raise_error ImageOptim::BadBinVersion
+      end
+      resolver.env_path.should == "#{ENV['PATH']}:#{ImageOptim::BinResolver::VENDOR_PATH}"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -109,7 +109,6 @@ files:
 - bin/image_optim
 - image_optim.gemspec
 - lib/image_optim.rb
-- lib/image_optim/bin_not_found_error.rb
 - lib/image_optim/bin_resolver.rb
 - lib/image_optim/config.rb
 - lib/image_optim/configuration_error.rb

data/lib/image_optim/bin_not_found_error.rb

@@ -1,3 +0,0 @@
-class ImageOptim
-  class BinNotFoundError < StandardError; end
-end