image_optim_pack 0.6.0.20200215 → 0.7.0.20210511

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 199d6670167aa384cdb70f274ee427fc1c3252ea3e9c11e766ce52ea8c2c86ce
-  data.tar.gz: b2103b00476aefb1f78f07cf03639caeed6e5e5ea3e2d5b4d96fa2b33bf1c9d5
+  metadata.gz: 7852ea59f176e968548022056385c61b560834f049a0a8b073add0a54d9b2e96
+  data.tar.gz: 572a8d7816118f8d31faf52582972ab5f3fa554388a49436803c1d95252f6722
 SHA512:
-  metadata.gz: 8b727e43a28f046850a008007b33ca4d5217101670a165338267ebe883fe9a93e09a4dc6212c7eda49bfb2830846712f08574891a9056f27caf91d6cc153a8ea
-  data.tar.gz: fed59a0dd80aaa64257b156dcd9b76625f3847c58e2cd3235892537c4e040d252e51400cb50ffe73cdbb52b85db4b8aacb2b02db5a7d34b4ba3d5238f18db7a5
+  metadata.gz: 26800ec1838e187ed6a24db054c21d3a8f0d32660cff9e3b325382e58da3cf6c411dbc4a9364b32dd5cea81108a1e0e9efd13349d5b42c3202f174860550d839
+  data.tar.gz: eed2a1cb3ad85466a57b9a8db63e6ea764cd872b8c979cc1cbadfc8b7708d9ff254b8763bb17f148ee8e56f8ccae32a5c9eaa04a4f83dc5263c1aae8b524b1bd

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
     - 'build/**/*'
     - 'download/**/*'
     - Vagrantfile
+  NewCops: enable
 
 Bundler/OrderedGems:
   Enabled: false
@@ -17,6 +18,9 @@ Layout/DotPosition:
 Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
+Layout/LineLength:
+  Max: 120
+
 Layout/RescueEnsureAlignment:
   Enabled: false
 
@@ -30,9 +34,6 @@ Metrics/BlockLength:
   Exclude:
     - spec/**/*_spec.rb
 
-Metrics/LineLength:
-  Max: 120
-
 Metrics/MethodLength:
   Max: 15
 
@@ -40,6 +41,9 @@ Security/YAMLLoad:
   Exclude:
     - script/livecheck
 
+Style/AccessorGrouping:
+  Enabled: false
+
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
@@ -52,15 +56,30 @@ Style/EmptyCaseCondition:
 Style/FormatStringToken:
   Enabled: false
 
+Style/HashConversion:
+  Enabled: false
+
+Style/HashEachMethods:
+  Enabled: true
+
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
+Style/HashTransformKeys:
+  Enabled: false
+
+Style/HashTransformValues:
+  Enabled: false
+
 Style/IfUnlessModifier:
   Enabled: false
 
 Style/MultilineBlockChain:
   Enabled: false
 
+Style/RedundantArgument:
+  Enabled: false
+
 Style/Semicolon:
   AllowAsExpressionSeparator: true
 

data/.travis.yml

@@ -1,26 +1,25 @@
-sudo: false
-dist: trusty
+dist: xenial
 language: ruby
 rvm:
-  - '1.8.7-p374'
   - '1.9.3-p551'
   - '2.0.0-p648'
   - '2.1.10'
   - '2.2.10'
   - '2.3.8'
-  - '2.4.9'
-  - '2.5.7'
-  - '2.6.5'
-  - '2.7.0'
-  - 'jruby-9.1.17.0'
-  - 'jruby-9.2.7.0'
+  - '2.4.10'
+  - '2.5.9'
+  - '2.6.7'
+  - '2.7.3'
+  - '3.0.1'
+  - 'jruby-9.2.14.0'
 script:
   - make test
   - bundle exec image_optim --info
   - bundle exec rspec
 before_install:
+  - 'echo "gem: --no-ri --no-rdoc --no-document" > ~/.gemrc'
   - gem install rubygems-update || gem install rubygems-update --version '< 3'
-  - gem update --system
+  - update_rubygems
   - gem install bundler || gem install bundler --version '< 2'
   - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install imagemagick; fi; which convert
   - make ldd-version
@@ -28,13 +27,15 @@ matrix:
   include:
     - os: osx
       rvm: default
-      osx_image: xcode10.1
+      osx_image: xcode11.3
     - os: osx
       rvm: default
-      osx_image: xcode11.2
-    - env: RUBOCOP=✓
-      rvm: '2.6.5'
+      osx_image: xcode12.2
+    - env: RUBOCOP=1
+      rvm: '2.6.7'
       script: bundle exec rubocop
