image_optim 0.15.0 → 0.16.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODA5N2IyMjgwM2FjYTU3OGM4NjE2OTU0NzM5NGRhOTRiNGExNDM5Mw==
+    MDE1MjA4Yzc2MDkwZWM5YjgwNmJhZDVmMzM5MzI5NTU2ZjY3YWViZA==
   data.tar.gz: !binary |-
-    YTNiZmYwOTk0OWY5NmE0OGM3OTliNzRmNTE5NDIwMGQ4OWM4NmMyMQ==
+    NTMxMjc5YTI1ZmEzYzA1YTYwMWYwNWU4YzM3ODA0YTMwNDAyZDc3MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzI4NWY2MmU5Y2Y3YjJjMmExNzQ1NDk4NmE5NjhmOWFjMjVlZmY1NmQyMmM3
-    M2RmZTAzZWI1Mzg2MTQ3ZDQ4YzkyZjM5MGYxYjcwM2NiMTE3Mzg1ZmMwY2Vl
-    MmQwODgxMDkwYmVlOTE2ZjY1MTA2YzY4ODgxMzJmODFiN2FmMmU=
+    YWM3ZmNmMzk0NWE4YTI0NTQxNDI1YzEyM2YxNzM3ZjlhMmM3NWIwMTQwYjE5
+    NGIwYzJiZDk3MzhlMGJkOWQ5Y2NkYzc3OWEyMGMyZGQ5YzEyNzJkOGRhODgy
+    NmRkNzBkMTQ0N2M3YTc3YWU2OTI0MzAxM2MyMDZmMzliMjljNDM=
   data.tar.gz: !binary |-
-    NzViMzQ4Yjc0Y2MyYjdlNDBiNjM1N2U5ZmIzYTkzYzZlZjNkNjZlMzMxMDVk
-    NWEwYjk0MzEzMTU3NDdlNmZiZjlmMjMzYWM2ZjRjNGNlNjRmY2I2MTY2MjRm
-    YmFjNmE0ZTc2M2I1MGVlM2RiOTg1OTJmOGFhZjEwYzkxMjNiNTY=
+    MjEyYWRhNDA3OTZkMTM2NWNiYTc5MzI2MDEyYzQ4ZDBlYzcyNzU4MjkxODY0
+    MTVjZjdjYjIyMWRhYTIzY2ZiMTA0ZDM3N2U2YzAyZDllM2M5Y2NkNWI5YWQw
+    OGRhYmFmZGU5ZWVlNWIzZjYzMmJkNDI3ODM1NTg0NWY3NDdhODM=

data/.rubocop.yml

@@ -5,18 +5,24 @@ AllCops:
 Lint/EndAlignment:
   AlignWith: variable
 
+Metrics/ClassLength:
+  Max: 150
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+Metrics/MethodLength:
+  Max: 20
+
+Metrics/PerceivedComplexity:
+  Max: 8
+
 Style/AccessModifierIndentation:
   EnforcedStyle: outdent
 
 Style/CaseIndentation:
   IndentWhenRelativeTo: end
 
-Style/ClassLength:
-  Max: 120
-
-Style/CyclomaticComplexity:
-  Max: 8
-
 Style/DotPosition:
   EnforcedStyle: trailing
 
@@ -35,9 +41,6 @@ Style/IfUnlessModifier:
 Style/IndentHash:
   EnforcedStyle: consistent
 
-Style/MethodLength:
-  Max: 20
-
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%w': '[]'

data/.travis.yml

@@ -16,17 +16,27 @@ script:
   - '! bundle show rubocop || bundle exec rubocop' # run rubocop only if it is bundled
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq advancecomp gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush
+  - sudo apt-get install -qq gifsicle jhead jpegoptim libjpeg-progs optipng pngcrush
   - npm install -g svgo
   - mkdir ~/bin
-  # pngquant:
+
+  - echo 'Installing advancecomp(advpng):'
+  - ADVANCECOMP_VERSION=1.19
+  - wget http://downloads.sourceforge.net/project/advancemame/advancecomp/$ADVANCECOMP_VERSION/advancecomp-$ADVANCECOMP_VERSION.tar.gz
+  - tar -xzf advancecomp-$ADVANCECOMP_VERSION.tar.gz
+  - (cd advancecomp-$ADVANCECOMP_VERSION && ./configure && make)
+  - mv advancecomp-$ADVANCECOMP_VERSION/advpng ~/bin
+
+  - echo 'Installing pngquant:'
   - git clone git://github.com/pornel/pngquant.git
-  - pushd pngquant && git checkout $(git describe --tags --abbrev=0) && make && popd
+  - (cd pngquant && git checkout $(git describe --tags --abbrev=0) && make)
   - mv pngquant/pngquant ~/bin
-  # pngout:
-  - wget http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz
-  - tar -xzf pngout-*-linux.tar.gz
-  - mv pngout-*-linux/x86_64/pngout ~/bin
+
+  - echo 'Installing pngout:'
+  - PNGOUT_VERSION=20130221
+  - wget http://static.jonof.id.au/dl/kenutils/pngout-$PNGOUT_VERSION-linux.tar.gz
+  - tar -xzf pngout-$PNGOUT_VERSION-linux.tar.gz
+  - mv pngout-$PNGOUT_VERSION-linux/x86_64/pngout ~/bin
 env:
   - PATH=~/bin:$PATH
 matrix:

data/CHANGELOG.markdown

