image_optim_pack 0.6.0 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.rubocop.yml +20 -4
- data/.travis.yml +15 -16
- data/CHANGELOG.markdown +25 -0
- data/LICENSE.txt +1 -1
- data/Makefile +18 -21
- data/README.markdown +13 -13
- data/Vagrantfile +2 -2
- data/boxes/.rubocop.yml +2 -5
- data/boxes/definitions/centos-amd64/definition.rb +3 -3
- data/boxes/definitions/centos-i386/definition.rb +3 -3
- data/boxes/definitions/centos-postinstall.sh +0 -4
- data/checksums.mk +5 -5
- data/image_optim_pack.gemspec +4 -4
- data/script/livecheck +9 -11
- data/script/run +1 -1
- data/spec/image_optim_spec.rb +5 -4
- data/vendor/darwin-x86_64/advpng +0 -0
- data/vendor/darwin-x86_64/gifsicle +0 -0
- data/vendor/darwin-x86_64/jhead +0 -0
- data/vendor/darwin-x86_64/jpeg-recompress +0 -0
- data/vendor/darwin-x86_64/jpegoptim +0 -0
- data/vendor/darwin-x86_64/jpegtran +0 -0
- data/vendor/darwin-x86_64/libjpeg.dylib +0 -0
- data/vendor/darwin-x86_64/libpng.dylib +0 -0
- data/vendor/darwin-x86_64/libz.dylib +0 -0
- data/vendor/darwin-x86_64/optipng +0 -0
- data/vendor/darwin-x86_64/pngcrush +0 -0
- data/vendor/darwin-x86_64/pngquant +0 -0
- data/vendor/linux-i686/advpng +0 -0
- data/vendor/linux-i686/gifsicle +0 -0
- data/vendor/linux-i686/jhead +0 -0
- data/vendor/linux-i686/jpeg-recompress +0 -0
- data/vendor/linux-i686/jpegoptim +0 -0
- data/vendor/linux-i686/jpegtran +0 -0
- data/vendor/linux-i686/libjpeg.so +0 -0
- data/vendor/linux-i686/libpng.so +0 -0
- data/vendor/linux-i686/libz.so +0 -0
- data/vendor/linux-i686/optipng +0 -0
- data/vendor/linux-i686/pngcrush +0 -0
- data/vendor/linux-i686/pngquant +0 -0
- data/vendor/linux-x86_64/advpng +0 -0
- data/vendor/linux-x86_64/gifsicle +0 -0
- data/vendor/linux-x86_64/jhead +0 -0
- data/vendor/linux-x86_64/jpeg-recompress +0 -0
- data/vendor/linux-x86_64/jpegoptim +0 -0
- data/vendor/linux-x86_64/jpegtran +0 -0
- data/vendor/linux-x86_64/libjpeg.so +0 -0
- data/vendor/linux-x86_64/libpng.so +0 -0
- data/vendor/linux-x86_64/libz.so +0 -0
- data/vendor/linux-x86_64/optipng +0 -0
- data/vendor/linux-x86_64/pngcrush +0 -0
- data/vendor/linux-x86_64/pngquant +0 -0
- metadata +12 -25
- data/image_optim_pack-darwin-x86.gemspec +0 -3
- data/vendor/darwin-i386/advpng +0 -0
- data/vendor/darwin-i386/gifsicle +0 -0
- data/vendor/darwin-i386/jhead +0 -0
- data/vendor/darwin-i386/jpeg-recompress +0 -0
- data/vendor/darwin-i386/jpegoptim +0 -0
- data/vendor/darwin-i386/jpegtran +0 -0
- data/vendor/darwin-i386/libjpeg.dylib +0 -0
- data/vendor/darwin-i386/libpng.dylib +0 -0
- data/vendor/darwin-i386/libz.dylib +0 -0
- data/vendor/darwin-i386/optipng +0 -0
- data/vendor/darwin-i386/pngcrush +0 -0
- data/vendor/darwin-i386/pngquant +0 -0
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d4072bcc33e2c9c65cbb61203e24f996a28143d9f2bc2c17a369c4a1c84d7d20
|
|
4
|
+
data.tar.gz: e588e07f04ebcba76de3aea586f837330c0d565efc9e54128b0698fa59071f98
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 319738df8f69458d56d010e5ddcda4bf9c36cce16bc484d4d74941c97f183e31a3a416dea2f9ca36a1aff2696a4292ad731840cf127e5b640a5cd7e2db9f22f5
|
|
7
|
+
data.tar.gz: 887dbaf8497141aac705242f8ca1afdb0818cf01c6b9c5f6b942b75c149624e9347cd6170c77777d794d3ad8999a95fbcd3e37ced9eba3a8aca1d9ef7ea1c78b
|
data/.rubocop.yml
CHANGED
|
@@ -4,6 +4,7 @@ AllCops:
|
|
|
4
4
|
- 'build/**/*'
|
|
5
5
|
- 'download/**/*'
|
|
6
6
|
- Vagrantfile
|
|
7
|
+
NewCops: enable
|
|
7
8
|
|
|
8
9
|
Bundler/OrderedGems:
|
|
9
10
|
Enabled: false
|
|
@@ -14,9 +15,12 @@ Layout/AccessModifierIndentation:
|
|
|
14
15
|
Layout/DotPosition:
|
|
15
16
|
EnforcedStyle: trailing
|
|
16
17
|
|
|
17
|
-
Layout/
|
|
18
|
+
Layout/FirstHashElementIndentation:
|
|
18
19
|
EnforcedStyle: consistent
|
|
19
20
|
|
|
21
|
+
Layout/LineLength:
|
|
22
|
+
Max: 120
|
|
23
|
+
|
|
20
24
|
Layout/RescueEnsureAlignment:
|
|
21
25
|
Enabled: false
|
|
22
26
|
|
|
@@ -30,9 +34,6 @@ Metrics/BlockLength:
|
|
|
30
34
|
Exclude:
|
|
31
35
|
- spec/**/*_spec.rb
|
|
32
36
|
|
|
33
|
-
Metrics/LineLength:
|
|
34
|
-
Max: 120
|
|
35
|
-
|
|
36
37
|
Metrics/MethodLength:
|
|
37
38
|
Max: 15
|
|
38
39
|
|
|
@@ -40,6 +41,9 @@ Security/YAMLLoad:
|
|
|
40
41
|
Exclude:
|
|
41
42
|
- script/livecheck
|
|
42
43
|
|
|
44
|
+
Style/AccessorGrouping:
|
|
45
|
+
Enabled: false
|
|
46
|
+
|
|
43
47
|
Style/Alias:
|
|
44
48
|
EnforcedStyle: prefer_alias_method
|
|
45
49
|
|
|
@@ -52,15 +56,27 @@ Style/EmptyCaseCondition:
|
|
|
52
56
|
Style/FormatStringToken:
|
|
53
57
|
Enabled: false
|
|
54
58
|
|
|
59
|
+
Style/HashEachMethods:
|
|
60
|
+
Enabled: true
|
|
61
|
+
|
|
55
62
|
Style/HashSyntax:
|
|
56
63
|
EnforcedStyle: hash_rockets
|
|
57
64
|
|
|
65
|
+
Style/HashTransformKeys:
|
|
66
|
+
Enabled: false
|
|
67
|
+
|
|
68
|
+
Style/HashTransformValues:
|
|
69
|
+
Enabled: false
|
|
70
|
+
|
|
58
71
|
Style/IfUnlessModifier:
|
|
59
72
|
Enabled: false
|
|
60
73
|
|
|
61
74
|
Style/MultilineBlockChain:
|
|
62
75
|
Enabled: false
|
|
63
76
|
|
|
77
|
+
Style/RedundantArgument:
|
|
78
|
+
Enabled: false
|
|
79
|
+
|
|
64
80
|
Style/Semicolon:
|
|
65
81
|
AllowAsExpressionSeparator: true
|
|
66
82
|
|
data/.travis.yml
CHANGED
|
@@ -2,40 +2,39 @@ sudo: false
|
|
|
2
2
|
dist: trusty
|
|
3
3
|
language: ruby
|
|
4
4
|
rvm:
|
|
5
|
-
- '1.8.7-
|
|
5
|
+
- '1.8.7-p374'
|
|
6
6
|
- '1.9.3-p551'
|
|
7
7
|
- '2.0.0-p648'
|
|
8
8
|
- '2.1.10'
|
|
9
9
|
- '2.2.10'
|
|
10
10
|
- '2.3.8'
|
|
11
|
-
- '2.4.
|
|
12
|
-
- '2.5.
|
|
13
|
-
- '2.6.
|
|
14
|
-
- '
|
|
11
|
+
- '2.4.10'
|
|
12
|
+
- '2.5.8'
|
|
13
|
+
- '2.6.6'
|
|
14
|
+
- '2.7.2'
|
|
15
|
+
- 'jruby-9.2.11.1'
|
|
15
16
|
script:
|
|
16
17
|
- make test
|
|
17
18
|
- bundle exec image_optim --info
|
|
18
19
|
- bundle exec rspec
|
|
19
20
|
before_install:
|
|
21
|
+
- 'echo "gem: --no-ri --no-rdoc --no-document" > ~/.gemrc'
|
|
20
22
|
- gem install rubygems-update || gem install rubygems-update --version '< 3'
|
|
21
|
-
-
|
|
23
|
+
- update_rubygems
|
|
22
24
|
- gem install bundler || gem install bundler --version '< 2'
|
|
23
|
-
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install imagemagick; fi
|
|
25
|
+
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install imagemagick; fi; which convert
|
|
24
26
|
- make ldd-version
|
|
25
27
|
matrix:
|
|
26
28
|
include:
|
|
27
29
|
- os: osx
|
|
28
30
|
rvm: default
|
|
29
|
-
osx_image:
|
|
31
|
+
osx_image: xcode11.3
|
|
30
32
|
- os: osx
|
|
31
33
|
rvm: default
|
|
32
|
-
osx_image:
|
|
33
|
-
-
|
|
34
|
-
rvm:
|
|
35
|
-
osx_image: xcode10.1
|
|
36
|
-
- env: RUBOCOP=✓
|
|
37
|
-
rvm: '2.6.3'
|
|
34
|
+
osx_image: xcode12.2
|
|
35
|
+
- env: RUBOCOP=1
|
|
36
|
+
rvm: '2.6.6'
|
|
38
37
|
script: bundle exec rubocop
|
|
39
|
-
- env: CHECK_RUBIES
|
|
40
|
-
rvm: '2.6.
|
|
38
|
+
- env: CHECK_RUBIES=1
|
|
39
|
+
rvm: '2.6.6'
|
|
41
40
|
script: bundle exec travis_check_rubies
|
data/CHANGELOG.markdown
CHANGED
|
@@ -2,6 +2,31 @@
|
|
|
2
2
|
|
|
3
3
|
## unreleased
|
|
4
4
|
|
|
5
|
+
## v0.7.0 (2020-12-05)
|
|
6
|
+
|
|
7
|
+
* libmozjpeg 4.0.0 [@toy](https://github.com/toy)
|
|
8
|
+
* Set darwin deployment target to 10.9 [@toy](https://github.com/toy)
|
|
9
|
+
* Remove 32 bit (i386) binaries/platform on darwin [@toy](https://github.com/toy)
|
|
10
|
+
* Switch to centos 7 for linux builds as 6.9 is outdated [@toy](https://github.com/toy)
|
|
11
|
+
* pngquant 2.13.1 [@toy](https://github.com/toy)
|
|
12
|
+
|
|
13
|
+
## v0.6.0.20201024 (2020-10-24)
|
|
14
|
+
|
|
15
|
+
* pngquant 2.13.0 [@toy](https://github.com/toy)
|
|
16
|
+
|
|
17
|
+
## v0.6.0.20200215 (2020-02-15)
|
|
18
|
+
|
|
19
|
+
* jpegarchive 2.2.0 and libmozjpeg 3.3.1 [@toy](https://github.com/toy)
|
|
20
|
+
|
|
21
|
+
## v0.6.0.20200116 (2020-01-16)
|
|
22
|
+
|
|
23
|
+
* libjpeg 9d [@toy](https://github.com/toy)
|
|
24
|
+
|
|
25
|
+
## v0.6.0.20191208 (2019-12-08)
|
|
26
|
+
|
|
27
|
+
* jhead 3.04 [@toy](https://github.com/toy)
|
|
28
|
+
* Update jhead source and use https where possible [@toy](https://github.com/toy)
|
|
29
|
+
|
|
5
30
|
## v0.6.0 (2019-08-15)
|
|
6
31
|
|
|
7
32
|
* Remove FreeBSD and OpenBSD binaries/platforms [#16](https://github.com/toy/image_optim_pack/issues/16) [@toy](https://github.com/toy)
|
data/LICENSE.txt
CHANGED
data/Makefile
CHANGED
|
@@ -4,16 +4,16 @@ all :
|
|
|
4
4
|
|
|
5
5
|
ADVANCECOMP_VER := 2.1
|
|
6
6
|
GIFSICLE_VER := 1.92
|
|
7
|
-
JHEAD_VER := 3.
|
|
8
|
-
JPEGARCHIVE_VER := 2.
|
|
7
|
+
JHEAD_VER := 3.04
|
|
8
|
+
JPEGARCHIVE_VER := 2.2.0
|
|
9
9
|
JPEGOPTIM_VER := 1.4.6
|
|
10
|
-
LIBJPEG_VER :=
|
|
11
|
-
LIBMOZJPEG_VER :=
|
|
10
|
+
LIBJPEG_VER := 9d
|
|
11
|
+
LIBMOZJPEG_VER := 4.0.0
|
|
12
12
|
LIBPNG_VER := 1.6.37
|
|
13
13
|
LIBZ_VER := 1.2.11
|
|
14
14
|
OPTIPNG_VER := 0.7.7
|
|
15
15
|
PNGCRUSH_VER := 1.8.13
|
|
16
|
-
PNGQUANT_VER := 2.
|
|
16
|
+
PNGQUANT_VER := 2.13.1
|
|
17
17
|
|
|
18
18
|
# ====== CHECKSUMS ======
|
|
19
19
|
|
|
@@ -83,17 +83,17 @@ $$($1_TGZ) :
|
|
|
83
83
|
endef
|
|
84
84
|
|
|
85
85
|
$(eval $(call archive-dl,ADVANCECOMP, https://github.com/amadvance/advancecomp/releases/download/v[VER]/advancecomp-[VER].tar.gz))
|
|
86
|
-
$(eval $(call archive-dl,GIFSICLE,
|
|
87
|
-
$(eval $(call archive-dl,JHEAD,
|
|
88
|
-
$(eval $(call archive-dl,JPEGARCHIVE, https://github.com/danielgtaylor/jpeg-archive/archive/[VER].tar.gz))
|
|
89
|
-
$(eval $(call archive-dl,JPEGOPTIM,
|
|
90
|
-
$(eval $(call archive-dl,LIBJPEG,
|
|
86
|
+
$(eval $(call archive-dl,GIFSICLE, https://www.lcdf.org/gifsicle/gifsicle-[VER].tar.gz))
|
|
87
|
+
$(eval $(call archive-dl,JHEAD, https://www.sentex.ca/~mwandel/jhead/jhead-[VER].tar.gz))
|
|
88
|
+
$(eval $(call archive-dl,JPEGARCHIVE, https://github.com/danielgtaylor/jpeg-archive/archive/v[VER].tar.gz))
|
|
89
|
+
$(eval $(call archive-dl,JPEGOPTIM, https://www.kokkonen.net/tjko/src/jpegoptim-[VER].tar.gz))
|
|
90
|
+
$(eval $(call archive-dl,LIBJPEG, https://www.ijg.org/files/jpegsrc.v[VER].tar.gz))
|
|
91
91
|
$(eval $(call archive-dl,LIBMOZJPEG, https://github.com/mozilla/mozjpeg/archive/v[VER].tar.gz))
|
|
92
|
-
$(eval $(call archive-dl,LIBPNG,
|
|
93
|
-
$(eval $(call archive-dl,LIBZ,
|
|
94
|
-
$(eval $(call archive-dl,OPTIPNG,
|
|
95
|
-
$(eval $(call archive-dl,PNGCRUSH,
|
|
96
|
-
$(eval $(call archive-dl,PNGQUANT,
|
|
92
|
+
$(eval $(call archive-dl,LIBPNG, https://prdownloads.sourceforge.net/libpng/libpng-[VER].tar.gz?download))
|
|
93
|
+
$(eval $(call archive-dl,LIBZ, https://prdownloads.sourceforge.net/libpng/zlib-[VER].tar.gz?download))
|
|
94
|
+
$(eval $(call archive-dl,OPTIPNG, https://prdownloads.sourceforge.net/optipng/optipng-[VER].tar.gz?download))
|
|
95
|
+
$(eval $(call archive-dl,PNGCRUSH, https://prdownloads.sourceforge.net/pmt/pngcrush-[VER]-nolib.tar.gz?download))
|
|
96
|
+
$(eval $(call archive-dl,PNGQUANT, https://pngquant.org/pngquant-[VER]-src.tar.gz))
|
|
97
97
|
|
|
98
98
|
download : $(foreach archive,$(ARCHIVES),$($(archive)_TGZ))
|
|
99
99
|
.PHONY : download
|
|
@@ -327,7 +327,7 @@ export CPPFLAGS = $(GCC_FLAGS)
|
|
|
327
327
|
export LDFLAGS = $(GCC_FLAGS)
|
|
328
328
|
|
|
329
329
|
ifdef IS_DARWIN
|
|
330
|
-
export MACOSX_DEPLOYMENT_TARGET := 10.
|
|
330
|
+
export MACOSX_DEPLOYMENT_TARGET := 10.9
|
|
331
331
|
GCC_FLAGS += -arch $(ARCH)
|
|
332
332
|
CXXFLAGS += -stdlib=libc++
|
|
333
333
|
endif
|
|
@@ -388,11 +388,8 @@ endif
|
|
|
388
388
|
|
|
389
389
|
## libmozjpeg
|
|
390
390
|
$(LIBMOZJPEG_TARGET) :
|
|
391
|
-
cd $(DIR) &&
|
|
392
|
-
cd $(DIR) &&
|
|
393
|
-
cd $(DIR)/simd && $(MAKE)
|
|
394
|
-
cd $(DIR) && $(MAKE) libjpeg.la
|
|
395
|
-
cd $(DIR) && $(ln_s) .libs/libjpeg.a .
|
|
391
|
+
cd $(DIR) && cmake -DPNG_SUPPORTED=0 .
|
|
392
|
+
cd $(DIR) && $(MAKE) jpeg-static
|
|
396
393
|
|
|
397
394
|
## libpng
|
|
398
395
|
$(eval $(call depend,LIBPNG,LIBZ))
|
data/README.markdown
CHANGED
|
@@ -8,36 +8,36 @@
|
|
|
8
8
|
|
|
9
9
|
Precompiled binaries for [`image_optim`](https://github.com/toy/image_optim).
|
|
10
10
|
|
|
11
|
-
Contains binaries for Mac OS X (>= 10.
|
|
11
|
+
Contains binaries for Mac OS X (>= 10.9, x86\_64) and Linux (i686 and x86\_64).
|
|
12
12
|
|
|
13
13
|
A test application with latest `image_optim` and `image_optim_pack` is available on heroku: https://iopack.herokuapp.com/.
|
|
14
14
|
|
|
15
15
|
## Binaries and libraries
|
|
16
16
|
|
|
17
|
-
* [advpng](
|
|
18
|
-
* contains parts of [7z](
|
|
17
|
+
* [advpng](https://www.advancemame.it/doc-advpng.html) by Andrea Mazzoleni and Filipe Estima ([GNU GPLv3](acknowledgements/advancecomp.txt))
|
|
18
|
+
* contains parts of [7z](https://7-zip.org) by Igor Pavlov with modifications by Andrea Mazzoleni ([license](acknowledgements/7z.txt))
|
|
19
19
|
* and [zopfli](https://code.google.com/p/zopfli/) by Lode Vandevenne and Jyrki Alakuijala ([license](acknowledgements/zopfli.txt), [contributors](acknowledgements/zopfli-contributors.txt))
|
|
20
|
-
* [gifsicle](
|
|
21
|
-
* [jhead](
|
|
20
|
+
* [gifsicle](https://lcdf.org/gifsicle/) by Eddie Kohler ([GNU GPLv2](acknowledgements/gifsicle.txt))
|
|
21
|
+
* [jhead](https://www.sentex.ca/~mwandel/jhead/) by Matthias Wandel ([public domain](acknowledgements/jhead.txt))
|
|
22
22
|
* [jpeg-recompress](https://github.com/danielgtaylor/jpeg-archive) by Daniel G. Taylor ([license](acknowledgements/jpeg-archive.txt))
|
|
23
23
|
* includes [Image Quality Assessment (IQA)](http://tdistler.com/iqa/) by Tom Distler ([license](acknowledgements/iqa.txt))
|
|
24
24
|
* includes [SmallFry](https://github.com/dwbuiten/smallfry) by Derek Buitenhuis ([license](acknowledgements/smallfry.txt))
|
|
25
25
|
* statically linked against mozjpeg, see below
|
|
26
|
-
* [jpegoptim](
|
|
27
|
-
* [libjpeg and jpegtran](
|
|
28
|
-
* [libjpeg-turbo](
|
|
26
|
+
* [jpegoptim](https://www.kokkonen.net/tjko/projects.html) by Timo Kokkonen ([GNU GPLv2](acknowledgements/jpegoptim.txt) or later)
|
|
27
|
+
* [libjpeg and jpegtran](https://ijg.org/) by the Independent JPEG Group ([license](acknowledgements/libjpeg.txt))
|
|
28
|
+
* [libjpeg-turbo](https://www.libjpeg-turbo.org/) by libjpeg-turbo Project ([license](acknowledgements/libjpeg-turbo.txt))
|
|
29
29
|
* based on libjpeg, see above
|
|
30
|
-
* includes [x86 SIMD extension for IJG JPEG library](
|
|
30
|
+
* includes [x86 SIMD extension for IJG JPEG library](https://cetus.sakura.ne.jp/softlab/jpeg-x86simd/jpegsimd.html) by Miyasaka Masaru ([license](acknowledgements/libjpeg-x86-simd.txt))
|
|
31
31
|
* [libpng](http://libpng.org/pub/png/) by Guy Eric Schalnat, Andreas Dilger, Glenn Randers-Pehrson and others ([license](acknowledgements/libpng.txt))
|
|
32
32
|
* [mozjpeg](https://github.com/mozilla/mozjpeg) by Mozilla Research ([license](acknowledgements/mozjpeg.txt))
|
|
33
33
|
* base on libjpeg and libjpeg-turbo, see above
|
|
34
34
|
* [optipng](http://optipng.sourceforge.net/) by Cosmin Truta ([license](acknowledgements/optipng.txt), [authors](acknowledgements/optipng-authors.txt))
|
|
35
35
|
* contains code based in part on the work of Miyasaka Masaru for BMP support ([license](acknowledgements/bmp2png.txt))
|
|
36
36
|
* and David Koblas for GIF support ([license](acknowledgements/gifread.txt))
|
|
37
|
-
* [pngcrush](
|
|
37
|
+
* [pngcrush](https://pmt.sourceforge.io/pngcrush/) by Glenn Randers-Pehrson, portions by Greg Roelofs ([license](acknowledgements/pngcrush.txt))
|
|
38
38
|
* contains [cexcept](http://www.nicemice.net/cexcept/) interface by Adam M. Costello and Cosmin Truta ([license](acknowledgements/cexcept.txt))
|
|
39
|
-
* [pngquant](
|
|
40
|
-
* [zlib](
|
|
39
|
+
* [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))
|
|
40
|
+
* [zlib](https://zlib.net/) by Jean-Loup Gailly and Mark Adler ([license](acknowledgements/zlib.txt))
|
|
41
41
|
|
|
42
42
|
**NOTE: On FreeBSD and OpenBSD `make` is not the GNU Make, so `gmake` should be used instead.**
|
|
43
43
|
|
|
@@ -92,4 +92,4 @@ make clobber # `clean-all` and remove download directory
|
|
|
92
92
|
|
|
93
93
|
## Copyright
|
|
94
94
|
|
|
95
|
-
Copyright (c) 2014-
|
|
95
|
+
Copyright (c) 2014-2020 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
|
data/Vagrantfile
CHANGED
|
@@ -28,9 +28,9 @@ Vagrant.configure('2') do |config|
|
|
|
28
28
|
set -ex
|
|
29
29
|
if command -v apt-get; then
|
|
30
30
|
apt-get update
|
|
31
|
-
apt-get -y install rsync ntpdate make wget gcc g++ chrpath perl pkg-config autoconf automake libtool nasm
|
|
31
|
+
apt-get -y install rsync ntpdate make wget gcc g++ chrpath perl pkg-config autoconf automake libtool nasm cmake
|
|
32
32
|
else
|
|
33
|
-
yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm
|
|
33
|
+
yum -y install rsync ntpdate make wget gcc gcc-c++ chrpath perl pkg-config autoconf automake libtool nasm cmake
|
|
34
34
|
fi
|
|
35
35
|
SH
|
|
36
36
|
end
|
data/boxes/.rubocop.yml
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
inherit_from: ../.rubocop.yml
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
Layout/LineLength:
|
|
4
4
|
Enabled: false
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
Lint/RedundantSplatExpansion:
|
|
7
7
|
Enabled: false
|
|
8
8
|
|
|
9
9
|
Security/Eval:
|
|
10
10
|
Exclude: [Rakefile]
|
|
11
|
-
|
|
12
|
-
Style/BracesAroundHashParameters:
|
|
13
|
-
Enabled: false
|
|
@@ -7,9 +7,9 @@ Veewee::Session.declare({
|
|
|
7
7
|
:disk_format => 'VDI',
|
|
8
8
|
:hostiocache => 'off',
|
|
9
9
|
:os_type_id => 'RedHat6_64',
|
|
10
|
-
:iso_file => 'CentOS-
|
|
11
|
-
:iso_src => 'http://
|
|
12
|
-
:iso_sha256 => '
|
|
10
|
+
:iso_file => 'CentOS-7-x86_64-Minimal-2009.iso',
|
|
11
|
+
:iso_src => 'http://linux.darkpenguin.net/distros/CentOS/7.9.2009/isos/x86_64/CentOS-7-x86_64-Minimal-2009.iso',
|
|
12
|
+
:iso_sha256 => '07b94e6b1a0b0260b94c83d6bb76b26bf7a310dc78d7a9c7432809fb9bc6194a',
|
|
13
13
|
:iso_download_timeout => '1000',
|
|
14
14
|
:boot_wait => '10',
|
|
15
15
|
:boot_cmd_sequence => [
|
|
@@ -7,9 +7,9 @@ Veewee::Session.declare({
|
|
|
7
7
|
:disk_format => 'VDI',
|
|
8
8
|
:hostiocache => 'off',
|
|
9
9
|
:os_type_id => 'RedHat',
|
|
10
|
-
:iso_file => 'CentOS-
|
|
11
|
-
:iso_src => 'http://
|
|
12
|
-
:iso_sha256 => '
|
|
10
|
+
:iso_file => 'CentOS-7-i386-Minimal-2009.iso',
|
|
11
|
+
:iso_src => 'http://linux.darkpenguin.net/distros/CentOS-AltArch/7.9.2009/isos/i386/CentOS-7-i386-Minimal-2009.iso',
|
|
12
|
+
:iso_sha256 => 'bcbde5d345c5013fa618c38380765547be01a354883b3055f32d7067dd7b5bca',
|
|
13
13
|
:iso_download_timeout => '1000',
|
|
14
14
|
:boot_wait => '10',
|
|
15
15
|
:boot_cmd_sequence => [
|
|
@@ -25,9 +25,5 @@ chown -R vagrant /home/vagrant/.ssh
|
|
|
25
25
|
|
|
26
26
|
yum -y clean all
|
|
27
27
|
|
|
28
|
-
# Remove traces of mac address from network configuration
|
|
29
|
-
sed -i /HWADDR/d /etc/sysconfig/network-scripts/ifcfg-eth0
|
|
30
|
-
rm /etc/udev/rules.d/70-persistent-net.rules
|
|
31
|
-
|
|
32
28
|
# Zero out the free space to save space in the final image
|
|
33
29
|
dd if=/dev/zero of=/filler bs=1M || rm /filler
|
data/checksums.mk
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
ADVANCECOMP_SHA256 := 3ac0875e86a8517011976f04107186d5c60d434954078bc502ee731480933eb8
|
|
2
2
|
GIFSICLE_SHA256 := 5ab556c01d65fddf980749e3ccf50b7fd40de738b6df679999294cc5fabfce65
|
|
3
|
-
JHEAD_SHA256 :=
|
|
4
|
-
JPEGARCHIVE_SHA256 :=
|
|
3
|
+
JHEAD_SHA256 := ef89bbcf4f6c25ed88088cf242a47a6aedfff4f08cc7dc205bf3e2c0f10a03c9
|
|
4
|
+
JPEGARCHIVE_SHA256 := 3da16a5abbddd925dee0379aa51d9fe0cba33da0b5703be27c13a2dda3d7ed75
|
|
5
5
|
JPEGOPTIM_SHA256 := 88b1eb64c2a33a2f013f068df8b0331f42c019267401ae3fa28e3277403a5ab7
|
|
6
|
-
LIBJPEG_SHA256 :=
|
|
7
|
-
LIBMOZJPEG_SHA256 :=
|
|
6
|
+
LIBJPEG_SHA256 := 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32
|
|
7
|
+
LIBMOZJPEG_SHA256 := 961e14e73d06a015e9b23b8af416f010187cc0bec95f6e3b0fcb28cc7e2cbdd4
|
|
8
8
|
LIBPNG_SHA256 := daeb2620d829575513e35fecc83f0d3791a620b9b93d800b763542ece9390fb4
|
|
9
9
|
LIBZ_SHA256 := c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
|
|
10
10
|
OPTIPNG_SHA256 := 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
|
|
11
11
|
PNGCRUSH_SHA256 := fed0aaf5c098aa8c7f78c75365cd18d7341417326ecbdba547876b7b4f3df4be
|
|
12
|
-
PNGQUANT_SHA256 :=
|
|
12
|
+
PNGQUANT_SHA256 := 4b911a11aa0c35d364b608c917d13002126185c8c314ba4aa706b62fd6a95a7a
|
data/image_optim_pack.gemspec
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
Gem::Specification.new do |s|
|
|
4
4
|
s.name = 'image_optim_pack'
|
|
5
|
-
s.version = '0.
|
|
5
|
+
s.version = '0.7.0'
|
|
6
6
|
s.summary = %q{Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegtran, optipng, pngcrush, pngquant}
|
|
7
|
-
s.homepage = "
|
|
7
|
+
s.homepage = "https://github.com/toy/#{s.name}"
|
|
8
8
|
s.authors = ['Ivan Kuchin']
|
|
9
9
|
s.license = 'MIT'
|
|
10
10
|
|
|
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
|
|
|
54
54
|
s.add_dependency 'fspath', '>= 2.1', '< 4'
|
|
55
55
|
|
|
56
56
|
s.add_development_dependency 'rspec', '~> 3.0'
|
|
57
|
-
if RUBY_VERSION >= '2.
|
|
58
|
-
s.add_development_dependency 'rubocop', '~> 0
|
|
57
|
+
if RUBY_VERSION >= '2.4'
|
|
58
|
+
s.add_development_dependency 'rubocop', '~> 1.0'
|
|
59
59
|
end
|
|
60
60
|
end
|
data/script/livecheck
CHANGED
|
@@ -72,11 +72,7 @@ class Livecheck
|
|
|
72
72
|
def changelog_entry
|
|
73
73
|
github_user = `git config github.user`.strip
|
|
74
74
|
changed = livechecks.select(&:changed?)
|
|
75
|
-
|
|
76
|
-
*
|
|
77
|
-
#{to_sentence(changed.map(&:name_n_latest_version))}
|
|
78
|
-
[@#{github_user}](https://github.com/#{github_user})
|
|
79
|
-
].join(' ') + "\n"
|
|
75
|
+
"* #{to_sentence(changed.map(&:name_n_latest_version))} [@#{github_user}](https://github.com/#{github_user})\n"
|
|
80
76
|
end
|
|
81
77
|
|
|
82
78
|
def to_sentence(array)
|
|
@@ -90,7 +86,9 @@ class Livecheck
|
|
|
90
86
|
def write(path, data)
|
|
91
87
|
path.temp_file(path.dirname) do |io|
|
|
92
88
|
io.write data
|
|
89
|
+
mode = path.exist? ? path.stat.mode : (0o777 & ~File.umask)
|
|
93
90
|
io.path.rename(path)
|
|
91
|
+
path.chmod(mode)
|
|
94
92
|
end
|
|
95
93
|
warn "Wrote #{path}"
|
|
96
94
|
end
|
|
@@ -173,25 +171,25 @@ Livecheck::Cli.new(ARGV).run
|
|
|
173
171
|
__END__
|
|
174
172
|
advancecomp:
|
|
175
173
|
url: https://github.com/amadvance/advancecomp/releases.atom
|
|
176
|
-
regexp:
|
|
174
|
+
regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
|
|
177
175
|
gifsicle:
|
|
178
176
|
url: https://www.lcdf.org/gifsicle/
|
|
179
177
|
regexp: gifsicle-(\d+(?:\.\d+)*)\.tar\.gz
|
|
180
178
|
jhead:
|
|
181
|
-
url:
|
|
179
|
+
url: https://www.sentex.ca/~mwandel/jhead/
|
|
182
180
|
regexp: jhead-(\d+(?:\.\d+)*)
|
|
183
181
|
jpegoptim:
|
|
184
182
|
url: https://github.com/tjko/jpegoptim/releases.atom
|
|
185
|
-
regexp: <
|
|
183
|
+
regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
|
|
186
184
|
jpegarchive:
|
|
187
185
|
url: https://github.com/danielgtaylor/jpeg-archive/releases.atom
|
|
188
|
-
regexp: <
|
|
186
|
+
regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
|
|
189
187
|
libjpeg:
|
|
190
|
-
url:
|
|
188
|
+
url: https://www.ijg.org/files/
|
|
191
189
|
regexp: jpegsrc.v(.*?).tar.gz
|
|
192
190
|
libmozjpeg:
|
|
193
191
|
url: https://github.com/mozilla/mozjpeg/releases.atom
|
|
194
|
-
regexp: <
|
|
192
|
+
regexp: <id>tag:github.com,2008:Repository/\d+/\D+?(\d+(?:\.\d+)*)</id>
|
|
195
193
|
libpng:
|
|
196
194
|
url: https://sourceforge.net/projects/libpng/rss?path=/libpng16
|
|
197
195
|
regexp: /libpng\d*/(\d+(?:\.\d+)*)/
|
data/script/run
CHANGED
data/spec/image_optim_spec.rb
CHANGED
|
@@ -15,10 +15,11 @@ describe ImageOptim do
|
|
|
15
15
|
images_dir = FSPath.new(image_optim_root) / 'spec/images'
|
|
16
16
|
test_images = images_dir.glob('**/*.*')
|
|
17
17
|
|
|
18
|
-
isolated_options_base =
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
isolated_options_base = Hash[
|
|
19
|
+
ImageOptim::Worker.klasses.map do |klass|
|
|
20
|
+
[klass.bin_sym, false]
|
|
21
|
+
end
|
|
22
|
+
].merge(:skip_missing_workers => false)
|
|
22
23
|
|
|
23
24
|
ImageOptim::Worker.klasses.each do |worker_klass|
|
|
24
25
|
next if [:pngout, :svgo].include?(worker_klass.bin_sym)
|
data/vendor/darwin-x86_64/advpng
CHANGED
|
Binary file
|
|
Binary file
|
data/vendor/darwin-x86_64/jhead
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
data/vendor/linux-i686/advpng
CHANGED
|
Binary file
|
data/vendor/linux-i686/gifsicle
CHANGED
|
Binary file
|
data/vendor/linux-i686/jhead
CHANGED
|
Binary file
|
|
Binary file
|
data/vendor/linux-i686/jpegoptim
CHANGED
|
Binary file
|
data/vendor/linux-i686/jpegtran
CHANGED
|
Binary file
|
|
Binary file
|
data/vendor/linux-i686/libpng.so
CHANGED
|
Binary file
|
data/vendor/linux-i686/libz.so
CHANGED
|
Binary file
|
data/vendor/linux-i686/optipng
CHANGED
|
Binary file
|
data/vendor/linux-i686/pngcrush
CHANGED
|
Binary file
|
data/vendor/linux-i686/pngquant
CHANGED
|
Binary file
|
data/vendor/linux-x86_64/advpng
CHANGED
|
Binary file
|
|
Binary file
|
data/vendor/linux-x86_64/jhead
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
data/vendor/linux-x86_64/libz.so
CHANGED
|
Binary file
|
data/vendor/linux-x86_64/optipng
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: image_optim_pack
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.7.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ivan Kuchin
|
|
8
|
-
autorequire:
|
|
8
|
+
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2020-12-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: image_optim
|
|
@@ -64,16 +64,16 @@ dependencies:
|
|
|
64
64
|
requirements:
|
|
65
65
|
- - "~>"
|
|
66
66
|
- !ruby/object:Gem::Version
|
|
67
|
-
version: '0
|
|
67
|
+
version: '1.0'
|
|
68
68
|
type: :development
|
|
69
69
|
prerelease: false
|
|
70
70
|
version_requirements: !ruby/object:Gem::Requirement
|
|
71
71
|
requirements:
|
|
72
72
|
- - "~>"
|
|
73
73
|
- !ruby/object:Gem::Version
|
|
74
|
-
version: '0
|
|
75
|
-
description:
|
|
76
|
-
email:
|
|
74
|
+
version: '1.0'
|
|
75
|
+
description:
|
|
76
|
+
email:
|
|
77
77
|
executables: []
|
|
78
78
|
extensions: []
|
|
79
79
|
extra_rdoc_files: []
|
|
@@ -120,7 +120,6 @@ files:
|
|
|
120
120
|
- boxes/definitions/centos-i386/ks.cfg
|
|
121
121
|
- boxes/definitions/centos-postinstall.sh
|
|
122
122
|
- checksums.mk
|
|
123
|
-
- image_optim_pack-darwin-x86.gemspec
|
|
124
123
|
- image_optim_pack-darwin-x86_64.gemspec
|
|
125
124
|
- image_optim_pack-linux-x86.gemspec
|
|
126
125
|
- image_optim_pack-linux-x86_64.gemspec
|
|
@@ -133,18 +132,6 @@ files:
|
|
|
133
132
|
- spec/image_optim/pack_spec.rb
|
|
134
133
|
- spec/image_optim_spec.rb
|
|
135
134
|
- spec/spec_helper.rb
|
|
136
|
-
- vendor/darwin-i386/advpng
|
|
137
|
-
- vendor/darwin-i386/gifsicle
|
|
138
|
-
- vendor/darwin-i386/jhead
|
|
139
|
-
- vendor/darwin-i386/jpeg-recompress
|
|
140
|
-
- vendor/darwin-i386/jpegoptim
|
|
141
|
-
- vendor/darwin-i386/jpegtran
|
|
142
|
-
- vendor/darwin-i386/libjpeg.dylib
|
|
143
|
-
- vendor/darwin-i386/libpng.dylib
|
|
144
|
-
- vendor/darwin-i386/libz.dylib
|
|
145
|
-
- vendor/darwin-i386/optipng
|
|
146
|
-
- vendor/darwin-i386/pngcrush
|
|
147
|
-
- vendor/darwin-i386/pngquant
|
|
148
135
|
- vendor/darwin-x86_64/advpng
|
|
149
136
|
- vendor/darwin-x86_64/gifsicle
|
|
150
137
|
- vendor/darwin-x86_64/jhead
|
|
@@ -181,15 +168,15 @@ files:
|
|
|
181
168
|
- vendor/linux-x86_64/optipng
|
|
182
169
|
- vendor/linux-x86_64/pngcrush
|
|
183
170
|
- vendor/linux-x86_64/pngquant
|
|
184
|
-
homepage:
|
|
171
|
+
homepage: https://github.com/toy/image_optim_pack
|
|
185
172
|
licenses:
|
|
186
173
|
- MIT
|
|
187
174
|
metadata:
|
|
188
175
|
bug_tracker_uri: https://github.com/toy/image_optim_pack/issues
|
|
189
176
|
changelog_uri: https://github.com/toy/image_optim_pack/blob/master/CHANGELOG.markdown
|
|
190
|
-
documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.
|
|
177
|
+
documentation_uri: https://www.rubydoc.info/gems/image_optim_pack/0.7.0
|
|
191
178
|
source_code_uri: https://github.com/toy/image_optim_pack
|
|
192
|
-
post_install_message:
|
|
179
|
+
post_install_message:
|
|
193
180
|
rdoc_options: []
|
|
194
181
|
require_paths:
|
|
195
182
|
- lib
|
|
@@ -204,8 +191,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
204
191
|
- !ruby/object:Gem::Version
|
|
205
192
|
version: '0'
|
|
206
193
|
requirements: []
|
|
207
|
-
rubygems_version: 3.
|
|
208
|
-
signing_key:
|
|
194
|
+
rubygems_version: 3.1.4
|
|
195
|
+
signing_key:
|
|
209
196
|
specification_version: 4
|
|
210
197
|
summary: 'Precompiled binaries for image_optim: advpng, gifsicle, jhead, jpeg-recompress,
|
|
211
198
|
jpegoptim, jpegtran, optipng, pngcrush, pngquant'
|
data/vendor/darwin-i386/advpng
DELETED
|
Binary file
|
data/vendor/darwin-i386/gifsicle
DELETED
|
Binary file
|
data/vendor/darwin-i386/jhead
DELETED
|
Binary file
|
|
Binary file
|
|
Binary file
|
data/vendor/darwin-i386/jpegtran
DELETED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
data/vendor/darwin-i386/optipng
DELETED
|
Binary file
|
data/vendor/darwin-i386/pngcrush
DELETED
|
Binary file
|
data/vendor/darwin-i386/pngquant
DELETED
|
Binary file
|