Merge branch 'cleanup'

Author: toy

.appveyor.yml

@@ -5,9 +5,7 @@ install:
   - ruby --version
   - bundle package --all
 
-  - ps: git --work-tree=tmp\bin checkout origin/windows-binaries --
-      advpng.exe gifsicle.exe jhead.exe jpeg-recompress.exe jpegoptim.exe
-      jpegtran.exe optipng.exe pngcrush.exe pngout.exe pngquant.exe
+  - ps: git --work-tree=tmp\bin checkout origin/windows-binaries -- '*.exe'
 
   - ps: | # svgo
       npm install -g svgo

.rubocop.yml

@@ -3,6 +3,9 @@ AllCops:
     - '*.gemspec'
     - 'vendor/**/*'
 
+Bundler/OrderedGems:
+  Enabled: false
+
 Lint/EndAlignment:
   EnforcedStyleAlignWith: variable
 

.travis.yml

@@ -3,48 +3,39 @@ language: ruby
 cache:
   bundler: true
   directories:
-  - $(npm root)
-  - ~/bin
+    - $(npm root)
+    - ~/bin
 rvm:
-  - '1.8'
-  - '1.9'
-  - '2.0'
-  - '2.1'
-  - '2.2'
-  - jruby-19mode
-  - ree
-script: |
-  (
-    set -ex
-    if [ -n "$RUBOCOP" ]; then
-      bundle exec rubocop
-    else
-      bundle exec image_optim --info
-      bundle exec rspec
-    fi
-  )
-before_install: |
-  (
-    set -ex
-    if [ -z "$RUBOCOP" ]; then
-      command -v svgo || npm install svgo
-      command -v pngout || {
-        mkdir -p ~/bin
-        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'
-      }
-    fi
-  )
-after_success:
-  - if [ -n "$CODECLIMATE" ]; then bundle exec codeclimate-test-reporter; fi
+  - '1.8.7-p371'
+  - '1.9.3-p551'
+  - '2.0.0-p648'
+  - '2.1.10'
+  - '2.2.6'
+  - '2.3.3'
+  - '2.4.0'
+  - 'jruby-1.7.26'
+  - 'jruby-9.0.5.0'
+  - 'jruby-9.1.5.0'
+script:
+  - bundle exec image_optim --info
+  - bundle exec rspec
+before_install:
+  - mkdir -p ~/bin
+  - command -v svgo || npm install 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:
-  fast_finish: true
   include:
-    - env: CODECLIMATE=true
-      rvm: '2'
-    - env: RUBOCOP=true
-      rvm: '2'
-  allow_failures:
-    - rvm: jruby-19mode
+    - env: CODECLIMATE=✓
+      rvm: '2.4.0'
+      after_success: bundle exec codeclimate-test-reporter
+    - env: RUBOCOP=✓
+      rvm: '2.4.0'
+      script: bundle exec rubocop
+      before_install:
+    - env: CHECK_RUBIES=✓
+      rvm: '2.4.0'
+      script: bundle exec travis_check_rubies
+      before_install:
 addons:
   code_climate:
     repo_token:

Gemfile

@@ -9,3 +9,8 @@ if ENV['CODECLIMATE']
     gem 'codeclimate-test-reporter'
   end
 end
+
+if RUBY_VERSION >= '2.0'
+  gem 'travis_check_rubies', '~> 0.2'
+  gem 'rainbow', '!= 2.2.1' # TODO: remove when sickill/rainbow#44 is resolved
+end

spec/image_optim/option_definition_spec.rb

@@ -68,7 +68,11 @@
     end
 
     context 'when proc given' do
-      subject{ described_class.new('abc', :def, 'desc', &:inspect) }
+      subject do
+        # not using &:inspect due to ruby Bug #13087
+        # to_s is just to calm rubocop
+        described_class.new('abc', :def, 'desc'){ |o| o.inspect.to_s }
+      end
 
       context 'when option not provided' do
         it 'returns default passed through proc' do
@@ -88,6 +92,30 @@
         end
       end
     end
+
+    context 'when proc with arity 2 given' do
+      subject do
+        described_class.new('abc', :def, 'desc'){ |a, b| [a.inspect, b] }
+      end
+
+      context 'when option not provided' do
+        it 'returns default passed through proc' do
+          expect(subject.value(nil, {})).to eq([':def', subject])
+        end
+      end
+
+      context 'when option is nil' do
+        it 'returns nil passed through proc' do
+          expect(subject.value(nil, :abc => nil)).to eq(['nil', subject])
+        end
+      end
+
+      context 'when option is set' do
+        it 'returns value passed through proc' do
+          expect(subject.value(nil, :abc => 123)).to eq(['123', subject])
+        end
+      end
+    end
   end
 
   describe '#default_description' do

spec/image_optim_spec.rb

@@ -204,7 +204,7 @@ def temp_copy(image)
           image_optim = ImageOptim.new
           results = test_images.map do |src|
             dst = double
-            expect(image_optim).to receive(method).with(src).and_return(dst)
+            allow(image_optim).to receive(method).with(src).and_return(dst)
             [src, dst]
           end
           expect(image_optim.send(list_method, test_images)).to eq(results)
@@ -217,7 +217,7 @@ def temp_copy(image)
           image_optim = ImageOptim.new
           results = test_images.map do |src|
             dst = double
-            expect(image_optim).to receive(method).with(src).and_return(dst)
+            allow(image_optim).to receive(method).with(src).and_return(dst)
             [src, dst, :test]
           end
           expect(image_optim.send(list_method, test_images) do |src, dst|