image_optim_pack 0.3.0.20161206 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI3NWVkNjlhNzZlYTZhMjgwZGRkNDhjYWRhOGFhYjEyMjIxMWIyZg==
+    MWRmOWUzZTBiYmE2Yzk3MzMzNWQxYTZlYzc5M2U2NDE1NzY2YzI0Yg==
   data.tar.gz: !binary |-
-    NjFhMWNiNzdiN2MyYmYwMmM0NDFmODBhNmRjYzNlNWZiMTg2ZjI2OA==
+    MjBmYjE0MGE3ZTYzNWYyZWZiZmUxOTczODVmYWFlNThiNmE2OTVhYg==
 SHA512:
   metadata.gz: !binary |-
-    NDA1ZDQwYWJjMDc0YTlkMTA0YjU2MTI1ZWQwYzYzMDc3YmFjNTFjNWEyMzAw
-    M2E1ZGU3OWE1YWNkNTg2M2U1NTQ3OGI0NzFhYjMyZTI4N2EwY2NhNmM2OWI1
-    OGJiYzAyNWVjMTRmN2IyMzAyNTIyYWE3YTc5NjJmZGY5OTVjODk=
+    ZjNiZGNlMzdmYWVmNzRhYWQwOGVmYTEwNWQyYzJjM2ZhZjlkNGNjOGJiMTAz
+    M2JjMjNmOTYzOGNiMTZiYWYwNWVmNTYxZTE5NTJhNzIwMDViNTcxOGJhYmJm
+    M2E4N2IyZTU4Mjk2MTQ1MWY4OGE4MzVjY2M5NTAwMzVjNjgzZDU=
   data.tar.gz: !binary |-
-    ZWMyMjEyZTk1MTg3ZTgwY2ZhNDY5ZTQ0NjM1YmU2YTE0M2YxY2I4NDEwYzU4
-    ZmY0YmYyYjVjZWI5NDljYjIzMmYxODIxNGQ5ZWRmOTJmNzIyMDM1NDU4Zjc3
-    Yjg5YTJmYzYzZWQ4MTU4ZWM1MDkwODUwZDRjNjNkMDUwY2MzM2Q=
+    NTM3MDM3ZWU3YjBkMmMxYTc1MmU1NTYyZTU0NTBlYWQ1NTVlODM5YzczZGFi
+    ODQwMTUzZjY3M2M1MWZiNjhmNGM3ZTU4MjA5ZWVmZjI5YTVkNDgzYTFjNjZk
+    NTFlYTU3OTdlOTI1NTMxNTA4MDM5MjdhZTY4ZjQ0YjUwYjUzNGI=

data/.rubocop.yml

@@ -3,6 +3,9 @@ AllCops:
     - '*.gemspec'
     - Vagrantfile
 
+Bundler/OrderedGems:
+  Enabled: false
+
 Lint/EndAlignment:
   AlignWith: variable
 
@@ -39,6 +42,9 @@ Style/IfUnlessModifier:
 Style/IndentHash:
   EnforcedStyle: consistent
 
+Style/MultilineBlockChain:
+  Enabled: false
+
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%w': '[]'
@@ -56,6 +62,9 @@ Style/SpaceBeforeBlockBraces:
 Style/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
+Style/SpecialGlobalVars:
+  Enabled: false
+
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: no_comma
 

data/Makefile

@@ -1,4 +1,4 @@
-run : all
+all :
 
 # ====== VERSIONS ======
 
@@ -9,11 +9,11 @@ JPEGARCHIVE_VER := 2.1.1
 JPEGOPTIM_VER := 1.4.4
 LIBJPEG_VER := 9b
 LIBMOZJPEG_VER := 3.1
-LIBPNG_VER := 1.6.26
+LIBPNG_VER := 1.6.27
 LIBZ_VER := 1.2.8
 OPTIPNG_VER := 0.7.6
 PNGCRUSH_VER := 1.8.10
-PNGQUANT_VER := 2.8.1
+PNGQUANT_VER := 2.8.2
 
 # ====== CONSTANTS ======
 
@@ -33,69 +33,78 @@ BUILD_ROOT_DIR := $(CURDIR)/build
 BUILD_DIR := $(BUILD_ROOT_DIR)/$(OS)-$(ARCH)
 OUTPUT_ROOT_DIR := $(CURDIR)/vendor
 OUTPUT_DIR := $(OUTPUT_ROOT_DIR)/$(OS)-$(ARCH)
+$(shell mkdir -p $(DL_DIR) $(BUILD_DIR) $(OUTPUT_DIR))
 
