image_optim_pack 0.8.0.20220131-x86-linux → 0.9.1-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1003a08d7e342e13a323ce17811611cb052a461f0bb0e1437035064306d9eafb
-  data.tar.gz: d4a65d16182e435a6c4d950c8f511b0978a0ca928604fcd62ac307f7b6a54473
+  metadata.gz: b2ce293685e7106f78b30ac9c8f8f54b40797d9359ab041418c7d5d43665e710
+  data.tar.gz: 9b35ece0c4917e6f54ca837d0e60df9c154839b6e703972ceb42df366d4f79f4
 SHA512:
-  metadata.gz: 50168e5e878eb16cb4ec1f34441799525453b8b302286df2d74bbabdcca844fe9aff8b2d1f26def9fd5338afc98f50213aa6a9d0bfabe74916808e30c7cfa2a6
-  data.tar.gz: 9af4bae51808bdf5515e2b854f311e0f798836fff90ac7e43748d8ab8e7e6d2ff78873051f301d0c84e280c57094303dd74a83df584b0ec8d57c88080e1dc781
+  metadata.gz: ddbd4931bdf4faaf06299c47174323fb970a6b9a04cdf5ab9b0b9d2081379a030a1a00ef69208aded50d5a0486e330a7cc06715e58c8bf23e98f79e099ad7f3d
+  data.tar.gz: 7fa3f68254b93db6fa1bd4956f3712f49b85940cc463d36fd9de8389e5e3f8b8ca4e4d4249f911cf9d08a0e17d3909a94b9b5cd157d2bbdbb33a130954de4250

data/.github/workflows/docker-build.yml

@@ -0,0 +1,16 @@
+name: docker-build
+on:
+  push:
+    tags:
+    - '*'
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - run: make docker-push

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 (2022-08-29)
+
+* libmozjpeg 4.1.1 [@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)
+
+## v0.8.0.20220418 (2022-04-18)
+
+* advancecomp 2.3 and jpegoptim 1.4.7 [@toy](https://github.com/toy)
+
 ## v0.8.0.20220131 (2022-01-31)
 
 * liblcms 2.13 [@toy](https://github.com/toy)

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.12 as base
+FROM alpine as base
 ENV LD_LIBRARY_PATH=/usr/local/lib
 WORKDIR /tmp
 
@@ -85,7 +85,7 @@ ARG JPEGARCHIVE_SHA256
 COPY download/jpegarchive-$JPEGARCHIVE_VER.tar.gz download/
 RUN ./extract jpegarchive && \
     cd build/jpegarchive && \
-    make install
+    CFLAGS=-fcommon make install
 
 FROM libjpeg as jpegoptim
 ARG JPEGOPTIM_VER
@@ -105,7 +105,7 @@ RUN ./extract optipng && \
     ./configure && \
     make install
 
-FROM rust:1.55-alpine3.13 as oxipng
+FROM rust:1-alpine as oxipng
 RUN apk add --no-cache build-base
 COPY script/extract ./
 ARG OXIPNG_VER
@@ -125,6 +125,14 @@ RUN ./extract pngcrush && \
     make && \
     install -c pngcrush /usr/local/bin
 
+FROM build as pngout
+ARG PNGOUT_LINUX_STATIC_VER
+ARG PNGOUT_LINUX_STATIC_SHA256
+COPY download/pngout_linux_static-$PNGOUT_LINUX_STATIC_VER.tar.gz download/
+RUN ./extract pngout_linux_static && \
+    cd build/pngout_linux_static && \
+    cp amd64/pngout-static /usr/local/bin/pngout
+
 FROM liblcms as pngquant
 ARG PNGQUANT_VER
 ARG PNGQUANT_SHA256
@@ -145,6 +153,9 @@ RUN ./extract pngquant && \
 FROM base as image_optim
 RUN apk add --no-cache libstdc++ ruby npm perl dumb-init
 
+COPY README.markdown /
+COPY acknowledgements /acknowledgements
+
 COPY --from=advancecomp /usr/local/bin/advpng          /usr/local/bin/
 COPY --from=gifsicle    /usr/local/bin/gifsicle        /usr/local/bin/
 COPY --from=jhead       /usr/local/bin/jhead           /usr/local/bin/
@@ -154,6 +165,7 @@ COPY --from=libjpeg     /usr/local/bin/jpegtran        /usr/local/bin/
 COPY --from=optipng     /usr/local/bin/optipng         /usr/local/bin/
 COPY --from=oxipng      /usr/local/bin/oxipng          /usr/local/bin/
 COPY --from=pngcrush    /usr/local/bin/pngcrush        /usr/local/bin/
+COPY --from=pngout      /usr/local/bin/pngout          /usr/local/bin/
 COPY --from=pngquant    /usr/local/bin/pngquant        /usr/local/bin/
 
 COPY --from=libjpeg     /usr/local/lib/libjpeg.so.9    /usr/local/lib/
@@ -163,5 +175,5 @@ COPY --from=liblcms     /usr/local/lib/liblcms2.so.2   /usr/local/lib/
 
 RUN npm -g install svgo
 RUN gem install --no-document image_optim
-ENTRYPOINT ["dumb-init", "image_optim", "--skip-missing-workers"]
+ENTRYPOINT ["dumb-init", "image_optim"]
 CMD ["--help"]

data/Makefile

@@ -2,19 +2,23 @@ all :
 
 # ====== VERSIONS ======
 
-ADVANCECOMP_VER := 2.1
+ADVANCECOMP_VER := 2.3
 GIFSICLE_VER := 1.93
 JHEAD_VER := 3.04
 JPEGARCHIVE_VER := 2.2.0
-JPEGOPTIM_VER := 1.4.6
+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
 PNGCRUSH_VER := 1.8.13
+PNGOUT_VER := 20200115
+PNGOUT_LINUX_VER := $(PNGOUT_VER)
+PNGOUT_LINUX_STATIC_VER := $(PNGOUT_VER)
+PNGOUT_DARWIN_VER := $(PNGOUT_VER)
 PNGQUANT_VER := 2.17.0
 
 # ====== CHECKSUMS ======
@@ -57,12 +61,13 @@ sha256sum := $(shell if command -v sha256sum >/dev/null 2>&1; then echo sha256su
 ARCHIVES :=
 
 # $1 - name of archive
+# $2 - extension to use (instead of default tar.gz)
 define archive
 ARCHIVES += $1
 $1_DIR := $(BUILD_DIR)/$(call downcase,$1)
-$1_TGZ := $(DL_DIR)/$(call downcase,$1)-$($1_VER).tar.gz
-$1_EXTRACTED := $$($1_DIR)/__$$(notdir $$($1_TGZ))__
-$$($1_EXTRACTED) : $$($1_TGZ)
+$1_ARC := $(DL_DIR)/$(call downcase,$1)-$($1_VER).$(or $2,tar.gz)
+$1_EXTRACTED := $$($1_DIR)/__$$(notdir $$($1_ARC))__
+$$($1_EXTRACTED) : $$($1_ARC)
 	mkdir -p $(BUILD_DIR)
 	rm -rf $$(@D)
 	echo "$$($1_SHA256)  $$<" | $(sha256sum) -c
@@ -73,11 +78,13 @@ endef
 
 # $1 - name of archive
 # $2 - url of archive with [VER] for replace with version
+# $3 - extension to use
 define archive-dl
-$(call archive,$1)
+$(call archive,$1,$3)
 # download archive from url
-$$($1_TGZ) :
+$$($1_ARC) :
 	mkdir -p $(DL_DIR)
+	test -w $(DL_DIR)
 	while ! mkdir $$@.lock 2> /dev/null; do sleep 1; done
 	wget -q -O $$@.tmp $(subst [VER],$($1_VER),$(strip $2))
 	mv $$@.tmp $$@
@@ -88,7 +95,7 @@ $(eval $(call archive-dl,ADVANCECOMP, https://github.com/amadvance/advancecomp/r
 $(eval $(call archive-dl,GIFSICLE,    https://www.lcdf.org/gifsicle/gifsicle-[VER].tar.gz))
 $(eval $(call archive-dl,JHEAD,       https://www.sentex.ca/~mwandel/jhead/jhead-[VER].tar.gz))
 $(eval $(call archive-dl,JPEGARCHIVE, https://github.com/danielgtaylor/jpeg-archive/archive/v[VER].tar.gz))
-$(eval $(call archive-dl,JPEGOPTIM,   https://www.kokkonen.net/tjko/src/jpegoptim-[VER].tar.gz))
+$(eval $(call archive-dl,JPEGOPTIM,   https://github.com/tjko/jpegoptim/archive/v[VER].tar.gz))
 $(eval $(call archive-dl,LIBJPEG,     https://www.ijg.org/files/jpegsrc.v[VER].tar.gz))
 $(eval $(call archive-dl,LIBLCMS,     https://prdownloads.sourceforge.net/lcms/lcms2-[VER].tar.gz?download))
 $(eval $(call archive-dl,LIBMOZJPEG,  https://github.com/mozilla/mozjpeg/archive/v[VER].tar.gz))
@@ -97,25 +104,28 @@ $(eval $(call archive-dl,LIBZ,        https://prdownloads.sourceforge.net/libpng
 $(eval $(call archive-dl,OPTIPNG,     https://prdownloads.sourceforge.net/optipng/optipng-[VER].tar.gz?download))
 $(eval $(call archive-dl,OXIPNG,      https://github.com/shssoichiro/oxipng/archive/refs/tags/v[VER].tar.gz))
 $(eval $(call archive-dl,PNGCRUSH,    https://prdownloads.sourceforge.net/pmt/pngcrush-[VER]-nolib.tar.gz?download))
+$(eval $(call archive-dl,PNGOUT_LINUX,http://www.jonof.id.au/files/kenutils/pngout-[VER]-linux.tar.gz))
+$(eval $(call archive-dl,PNGOUT_LINUX_STATIC,http://www.jonof.id.au/files/kenutils/pngout-[VER]-linux-static.tar.gz))
+$(eval $(call archive-dl,PNGOUT_DARWIN,http://www.jonof.id.au/files/kenutils/pngout-[VER]-macos.zip,zip))
 $(eval $(call archive-dl,PNGQUANT,    https://pngquant.org/pngquant-[VER]-src.tar.gz))
 
-download : $(foreach archive,$(ARCHIVES),$($(archive)_TGZ))
+download : $(foreach archive,$(ARCHIVES),$($(archive)_ARC))
 .PHONY : download
 
 download-tidy-up :
-	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_TGZ)),$(wildcard $(DL_DIR)/*.*))
+	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_ARC)),$(wildcard $(DL_DIR)/*.*))
 .PHONY : download-tidy-up
 
 checksum : download
-	@$(sha256sum) $(foreach archive,$(ARCHIVES),$($(archive)_TGZ))
+	@$(sha256sum) $(foreach archive,$(ARCHIVES),$($(archive)_ARC))
 .PHONY : checksum
 
 checksum-verify : download
-	@printf '%s  %s\n' $(foreach archive,$(ARCHIVES),$($(archive)_SHA256) $($(archive)_TGZ)) | $(sha256sum) -c
+	@printf '%s  %s\n' $(foreach archive,$(ARCHIVES),$($(archive)_SHA256) $($(archive)_ARC)) | $(sha256sum) -c
 .PHONY : checksum-verify
 
 checksum-update : download
-	@printf '%s := %s\n' $(foreach archive,$(ARCHIVES),$(archive)_SHA256 $(shell $(sha256sum) $($(archive)_TGZ) | cut -d ' ' -f 1)) > checksums.mk
+	@printf '%s := %s\n' $(foreach archive,$(ARCHIVES),$(archive)_SHA256 $(shell $(sha256sum) $($(archive)_ARC) | cut -d ' ' -f 1)) > checksums.mk
 .PHONY : checksum-update
 
 # ====== PRODUCTS ======
@@ -129,7 +139,7 @@ define target-build
 $1_PATH := $(or $3,$(call downcase,$1))
 $1_BASENAME := $$(notdir $$($1_PATH))
 $1_DIR := $($(or $2,$1)_DIR)
-$1_TGZ := $($(or $2,$1)_TGZ)
+$1_ARC := $($(or $2,$1)_ARC)
 $1_EXTRACTED := $($(or $2,$1)_EXTRACTED)
 $1_TARGET := $$($1_DIR)/$$($1_PATH)
 $$($1_TARGET) : DIR := $$($1_DIR)
@@ -139,6 +149,7 @@ endef
 # $1 - product name
 # $2 - archive name ($1 if empty)
 # $3 - basename ($1 if empty)
+# $4 - don't strip the target
 define target
 $(call target-build,$1,$2,$3)
 PRODUCTS += $1
@@ -147,7 +158,7 @@ $1_DESTINATION := $$(OUTPUT_DIR)/$$($1_BASENAME)
 $$($1_DESTINATION) : $$($1_TARGET)
 	mkdir -p $(OUTPUT_DIR)
 	temppath=`mktemp "$(BUILD_DIR)"/tmp.XXXXXXXXXX` && \
-		strip $$< -Sx -o "$$$$temppath" && \
+		$(if $4,cp $$< "$$$$temppath",strip $$< -Sx -o "$$$$temppath") && \
 		chmod 755 "$$$$temppath" && \
 		mv "$$$$temppath" $$@
 # short name target
@@ -168,6 +179,11 @@ $(eval $(call target,LIBZ,,libz$(DLEXT)))
 $(eval $(call target,OPTIPNG,,src/optipng/optipng))
 $(eval $(call target,OXIPNG,,target/release/oxipng))
 $(eval $(call target,PNGCRUSH))
+ifdef IS_DARWIN
+$(eval $(call target,PNGOUT,PNGOUT_DARWIN,,NOSTRIP))
+else
+$(eval $(call target,PNGOUT,PNGOUT_LINUX,,NOSTRIP))
+endif
 $(eval $(call target,PNGQUANT))
 
 # ====== TARGETS ======
@@ -190,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; }
+	@$(OUTPUT_DIR)/$1 $2 | fgrep -q "$3" || \
+		{ 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
@@ -248,12 +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 | 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
@@ -266,15 +280,25 @@ DOCKER_TAG := $(shell date +%Y%m%d)
 
 docker-build : download
 	@docker build \
+		--pull \
 		$(foreach archive,$(ARCHIVES),--build-arg $(archive)_VER=$($(archive)_VER) --build-arg $(archive)_SHA256=$($(archive)_SHA256)) \
-		-t $(DOCKER_IMAGE):$(DOCKER_TAG) \
 		-t $(DOCKER_IMAGE):latest \
 		.
+	@docker tag \
+		$(DOCKER_IMAGE):latest \
+		$(DOCKER_IMAGE):$(DOCKER_TAG)
 .PHONY : docker-build
 
-docker-push : docker-build
-	@docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
+docker-test : docker-build
+	@docker run \
+		--rm \
+		$(DOCKER_IMAGE):latest \
+		--info
+.PHONY : docker-test
+
+docker-push : docker-test
 	@docker push $(DOCKER_IMAGE):latest
+	@docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
 .PHONY : docker-push
 
 # ====== CLEAN ======
@@ -480,6 +504,13 @@ $(PNGCRUSH_TARGET) :
 		LDFLAGS="$(XORIGIN) $(LDFLAGS)"
 	$(call chrpath_origin,$@)
 
+## pngout
+$(PNGOUT_TARGET) :
+ifdef IS_LINUX
+	cd $(DIR) && ln -sf $(ARCH:x86_64=amd64)/pngout .
+endif
+	cd $(DIR) && touch pngout
+
 ## pngquant
 $(eval $(call depend,PNGQUANT,LIBLCMS LIBPNG LIBZ))
 $(PNGQUANT_TARGET) :

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
 
@@ -38,6 +41,9 @@ A test application with latest `image_optim` and `image_optim_pack` is available
 * [oxipng](https://github.com/shssoichiro/oxipng) by Joshua Holmer ([license](acknowledgements/oxipng.txt))
 * [pngcrush](https://pmt.sourceforge.io/pngcrush/) by Glenn Randers-Pehrson, portions by Greg Roelofs ([license](acknowledgements/pngcrush.txt))
 	* contains [cexcept](http://www.nicemice.net/cexcept/) interface by Adam M. Costello and Cosmin Truta ([license](acknowledgements/cexcept.txt))
+* [pngout](http://advsys.net/ken/utils.htm) by Ken Silverman ([license](acknowledgements/pngout.txt))
+	* Linux and BSD ports by Jonathon Fowler (http://www.jonof.id.au/pngout)
+	* Mac OS X port by Ken Silverman, with assistance by Jonathon Fowler
 * [pngquant](https://pngquant.org/) by Kornel Lesiński based on code by Greg Roelofs and Jef Poskanzer after an idea by Stefan Schneider ([license](acknowledgements/pngquant.txt))
 * [zlib](https://zlib.net/) by Jean-Loup Gailly and Mark Adler ([license](acknowledgements/zlib.txt))
 
@@ -77,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/acknowledgements/pngout.txt

@@ -0,0 +1,9 @@
+PNGOUT / KZIP license:
+
+I have gotten a lot of requests about bundling the command line executables, or releasing the source code to KZIP and PNGOUT. This is my license (updated 01/16/2021):
+
+* The command line versions of PNGOUT.EXE and KZIP.EXE are free for use, as are the Mac and Linux ports.
+* You may use PNGOUT- or KZIP-compressed content for non-commercial or commercial purposes.
+* Redistributing, repackaging, or reusing the PNGOUT or KZIP executable is permitted for non-commercial projects that are distributed freely.
+* For commercial requests (such as bundling with a commercial product), please write to my business partner, David Blake.
+* When bundling, my credit (both my name and website) must be clearly displayed in some reasonable fashion that can be seen by an average user.

data/checksums.mk

@@ -1,14 +1,17 @@
-ADVANCECOMP_SHA256 := 3ac0875e86a8517011976f04107186d5c60d434954078bc502ee731480933eb8
+ADVANCECOMP_SHA256 := 811f661dfbbdddefdcb5eaf133e403ca2af99328b850b22c1249f7bebe657578
 GIFSICLE_SHA256 := 92f67079732bf4c1da087e6ae0905205846e5ac777ba5caa66d12a73aa943447
 JHEAD_SHA256 := ef89bbcf4f6c25ed88088cf242a47a6aedfff4f08cc7dc205bf3e2c0f10a03c9
 JPEGARCHIVE_SHA256 := 3da16a5abbddd925dee0379aa51d9fe0cba33da0b5703be27c13a2dda3d7ed75
-JPEGOPTIM_SHA256 := 88b1eb64c2a33a2f013f068df8b0331f42c019267401ae3fa28e3277403a5ab7
+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
 PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be
+PNGOUT_LINUX_SHA256 := ac38bba6f0de29033de866538c3afa64341319b695bbe388efbc5fd9e830e928
+PNGOUT_LINUX_STATIC_SHA256 := 7a78ea475d65a00981bf418e5dfa3b34e42d6460fb992340802873bb14b08597
+PNGOUT_DARWIN_SHA256 := 3272fa947eeafc1ac0086e1f14935f9efa21d090a555e6892255fe5c88f6686e
 PNGQUANT_SHA256 := a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.8.0.20220131'
+  s.version     = '0.9.1'
   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,47 +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+)*)/
-pngquant:
-  url: https://pngquant.org/releases.html
-  regexp: <span itemprop='version'>(\d+(?:\.\d+)*)</span>

data/script/platform_downloads

@@ -36,9 +36,9 @@ version_time = begin
   end.sort
   time_pairs << [nil, Time.now]
 
-  time_pairs.each_cons(2).map do |(version_n, created_at), (_, next_created_at)|
+  time_pairs.each_cons(2).to_h do |(version_n, created_at), (_, next_created_at)|
     [version_n, next_created_at - created_at]
-  end.to_h
+  end
 end
 
 table = Terminal::Table.new

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.8.0.20220131
+  version: 0.9.1
 platform: x86-linux
 authors:
 - Ivan Kuchin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim
@@ -100,6 +100,8 @@ extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".github/workflows/check.yml"
+- ".github/workflows/docker-build.yml"
+- ".github/workflows/livecheck.yml"
 - ".github/workflows/rubocop.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -130,6 +132,7 @@ files:
 - acknowledgements/optipng.txt
 - acknowledgements/oxipng.txt
 - acknowledgements/pngcrush.txt
+- acknowledgements/pngout.txt
 - acknowledgements/pngquant.txt
 - acknowledgements/smallfry.txt
 - acknowledgements/zlib.txt
@@ -169,6 +172,7 @@ files:
 - vendor/linux-i686/optipng
 - vendor/linux-i686/oxipng
 - vendor/linux-i686/pngcrush
+- vendor/linux-i686/pngout
 - vendor/linux-i686/pngquant
 homepage: https://github.com/toy/image_optim_pack
 licenses:
@@ -176,7 +180,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.8.0.20220131
+  documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.9.1
   source_code_uri: https://github.com/toy/image_optim_pack
 post_install_message:
 rdoc_options: []
@@ -193,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,