image_optim_pack 0.2.1.20160510 → 0.2.1.20160610

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDE3ZDdlMTg2OGJmZTI0Y2E2ODc5Y2Q2OTRmZWY4NmJhNjA2MDY0ZA==
+    NjI1NTMyNzkyNmU0NjYzNTkzNzBlYmNhNGFkNjU2M2Y5YzFkYWNhOQ==
   data.tar.gz: !binary |-
-    ZDFhMTFhMjBmYzNiMDVjMDgxMTQ2MGRhNzI1OTI5OTE2ZGU4YjJkOA==
+    NmQ2OGI1MWZjYmE0MWYxMmI5MTdkYWFjMzcwNmU3NDY4MDRlY2I4Nw==
 SHA512:
   metadata.gz: !binary |-
-    YTIyZWEzZTk3NjUzNWQ5ZjUwMDlmYWFmNjgwN2U4NzlmZmRlMGU3MjQ5ZDlj
-    NjU0M2FjY2E2YjM4ODViNDhiZDY4YTE2MGI5YWU5M2E4NWEyOWE3OGQ3OTk1
-    NDRiOTdkMDZiMWFmNWNjNTBlN2QyMGFhNzIwOGZlOWNmOTIwY2I=
+    NWM0ZTA1YzNlNTZmYzU0OWNmNDQxNzViOWEzOWM3ZTZiZTZkNGY0NjQ2ZDgz
+    M2FlMTYyMzVmNDE1NWU0MDM4ZDY1NDYwYmZjOGFiYjg0NzVkNzcwYjhlMTg5
+    NmNmOGE3NDM3YWZmYmVmY2Y2ZmVmMDM1MGUyNDI1MzUwYmZiNWI=
   data.tar.gz: !binary |-
-    ZjI0ZmI4M2I1NzJjMmU2NjM1NjlkZDBkNDE1ZjE1Njk5ZTg1NWIzNTU4YmI4
-    YmY4NGNmNTc2MWY5NDcxZDA4N2Q5ZTJmMmY5OTBiMzYzZTU0MDdlMDQ1MGYz
-    MjEzNjFmNTQ1MGIzM2Y0NGY2MTc2YjRjMjE2NWJiNTQ5MGIzOWM=
+    ZDlhMmM1MjUyMjUzYThkNGZiZGNhNjlhYThmNTJiNzM2OTZjODI4YjVmN2Vi
+    YTI1ODYyYTIyYmM2MDAzNzRkNDBkMWM2MzM2NDRjZTliOGIzYTZjNTVhODY4
+    ZTNhNDA0YmU5NGMzYzk1ZThjYTU2NDAxNzNhZThmNTJmZGQwOTk=

data/.travis.yml

@@ -17,8 +17,12 @@ script:
   ; else
     bundle exec rubocop
   ; fi
+before_install:
+  if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install imagemagick; fi
 matrix:
   fast_finish: true
   include:
+    - os: osx
+      rvm: default
     - env: RUBOCOP=true
       rvm: default

data/Makefile

@@ -9,11 +9,11 @@ JPEGARCHIVE_VER := 2.1.1
 JPEGOPTIM_VER := 1.4.3
 LIBJPEG_VER := 9b
 LIBMOZJPEG_VER := 3.1
-LIBPNG_VER := 1.6.21
+LIBPNG_VER := 1.6.23
 LIBZ_VER := 1.2.8
 OPTIPNG_VER := 0.7.6
 PNGCRUSH_VER := 1.8.1
-PNGQUANT_VER := 2.7.0
+PNGQUANT_VER := 2.7.1
 
 # ====== CONSTANTS ======
 

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.2.1.20160510'
+  s.version     = '0.2.1.20160610'
   s.summary     = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, pngcrush, pngquant}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/spec/image_optim_spec.rb

@@ -5,106 +5,36 @@ require 'tempfile'
 require 'English'
 
 describe ImageOptim do
-  def self.temp_copy(image)
-    image.temp_path.tap{ |path| image.copy(path) }
-  end
-
   before do
     stub_const('Cmd', ImageOptim::Cmd)
   end
 
-  def flatten_animation(image)
-    if image.format == :gif
-      flattened = image.temp_path
-      flatten_command = %W[
-        convert
-        #{image.to_s.shellescape}
-        -coalesce
-        -append
-        #{flattened.to_s.shellescape}
-      ].join(' ')
-      expect(Cmd.run(flatten_command)).to be_truthy
-      flattened
-    else
-      image
-    end
-  end
-
-  def nrmse(image_a, image_b)
-    coalesce_a = flatten_animation(image_a)
-    coalesce_b = flatten_animation(image_b)
-    nrmse_command = %W[
-      compare
-      -metric RMSE
-      -alpha Background
-      #{coalesce_a.to_s.shellescape}
-      #{coalesce_b.to_s.shellescape}
-      /dev/null
-      2>&1
-    ].join(' ')
-    output = Cmd.capture(nrmse_command)
-    if [0, 1].include?($CHILD_STATUS.exitstatus)
-      output[/\((\d+(\.\d+)?)\)/, 1].to_f
-    else
-      fail "compare #{image_a} with #{image_b} failed with `#{output}`"
-    end
-  end
-
-  define :have_same_data_as do |expected|
-    match{ |actual| actual.binread == expected.binread }
-  end
-
-  define :have_size do
-    match(&:size?)
-  end
-
-  define :be_smaller_than do |expected|
-    match{ |actual| actual.size < expected.size }
-  end
-
-  define :be_pixel_identical_to do |expected|
-    match do |actual|
-      @diff = nrmse(actual, expected)
-      @diff == 0
-    end
-    failure_message do |actual|
-      "expected #{actual} to be pixel identical to #{expected}, got "\
-          "normalized root-mean-square error of #{@diff}"
-    end
-  end
-
-  image_optim = ImageOptim.new
-
   # grab images from image_optim gem
   image_optim_root = Gem.loaded_specs['image_optim'].gem_dir
-  images_dir = ImageOptim::ImagePath.new(image_optim_root) / 'spec/images'
+  images_dir = FSPath.new(image_optim_root) / 'spec/images'
   test_images = images_dir.glob('**/*.*')
 
-  # select images which for which there are workers
-  test_images = test_images.select do |image|
-    image_optim.workers_for_image(image)
+  isolated_options_base = {:skip_missing_workers => false}
+  ImageOptim::Worker.klasses.each do |klass|
+    isolated_options_base[klass.bin_sym] = false
   end
 
-  rotated = images_dir / 'orient/original.jpg'
-  rotate_images = images_dir.glob('orient/?.jpg')
-
-  copies = test_images.map{ |image| temp_copy(image) }
-  original_by_copy = Hash[copies.zip(test_images)]
-
-  image_optim.optimize_images(copies) do |copy, optimized|
-    fail 'expected copy to not be nil' if copy.nil?
-    original = original_by_copy[copy]
+  ImageOptim::Worker.klasses.each do |worker_klass|
+    next if [:pngout, :svgo].include?(worker_klass.bin_sym)
 
-    it "optimizes #{original}" do
-      expect(copy).to have_same_data_as(original)
+    describe "#{worker_klass.bin_sym} worker" do
+      it 'optimizes at least one test image' do
+        options = isolated_options_base.merge(worker_klass.bin_sym => true)
 
-      expect(optimized).not_to be_nil
-      expect(optimized).to have_size
-      expect(optimized).to be_smaller_than(original)
-      expect(optimized).not_to have_same_data_as(original)
+        image_optim = ImageOptim.new(options)
+        if Array(worker_klass.init(image_optim)).empty?
+          image_optim = ImageOptim.new(options.merge(:allow_lossy => true))
+        end
 
-      compare_to = rotate_images.include?(original) ? rotated : original
-      expect(optimized).to be_pixel_identical_to(compare_to)
+        expect(test_images.any? do |original|
+          image_optim.optimize_image(original)
+        end).to be true
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+RSpec.configure do |c|
+  c.before do
+    stub_const('ImageOptim::Config::GLOBAL_PATH', '/dev/null')
+    stub_const('ImageOptim::Config::LOCAL_PATH', '/dev/null')
+  end
+
+  c.order = :random
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.2.1.20160510
+  version: 0.2.1.20160610
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: image_optim_pack
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: ! 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,