image_optim 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0274d7bf579938c5c208f39fb85d60781d727566
-  data.tar.gz: e27be28692c75bc6456071311a3bed6fa3a8a216
+  metadata.gz: 1aeb8f8d2ab461d2e51a1956f736301d9c49bb86
+  data.tar.gz: 183e8cc5d1a0669a2f11292bf735e9cdf43ab642
 SHA512:
-  metadata.gz: e8b6ec09460fa0f07b11ab3930e4b55d52c6ab313caf1a04b55ad5244b20430686f1833a0e66e3501f3cbeb64893b7e35cc9fa75edcb3810b93fb8942d853a20
-  data.tar.gz: 7550e19b5a4ec5821e3b4603bab89d48f09fe6c24e65beb79130c5eda8fa2aa5f7e3e7fe08630bef0021ddcf3affc50964662db1e339d8e5b4c96c10ca08fea7
+  metadata.gz: 4f06ddb5e329cd2592bfde66cabcc7cd10136c40b03f25c45ab872a1155cc3ba909da869ade47e59f038071c07c0cdc3d9408c869e7f799d9a9646f6b78f7d29
+  data.tar.gz: 44e30b8b6bd3e43d0dbe309bbc34ae6ced6725ec87fa3f3661572eb4906ceed6a9e149a51c669878e8eff42a554a898302e2b448af57f50d1bddf98e7a3cbcbc

data/.gitignore

@@ -5,7 +5,6 @@
 /rdoc/
 /.yardoc/
 /coverage/
-/vendor/
 
 /Gemfile.lock
 Makefile

data/.rubocop.yml

@@ -40,6 +40,9 @@ Lint/AmbiguousBlockAssociation:
 Lint/EndAlignment:
   EnforcedStyleAlignWith: variable
 
+Lint/RescueWithoutErrorClass:
+  Enabled: false
+
 Lint/UnneededSplatExpansion:
   Enabled: false
 
@@ -78,7 +81,7 @@ Style/EmptyCaseCondition:
   Enabled: false
 
 Style/Encoding:
-  EnforcedStyle: when_needed
+  Enabled: false
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets

data/.travis.yml

@@ -10,10 +10,9 @@ rvm:
   - '1.9.3-p551'
   - '2.0.0-p648'
   - '2.1.10'
-  - '2.2.7'
-  - '2.3.4'
-  - '2.4.1'
-  - 'jruby-1.7.26'
+  - '2.2.8'
+  - '2.3.5'
+  - '2.4.2'
   - 'jruby-9.0.5.0'
   - 'jruby-9.1.9.0'
 script:
@@ -24,19 +23,19 @@ before_install:
   - gem update bundler
   - nvm install stable
   - mkdir -p ~/bin
-  - command -v svgo || npm install svgo
+  - command -v svgo || npm install -g svgo
   - command -v pngout || curl -L "http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz" | tar -xz -C ~/bin --strip-components 2 --wildcards '*/x86_64/pngout'
 matrix:
   include:
     - env: CODECLIMATE=✓
-      rvm: '2.4.1'
+      rvm: '2.4.2'
       after_success: bundle exec codeclimate-test-reporter
     - env: RUBOCOP=✓
-      rvm: '2.4.1'
+      rvm: '2.4.2'
       script: bundle exec rubocop
       before_install:
     - env: CHECK_RUBIES=✓
-      rvm: '2.4.1'
+      rvm: '2.4.2'
       script: bundle exec travis_check_rubies
       before_install:
 addons:

data/CHANGELOG.markdown

@@ -2,6 +2,11 @@
 
 ## unreleased
 
+## v0.26.0 (2017-11-13)
+
+* Enable `jpegrescan` by default after removing its dependency on `File::Slurp` and fixing for windows [#153](https://github.com/toy/image_optim/issues/153) [@toy](https://github.com/toy)
+* Extend description of `--verbose` flag [#152](https://github.com/toy/image_optim/issues/152) [@toy](https://github.com/toy)
+
 ## v0.25.0 (2017-07-06)
 
 * Fix error `uninitialized constant EXIFR::JPEG` (breaking change in [exifr v1.3.0](https://github.com/remvee/exifr/commit/e073a22d06c39f2c1c0e77f5b5fe71545b25e967)) [#150](https://github.com/toy/image_optim/pull/150) [@abemedia](https://github.com/abemedia)

data/README.markdown

@@ -58,7 +58,7 @@ With version:
 
 <!---<update-version>-->
 ```ruby
-gem 'image_optim', '~> 0.25'
+gem 'image_optim', '~> 0.26'
 ```
 <!---</update-version>-->
 
@@ -300,7 +300,7 @@ Worker has no options
 ### jpegtran:
 * `:copy_chunks` — Copy all chunks *(defaults to `false`)*
 * `:progressive` — Create progressive JPEG file *(defaults to `true`)*
-* `:jpegrescan` — Use jpegtran through jpegrescan, ignore progressive option *(defaults to `false`)*
+* `:jpegrescan` — Use jpegtran through jpegrescan, ignore progressive option *(defaults to `true`)*
 
 ### optipng:
 * `:level` — Optimization level preset: `0` is least, `7` is best *(defaults to `6`)*
@@ -335,10 +335,6 @@ Worker has no options
 
 If you would like to contribute - that is great and you are very welcome. Please check few notes in file [CONTRIBUTING.markdown](CONTRIBUTING.markdown).
 
-Financial contributions can be made via [gratipay](https://gratipay.com/toy/).
-
-[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.2/dist/gratipay.png)](https://gratipay.com/toy/)
-
 ## ChangeLog
 
 In separate file [CHANGELOG.markdown](CHANGELOG.markdown).

data/bin/image_optim

@@ -10,7 +10,7 @@ options = ImageOptim::Runner::OptionParser.parse!(args)
 
 begin
   if options[:verbose]
-    $stderr.puts ImageOptim.full_version
+    $stderr << "#{ImageOptim.full_version}\n"
   end
 
   only_info = options.delete(:only_info)

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.25.0'
+  s.version     = '0.26.0'
   s.summary     = %q{Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg) using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']

data/lib/image_optim/runner/option_parser.rb

@@ -221,7 +221,9 @@ ImageOptim::Runner::OptionParser::DEFINE = proc do |op, options|
   op.separator nil
   op.separator '  Common options:'
 
-  op.on_tail('-v', '--verbose', 'Verbose output') do
+  op.on_tail('-v', '--verbose', 'Verbose output (show global and worker '\
+      'config, binary resolution log, information about each tool invocation, '\
+      'backtrace of exception)') do
     options[:verbose] = true
   end
 

data/lib/image_optim/worker.rb

@@ -141,7 +141,8 @@ class ImageOptim
         %W[
           env PATH=#{@image_optim.env_path.shellescape}
           nice -n #{@image_optim.nice}
-          #{cmd_args.shelljoin} > #{Path::NULL} 2>&1
+          #{cmd_args.shelljoin}
+          > #{Path::NULL} 2>&1
         ].join(' ')
       else
         [

data/lib/image_optim/worker/jpegtran.rb

@@ -14,7 +14,7 @@ class ImageOptim
       option(:progressive, true, 'Create progressive JPEG file'){ |v| !!v }
 
       JPEGRESCAN_OPTION =
-      option(:jpegrescan, false, 'Use jpegtran through jpegrescan, '\
+      option(:jpegrescan, true, 'Use jpegtran through jpegrescan, '\
           'ignore progressive option'){ |v| !!v }
 
       def used_bins

data/vendor/jpegrescan

@@ -0,0 +1,173 @@
+#!/usr/bin/env perl
+# jpegrescan by Loren Merritt
+# Last updated: 2008-11-29 / 2013-03-19
+# This code is public domain.
+
+use warnings;
+use File::Temp qw/ tempfile /;
+
+%switches = ();
+while (@ARGV && $ARGV[0] =~ /^-.+/) {
+    for (shift @ARGV) {
+        m/^--$/ && last;
+        m/^-([svq])$/ && do { $switches{$1} = 1; next; };
+        die "Unknown switch: $_";
+    }
+}
+@ARGV==2 or die "usage: jpegrescan in.jpg out.jpg
+tries various progressive scan orders
+switches:
+  -s strip from all extra markers (`jpegtran -copy none` otherwise `jpegtran -copy all`)
+  -v verbose output
+  -q supress all output
+";
+$fin = $ARGV[0];
+$fout = $ARGV[1];
+(undef, $meta_tmp) = tempfile(SUFFIX => ".scan");
+(undef, $baseline_tmp) = tempfile(SUFFIX => ".jpg");
+$output_tmp = $fout;
+$verbose = $switches{'v'};
+$quiet = $switches{'q'};
+@strip = $switches{'s'} ? ("-copy","none") : ("-copy","all");
+undef $/;
+$|=1;
+
+sub read_file {
+    my ($path) = @_;
+    my $data;
+
+    open my $fh, '<', $path
+        or die "Could not open file $path: $!\n";
+    binmode $fh;
+    $data = <$fh>;
+    close $fh
+        or die "Could not close $path: $!\n";
+
+    return $data;
+}
+
+sub write_file {
+    my ($path, $data) = @_;
+
+    open my $fh, '>', $path
+        or die "Could not open file $path: $!\n";
+    binmode $fh;
+    print $fh $data;
+    close $fh
+        or die "Could not close $path: $!\n";
+}
+
+# convert the input to baseline, just to make all the other conversions faster
+# FIXME there's still a bunch of redundant computation in separate calls to jpegtran
+open $OLDERR, ">&", STDERR;
+open STDERR, ">", $meta_tmp;
+system("jpegtran", "-v", @strip, "-optimize", "-outfile", $baseline_tmp, $fin) == 0 or die;
+open STDERR, ">&", $OLDERR;
+
+$type = read_file($meta_tmp);
+$type =~ /components=(\d+)/ or die "Could not find components=\d+ in $type";
+$rgb = $1==3 ? 1 : $1==1 ? 0 : die "not RGB nor gray\n";
+
+# FIXME optimize order for either progressive transfer or decoding speed
+sub canonize {
+    my $txt = $prefix.$suffix.shift;
+    $txt =~ s/\s*;\s*/;\n/g;
+    $txt =~ s/^\s*//;
+    $txt =~ s/ +/ /g;
+    $txt =~ s/: (\d+) (\d+)/sprintf ": %2d %2d", $1, $2/ge;
+    # treat u and v identically. I shouldn't need to do this, but with jpegtran overhead it saves 9% speed. cost: .008% bitrate.
+    $txt =~ s/^2:.*\n//gm;
+    $txt =~ s/^1:(.+)\n/1:$1\n2:$1\n/gm;
+    # dc before ac, coarse before fine
+    my @txt = sort {"$a\n$b" =~ /: *(\d+) .* (\d);\n.*: *(\d+) .* (\d);/ or die; !$3 <=> !$1 or $4 <=> $2 or $a cmp $b;} split /\n/, $txt;
+    return join "\n", @txt;
+}
+
+sub try {
+    my $txt = canonize(shift);
+    return $memo{$txt} if $memo{$txt};
+    write_file($meta_tmp, $txt);
+    system("jpegtran", @strip, "-scans", $meta_tmp, "-outfile", $output_tmp, $baseline_tmp) == 0 or die;
+    $data = read_file($output_tmp);
+    my $s = length $data;
+    $s or die;
+    $memo{$txt} = $s;
+    !$quiet && print $verbose ? "$txt\n$s\n\n" : ".";
+    return $s;
+}
+
+sub triesn {
+    my($bmode, $bsize);
+    my ($limit, @modes) = @_;
+    my $overshoot = 0;
+    for(@modes) {
+        my $s = try($_);
+        if(!$bsize || $s < $bsize) {
+            $bsize = $s;
+            $bmode = $_;
+            $overshoot = 0;
+        } elsif(++$overshoot >= $limit) {
+            last;
+        }
+    }
+    return $bmode;
+}
+
+sub tries { triesn(99, @_); }
+
+$prefix = "";
+$suffix = "";
+
+if($rgb) {
+    # 012 helps very little
+    # 0/12 and 0/1/2 are pretty evenly matched in frequency, but 0/12 wins in total size if every image had to use the same mode
+    # dc refinement passes never help
+    $dc = tries(
+    #           "0: 0 0 0 0; 1 2: 0 0 0 0;", # two scans expose a bug in Opera <= 11.61
+                "0: 0 0 0 0; 1: 0 0 0 0; 2: 0 0 0 0;");
+    # jpegtran won't let me omit dc entirely, but I can at least quantize it away to make the rest of the tests faster.
+    $prefix = "0 1 2: 0 0 0 9;";
+} else {
+    $dc = "0: 0 0 0 0;";
+    $prefix = "0: 0 0 0 9;";
+}
+
+# luma can make use of up to 3 refinement passes.
+# chroma can make use of up to 2 refinement passes.
+# refinement passes have some chance of being split (luma: 4%,4%,4%. chroma: 20%,8%) but the total bit gain is negligible.
+# msb pass should almost always be split (luma: 87%, chroma: 81%).
+# I have no theoretical reason for this list of split positions, they're just the most common in practice.
+# splitting into 3 ections is often slightly better, but the total number of bits saved is negligible.
+# FIXME: penalize lots of refinement passes because it's slower to decode. if so, then also force overwrite if bigger than the input.
+sub try_splits {
+    my $str = shift;
+    my %n = map {$_ => sprintf "$c: 1 %d $str; $c: %d 63 $str;", $_, $_+1} 2,5,8,12,18;
+    my $mode = triesn(2, "$c: 1 63 $str;", @n{2,8,5});
+    return $mode if $mode ne $n{8};
+    return triesn(1, $mode, @n{12,18});
+}
+
+foreach $c (0..$rgb) {
+    my @modes;
+    my $ml = "";
+    for(0..($c?2:3)) {
+        push @modes, "$c: 1 8 0 $_; $c: 9 63 0 $_;".$ml;
+        $ml .= sprintf("$c: 1 63 %d %d;", $_+1, $_);
+    }
+    my $refine = triesn(1, @modes);
+    $refine =~ s/.* (0 \d);//;
+    $ac .= $refine . try_splits($1);
+}
+
+$prefix = "";
+undef %memo;
+$mode = canonize($dc.$ac);
+try($mode);
+$size = $memo{$mode};
+!$quiet && print "\n$mode\n$size\n";
+$old_size = -s $fin;
+!$quiet && printf "%+.2f%%\n", ($size/$old_size-1)*100;
+if($size < $old_size) {
+    write_file($fout, $data);
+}
+unlink $meta_tmp, $baseline_tmp;

data/vendor/jpegrescan.bat

@@ -0,0 +1,6 @@
+@ECHO OFF
+IF NOT "%~f0" == "~f0" GOTO :WinNT
+@"perl" %1 %2 %3 %4 %5 %6 %7 %8 %9
+GOTO :EOF
+:WinNT
+@"%~dpn0.exe" %*

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -250,6 +250,7 @@ files:
 - spec/images/vergroessert.jpg
 - spec/spec_helper.rb
 - vendor/jpegrescan
+- vendor/jpegrescan.bat
 homepage: http://github.com/toy/image_optim
 licenses:
 - MIT
@@ -272,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: image_optim
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg)