image_optim 0.24.2 → 0.24.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTQ3MTQ0OTM1ODJjOWQ1MDUwZDVmZTc1NGFmMDY4ODMzYzRmMGY3Zg==
-  data.tar.gz: !binary |-
-    NDU1NzhlYTg5NWViNzhhNDcwYzY1NzJlMGM1NzkwZTAzY2Y1M2IwNQ==
+SHA1:
+  metadata.gz: 76bd58bfc7147d344de3180b31eaf30572fdb940
+  data.tar.gz: 477c8fb36bab5dcd8abc0fa9714404453e19fc7a
 SHA512:
-  metadata.gz: !binary |-
-    ZTUzMjk0ZGY1YjBjNmNiMmRiZWFiMjMzZjkwZDIwZGI4OWUyNDg4NjdjYWY1
-    NGE4MjA1ZjFkMTFiMjdhOGE0NDIzZWI3OTRiNjk0YjA1NTRiYmVjZTBlNzFi
-    ZjIxOWE4MDEwMTEyZGQxMjc5ZGFjZmQ4ZDdmMzBjMmVmNDkyMWI=
-  data.tar.gz: !binary |-
-    NGM5YjNjYzUzODVhYjY4ZjE5NjNhOGVmOTU3Y2Y4ZjU5NDI0MTg0Y2E3Mjk2
-    NzViOGU3YjAxNjQyZGM5NGMyZTU3MmZlOTk1ZDE3Y2E0MTIxNjgyMTdhZDEy
-    ZGZkMjcyMjExYWIxZjNiYzM3MzczOTllNTU0MjI3MGFmOTEwNzU=
+  metadata.gz: c4dbea61152a4b7ae6fb1dd97f2019dd474073863009b7af55000f9e7657e691c43dbc7e11917f477f674536aba80d4e7d9dff588c0026f5e516a215941a5f6c
+  data.tar.gz: f120068d0b452500630247676dedbe475b8299127d3aa08e479308fea2731b7f3b06b63291858482d4f90ded3f9137975e11b9e66aa5abb0b067dd53e167e348

data/.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

data/.gitignore

@@ -7,7 +7,7 @@
 /coverage/
 /vendor/
 
-Gemfile.lock
+/Gemfile.lock
 Makefile
 *.o
 *.bundle

data/.rubocop.yml

@@ -3,6 +3,13 @@ AllCops:
     - '*.gemspec'
     - 'vendor/**/*'
 
+Bundler/OrderedGems:
+  Enabled: false
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - spec/**/*_spec.rb
+
 Lint/EndAlignment:
   EnforcedStyleAlignWith: variable
 
@@ -70,6 +77,9 @@ Style/IndentAssignment:
 Style/IndentHash:
   EnforcedStyle: consistent
 
+Style/IndentHeredoc:
+  Enabled: false
+
 Style/ParallelAssignment:
   Enabled: false
 
@@ -95,3 +105,6 @@ Style/TrailingCommaInArguments:
 
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
+
+Style/SymbolArray:
+  Enabled: false

data/.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.7'
+  - '2.3.4'
+  - '2.4.1'
+  - '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.1'
+      after_success: bundle exec codeclimate-test-reporter
+    - env: RUBOCOP=✓
+      rvm: '2.4.1'
+      script: bundle exec rubocop
+      before_install:
+    - env: CHECK_RUBIES=✓
+      rvm: '2.4.1'
+      script: bundle exec travis_check_rubies
+      before_install:
 addons:
   code_climate:
     repo_token:

data/CHANGELOG.markdown

@@ -2,6 +2,10 @@
 
 ## unreleased
 