-    - env: CHECK_RUBIES=✓
-      rvm: '2.6.5'
+    - env: CHECK_RUBIES=1
+      rvm: '2.6.7'
       script: bundle exec travis_check_rubies
+  allow_failures:
+    - rvm: 'jruby-9.2.14.0'

data/CHANGELOG.markdown

@@ -2,6 +2,31 @@
 
 ## unreleased
 
+## v0.7.0.20210511 (2021-05-11)
+
+* pngquant 2.15.0 [@toy](https://github.com/toy)
+
+## v0.7.0.20210430 (2021-04-30)
+
+* pngquant 2.14.1 [@toy](https://github.com/toy)
+* libmozjpeg 4.0.3 [@toy](https://github.com/toy)
+
+## v0.7.0.20210206 (2021-02-06)
+
+* libmozjpeg 4.0.2 [@toy](https://github.com/toy)
+
+## v0.7.0 (2020-12-05)
+
+* libmozjpeg 4.0.0 [@toy](https://github.com/toy)
+* Set darwin deployment target to 10.9 [@toy](https://github.com/toy)
+* Remove 32 bit (i386) binaries/platform on darwin [@toy](https://github.com/toy)
+* Switch to centos 7 for linux builds as 6.9 is outdated [@toy](https://github.com/toy)
+* pngquant 2.13.1 [@toy](https://github.com/toy)
+
+## v0.6.0.20201024 (2020-10-24)
+
+* pngquant 2.13.0 [@toy](https://github.com/toy)
+
 ## v0.6.0.20200215 (2020-02-15)
 
 * jpegarchive 2.2.0 and libmozjpeg 3.3.1 [@toy](https://github.com/toy)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2020 Ivan Kuchin
+Copyright (c) 2014-2021 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Makefile

@@ -8,12 +8,12 @@ JHEAD_VER := 3.04
 JPEGARCHIVE_VER := 2.2.0
 JPEGOPTIM_VER := 1.4.6
 LIBJPEG_VER := 9d
-LIBMOZJPEG_VER := 3.3.1
+LIBMOZJPEG_VER := 4.0.3
 LIBPNG_VER := 1.6.37
 LIBZ_VER := 1.2.11
 OPTIPNG_VER := 0.7.7
 PNGCRUSH_VER := 1.8.13
-PNGQUANT_VER := 2.12.5
+PNGQUANT_VER := 2.15.0
 
 # ====== CHECKSUMS ======
 
@@ -327,7 +327,7 @@ export CPPFLAGS = $(GCC_FLAGS)
 export LDFLAGS = $(GCC_FLAGS)
 
 ifdef IS_DARWIN
-export MACOSX_DEPLOYMENT_TARGET := 10.7
+export MACOSX_DEPLOYMENT_TARGET := 10.9
 GCC_FLAGS += -arch $(ARCH)
 CXXFLAGS += -stdlib=libc++
 endif
@@ -388,11 +388,8 @@ endif
 
 ## libmozjpeg
 $(LIBMOZJPEG_TARGET) :
-	cd $(DIR) && autoreconf -fiv
-	cd $(DIR) && ./configure --host $(HOST)
-	cd $(DIR)/simd && $(MAKE)
-	cd $(DIR) && $(MAKE) libjpeg.la
-	cd $(DIR) && $(ln_s) .libs/libjpeg.a .
+	cd $(DIR) && cmake -DPNG_SUPPORTED=0 .
+	cd $(DIR) && $(MAKE) jpeg-static
 
 ## libpng
 $(eval $(call depend,LIBPNG,LIBZ))

data/README.markdown

@@ -8,7 +8,7 @@
 
 Precompiled binaries for [`image_optim`](https://github.com/toy/image_optim).
 
-Contains binaries for Mac OS X (>= 10.7, i386 and x86\_64) and Linux (i686 and x86\_64).
+Contains binaries for Mac OS X (>= 10.9, x86\_64) and Linux (i686 and x86\_64).
 
 A test application with latest `image_optim` and `image_optim_pack` is available on heroku: https://iopack.herokuapp.com/.
 
@@ -92,4 +92,4 @@ make clobber # `clean-all` and remove download directory
 
 ## Copyright
 
-Copyright (c) 2014-2020 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2014-2021 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/Vagrantfile

@@ -28,9 +28,9 @@ Vagrant.configure('2') do |config|
           set -ex
           if command -v apt-get; then
             apt-get update
-            apt-get -y install rsync ntpdate make wget gcc g++ chrpath perl pkg-config autoconf automake libtool nasm
+            apt-get -y install rsync ntpdate make wget gcc g++ chrpath perl pkg-config autoconf automake libtool nasm cmake
           else
-            yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm
+            yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm cmake
           fi
         SH
       end

data/boxes/.rubocop.yml

@@ -1,13 +1,10 @@
 inherit_from: ../.rubocop.yml
 
-Lint/RedundantSplatExpansion:
+Layout/LineLength:
   Enabled: false
 
-Metrics/LineLength:
+Lint/RedundantSplatExpansion:
   Enabled: false
 
 Security/Eval:
   Exclude: [Rakefile]
-
-Style/BracesAroundHashParameters:
-  Enabled: false

data/boxes/Rakefile

@@ -37,9 +37,7 @@ class Box # :nodoc:
 private
 
   def definition
-    @definition ||= begin
-      eval definition_path.read.sub('Veewee::Session.declare', '{}.merge')
-    end
+    @definition ||= eval definition_path.read.sub('Veewee::Session.declare', '{}.merge')
   end
 
   def assert_box_created

data/boxes/definitions/centos-amd64/definition.rb

@@ -7,9 +7,9 @@ Veewee::Session.declare({
   :disk_format => 'VDI',
   :hostiocache => 'off',
   :os_type_id => 'RedHat6_64',
-  :iso_file => 'CentOS-6.9-x86_64-minimal.iso',
-  :iso_src => 'http://artfiles.org/centos.org/6.9/isos/x86_64/CentOS-6.9-x86_64-minimal.iso',
-  :iso_sha256 => '422af57b493b8af49d485885a730c5a1d955f803fac85aa51311c393168b9080',
+  :iso_file => 'CentOS-7-x86_64-Minimal-2009.iso',
+  :iso_src => 'http://linux.darkpenguin.net/distros/CentOS/7.9.2009/isos/x86_64/CentOS-7-x86_64-Minimal-2009.iso',
+  :iso_sha256 => '07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a',
   :iso_download_timeout => '1000',
   :boot_wait => '10',
   :boot_cmd_sequence => [

data/boxes/definitions/centos-i386/definition.rb

@@ -7,9 +7,9 @@ Veewee::Session.declare({
   :disk_format => 'VDI',
   :hostiocache => 'off',
   :os_type_id => 'RedHat',
-  :iso_file => 'CentOS-6.9-i386-minimal.iso',
-  :iso_src => 'http://artfiles.org/centos.org/6.9/isos/i386/CentOS-6.9-i386-minimal.iso',
-  :iso_sha256 => 'e104b3bc2261e40c020e4047d31a4454a00435787c54fb0a376261f9348382b7',
+  :iso_file => 'CentOS-7-i386-Minimal-2009.iso',
+  :iso_src => 'http://linux.darkpenguin.net/distros/CentOS-AltArch/7.9.2009/isos/i386/CentOS-7-i386-Minimal-2009.iso',
+  :iso_sha256 => 'bcbde5d345c5013fa618c38380765547be01a354883b3055f32d7067dd7b5bca',
   :iso_download_timeout => '1000',
   :boot_wait => '10',
   :boot_cmd_sequence => [

data/boxes/definitions/centos-postinstall.sh

@@ -25,9 +25,5 @@ chown -R vagrant /home/vagrant/.ssh
 
 yum -y clean all
 
-# Remove traces of mac address from network configuration
-sed -i /HWADDR/d /etc/sysconfig/network-scripts/ifcfg-eth0
-rm /etc/udev/rules.d/70-persistent-net.rules
-
 # Zero out the free space to save space in the final image
 dd if=/dev/zero of=/filler bs=1M || rm /filler

data/checksums.mk

@@ -4,9 +4,9 @@ JHEAD_SHA256 := ef89bbcf4f6c25ed88088cf242a47a6aedfff4f08cc7dc205bf3e2c0f10a03c9
 JPEGARCHIVE_SHA256 := 3da16a5abbddd925dee0379aa51d9fe0cba33da0b5703be27c13a2dda3d7ed75
 JPEGOPTIM_SHA256 := 88b1eb64c2a33a2f013f068df8b0331f42c019267401ae3fa28e3277403a5ab7
 LIBJPEG_SHA256 := 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32
-LIBMOZJPEG_SHA256 := aebbea60ea038a84a2d1ed3de38fdbca34027e2e54ee2b7d08a97578be72599d
+LIBMOZJPEG_SHA256 := 4f22731db2afa14531a5bf2633d8af79ca5cb697a550f678bf43f24e5e409ef0
 LIBPNG_SHA256 := daeb2620d829575513e35fecc83f0d3791a620b9b93d800b763542ece9390fb4
 LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 OPTIPNG_SHA256 := 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
 PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be
-PNGQUANT_SHA256 := 3638936cf6270eeeaabcee42e10768d78e4dc07cac9310307835c1f58b140808
+PNGQUANT_SHA256 := c5051b9eb3de5acd1ee3b5b4cc87036b25289277fcef8f293a35f84da71e5a04

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.6.0.20200215'
+  s.version     = '0.7.0.20210511'
   s.summary     = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, pngcrush, pngquant}
   s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -54,7 +54,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'fspath', '>= 2.1', '< 4'
 
   s.add_development_dependency 'rspec', '~> 3.0'
-  if RUBY_VERSION >= '2.2'
-    s.add_development_dependency 'rubocop', '~> 0.59', '!= 0.78.0'
+  if RUBY_VERSION >= '2.4'
+    s.add_development_dependency 'rubocop', '~> 1.0'
+    s.add_development_dependency 'rubocop-rspec', '~> 2.0'
   end
 end

data/script/livecheck

@@ -72,11 +72,7 @@ class Livecheck
     def changelog_entry
       github_user = `git config github.user`.strip
       changed = livechecks.select(&:changed?)
-      %W[
-        *
-        #{to_sentence(changed.map(&:name_n_latest_version))}
-        [@#{github_user}](https://github.com/#{github_user})
-      ].join(' ') + "\n"
+      "* #{to_sentence(changed.map(&:name_n_latest_version))} [@#{github_user}](https://github.com/#{github_user})\n"
     end
 
     def to_sentence(array)

data/script/run

@@ -29,7 +29,7 @@ if [[ $(uname -s) != 'Darwin' ]]; then
   exit 1
 fi
 
-for arch in i386 x86_64; do
+for arch in x86_64; do
   platform="darwin-$arch"
   passes-filter "$platform" || continue
   header "$platform"

data/spec/image_optim_spec.rb

@@ -15,10 +15,11 @@ describe ImageOptim do
   images_dir = FSPath.new(image_optim_root) / 'spec/images'
   test_images = images_dir.glob('**/*.*')
 
-  isolated_options_base = {:skip_missing_workers => false}
-  ImageOptim::Worker.klasses.each do |klass|
-    isolated_options_base[klass.bin_sym] = false
-  end
+  isolated_options_base = Hash[
+    ImageOptim::Worker.klasses.map do |klass|
+      [klass.bin_sym, false]
+    end
+  ].merge(:skip_missing_workers => false)
 
   ImageOptim::Worker.klasses.each do |worker_klass|
     next if [:pngout, :svgo].include?(worker_klass.bin_sym)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.6.0.20200215
+  version: 0.7.0.20210511
 platform: ruby
 authors:
 - Ivan Kuchin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -64,22 +64,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.59'
-    - - "!="
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.78.0
-description: 
-email: 
+        version: '2.0'
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -126,7 +134,6 @@ files:
 - boxes/definitions/centos-i386/ks.cfg
 - boxes/definitions/centos-postinstall.sh
 - checksums.mk
-- image_optim_pack-darwin-x86.gemspec
 - image_optim_pack-darwin-x86_64.gemspec
 - image_optim_pack-linux-x86.gemspec
 - image_optim_pack-linux-x86_64.gemspec
@@ -139,18 +146,6 @@ files:
 - spec/image_optim/pack_spec.rb
 - spec/image_optim_spec.rb
 - spec/spec_helper.rb
-- vendor/darwin-i386/advpng
-- vendor/darwin-i386/gifsicle
-- vendor/darwin-i386/jhead
-- vendor/darwin-i386/jpeg-recompress
-- vendor/darwin-i386/jpegoptim
-- vendor/darwin-i386/jpegtran
-- vendor/darwin-i386/libjpeg.dylib
-- vendor/darwin-i386/libpng.dylib
-- vendor/darwin-i386/libz.dylib
-- vendor/darwin-i386/optipng
-- vendor/darwin-i386/pngcrush
-- vendor/darwin-i386/pngquant
 - vendor/darwin-x86_64/advpng
 - vendor/darwin-x86_64/gifsicle
 - vendor/darwin-x86_64/jhead
@@ -193,9 +188,9 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/toy/image_optim_pack/issues
   changelog_uri: https://github.com/toy/image_optim_pack/blob/master/CHANGELOG.markdown
-  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.6.0.20200215
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.7.0.20210511
   source_code_uri: https://github.com/toy/image_optim_pack
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -210,8 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,
   jpegoptim, jpegtran, optipng, pngcrush, pngquant'

data/image_optim_pack-darwin-x86.gemspec

@@ -1,3 +0,0 @@
-# encoding: UTF-8
-
-eval "gemspec_path = #{__FILE__.inspect}; #{File.read('image_optim_pack.gemspec')}"