-ERROR_COLOUR=\033[31m
-GREEN_COLOUR=\033[32m
-MAGENTA_COLOUR=\033[35m
-RESET_COLOUR=\033[0m
+ANSI_RED=\033[31m
+ANSI_GREEN=\033[32m
+ANSI_MAGENTA=\033[35m
+ANSI_RESET=\033[0m
 
 # ====== HELPERS ======
 
 downcase = $(shell echo $1 | tr A-Z a-z)
 
-mkpath := mkdir -p
 ln_s := ln -sf
 tar := $(shell if command -v gtar >/dev/null 2>&1; then echo gtar; else echo tar; fi)
 
-# lock using %.lock dir, download to %.tmp rename to %, remove %.lock
-define download
-	while ! mkdir $2.lock 2> /dev/null; do sleep 1; done
-	wget -q -O $2.tmp $1
-	mv $2.tmp $2
-	rm -r $2.lock
-endef
-
 # ====== ARCHIVES ======
 
-$(shell $(mkpath) $(DL_DIR)) # just create dl dir
-
 ARCHIVES :=
 
 # $1 - name of archive
-# $2 - url of archive with [VER] for replace with version
-# $3 - optional addition to version string
 define archive
-$1_URL := $(subst [VER],$($1_VER)$(strip $3),$(strip $2))
-$1_DIR := $(BUILD_DIR)/$(call downcase,$1)
-$1_TGZ := $(DL_DIR)/$(call downcase,$1)-$($1_VER)$(strip $3).tar.gz
 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)
+	rm -rf $$(@D)
+	mkdir $$(@D)
+	$(tar) -C $$(@D) --strip-components=1 -xzf $$<
+	touch $$(@D)/__$$(notdir $$<)__
+endef
+
+# $1 - name of archive
+# $2 - url of archive with [VER] for replace with version
+define archive-dl
+$(call archive,$1)
 # download archive from url
-$$($1_TGZ) :; $$(call download,$$($1_URL),$$@)
-livecheck-$(call downcase,$1) :; @script/livecheck $(call downcase,$1) $($1_VER)
+$$($1_TGZ) :
+	while ! mkdir $$@.lock 2> /dev/null; do sleep 1; done
+	wget -q -O $$@.tmp $(subst [VER],$($1_VER),$(strip $2))
+	mv $$@.tmp $$@
+	rm -r $$@.lock
 endef
 
-$(eval $(call archive,ADVANCECOMP, https://github.com/amadvance/advancecomp/releases/download/v[VER]/advancecomp-[VER].tar.gz))
-$(eval $(call archive,GIFSICLE,    http://www.lcdf.org/gifsicle/gifsicle-[VER].tar.gz))
-$(eval $(call archive,JHEAD,       http://www.sentex.net/~mwandel/jhead/jhead-[VER].tar.gz))
-$(eval $(call archive,JPEGARCHIVE, https://github.com/danielgtaylor/jpeg-archive/archive/[VER].tar.gz))
-$(eval $(call archive,JPEGOPTIM,   http://www.kokkonen.net/tjko/src/jpegoptim-[VER].tar.gz))
-$(eval $(call archive,LIBJPEG,     http://www.ijg.org/files/jpegsrc.v[VER].tar.gz))
-$(eval $(call archive,LIBMOZJPEG,  https://github.com/mozilla/mozjpeg/archive/v[VER].tar.gz))
-$(eval $(call archive,LIBPNG,      http://prdownloads.sourceforge.net/libpng/libpng-[VER].tar.gz?download))
-$(eval $(call archive,LIBZ,        http://prdownloads.sourceforge.net/libpng/zlib-[VER].tar.gz?download))
-$(eval $(call archive,OPTIPNG,     http://prdownloads.sourceforge.net/optipng/optipng-[VER].tar.gz?download))
-$(eval $(call archive,PNGCRUSH,    http://prdownloads.sourceforge.net/pmt/pngcrush-[VER]-nolib.tar.gz?download))
-$(eval $(call archive,PNGQUANT,    https://github.com/pornel/pngquant/archive/[VER].tar.gz))
+$(eval $(call archive-dl,ADVANCECOMP, https://github.com/amadvance/advancecomp/releases/download/v[VER]/advancecomp-[VER].tar.gz))
+$(eval $(call archive-dl,GIFSICLE,    http://www.lcdf.org/gifsicle/gifsicle-[VER].tar.gz))
+$(eval $(call archive-dl,JHEAD,       http://www.sentex.net/~mwandel/jhead/jhead-[VER].tar.gz))
+$(eval $(call archive-dl,JPEGARCHIVE, https://github.com/danielgtaylor/jpeg-archive/archive/[VER].tar.gz))
+$(eval $(call archive-dl,JPEGOPTIM,   http://www.kokkonen.net/tjko/src/jpegoptim-[VER].tar.gz))
+$(eval $(call archive-dl,LIBJPEG,     http://www.ijg.org/files/jpegsrc.v[VER].tar.gz))
+$(eval $(call archive-dl,LIBMOZJPEG,  https://github.com/mozilla/mozjpeg/archive/v[VER].tar.gz))
+$(eval $(call archive-dl,LIBPNG,      http://prdownloads.sourceforge.net/libpng/libpng-[VER].tar.gz?download))
+$(eval $(call archive-dl,LIBZ,        http://prdownloads.sourceforge.net/libpng/zlib-[VER].tar.gz?download))
+$(eval $(call archive-dl,OPTIPNG,     http://prdownloads.sourceforge.net/optipng/optipng-[VER].tar.gz?download))
+$(eval $(call archive-dl,PNGCRUSH,    http://prdownloads.sourceforge.net/pmt/pngcrush-[VER]-nolib.tar.gz?download))
+$(eval $(call archive,PNGQUANT))
 
 PNGQUANT_GIT := $(DL_DIR)/pngquant.git
 $(PNGQUANT_GIT) :; git clone --recursive https://github.com/pornel/pngquant.git $@
 $(PNGQUANT_TGZ) : $(PNGQUANT_GIT)
-	cd $(PNGQUANT_GIT) && git checkout -q $(PNGQUANT_VER) && git submodule -q update
-	cd $(PNGQUANT_GIT) && tar --exclude=.git -czf $(PNGQUANT_TGZ) .
+	while ! mkdir $@.lock 2> /dev/null; do sleep 1; done
+	cd $(PNGQUANT_GIT) && git fetch && git checkout -q $(PNGQUANT_VER) && git submodule -q update
+	cd $(PNGQUANT_GIT) && $(tar) --exclude=.git -czf $(PNGQUANT_TGZ) .
+	rm -r $@.lock
 
-# ====== PRODUCTS ======
+download : $(foreach archive,$(ARCHIVES),$($(archive)_TGZ))
+.PHONY : download
 
-$(shell $(mkpath) $(OUTPUT_DIR)) # just create output dir
+download-tidy-up :
+	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_TGZ)) $(PNGQUANT_GIT),$(wildcard $(DL_DIR)/*.*))
+.PHONY : download-tidy-up
+
+# ====== PRODUCTS ======
 
 PRODUCTS :=
 
@@ -106,11 +115,9 @@ define target-build
 $1_BASENAME := $(or $3,$(call downcase,$1))
 $1_DIR := $($(or $2,$1)_DIR)
 $1_TGZ := $($(or $2,$1)_TGZ)
+$1_EXTRACTED := $($(or $2,$1)_EXTRACTED)
 $1_TARGET := $$($1_DIR)/$$($1_BASENAME)
-# first dependency on archive
-$$($1_TARGET) $$($1_DIR)/__$$(notdir $$($1_TGZ))__ : $$($1_TGZ)
-# second dependency on check file
-$$($1_TARGET) : $$($1_DIR)/__$$(notdir $$($1_TGZ))__
+$$($1_TARGET) : $$($1_EXTRACTED)
 endef
 
 # $1 - product name
@@ -119,14 +126,15 @@ endef
 define target
 $(call target-build,$1,$2,$3)
 PRODUCTS += $1
+$1_DESTINATION := $$(OUTPUT_DIR)/$$($1_BASENAME)
 # copy product to output dir
-$$(OUTPUT_DIR)/$$($1_BASENAME) : $$($1_TARGET)
+$$($1_DESTINATION) : $$($1_TARGET)
 	temppath=`mktemp tmp.XXXXXXXXXX` && \
 		strip $$< -Sx -o "$$$$temppath" && \
 		chmod 755 "$$$$temppath" && \
 		mv "$$$$temppath" $$@
 # short name target
-$(call downcase,$1) : | $$(OUTPUT_DIR)/$$($1_BASENAME)
+$(call downcase,$1) : | $$($1_DESTINATION)
 endef
 
 $(eval $(call target,ADVPNG,ADVANCECOMP))
@@ -145,24 +153,22 @@ $(eval $(call target,PNGQUANT))
 
 # ====== TARGETS ======
 
-all : $(call downcase,$(PRODUCTS))
-	$(MAKE) test
-
-download : $(foreach archive,$(ARCHIVES),$($(archive)_TGZ))
-download-tidy-up :
-	rm -f $(filter-out $(foreach archive,$(ARCHIVES),$($(archive)_TGZ)),$(wildcard $(DL_DIR)/*.*))
+all : build
+	@$(MAKE) test
+.PHONY : all
 
-build : $(foreach product,$(PRODUCTS),$($(product)_TARGET))
+build : $(call downcase,$(PRODUCTS))
+.PHONY : build
 
 define check_bin
 	@test -f $(OUTPUT_DIR)/$1 || \
-		{ printf "$(ERROR_COLOUR)no $1 found$(RESET_COLOUR)\n"; exit 1; }
+		{ printf "$(ANSI_RED)no $1 found$(ANSI_RESET)\n"; exit 1; }
 	@printf "$1: "; \
 		VERSION=$$($(OUTPUT_DIR)/$1 $2 | fgrep -o $3) || \
-		{ printf "$(ERROR_COLOUR)Expected $3, got $$($(OUTPUT_DIR)/$1 $2)$(RESET_COLOUR)\n"; exit 1; }; \
+		{ printf "$(ANSI_RED)Expected $3, got $$($(OUTPUT_DIR)/$1 $2)$(ANSI_RESET)\n"; exit 1; }; \
 		ARCH=$$(file -b $(OUTPUT_DIR)/$1 | fgrep -o '$(ARCH_STRING)') || \
-		{ printf "$(ERROR_COLOUR)Expected $(ARCH_STRING), got $$(file -b $(OUTPUT_DIR)/$1)$(RESET_COLOUR)\n"; exit 1; }; \
-		printf "$(GREEN_COLOUR)$$VERSION$(RESET_COLOUR) / $(MAGENTA_COLOUR)$$ARCH$(RESET_COLOUR)\n"
+		{ printf "$(ANSI_RED)Expected $(ARCH_STRING), got $$(file -b $(OUTPUT_DIR)/$1)$(ANSI_RESET)\n"; exit 1; }; \
+		printf "$(ANSI_GREEN)$$VERSION$(ANSI_RESET) / $(ANSI_MAGENTA)$$ARCH$(ANSI_RESET)\n"
 endef
 
 ifdef IS_DARWIN
@@ -183,25 +189,33 @@ test :
 	$(call check_bin,optipng,--version,$(OPTIPNG_VER))
 	$(call check_bin,pngcrush,-version 2>&1,$(PNGCRUSH_VER))
 	$(call check_bin,pngquant,--help,$(PNGQUANT_VER))
+.PHONY : test
+
+livecheck :; @$(foreach archive,$(ARCHIVES),script/livecheck $(call downcase,$(archive)) $($(archive)_VER);)
+.PHONY : livecheck
 
-livecheck : $(foreach archive,$(ARCHIVES),livecheck-$(call downcase,$(archive)))
+Makefile.updated :
+	cat Makefile | script/update_versions > Makefile.updated
 
-update-versions :
-	cat Makefile | script/update_versions > Makefile.tmp
-	mv Makefile.tmp Makefile
+update-versions : Makefile.updated
+	mv Makefile.updated Makefile
+.PHONY : update-versions
 
 # ====== CLEAN ======
 
 clean :
 	rm -rf $(BUILD_DIR)
 	rm -rf $(OUTPUT_DIR)
+.PHONY : clean
 
 clean-all :
 	rm -rf $(BUILD_ROOT_DIR)
 	rm -rf $(OUTPUT_ROOT_DIR)
+.PHONY : clean-all
 
 clobber : clean-all
 	rm -rf $(DL_DIR)
+.PHONY : clobber
 
 # ====== BUILDING ======
 
@@ -209,7 +223,8 @@ clobber : clean-all
 # $2 - list of dependency products
 define depend-build
 # depend this product on every specified product
-$$($1_TARGET) : $(foreach dep,$2,$$($(dep)_TARGET))
+$($1_EXTRACTED) : $$(filter-out $($1_EXTRACTED),$(foreach dep,$2,$$($(dep)_EXTRACTED)))
+$($1_TARGET) : $(foreach dep,$2,$$($(dep)_TARGET))
 # add dependent product dir to CPATH, LIBRARY_PATH and PKG_CONFIG_PATH
 $($1_TARGET) : export CPATH := $(subst $(eval) ,:,$(foreach dep,$2,$$($(dep)_DIR)))
 $($1_TARGET) : export LIBRARY_PATH := $$(CPATH)
@@ -221,14 +236,7 @@ endef
 define depend
 $(call depend-build,$1,$2)
 # depend output of this product on output of every specified product
-$$(OUTPUT_DIR)/$$($1_BASENAME) : $(foreach dep,$2,$$(OUTPUT_DIR)/$$($(dep)_BASENAME))
-endef
-
-define clean_untar
-	rm -rf $(@D)
-	$(mkpath) $(@D)
-	$(tar) -C $(@D) --strip-components=1 -xzf $<
-	touch $(@D)/__$(notdir $<)__
+$$($1_DESTINATION) : $(foreach dep,$2,$$($(dep)_DESTINATION))
 endef
 
 pkgconfig_pwd = perl -pi -e 's/(?<=dir=).*/$$ENV{PWD}/'
@@ -277,40 +285,43 @@ endif
 
 ## advpng
 $(eval $(call depend,ADVPNG,LIBZ))
-$(ADVPNG_TARGET) :; $(clean_untar)
+$(ADVPNG_TARGET) :
 	cd $(@D) && ./configure LDFLAGS="$(XORIGIN)"
 	cd $(@D) && $(MAKE) advpng
 	$(call chrpath_origin,$@)
 
 ## gifsicle
-$(GIFSICLE_TARGET) :; $(clean_untar)
+$(GIFSICLE_TARGET) :
 	cd $(@D) && ./configure
 	cd $(@D) && $(MAKE) gifsicle
 	cd $(@D) && $(ln_s) src/gifsicle .
 
 ## jhead
-$(JHEAD_TARGET) :; $(clean_untar)
+$(JHEAD_TARGET) :
 	cd $(@D) && $(MAKE) jhead CC="$(CC) $(GCC_FLAGS)"
 
 ## jpeg-recompress
 $(eval $(call depend-build,JPEG-RECOMPRESS,LIBMOZJPEG))
-$(JPEG-RECOMPRESS_TARGET) :; $(clean_untar)
+$(JPEG-RECOMPRESS_TARGET) :
 	cd $(@D) && $(MAKE) jpeg-recompress CC="$(CC) $(GCC_FLAGS)" LIBJPEG=$(LIBMOZJPEG_TARGET) \
 		MAKE=$(MAKE) # fix for bsd in jpeg-archive-2.1.1
 
 ## jpegoptim
 $(eval $(call depend,JPEGOPTIM,LIBJPEG))
-$(JPEGOPTIM_TARGET) :; $(clean_untar)
+$(JPEGOPTIM_TARGET) :
 	cd $(@D) && ./configure LDFLAGS="$(XORIGIN)" --host $(HOST)
 	cd $(@D) && $(MAKE) jpegoptim
 	$(call chrpath_origin,$@)
 
 ## jpegtran
 $(eval $(call depend,JPEGTRAN,LIBJPEG))
-$(JPEGTRAN_TARGET) :; # built in $(LIBJPEG_TARGET)
+$(JPEGTRAN_TARGET) :
+	cd $(@D) && $(MAKE) jpegtran LDFLAGS="$(XORIGIN)"
+	cd $(@D) && $(ln_s) .libs/jpegtran .
+	$(call chrpath_origin,$(JPEGTRAN_TARGET))
 
 ## libjpeg
-$(LIBJPEG_TARGET) :; $(clean_untar)
+$(LIBJPEG_TARGET) :
 	cd $(@D) && ./configure CC="$(CC) $(GCC_FLAGS)"
 	$(libtool_target_soname)
 ifdef IS_DARWIN
@@ -318,12 +329,10 @@ ifdef IS_DARWIN
 else
 	cd $(@D) && $(MAKE) libjpeg.la
 endif
-	cd $(@D) && $(MAKE) jpegtran LDFLAGS="$(XORIGIN)"
-	cd $(@D) && $(ln_s) .libs/libjpeg$(DLEXT) .libs/jpegtran .
-	$(call chrpath_origin,$(JPEGTRAN_TARGET))
+	cd $(@D) && $(ln_s) .libs/libjpeg$(DLEXT) .
 
 ## libmozjpeg
-$(LIBMOZJPEG_TARGET) :; $(clean_untar)
+$(LIBMOZJPEG_TARGET) :
 	cd $(@D) && autoreconf -fiv
 	cd $(@D) && ./configure --host $(HOST)
 	cd $(@D)/simd && $(MAKE)
@@ -332,7 +341,7 @@ $(LIBMOZJPEG_TARGET) :; $(clean_untar)
 
 ## libpng
 $(eval $(call depend,LIBPNG,LIBZ))
-$(LIBPNG_TARGET) :; $(clean_untar)
+$(LIBPNG_TARGET) :
 	cd $(@D) && ./configure CC="$(CC) $(GCC_FLAGS)"
 	cd $(@D) && $(pkgconfig_pwd) -- *.pc
 	cd $(@D) && perl -pi -e 's/(?<=lpng)\d+//g' -- *.pc # %MAJOR%%MINOR% suffix
@@ -351,14 +360,14 @@ $(LIBZ_TARGET) : export LDSHARED = $(CC) -dynamiclib -install_name @loader_path/
 else
 $(LIBZ_TARGET) : export LDSHARED = $(CC) -shared -Wl,-soname,$(@F),--version-script,zlib.map
 endif
-$(LIBZ_TARGET) :; $(clean_untar)
+$(LIBZ_TARGET) :
 	cd $(@D) && ./configure
 	cd $(@D) && $(pkgconfig_pwd) -- *.pc
 	cd $(@D) && $(MAKE) placebo
 
 ## optipng
 $(eval $(call depend,OPTIPNG,LIBPNG LIBZ))
-$(OPTIPNG_TARGET) :; $(clean_untar)
+$(OPTIPNG_TARGET) :
 	cd $(@D) && ./configure -with-system-libs
 	cd $(@D) && $(MAKE) all LDFLAGS="$(XORIGIN) $(GCC_FLAGS)"
 	cd $(@D) && $(ln_s) src/optipng/optipng .
@@ -366,7 +375,7 @@ $(OPTIPNG_TARGET) :; $(clean_untar)
 
 ## pngcrush
 $(eval $(call depend,PNGCRUSH,LIBPNG LIBZ))
-$(PNGCRUSH_TARGET) :; $(clean_untar)
+$(PNGCRUSH_TARGET) :
 	cd $(@D) && rm -f png.h pngconf.h
 	cd $(@D) && $(MAKE) -f Makefile pngcrush \
 		LIBS="-lpng -lz -lm" \
@@ -376,7 +385,7 @@ $(PNGCRUSH_TARGET) :; $(clean_untar)
 
 ## pngquant
 $(eval $(call depend,PNGQUANT,LIBPNG LIBZ))
-$(PNGQUANT_TARGET) :; $(clean_untar)
+$(PNGQUANT_TARGET) :
 	cd $(@D) && ./configure --without-cocoa --extra-ldflags="$(XORIGIN)"
 	cd $(@D) && $(MAKE) pngquant
 	$(call chrpath_origin,$@)

data/README.markdown

@@ -71,12 +71,12 @@ 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 run # same
 
 make livecheck # Check versions
 make update-versions # Update versions in Makefile
 
 make download # Download archives
+make download-tidy-up # Remove old archives
 make build # Build all without copying to output directory
 
 make test # Test bins for current os/arch

data/image_optim_pack.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim_pack'
-  s.version     = '0.3.0.20161206'
+  s.version     = '0.3.1'
   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/script/update_versions

@@ -2,18 +2,21 @@
 
 # Feed Makefile to this script to set all variables XXX_VER to latest versions
 
-require 'English'
-
-tty = $stdout.tty?
-
-ARGF.each do |line|
+ARGF.map do |line|
   if (name = line[/^([A-Z]+)_VER *:= *.*/, 1])
-    $stderr << name << ' := ' unless tty
-    latest_version = `script/livecheck --bare #{name}`.strip
-    abort unless $CHILD_STATUS.success?
-    $stderr << latest_version << "\n" unless tty
-    $stdout << "#{name}_VER := #{latest_version}\n"
+    Thread.new do
+      version = `script/livecheck --bare #{name}`.strip
+      abort unless $?.success?
+      "#{name}_VER := #{version}\n"
+    end
+  else
+    line
+  end
+end.each do |out|
+  if out.respond_to?(:value)
+    $stderr << out.value unless $stdout.tty?
+    $stdout << out.value
   else
-    $stdout << line
+    $stdout << out
   end
 end

data/spec/image_optim_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require 'image_optim'
 require 'image_optim/cmd'
 require 'tempfile'
-require 'English'
 
 describe ImageOptim do
   before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim_pack
 version: !ruby/object:Gem::Version
-  version: 0.3.0.20161206
+  version: 0.3.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_optim