image_optim_pack 0.9.0 → 0.9.1.20220909

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 485671ab97a671783e2c82e97e314d6357cdf876aed8a7204544a4b99b941027
-  data.tar.gz: 87ae97230127d09301cad73baa7321b21f553c9ed2b1a34642ad4715a6896bce
+  metadata.gz: 6678a68fb1c5e9393eba2e330d1c495097a653e344a4341f8adc3bf360d206b5
+  data.tar.gz: fca55b35342e9cf78af18caf15aea9f2c0a42fe734f8f200743b0bd010294bef
 SHA512:
-  metadata.gz: 21083f41e2bb802f5664e55ee7a1c2d0ee47e449b9ca608efb1fe9873a23974eefb719d30429d2b200b0d221bd9d329999589ead24e16f9ef074c9cc7b52bbb1
-  data.tar.gz: 215fda23456e52270e8d1a89cd0715a858792f4ccd0b37ca630efa9ea36181b86c45c133b83ab3be6afaf8ddc9b2c05d25a5f88b0056dace727347ed970402b7
+  metadata.gz: '068383b0f675a9bdee639c8bc392a728b084b71939d0b42a1218589952236d187a2b9a3012c058f497e1a882f39126023baa69b46d93e5988f893d433a6daa00'
+  data.tar.gz: eef9b2b05a721c3b19837335e08dc9c964eb96ffc9a8ddb7253054e23721542fa88b709ec3d085cb231dbdadb722e3268dc0724bea054ac447577cd3d7c92fd4

data/.github/workflows/livecheck.yml

@@ -0,0 +1,38 @@
+name: livecheck
+on:
+  schedule:
+  - cron: 34 5 * * *
+  workflow_dispatch:
+    inputs:
+      retry:
+        description: 'Retry attempt'
+        required: true
+        type: number
+jobs:
+  livecheck:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.1'
+        bundler-cache: true
+    - run: |
+        bundle exec script/livecheck || if (( $? == 1 )); then
+          exit 1
+        else
+          echo '::set-output name=RETRY::1'
+        fi
+      id: livecheck
+    - if: ${{ steps.livecheck.outputs.RETRY }}
+      env:
+        RETRY: ${{ inputs.retry }}
+        RETRIES: 10
+        GITHUB_TOKEN: ${{ secrets.RETRY_TOKEN }}
+      run: |
+        if (( ${RETRY:-0} < $RETRIES )); then
+          sleep 300
+          gh workflow run livecheck --repo $GITHUB_REPOSITORY --ref $GITHUB_REF_NAME -f retry=$(( $RETRY + 1 ))
+        else
+          exit 1
+        fi

data/.rubocop.yml

@@ -64,6 +64,8 @@ Style/HashEachMethods:
   Enabled: true
 
 Style/HashSyntax:
+  Exclude:
+    - script/livecheck
   EnforcedStyle: hash_rockets
 
 Style/HashTransformKeys:

data/CHANGELOG.markdown

@@ -2,6 +2,18 @@
 
 ## unreleased
 
