Skip to content

Commit 99154c8

Browse files
committed
Update ImageOptim dependency to 0.18.0
`ImageOptim` now supports a `skip_missing_workers` option, which allows us to not have to manually disable `pngout`. Change the hook to use this option and update the dependency. Change-Id: Iea175e9139b7f8e64d75a1da806d70241e618d37 Reviewed-on: http://gerrit.causes.com/45274 Tested-by: jenkins <jenkins@brigade.com> Reviewed-by: Shane da Silva <shane.dasilva@brigade.com>
1 parent f1c5062 commit 99154c8

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* Fix installer to work with Overcommit hooks created via `GIT_TEMPLATE_DIR`
88
* Fix hook runner to not display skip message unless hook would have actually
99
run
10+
* Change `ImageOptim` hook to use `skip_missing_workers` option and update
11+
dependency to 0.18.0
1012

1113
## 0.19.0
1214
* Add `--no-pngout` flag for `image_optim` command on `:fail` message

lib/overcommit/hook/pre_commit/image_optim.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def run
1919
return :fail,
2020
"The following images are optimizable:\n#{optimized_images.join("\n")}" \
2121
"\n\nOptimize them by running:\n" \
22-
" image_optim --no-pngout #{optimized_images.join(' ')}"
22+
" image_optim --skip-missing-workers #{optimized_images.join(' ')}"
2323
end
2424

2525
:pass
@@ -28,10 +28,10 @@ def run
2828
private
2929

3030
def optimize_images(image_paths)
31-
image_optim = ::ImageOptim.new(:pngout => false)
31+
image_optim = ::ImageOptim.new(:skip_missing_workers => true)
3232

3333
optimized_images =
34-
image_optim.optimize_images!(image_paths) do |path, optimized|
34+
image_optim.optimize_images(image_paths) do |path, optimized|
3535
path if optimized
3636
end
3737

overcommit.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ Gem::Specification.new do |s|
2828

2929
s.add_dependency 'childprocess', '>= 0.5.1'
3030

31-
s.add_development_dependency 'image_optim', '~> 0.15.0'
31+
s.add_development_dependency 'image_optim', '~> 0.18.0'
3232
s.add_development_dependency 'rspec', '~> 3.0'
3333
end

0 commit comments

Comments
 (0)