@@ -0,0 +1,209 @@
+# ChangeLog
+
+## unreleased
+
+## v0.16.0 (2014-09-12)
+
+* Wrote this ChangeLog [#62](https://github.com/toy/image_optim/issues/62) [@toy](https://github.com/toy)
+* Use rubocop ~> 0.26.0 [@toy](https://github.com/toy)
+* Install advancecomp from source in travis script [#61](https://github.com/toy/image_optim/issues/61) [@toy](https://github.com/toy)
+* Move expansion of config path to read method and rescue with warning [#58](https://github.com/toy/image_optim/issues/58) [@toy](https://github.com/toy)
+* Show workers options in verbose mode [#56](https://github.com/toy/image_optim/issues/56) [@toy](https://github.com/toy)
+* Resolve all bins during initialization [#22](https://github.com/toy/image_optim/issues/22) [@toy](https://github.com/toy)
+* Add exclusion glob patterns, `.*` by default [#35](https://github.com/toy/image_optim/issues/35) [#48](https://github.com/toy/image_optim/issues/48) [@toy](https://github.com/toy)
+* Show better warning when running image_optim for a directory without recursive option [@toy](https://github.com/toy)
+* Use stable sort for workers [@toy](https://github.com/toy)
+* Check binary version instead of using which to check if binary is present [#59](https://github.com/toy/image_optim/issues/59) [@toy](https://github.com/toy)
+
+## v0.15.0 (2014-08-19)
+
+* Use advpng worker before optipng [@toy](https://github.com/toy)
+* Fix order of results (use progress ~> 3.0.1) [@toy](https://github.com/toy)
+* Change array returned from `optimize_images`, `optimize_images!` and `optimize_images_data` to contain pairs of item and result instead of just result [@toy](https://github.com/toy)
+* Fixed `Space` causing exception with negative numbers [@toy](https://github.com/toy)
+* Added pngquant worker [#14](https://github.com/toy/image_optim/issues/14) [#32](https://github.com/toy/image_optim/issues/32) [#40](https://github.com/toy/image_optim/issues/40) [#52](https://github.com/toy/image_optim/issues/52) [@adammathys](https://github.com/adammathys) [@smasry](https://github.com/smasry) [@toy](https://github.com/toy)
+* Add instructions to errors from bin resolver [@toy](https://github.com/toy)
+* Use in_threads ~> 1.2.2 with fix for silent exceptions [@toy](https://github.com/toy)
+* Fix `LocalJumpError` in railtie initializer block (ruby 2.1.2, rails 4.1.4) [#50](https://github.com/toy/image_optim/issues/50) [@schnittchen](https://github.com/schnittchen)
+
+## v0.14.0 (2014-07-17)
+
+* Added Inch CI and Gittip badges to README [@toy](https://github.com/toy)
+* Assign worker options to constants for documentation [@toy](https://github.com/toy)
+* Code style, reorganized, comments, added rubocop [@toy](https://github.com/toy)
+* Switch to rspec 3.0 [@toy](https://github.com/toy)
+* Don't mention versions in instructions for installing jpegoptim and pngcrush [@toy](https://github.com/toy)
+
+## v0.13.3 (2014-05-22)
+
+* Added instruction about libjpeg-turbo-utils [#49](https://github.com/toy/image_optim/issues/49) [@toy](https://github.com/toy)
+
+## v0.13.2 (2014-04-24)
+
+* Updated versions of `pngcrush` and `jpegoptim` in installation instructions [#46](https://github.com/toy/image_optim/issues/46) [@toy](https://github.com/toy)
+* Script for updating instructions in README [@toy](https://github.com/toy)
+* Typo in README [#45](https://github.com/toy/image_optim/issues/45) [@rawsyntax](https://github.com/rawsyntax)
+
+## v0.13.1 (2014-04-08)
+
+* Use image_size ~> 1.3.0 so only `FormatError` exceptions are caught and show warning [#44](https://github.com/toy/image_optim/issues/44) [@lencioni](https://github.com/lencioni)
+
+## v0.13.0 (2014-04-06)
+
+* Detect and warn about broken images [#43](https://github.com/toy/image_optim/issues/43) [@toy](https://github.com/toy)
+* Output image_optim version when running in verbose mode [@toy](https://github.com/toy)
+* Show resolved version in version exceptions and warnings [@toy](https://github.com/toy)
+* Warn if advpng version is less than 1.17 as it does not use zopfli [#17](https://github.com/toy/image_optim/issues/17) [#18](https://github.com/toy/image_optim/issues/18) [@toy](https://github.com/toy)
+
+## v0.12.1 (2014-03-10)
+
+* Don't try to register preprocessors when sprockets library is not initialized (app.assets is nil) [#41](https://github.com/toy/image_optim/issues/41) [@toy](https://github.com/toy)
+* Output resolved binaries when verbose [@toy](https://github.com/toy)
+* Output nice level and number of threads when verbose [@toy](https://github.com/toy)
+* Output config to stderr when verbose [@toy](https://github.com/toy)
+* Don't limit number of threads [@toy](https://github.com/toy)
+
+## v0.12.0 (2014-03-02)
+
+* Checking bin versions [#33](https://github.com/toy/image_optim/issues/33) [@toy](https://github.com/toy)
+
+## v0.11.2 (2014-03-01)
+
+* Fixed building PATH environment variable [@toy](https://github.com/toy)
+
+## v0.11.1 (2014-02-20)
+
+* Allow `-v` for version if it is the only argument [@toy](https://github.com/toy)
+* Fixed initializing railtie [#37](https://github.com/toy/image_optim/issues/37) [@toy](https://github.com/toy)
+
+## v0.11.0 (2014-02-16)
+
+* Use image_size ~> 1.2.0 [@toy](https://github.com/toy)
+* Added `svgo` worker and support for svg files [#27](https://github.com/toy/image_optim/issues/27) [#30](https://github.com/toy/image_optim/issues/30) [@nybblr](https://github.com/nybblr)
+* Properly unlink temporary files [#29](https://github.com/toy/image_optim/issues/29) [@toy](https://github.com/toy)
+* Read options from rails app configuration `app.config.assets.image_optim` in railtie [#31](https://github.com/toy/image_optim/issues/31) [@bencrouse](https://github.com/bencrouse)
+* Updated versions of `pngcrush` and `jpegoptim` in installation instructions [#26](https://github.com/toy/image_optim/issues/26) [@jc00ke](https://github.com/jc00ke)
+
+## v0.10.2 (2014-01-25)
+
+* Fixed regression with progress introduced in v0.10.0 [@toy](https://github.com/toy)
+
+## v0.10.1 (2014-01-23)
+
+* Ensure binary data (ruby 1.9+) from `optimize_image_data` and `optimize_images_data` [#25](https://github.com/toy/image_optim/issues/25) [@toy](https://github.com/toy)
+* Mention `optimize_image_data` and `optimize_images_data` in README [#25](https://github.com/toy/image_optim/issues/25) [@toy](https://github.com/toy)
+
+## v0.10.0 (2013-12-25)
+
+* Fixed bug with inheritance of `DelegateClass` in jruby 1.9 and 2.0 [@toy](https://github.com/toy)
+* Return `ImagePath::Optimized` containing also original path and size from `optimize_image` and `optimize_image!` [#12](https://github.com/toy/image_optim/issues/12) [@toy](https://github.com/toy)
+* Show exception backtrace when verbose [@toy](https://github.com/toy)
+* Fail if there were warnings with paths to optimize [@toy](https://github.com/toy)
+* Rails (sprockets) preprocessor [#2](https://github.com/toy/image_optim/issues/2) [@toy](https://github.com/toy)
+* Use fspath ~> 2.1.0 with fixes for jruby 1.7.8 [@toy](https://github.com/toy)
+* Add `optimize_image_data` and `optimize_images_data` [@toy](https://github.com/toy)
+* Read config from `image_optim.yml` at `XDG_CONFIG_HOME` (`~/.config` by default) and from `.image_optim.yml` in current working directory [#13](https://github.com/toy/image_optim/issues/13) [@toy](https://github.com/toy)
+* Added badges to README [@toy](https://github.com/toy)
+* Big refactoring [@toy](https://github.com/toy)
+
+## v0.9.1 (2013-08-20)
+
+* Use progress ~> 3.0.0 and in_threads ~> 1.2.0 [@toy](https://github.com/toy)
+
+## v0.9.0 (2013-07-30)
+
+* Use fspath ~> 2.0.5 with bug fix for jruby in 1.8 mode [@toy](https://github.com/toy)
+* Overcome wrong implementation of `Process::Status` in jruby [@toy](https://github.com/toy)
+* Fix for jruby not `File.rename` not accepting non String [@toy](https://github.com/toy)
+* Fix for jruby `File.rename` not accepting non String [@toy](https://github.com/toy)
+* Added `.travis.yml` [@toy](https://github.com/toy)
+* Added `jhead` worker [@toy](https://github.com/toy)
+
+## v0.8.1 (2013-05-27)
+
+* Fixed variable name in `jpegoptim` worker [@toy](https://github.com/toy)
+* Added example of using `PATH` with ImageOptim.app bins [#11](https://github.com/toy/image_optim/issues/11) [@toy](https://github.com/toy)
+
+## v0.8.0 (2013-03-27)
+
+* Print options if verbose [@toy](https://github.com/toy)
+* Added worker options to README using script [#5](https://github.com/toy/image_optim/issues/5) [@toy](https://github.com/toy)
+* Setting worker options using arguments to image_optim bin [@toy](https://github.com/toy)
+* Option definitions with description, default value and validation instead of attribute reader in options [@toy](https://github.com/toy)
+* Don't change PATH for ruby process [@toy](https://github.com/toy)
+* Vendor `jpegrescan` [@toy](https://github.com/toy)
+* Option to use `jpegrescan` in `jpegtran` worker, off by default [#6](https://github.com/toy/image_optim/issues/6) [@toy](https://github.com/toy)
+
+## v0.7.3 (2013-02-24)
+
+* Use image_size ~> 1.1.2 [@toy](https://github.com/toy)
+
+## v0.7.2 (2013-01-18)
+
+* Make `apply_threading` accept enum instead of array [@toy](https://github.com/toy)
+
+## v0.7.1 (2013-01-17)
+
+* Use more compatible redirect syntax `>&` [#9](https://github.com/toy/image_optim/issues/9) @"Chris Thompson"
+
+## v0.7.0 (2013-01-17)
+
+* Use `system` with `env` and `nice` instead of forking [#8](https://github.com/toy/image_optim/issues/8) [@toy](https://github.com/toy)
+* Don't use `-s` of `which` as it is nonstandard [#7](https://github.com/toy/image_optim/issues/7) [@toy](https://github.com/toy)
+* Added bin resolving with ability to specify binary paths using environment variables [@toy](https://github.com/toy)
+* Reorganized workers [@toy](https://github.com/toy)
+* Added links to tool projects [@toy](https://github.com/toy)
+
+## v0.6.0 (2012-11-15)
+
+* Warn if directly added files are not images or are not optimizable [@toy](https://github.com/toy)
+* Recursively scan directories for images [#4](https://github.com/toy/image_optim/issues/4) [@toy](https://github.com/toy)
+* Typo in bin/image_optim  [#3](https://github.com/toy/image_optim/issues/3) [@fabiomcosta](https://github.com/fabiomcosta)
+
+## v0.5.1 (2012-08-07)
+
+* Nice output for configuration and binary resolving errors [@toy](https://github.com/toy)
+
+## v0.5.0 (2012-08-05)
+
+* Verbose output [@toy](https://github.com/toy)
+
+## v0.4.2 (2012-02-26)
+
+* Use image_size ~> 1.1 [@toy](https://github.com/toy)
+
+## v0.4.1 (2012-02-14)
+
+* Added binary installation instructions to README [#1](https://github.com/toy/image_optim/issues/1) [@jingoro](https://github.com/jingoro)
+
+## v0.4.0 (2012-01-13)
+
+* Added usage to README [@toy](https://github.com/toy)
+* Allow setting nice level, 10 by default [@toy](https://github.com/toy)
+* Use `fork` instead of `system` [@toy](https://github.com/toy)
+
+## v0.3.2 (2012-01-12)
+
+* Fixed setting max thread count [@toy](https://github.com/toy)
+
+## v0.3.1 (2012-01-12)
+
+* Fixed parsing thread option [@toy](https://github.com/toy)
+
+## v0.3.0 (2012-01-12)
+
+* Output size change per file and total [@toy](https://github.com/toy)
+* Warn about non files [@toy](https://github.com/toy)
+
+## v0.2.1 (2012-01-11)
+
+* Simplified determining presence of bin [@toy](https://github.com/toy)
+
+## v0.2.0 (2012-01-10)
+
+* Reduce number of created temp files to minimum [@toy](https://github.com/toy)
+* Use fspath ~> 2.0.3 [@toy](https://github.com/toy)
+
+## v0.1.0 (2012-01-09)
+
+* Initial release [@toy](https://github.com/toy)

data/CONTRIBUTING.markdown

@@ -2,6 +2,7 @@
 
 * Create topic/feature branch: `git checkout -b awesome-changes`
 * Commit…
+* Add entry to [ChangeLog](CHANGELOG.markdown)
 * Run tests: `bundle exec rspec`
 * Check code style: `bundle exec rubocop`
 * Push your branch: `git push origin awesome-changes`

data/Gemfile

@@ -1,3 +1,3 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec

data/README.markdown

@@ -160,6 +160,8 @@ npm install -g svgo
 ```sh
 image_optim *.{jpg,png,gif,svg}
 
+image_optim -r .
+
 image_optim -h
 ```
 
@@ -285,7 +287,11 @@ Worker has no options
 
 ## Contributing
 
-If you would like to contribute - that is great and you are very welcome. Please check few notes about [CONTRIBUTING](CONTRIBUTING.markdown).
+If you would like to contribute - that is great and you are very welcome. Please check few notes in file [CONTRIBUTING.markdown](CONTRIBUTING.markdown).
+
+## ChangeLog
+
+In separate file [CHANGELOG.markdown](CHANGELOG.markdown).
 
 ## Copyright
 

data/bin/image_optim

@@ -23,11 +23,26 @@ option_parser = OptionParser.new do |op|
     |
   TEXT
 
-  op.on('-r', '-R', '--recursive', 'Recurively scan directories '\
+  op.on('-r', '-R', '--recursive', 'Recursively scan directories '\
       'for images') do |recursive|
     options[:recursive] = recursive
   end
 
+  op.on("--exclude-dir 'GLOB'", 'Glob for excluding directories '\
+      '(defaults to .*)') do |glob|
+    options[:exclude_dir_glob] = glob
+  end
+
+  op.on("--exclude-file 'GLOB'", 'Glob for excluding files '\
+      '(defaults to .*)') do |glob|
+    options[:exclude_file_glob] = glob
+  end
+
+  op.on("--exclude 'GLOB'", 'Set glob for excluding both directories and '\
+      'files') do |glob|
+    options[:exclude_file_glob] = options[:exclude_dir_glob] = glob
+  end
+
   op.separator nil
 
   op.on('--[no-]threads N', Integer, 'Number of threads or disable '\

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.15.0'
+  s.version     = '0.16.0'
   s.summary     = %q{Optimize (lossless compress) images (jpeg, png, gif, svg) using external utilities (advpng, gifsicle, jpegoptim, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -15,13 +15,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
 
-  s.add_dependency 'fspath', '~> 2.1.0'
-  s.add_dependency 'image_size', '~> 1.3.0'
-  s.add_dependency 'exifr', '~> 1.1.3'
-  s.add_dependency 'progress', '~> 3.0.1'
-  s.add_dependency 'in_threads', '~> 1.2.2'
+  s.add_dependency 'fspath', '~> 2.1'
+  s.add_dependency 'image_size', '~> 1.3'
+  s.add_dependency 'exifr', '~> 1.1', '>= 1.1.3'
+  s.add_dependency 'progress', '~> 3.0', '>= 3.0.1'
+  s.add_dependency 'in_threads', '~> 1.2', '>= 1.2.2'
   s.add_development_dependency 'rspec', '~> 3.0'
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.2')
-    s.add_development_dependency 'rubocop', '~> 0.24.1'
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.3')
+    s.add_development_dependency 'rubocop', '~> 0.26.0'
   end
 end

data/lib/image_optim.rb

@@ -45,8 +45,8 @@ class ImageOptim
 
     if verbose
       $stderr << config
-      $stderr << "Nice level: #{nice}\n"
-      $stderr << "Using threads: #{threads}\n"
+      $stderr << "nice: #{nice}\n"
+      $stderr << "threads: #{threads}\n"
     end
 
     @bin_resolver = BinResolver.new(self)
@@ -55,6 +55,8 @@ class ImageOptim
       config.for_worker(klass)
     end
 
+    log_workers_by_format if verbose
+
     config.assert_no_unused_options!
   end
 
@@ -164,18 +166,32 @@ class ImageOptim
 
 private
 
+  def log_workers_by_format
+    $stderr << "Workers by format:\n"
+    @workers_by_format.each do |format, workers|
+      $stderr << "#{format}:\n"
+      workers.each do |worker|
+        $stderr << "  #{worker.class.bin_sym}:\n"
+        worker.options.each do |name, value|
+          $stderr << "    #{name}: #{value.inspect}\n"
+        end
+      end
+    end
+  end
+
   # Create hash with format mapped to list of workers sorted by run order
   def create_workers_by_format(&options_proc)
     by_format = {}
-    Worker.klasses.each do |klass|
-      next unless (options = options_proc[klass])
-      worker = klass.new(self, options)
+    workers = Worker.create_all(self, &options_proc)
+    Worker.resolve_all!(workers)
+    sorted = workers.sort_by.with_index{ |worker, i| [worker.run_order, i] }
+    sorted.each do |worker|
       worker.image_formats.each do |format|
         by_format[format] ||= []
         by_format[format] << worker
       end
     end
-    by_format.each{ |_format, workers| workers.sort! }
+    by_format
   end
 
   # Run method for each item in list

data/lib/image_optim/bin_resolver.rb

@@ -58,6 +58,19 @@ class ImageOptim
       [dir, ENV['PATH'], VENDOR_PATH].compact.join(':')
     end
 
+    # Collect resolving errors when running block over items of enumerable
+    def self.collect_errors(enumerable)
+      errors = []
+      enumerable.each do |item|
+        begin
+          yield item
+        rescue Error => e
+          errors << e
+        end
+      end
+      errors
+    end
+
   private
 
     def resolving(name)
@@ -80,17 +93,17 @@ class ImageOptim
     end
 
     def accessible?(name)
-      capture_output("which #{name.to_s.shellescape}") != ''
+      !!version(name)
     end
 
     def version(name)
       case name.to_sym
       when :advpng, :gifsicle, :jpegoptim, :optipng, :pngquant
-        capture_output("#{name} --version")[/\d+(\.\d+){1,}/]
+        capture_output("#{name} --version 2> /dev/null")[/\d+(\.\d+){1,}/]
       when :svgo
         capture_output("#{name} --version 2>&1")[/\d+(\.\d+){1,}/]
       when :jhead
-        capture_output("#{name} -V")[/\d+(\.\d+){1,}/]
+        capture_output("#{name} -V 2> /dev/null")[/\d+(\.\d+){1,}/]
       when :jpegtran
         capture_output("#{name} -v - 2>&1")[/version (\d+\S*)/, 1]
       when :pngcrush
@@ -98,7 +111,12 @@ class ImageOptim
       when :pngout
         date_regexp = /[A-Z][a-z]{2} (?: |\d)\d \d{4}/
         date_str = capture_output("#{name} 2>&1")[date_regexp]
-        Date.parse(date_str).strftime('%Y%m%d')
+        Date.parse(date_str).strftime('%Y%m%d') if date_str
+      when :jpegrescan
+        # jpegrescan has no version so just check presence
+        capture_output("command -v #{name}")['jpegrescan']
+      else
+        fail "getting `#{name}` version is not defined"
       end
     end
 

data/lib/image_optim/config.rb

@@ -10,7 +10,7 @@ class ImageOptim
   class Config
     include OptionHelpers
 
-    CONFIG_HOME = File.expand_path(ENV['XDG_CONFIG_HOME'] || '~/.config')
+    CONFIG_HOME = ENV['XDG_CONFIG_HOME'] || '~/.config'
     GLOBAL_CONFIG_PATH = File.join(CONFIG_HOME, 'image_optim.yml')
     LOCAL_CONFIG_PATH = './.image_optim.yml'
 
@@ -18,25 +18,32 @@ class ImageOptim
       # Read config at GLOBAL_CONFIG_PATH if it exists, warn if anything is
       # wrong
       def global
-        File.file?(GLOBAL_CONFIG_PATH) ? read(GLOBAL_CONFIG_PATH) : {}
+        read(GLOBAL_CONFIG_PATH)
       end
 
       # Read config at LOCAL_CONFIG_PATH if it exists, warn if anything is
       # wrong
       def local
-        File.file?(LOCAL_CONFIG_PATH) ? read(LOCAL_CONFIG_PATH) : {}
+        read(LOCAL_CONFIG_PATH)
       end
 
     private
 
       def read(path)
-        config = YAML.load_file(path)
+        begin
+          full_path = File.expand_path(path)
+        rescue ArgumentError => e
+          warn "Can't expand path #{path}: #{e}"
+          return {}
+        end
+        return {} unless File.file?(full_path)
+        config = YAML.load_file(full_path)
         unless config.is_a?(Hash)
-          fail "excpected hash, got #{config.inspect}"
+          fail "expected hash, got #{config.inspect}"
         end
         HashHelpers.deep_symbolise_keys(config)
       rescue => e
-        warn "exception when reading #{path}: #{e}"
+        warn "exception when reading #{full_path}: #{e}"
         {}
       end
     end
@@ -61,8 +68,7 @@ class ImageOptim
     def assert_no_unused_options!
       unknown_options = @options.reject{ |key, _value| @used.include?(key) }
       return if unknown_options.empty?
-      fail ConfigurationError, "unknown options #{unknown_options.inspect} "\
-          "for #{self}"
+      fail ConfigurationError, "unknown options #{unknown_options.inspect}"
     end
 
     def nice

data/lib/image_optim/runner.rb

@@ -1,5 +1,6 @@
 require 'image_optim'
 require 'image_optim/hash_helpers'
+require 'image_optim/runner/glob_helpers'
 require 'image_optim/space'
 require 'progress'
 require 'optparse'
@@ -47,6 +48,10 @@ class ImageOptim
       fail 'specify paths to optimize' if args.empty?
       options = HashHelpers.deep_symbolise_keys(options)
       @recursive = options.delete(:recursive)
+      @exclude_dir_globs, @exclude_file_globs = %w[dir file].map do |type|
+        glob = options.delete(:"exclude_#{type}_glob") || '.*'
+        GlobHelpers.expand_braces(glob)
+      end
       @image_optim = ImageOptim.new(options)
       @to_optimize = find_to_optimize(args)
     end
@@ -85,14 +90,14 @@ class ImageOptim
           else
             warning "#{path} is not an image or there is no optimizer for it"
           end
-        elsif @recursive
-          if File.directory?(path)
+        elsif File.directory?(path)
+          if @recursive
             to_optimize += find_to_optimize_recursive(path)
           else
-            warning "#{path} is not a file or a directory or does not exist"
+            warning "#{path} is a directory, use --recursive option"
           end
         else
-          warning "#{path} is not a file or does not exist"
+          warning "#{path} is not a file or a directory or does not exist"
         end
       end
       to_optimize
@@ -101,13 +106,36 @@ class ImageOptim
     def find_to_optimize_recursive(dir)
       to_optimize = []
       Find.find(dir) do |path|
-        next unless File.file?(path)
-        next unless @image_optim.optimizable?(path)
-        to_optimize << path
+        if File.file?(path)
+          next if exclude_file?(dir, path)
+          next unless @image_optim.optimizable?(path)
+          to_optimize << path
+        elsif File.directory?(path)
+          Find.prune if dir != path && exclude_dir?(dir, path)
+        end
       end
       to_optimize
     end
 
+    def exclude_dir?(dir, path)
+      exclude?(dir, path, @exclude_dir_globs)
+    end
+
+    def exclude_file?(dir, path)
+      exclude?(dir, path, @exclude_file_globs)
+    end
+
+    # Check if any of globs matches either part of path relative from dir or
+    # just basename
+    def exclude?(dir, path, globs)
+      relative_path = Pathname(path).relative_path_from(Pathname(dir)).to_s
+      basename = File.basename(path)
+      globs.any? do |glob|
+        File.fnmatch(glob, relative_path, File::FNM_PATHNAME) ||
+        File.fnmatch(glob, basename, File::FNM_PATHNAME)
+      end
+    end
+
     def warning(message)
       @warnings = true
       warn message

data/lib/image_optim/runner/glob_helpers.rb

@@ -0,0 +1,45 @@
+class ImageOptim
+  class Runner
+    # Helper methods for glob
+    module GlobHelpers
+      class << self
+        # Match inner curly braces in glob
+        # Negative lookbehind is not used as is not supported by ruby before 1.9
+        BRACE_REGEXP = /
+          \A
+          (
+            (?:.*[^\\]|)  # anything ending not with slash or nothing
+            (?:\\\\)*     # any number of self escaped slashes
+          )
+          \{              # open brace
+          (
+            (?:|.*?[^\\]) # nothing or non greedy anything ending not with slash
+            (?:\\\\)*     # any number of self escaped slashes
+          )
+          \}              # close brace
+          (
+            .*            # what is left
+          )
+          \z
+        /x
+
+        # Expand curly braces in glob as fnmatch in ruby before 2.0 doesn't
+        # support them
+        def expand_braces(original_glob)
+          expanded = []
+          unexpanded = [original_glob]
+          while (glob = unexpanded.shift)
+            if (m = BRACE_REGEXP.match(glob))
+              m[2].split(',', -1).each do |variant|
+                unexpanded << "#{m[1]}#{variant}#{m[3]}"
+              end
+            else
+              expanded << glob
+            end
+          end
+          expanded.uniq
+        end
+      end
+    end
+  end
+end

data/lib/image_optim/worker.rb

@@ -37,6 +37,24 @@ class ImageOptim
         option_definitions <<
             OptionDefinition.new(name, default, type, description, &proc)
       end
+
+      # Initialize all workers using options from calling options_proc with
+      # klass
+      def create_all(image_optim, &options_proc)
+        Worker.klasses.map do |klass|
+          next unless (options = options_proc[klass])
+          klass.new(image_optim, options)
+        end.compact
+      end
+
+      # Resolve all bins of all workers failing with one joint exception
+      def resolve_all!(workers)
+        errors = BinResolver.collect_errors(workers) do |worker|
+          worker.resolve_used_bins!
+        end
+        return if errors.empty?
+        fail BinResolver::Error, ['Bin resolving errors:', *errors].join("\n")
+      end
     end
 
     # Configure (raises on extra options)
@@ -60,6 +78,13 @@ class ImageOptim
       assert_no_unknown_options!(options)
     end
 
+    # Return hash with worker options
+    def options
+      self.class.option_definitions.each_with_object({}) do |option, h|
+        h[option.name] = send(option.name)
+      end
+    end
+
     # Optimize image at src, output at dst, must be overriden in subclass
     # return true on success
     def optimize(_src, _dst)
@@ -80,8 +105,18 @@ class ImageOptim
       0
     end
 
-    def <=>(other)
-      run_order <=> other.run_order
+    # List of bins used by worker
+    def used_bins
+      [self.class.bin_sym]
+    end
+
+    # Resolve used bins, raise exception mergin all messages
+    def resolve_used_bins!
+      errors = BinResolver.collect_errors(used_bins) do |bin|
+        @image_optim.resolve_bin!(bin)
+      end
+      return if errors.empty?
+      fail BinResolver::Error, wrap_resolver_error_message(errors.join(', '))
     end
 
     # Check if operation resulted in optimized file
@@ -103,9 +138,14 @@ class ImageOptim
     def resolve_bin!(bin)
       @image_optim.resolve_bin!(bin)
     rescue BinResolver::Error => e
+      raise e, wrap_resolver_error_message(e.message), e.backtrace
+    end
+
+    def wrap_resolver_error_message(message)
       name = self.class.bin_sym
-      raise e, "#{name} worker: #{e.message}; please provide proper binary or "\
-          "disable this worker (`:#{name} => false`)", e.backtrace
+      "#{name} worker: #{message}; please provide proper binary or "\
+          "disable this worker (--no-#{name} argument or "\
+          "`:#{name} => false` through options)"
     end
 
     # Run command setting priority and hiding output

data/lib/image_optim/worker/jhead.rb

@@ -17,6 +17,10 @@ class ImageOptim
         -10
       end
 
+      def used_bins
+        [:jhead, :jpegtran]
+      end
+
       def optimize(src, dst)
         if (2..8).include?(EXIFR::JPEG.new(src.to_s).orientation.to_i)
           src.copy(dst)

data/lib/image_optim/worker/jpegtran.rb

@@ -17,6 +17,10 @@ class ImageOptim
       option(:jpegrescan, false, 'Use jpegtran through jpegrescan, '\
           'ignore progressive option'){ |v| !!v }
 
+      def used_bins
+        jpegrescan ? [:jpegtran, :jpegrescan] : [:jpegtran]
+      end
+
       def optimize(src, dst)
         if jpegrescan
           args = %W[#{src} #{dst}]

data/spec/image_optim/bin_resolver_spec.rb

@@ -15,6 +15,7 @@ describe ImageOptim::BinResolver do
 
   it 'should resolve bin in path' do
     with_env 'LS_BIN', nil do
+      allow(resolver).to receive(:version).with(:ls).and_return('xxx')
       expect(resolver).to receive(:accessible?).with(:ls).once.and_return(true)
       expect(FSPath).not_to receive(:temp_dir)
 
@@ -28,12 +29,29 @@ describe ImageOptim::BinResolver do
     end
   end
 
+  it 'should fail to resolve unknown bin' do
+    with_env 'LS_BIN', nil do
+      expect(FSPath).not_to receive(:temp_dir)
+
+      5.times do
+        expect do
+          resolver.resolve!(:ls)
+        end.to raise_error RuntimeError
+      end
+      expect(resolver.env_path).to eq([
+        ENV['PATH'],
+        ImageOptim::BinResolver::VENDOR_PATH,
+      ].join(':'))
+    end
+  end
+
   it 'should resolve bin specified in ENV' do
     path = 'some/path/image_optim2.3.4'
     with_env 'IMAGE_OPTIM_BIN', path do
       tmpdir = double(:tmpdir, :to_str => 'tmpdir')
       symlink = double(:symlink)
 
+      allow(resolver).to receive(:version).with(:image_optim).and_return('xxx')
       expect(resolver).to receive(:accessible?).
         with(:image_optim).once.and_return(true)
       expect(FSPath).to receive(:temp_dir).
@@ -63,20 +81,15 @@ describe ImageOptim::BinResolver do
   end
 
   it 'should raise on failure to resolve bin' do
-    with_env 'SHOULD_NOT_EXIST_BIN', nil do
-      expect(resolver).to receive(:accessible?).
-        with(:should_not_exist).once.and_return(false)
+    with_env 'PATH', nil do
       expect(FSPath).not_to receive(:temp_dir)
 
       5.times do
         expect do
-          resolver.resolve!(:should_not_exist)
+          resolver.resolve!(:jpegtran)
         end.to raise_error ImageOptim::BinResolver::BinNotFound
       end
-      expect(resolver.env_path).to eq([
-        ENV['PATH'],
-        ImageOptim::BinResolver::VENDOR_PATH,
-      ].join(':'))
+      expect(resolver.env_path).to eq(ImageOptim::BinResolver::VENDOR_PATH)
     end
   end
 
@@ -118,6 +131,7 @@ describe ImageOptim::BinResolver do
 
   it 'should resolve bin only once' do
     with_env 'LS_BIN', nil do
+      allow(resolver).to receive(:version).with(:ls).and_return('xxx')
       expect(resolver).to receive(:resolve?).once.with(:ls){ sleep 0.1; true }
 
       10.times.map do

data/spec/image_optim/config_spec.rb

@@ -60,7 +60,11 @@ describe ImageOptim::Config do
   end
 
   describe 'for_worker' do
-    Abc = Class.new(ImageOptim::Worker) do
+    Abc = Class.new do
+      def self.bin_sym
+        :abc
+      end
+
       def image_formats
         []
       end
@@ -96,17 +100,7 @@ describe ImageOptim::Config do
     end
 
     describe 'global' do
-      it 'should return empty hash for global config if it does not exists' do
-        expect(File).to receive(:file?).
-          with(Config::GLOBAL_CONFIG_PATH).and_return(false)
-        expect(Config).not_to receive(:read)
-
-        expect(Config.global).to eq({})
-      end
-
-      it 'should read global config if it exists' do
-        expect(File).to receive(:file?).
-          with(Config::GLOBAL_CONFIG_PATH).and_return(true)
+      it 'should call read with GLOBAL_CONFIG_PATH' do
         expect(Config).to receive(:read).
           with(Config::GLOBAL_CONFIG_PATH).and_return(:config => true)
 
@@ -115,17 +109,7 @@ describe ImageOptim::Config do
     end
 
     describe 'local' do
-      it 'should return empty hash for local config if it does not exists' do
-        expect(File).to receive(:file?).
-          with(Config::LOCAL_CONFIG_PATH).and_return(false)
-        expect(Config).not_to receive(:read)
-
-        expect(Config.local).to eq({})
-      end
-
-      it 'should read local config if it exists' do
-        expect(File).to receive(:file?).
-          with(Config::LOCAL_CONFIG_PATH).and_return(true)
+      it 'should call read with LOCAL_CONFIG_PATH' do
         expect(Config).to receive(:read).
           with(Config::LOCAL_CONFIG_PATH).and_return(:config => true)
 
@@ -134,30 +118,65 @@ describe ImageOptim::Config do
     end
 
     describe 'read' do
+      let(:path){ double(:path) }
+      let(:full_path){ double(:full_path) }
+
+      it 'should warn if expand path fails' do
+        expect(Config).to receive(:warn)
+        expect(File).to receive(:expand_path).
+          with(path).and_raise(ArgumentError)
+        expect(File).not_to receive(:file?)
+
+        expect(Config.send(:read, path)).to eq({})
+      end
+
+      it 'should return empty hash if path is not a file' do
+        expect(Config).not_to receive(:warn)
+        expect(File).to receive(:expand_path).
+          with(path).and_return(full_path)
+        expect(File).to receive(:file?).
+          with(full_path).and_return(false)
+
+        expect(Config.send(:read, path)).to eq({})
+      end
+
       it 'should return hash with deep symbolised keys from reader' do
         stringified = {'config' => {'this' => true}}
         symbolized = {:config => {:this => true}}
 
-        path = double(:path)
-        expect(YAML).to receive(:load_file).with(path).and_return(stringified)
+        expect(Config).not_to receive(:warn)
+        expect(File).to receive(:expand_path).
+          with(path).and_return(full_path)
+        expect(File).to receive(:file?).
+          with(full_path).and_return(true)
+        expect(YAML).to receive(:load_file).
+          with(full_path).and_return(stringified)
 
-        expect(Config.instance_eval{ read(path) }).to eq(symbolized)
+        expect(Config.send(:read, path)).to eq(symbolized)
       end
 
       it 'should warn and return an empty hash if reader returns non hash' do
-        path = double(:path)
-        expect(YAML).to receive(:load_file).with(path).and_return([:config])
         expect(Config).to receive(:warn)
+        expect(File).to receive(:expand_path).
+          with(path).and_return(full_path)
+        expect(File).to receive(:file?).
+          with(full_path).and_return(true)
+        expect(YAML).to receive(:load_file).
+          with(full_path).and_return([:config])
 
-        expect(Config.instance_eval{ read(path) }).to eq({})
+        expect(Config.send(:read, path)).to eq({})
       end
 
       it 'should warn and return an empty hash if reader raises exception' do
-        path = double(:path)
-        expect(YAML).to receive(:load_file).with(path).and_raise
         expect(Config).to receive(:warn)
+        expect(File).to receive(:expand_path).
+          with(path).and_return(full_path)
+        expect(File).to receive(:file?).
+          with(full_path).and_return(true)
+        expect(YAML).to receive(:load_file).
+          with(full_path).and_raise
 
-        expect(Config.instance_eval{ read(path) }).to eq({})
+        expect(Config.send(:read, path)).to eq({})
       end
     end
   end

data/spec/image_optim/runner/glob_helpers_spec.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+require 'rspec'
+require 'image_optim/runner/glob_helpers'
+
+describe ImageOptim::Runner::GlobHelpers do
+  GH = ImageOptim::Runner::GlobHelpers
+
+  describe :expand_braces do
+    {
+      'hello.world' => %w[hello.world],
+      '{hello,.world}' => %w[hello .world],
+      'hello{.,!}world' => %w[hello.world hello!world],
+      '{a,b},{c,d}' => %w[a,c b,c a,d b,d],
+      '{{a,b},{c,d}}' => %w[a b c d],
+      '{a,b,{c,d}}' => %w[a b c d],
+      '{\{a,b\},\{c,d\}}' => %w[\\{a b\\} \\{c d\\}],
+      'test{ing,}' => %w[testing test],
+    }.each do |glob, expected|
+      it "should expand #{glob}" do
+        expect(GH.expand_braces(glob)).to match_array(expected)
+      end
+    end
+  end
+end

data/spec/image_optim/worker_spec.rb

@@ -6,13 +6,12 @@ describe ImageOptim::Worker do
   Worker = ImageOptim::Worker
 
   describe 'optimize' do
-    it 'should raise NotImplementedError unless overriden' do
-      class Abc < ImageOptim::Worker; end
-
+    it 'should raise NotImplementedError' do
       image_optim = ImageOptim.new
+      worker = Worker.new(image_optim, {})
 
       expect do
-        Abc.new(image_optim, {}).optimize(double, double)
+        worker.optimize(double, double)
       end.to raise_error NotImplementedError
     end
   end

data/spec/image_optim_spec.rb

@@ -67,7 +67,9 @@ describe ImageOptim do
           expect(path).to receive(:format).and_return(format)
 
           workers = image_optim.workers_for_image(path)
-          expect(workers).to eq(workers.sort)
+          expect(workers).to eq(workers.sort_by.with_index do |worker, i|
+            [worker.run_order, i]
+          end)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -16,33 +16,36 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: exifr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
@@ -50,6 +53,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
@@ -57,6 +63,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
@@ -64,6 +73,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
@@ -71,6 +83,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
@@ -78,6 +93,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
@@ -100,14 +118,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.26.0
 description: 
 email: 
 executables:
@@ -118,6 +136,7 @@ files:
 - .gitignore
 - .rubocop.yml
 - .travis.yml
+- CHANGELOG.markdown
 - CONTRIBUTING.markdown
 - Gemfile
 - LICENSE.txt
@@ -139,6 +158,7 @@ files:
 - lib/image_optim/option_helpers.rb
 - lib/image_optim/railtie.rb
 - lib/image_optim/runner.rb
+- lib/image_optim/runner/glob_helpers.rb
 - lib/image_optim/space.rb
 - lib/image_optim/true_false_nil.rb
 - lib/image_optim/worker.rb
@@ -160,6 +180,7 @@ files:
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_path_spec.rb
+- spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/space_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb
@@ -220,6 +241,7 @@ test_files:
 - spec/image_optim/handler_spec.rb
 - spec/image_optim/hash_helpers_spec.rb
 - spec/image_optim/image_path_spec.rb
+- spec/image_optim/runner/glob_helpers_spec.rb
 - spec/image_optim/space_spec.rb
 - spec/image_optim/worker_spec.rb
 - spec/image_optim_spec.rb