+## v0.9.1.20220909 (2022-09-09)
+
+* oxipng 6.0.1 [@toy](https://github.com/toy)
+
+## v0.9.1.20220907 (2022-09-07)
+
+* oxipng 6.0.0 [@toy](https://github.com/toy)
+
+## v0.9.1 (2022-08-29)
+
+* libmozjpeg 4.1.1, updrade 32 bit ubuntu to bionic [@toy](https://github.com/toy)
+
 ## v0.9.0 (2022-06-11)
 
 * Add [pngout](http://advsys.net/ken/utils.htm) (since January 2021 license allows redistrubition for freely distributed non-commercial projects) [#24](https://github.com/toy/image_optim_pack/issues/24) [@toy](https://github.com/toy)

data/Makefile

@@ -9,11 +9,11 @@ JPEGARCHIVE_VER := 2.2.0
 JPEGOPTIM_VER := 1.4.7
 LIBJPEG_VER := 9e
 LIBLCMS_VER := 2.13
-LIBMOZJPEG_VER := 4.0.3
+LIBMOZJPEG_VER := 4.1.1
 LIBPNG_VER := 1.6.37
 LIBZ_VER := 1.2.11
 OPTIPNG_VER := 0.7.7
-OXIPNG_VER := 5.0.1
+OXIPNG_VER := 6.0.1
 PNGCRUSH_VER := 1.8.13
 PNGOUT_VER := 20200115
 PNGOUT_LINUX_VER := $(PNGOUT_VER)
@@ -206,21 +206,21 @@ ldd-version :; $(ldd) --version
 
 define check_exists
 	@test -f $(OUTPUT_DIR)/$1 || \
-		{ printf "$1: $(ANSI_RED)not found$(ANSI_RESET)\n"; exit 1; }
+		{ printf "%s: $(ANSI_RED)not found$(ANSI_RESET)\n" "$1"; exit 1; }
 endef
 
 define check_version
 	@$(OUTPUT_DIR)/$1 $2 | fgrep -q "$3" || \
-		{ printf "$1: $(ANSI_RED)Expected $3, got $$($(OUTPUT_DIR)/$1 $2)$(ANSI_RESET)\n"; exit 1; }
+		{ printf "%s: $(ANSI_RED)Expected %s, got %s$(ANSI_RESET)\n" "$1" "$3" "$$($(OUTPUT_DIR)/$1 $2)"; exit 1; }
 endef
 
 define check_arch
 	@file -b $(OUTPUT_DIR)/$1 | fgrep -q '$(ARCH_STRING)' || \
-		{ printf "$1: $(ANSI_RED)Expected $(ARCH_STRING), got $$(file -b $(OUTPUT_DIR)/$1)$(ANSI_RESET)\n"; exit 1; }
+		{ printf "%s: $(ANSI_RED)Expected %s, got %s$(ANSI_RESET)\n" "$1" "$(ARCH_STRING)" "$$(file -b $(OUTPUT_DIR)/$1)"; exit 1; }
 endef
 
 define check_output
-	@printf "$1: $(ANSI_GREEN)$3$(ANSI_RESET) / $(ANSI_MAGENTA)$(ARCH_STRING)$(ANSI_RESET)\n"
+	@printf "%s: $(ANSI_GREEN)%s$(ANSI_RESET) / $(ANSI_MAGENTA)%s$(ANSI_RESET)\n" "$1" "$3" "$(ARCH_STRING)"
 endef
 
 define check_shlib
@@ -264,13 +264,10 @@ test :
 	$(call check_bin,optipng,--version,$(OPTIPNG_VER))
 	$(call check_bin,oxipng,--version,$(OXIPNG_VER))
 	$(call check_bin,pngcrush,-version 2>&1,$(PNGCRUSH_VER))
-	$(call check_bin,pngout,2>&1,$(shell perl -mTime::Piece -e 'print Time::Piece->strptime("$(PNGOUT_VER)", "%Y%m%d")->strftime("%b %e %Y")'))
+	$(call check_bin,pngout,2>&1 | head -n 1,$(shell perl -mTime::Piece -e 'print Time::Piece->strptime("$(PNGOUT_VER)", "%Y%m%d")->strftime("%b %e %Y")'))
 	$(call check_bin,pngquant,--help,$(PNGQUANT_VER))
 .PHONY : test
 
-livecheck :; @script/livecheck
-.PHONY : livecheck
-
 update-versions :
 	script/livecheck --update
 	make checksum-update

data/README.markdown

@@ -1,5 +1,8 @@
 [![Gem Version](https://img.shields.io/gem/v/image_optim_pack?logo=rubygems)](https://rubygems.org/gems/image_optim_pack)
 [![Build Status](https://img.shields.io/github/workflow/status/toy/image_optim_pack/check/master?logo=github)](https://github.com/toy/image_optim_pack/actions/workflows/check.yml)
+[![Rubocop](https://img.shields.io/github/workflow/status/toy/image_optim_pack/rubocop/master?label=rubocop&logo=rubocop)](https://github.com/toy/image_optim_pack/actions/workflows/rubocop.yml)
+[![Docker build](https://img.shields.io/github/workflow/status/toy/image_optim_pack/docker-build?label=docker+build&logo=docker)](https://github.com/toy/image_optim_pack/actions/workflows/docker-build.yml)
+[![Livecheck](https://img.shields.io/github/workflow/status/toy/image_optim_pack/livecheck/master?label=livecheck&logo=github)](https://github.com/toy/image_optim_pack/actions/workflows/livecheck.yml)
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/toy/image_optim_pack?logo=codeclimate)](https://codeclimate.com/github/toy/image_optim_pack)
 [![Depfu](https://img.shields.io/depfu/toy/image_optim_pack)](https://depfu.com/github/toy/image_optim_pack)
 [![Inch CI](https://inch-ci.org/github/toy/image_optim_pack.svg?branch=master)](https://inch-ci.org/github/toy/image_optim_pack)
@@ -10,7 +13,7 @@ Precompiled binaries for [`image_optim`](https://github.com/toy/image_optim).
 
 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/.
+A test application with latest `image_optim` and `image_optim_pack` is available on render: https://iopack.onrender.com/.
 
 ## Binaries and libraries
 
@@ -80,7 +83,7 @@ script/run darwin 64 # Build only platforms matching darwin or 64
 make # Build all tools and copy them to vendor/OS-ARCH for current OS and ARCH, then test
 make all # same
 
-make livecheck # Check versions
+script/livecheck # Check versions
 make update-versions # Update versions in Makefile
 
 make download # Download archives

data/Vagrantfile

@@ -46,6 +46,10 @@ Vagrant.configure('2') do |config|
 
           apt-get update
           apt-get -y dist-upgrade
+
+          if [ $(lsb_release -r | egrep -o '[0-9]+' | head -1) -lt 18 ]; then
+            do-release-upgrade -f DistUpgradeViewNonInteractive
+          fi
         else
           set -ex
 

data/checksums.mk

@@ -5,11 +5,11 @@ JPEGARCHIVE_SHA256 := 3da16a5abbddd925dee0379aa51d9fe0cba33da0b5703be27c13a2dda3
 JPEGOPTIM_SHA256 := c52616f2fb8d481315871680f9943b0f58c553d1e0c49a6bd4691a3e66d7e6de
 LIBJPEG_SHA256 := 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d
 LIBLCMS_SHA256 := 0c67a5cc144029cfa34647a52809ec399aae488db4258a6a66fba318474a070f
-LIBMOZJPEG_SHA256 := 4f22731db2afa14531a5bf2633d8af79ca5cb697a550f678bf43f24e5e409ef0
+LIBMOZJPEG_SHA256 := 66b1b8d6b55d263f35f27f55acaaa3234df2a401232de99b6d099e2bb0a9d196
 LIBPNG_SHA256 := daeb2620d829575513e35fecc83f0d3791a620b9b93d800b763542ece9390fb4
 LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 OPTIPNG_SHA256 := 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
-OXIPNG_SHA256 := aff72d2f627617f3f36d9796e65b83eb34f24d2c94f3a55612ade2df8ab8d946
+OXIPNG_SHA256 := 02625687bf19263bc2d537f9f81f85784c5b729c003e9dbb8551126d0e28ba7a
 PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be
 PNGOUT_LINUX_SHA256 := ac38bba6f0de29033de866538c3afa64341319b695bbe388efbc5fd9e830e928
 PNGOUT_LINUX_STATIC_SHA256 := 7a78ea475d65a00981bf418e5dfa3b34e42d6460fb992340802873bb14b08597

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.9.0'
+  s.version     = '0.9.1.20220909'
   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']

data/script/livecheck

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'yaml'
 require 'uri'
 require 'net/http'
 require 'openssl'
@@ -10,6 +9,69 @@ require 'fspath'
 
 # Fetch and compare latest tool/library versions
 class Livecheck
+  CONFIG = {
+    advancecomp: {
+      url: 'https://github.com/amadvance/advancecomp/releases.atom',
+      regexp: %r{<id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>},
+    },
+    gifsicle: {
+      url: 'https://www.lcdf.org/gifsicle/',
+      regexp: /gifsicle-(\d+(?:\.\d+)*)\.tar\.gz/,
+    },
+    jhead: {
+      url: 'https://www.sentex.ca/~mwandel/jhead/',
+      regexp: /jhead-(\d+(?:\.\d+)*)/,
+    },
+    jpegoptim: {
+      url: 'https://github.com/tjko/jpegoptim/tags.atom',
+      regexp: %r{<id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>},
+    },
+    jpegarchive: {
+      url: 'https://github.com/danielgtaylor/jpeg-archive/releases.atom',
+      regexp: %r{<id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>},
+    },
+    libjpeg: {
+      url: 'https://www.ijg.org/files/',
+      regexp: /jpegsrc.v(.*?).tar.gz/,
+    },
+    liblcms: {
+      url: 'https://sourceforge.net/projects/lcms/rss?path=/lcms',
+      regexp: %r{/lcms/(\d+(?:\.\d+)*)/},
+    },
+    libmozjpeg: {
+      url: 'https://github.com/mozilla/mozjpeg/releases.atom',
+      regexp: %r{<id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>},
+    },
+    libpng: {
+      url: 'https://sourceforge.net/projects/libpng/rss?path=/libpng16',
+      regexp: %r{/libpng\d*/(\d+(?:\.\d+)*)/},
+    },
+    libz: {
+      url: 'https://sourceforge.net/projects/libpng/rss?path=/zlib',
+      regexp: %r{/zlib/(\d+(?:\.\d+)*)/},
+    },
+    optipng: {
+      url: 'https://sourceforge.net/projects/optipng/rss',
+      regexp: %r{/OptiPNG/optipng-(\d+(?:\.\d+)*)/},
+    },
+    oxipng: {
+      url: 'https://github.com/shssoichiro/oxipng/releases.atom',
+      regexp: %r{<id>tag:github.com,2008:Repository/\d+/v(\d+(?:\.\d+)*)</id>},
+    },
+    pngcrush: {
+      url: 'https://sourceforge.net/projects/pmt/rss?path=/pngcrush',
+      regexp: %r{/pngcrush/(\d+(?:\.\d+)*)/},
+    },
+    pngout: {
+      url: 'http://www.jonof.id.au/kenutils.html',
+      regexp: %r{/files/kenutils/pngout-(\d{8})-linux.tar.gz},
+    },
+    pngquant: {
+      url: 'https://pngquant.org/releases.html',
+      regexp: %r{<span itemprop='version'>(\d+(?:\.\d+)*)</span>},
+    },
+  }.freeze
+
   # Commands
   class Cli
     VERSION_REGEXP = /^([A-Z]+)_VER *:= *(.*)$/.freeze
@@ -22,11 +84,15 @@ class Livecheck
     def run
       dump_changes
 
-      return unless @update
       return unless livechecks.any?(&:changed?)
 
+      exit 1 unless @update
+
       update_changelog
       update_makefile
+    rescue StandardError => e
+      warn e
+      exit 2
     end
 
   private
@@ -119,8 +185,6 @@ class Livecheck
     end
   end
 
-  CONFIG = YAML.load(DATA).freeze
-
   attr_reader :name, :current_version
 
   def initialize(name, current_version)
@@ -144,7 +208,7 @@ class Livecheck
 private
 
   def config
-    CONFIG[name] || fail(ArgumentError, "Livecheck for #{name} not defined")
+    CONFIG[name.to_sym] || fail(ArgumentError, "Livecheck for #{name} not defined")
   end
 
   def get(url)
@@ -155,9 +219,9 @@ private
   end
 
   def fetch_versions
-    body = get(config['url'])
+    body = get(config[:url])
 
-    version_regex = Regexp.new(config['regexp'])
+    version_regex = config[:regexp]
 
     versions = body.scan(version_regex).map{ |match| Version.new(*match) }.sort
     fail "No versions found for #{name} in body:\n#{body}" if versions.empty?
@@ -167,50 +231,3 @@ private
 end
 
 Livecheck::Cli.new(ARGV).run
-
-__END__
-advancecomp:
-  url: https://github.com/amadvance/advancecomp/releases.atom
-  regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
-gifsicle:
-  url: https://www.lcdf.org/gifsicle/
-  regexp: gifsicle-(\d+(?:\.\d+)*)\.tar\.gz
-jhead:
-  url: https://www.sentex.ca/~mwandel/jhead/
-  regexp: jhead-(\d+(?:\.\d+)*)
-jpegoptim:
-  url: https://github.com/tjko/jpegoptim/tags.atom
-  regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
-jpegarchive:
-  url: https://github.com/danielgtaylor/jpeg-archive/releases.atom
-  regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
-libjpeg:
-  url: https://www.ijg.org/files/
-  regexp: jpegsrc.v(.*?).tar.gz
-liblcms:
-  url: https://sourceforge.net/projects/lcms/rss?path=/lcms
-  regexp: /lcms/(\d+(?:\.\d+)*)/
-libmozjpeg:
-  url: https://github.com/mozilla/mozjpeg/releases.atom
-  regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
-libpng:
-  url: https://sourceforge.net/projects/libpng/rss?path=/libpng16
-  regexp: /libpng\d*/(\d+(?:\.\d+)*)/
-libz:
-  url: https://sourceforge.net/projects/libpng/rss?path=/zlib
-  regexp: /zlib/(\d+(?:\.\d+)*)/
-optipng:
-  url: https://sourceforge.net/projects/optipng/rss
-  regexp: /OptiPNG/optipng-(\d+(?:\.\d+)*)/
-oxipng:
-  url: https://github.com/shssoichiro/oxipng/releases.atom
-  regexp: <id>tag:github.com,2008:Repository/\d+/v(\d+(?:\.\d+)*)</id>
-pngcrush:
-  url: https://sourceforge.net/projects/pmt/rss?path=/pngcrush
-  regexp: /pngcrush/(\d+(?:\.\d+)*)/
-pngout:
-  url: http://www.jonof.id.au/kenutils.html
-  regexp: /files/kenutils/pngout-(\d{8})-linux.tar.gz
-pngquant:
-  url: https://pngquant.org/releases.html
-  regexp: <span itemprop='version'>(\d+(?:\.\d+)*)</span>

data/script/run

@@ -57,7 +57,9 @@ for vm in $(perl -pe "s/.*?'(.+?-.+?)'\s+=>\s+'.+?\/.+?'.*|.*/\$1/" Vagrantfile
   passes-filter "$vm" || continue
   header "$vm"
 
-  [[ -n "$NO_UP" ]] || vagrant up "$vm"
+  if [[ -z "$NO_UP" ]]; then
+    vagrant status "$vm" | grep -q running || vagrant up "$vm"
+  fi
 
   # create ssh config
   ssh_config=".vagrant/ssh_config.$vm"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1.20220909
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-11 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -101,6 +101,7 @@ files:
 - ".dockerignore"
 - ".github/workflows/check.yml"
 - ".github/workflows/docker-build.yml"
+- ".github/workflows/livecheck.yml"
 - ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -209,7 +210,7 @@ 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.9.0
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.9.1.20220909
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message:
 rdoc_options: []