+## v0.24.3 (2017-05-04)
+
+* Set mode of cache files to `0666 & ~umask`, related to [#147](https://github.com/toy/image_optim/issues/147) [@toy](https://github.com/toy)
+
 ## v0.24.2 (2017-02-18)
 
 * Describe `nice` level option [#140](https://github.com/toy/image_optim/issues/140) [@toy](https://github.com/toy)

data/Gemfile

@@ -9,3 +9,7 @@ if ENV['CODECLIMATE']
     gem 'codeclimate-test-reporter'
   end
 end
+
+if RUBY_VERSION >= '2.0'
+  gem 'travis_check_rubies', '~> 0.2'
+end

data/image_optim.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'image_optim'
-  s.version     = '0.24.2'
+  s.version     = '0.24.3'
   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/cache.rb

@@ -34,6 +34,7 @@ class ImageOptim
       if optimized
         tmp = FSPath.temp_file_path(digest, @cache_dir)
         FileUtils.mv(optimized, tmp)
+        tmp.chmod(0o666 & ~File.umask)
         tmp.rename(cached)
         cached_path = CachePath.convert(cached)
 

data/spec/image_optim/cache_path_spec.rb

@@ -51,9 +51,7 @@ describe ImageOptim::CachePath do
 
     it 'changes inode of destination' do
       skip 'inodes are not supported' unless inodes_supported?
-      expect do
-        src.replace(dst)
-      end.to change{ dst.stat.ino }
+      expect{ src.replace(dst) }.to change{ dst.stat.ino }
     end
   end
 end

data/spec/image_optim/cache_spec.rb

@@ -69,9 +69,12 @@ describe ImageOptim::Cache do
           cached_s = cached.to_s
           expect(FileTest).to receive(:file?).with(cached_s).and_return(false)
           expect(FileTest).not_to receive(:size?).with(cached_s)
-          expect(FileUtils).to receive(:mv).with(anything, tmp_file)
+          expect(FileUtils).to receive(:mv).with(optimized, tmp_file)
           expect(tmp_file).to receive(:rename).with(cached)
 
+          allow(File).to receive(:umask).and_return(0o024)
+          expect(tmp_file).to receive(:chmod).with(0o642)
+
           expect(cache.fetch(original){ optimized }).to eq(cached)
         end
 
@@ -79,10 +82,10 @@ describe ImageOptim::Cache do
           cached_s = cached.to_s
           expect(FileTest).to receive(:file?).with(cached_s).and_return(false)
           expect(FileTest).not_to receive(:size?).with(cached_s)
-          expect(FileUtils).to receive(:mv).with(anything, tmp_file)
-          expect(tmp_file).to receive(:rename).with(cached)
+          expect(FileUtils).not_to receive(:mv)
+          expect(FileUtils).to receive(:touch).with(cached)
 
-          expect(cache.fetch(original){ optimized }).to eq(cached)
+          expect(cache.fetch(original){ nil }).to eq(nil)
         end
       end
     end
@@ -106,7 +109,7 @@ describe ImageOptim::Cache do
           expect(FileUtils).not_to receive(:mv)
           expect(File).not_to receive(:rename)
 
-          expect(cache.fetch(original){}).to eq(nil)
+          expect(cache.fetch(original){ nil }).to eq(nil)
         end
       end
     end

data/spec/image_optim/option_definition_spec.rb

@@ -68,7 +68,11 @@ describe ImageOptim::OptionDefinition do
     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 @@ describe ImageOptim::OptionDefinition do
         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

data/spec/image_optim/path_spec.rb

@@ -97,9 +97,7 @@ describe ImageOptim::Path do
 
     it 'changes inode of destination' do
       skip 'inodes are not supported' unless inodes_supported?
-      expect do
-        src.replace(dst)
-      end.to change{ dst.stat.ino }
+      expect{ src.replace(dst) }.to change{ dst.stat.ino }
     end
   end
 end

data/spec/image_optim_spec.rb

@@ -204,7 +204,7 @@ describe ImageOptim do
           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 @@ describe ImageOptim do
           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|

metadata

@@ -1,131 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: image_optim
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.24.3
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: exifr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   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
   name: progress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
   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
   name: in_threads
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: image_optim_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.47'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.47'
 description: 
 email: 
 executables:
@@ -133,10 +147,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .appveyor.yml
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".appveyor.yml"
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.markdown
 - CONTRIBUTING.markdown
 - Gemfile
@@ -240,29 +254,25 @@ homepage: http://github.com/toy/image_optim
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! 'Rails image assets optimization is extracted into image_optim_rails
-  gem
-
-  You can safely remove `config.assets.image_optim = false` if you are not going to
-  use that gem
-
-'
+post_install_message: |
+  Rails image assets optimization is extracted into image_optim_rails gem
+  You can safely remove `config.assets.image_optim = false` if you are not going to use that gem
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: image_optim
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Optimize (lossless compress, optionally lossy) images (jpeg, png, gif, svg)
@@ -317,4 +327,3 @@ test_files:
 - spec/images/transparency2.png
 - spec/images/vergroessert.jpg
 - spec/spec_helper.rb
-has_rdoc: