capybara-screenshot-diff 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18cb8f36eeb03d05da4cd3300a91e7f871724a77
-  data.tar.gz: 2bbdc4d01d53b5bad98f43b16cec3557a167811b
+  metadata.gz: 8b8e8db9866c1792d98837c0795f1cd079299082
+  data.tar.gz: 70d03887cf122c6981883dd73b843ccb01affb85
 SHA512:
-  metadata.gz: b46673760287a2ff760f261e089ef75ed469cc83c05148a7dc4ca2791d8d5967f862bbffb45bf670c0e5bde9b50cb2cd42598679814b9cac88920a3bf333b7d5
-  data.tar.gz: 4048618b8364260ba070a1a320d44adf494f1af02344ae26a9d2a21d9a38f90ae3c9d4800c878234e20b494ac0c2af9e8bfaff1ad9689d35cf6a173bed2bdaf0
+  metadata.gz: 49185bf7799461dad6d4a10e1588846947bafa4352efa7f0475d1bcacc9c92a755c677c64ac3f413188fd496ec0c880922d2c11c90302a47d047207a0e257ade
+  data.tar.gz: 75dad95ba44ec14b7ebb89afa78e0d25751b5e82fb806d17f7eb191e5072338fd4231769c93321dc394af7893c880ba3ece1fde0c7f3652cbfe0a1484d96318e

data/.gitignore

@@ -1,10 +1,12 @@
 *~
 /.bundle/
+/.idea
 /.yardoc
 /Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
+/gemfiles/*.lock
 /pkg/
 /spec/reports/
 /tmp/

data/.travis.yml

@@ -1,15 +1,32 @@
 language: ruby
 rvm:
+  - ruby-2.3.3
   - jruby-9.1.6.0
-  - 2.3.3
-  - 2.2.6
-  - 2.1.9
-  - jruby-head
+  - ruby-2.2.6
+  - ruby-2.1.9
   - ruby-head
-before_install: gem query -i -n ^bundler$ >/dev/null || gem install bundler
+  - jruby-head
+
+gemfile:
+  - gemfiles/rails50.gemfile
+  - gemfiles/rails42.gemfile
 
 env:
   - JRUBY_OPTS="--dev --debug"
 
 jdk:
   - oraclejdk8
+
+matrix:
+  exclude:
+    - rvm: ruby-head # Cannot build json 1.x
+      gemfile: gemfiles/rails42.gemfile
+    - rvm: ruby-2.1.9 # Not supported by Rails 5
+      gemfile: gemfiles/rails50.gemfile
+  allow_failures:
+    - rvm: jruby-head # FIXME: (uwe) Low coverage: https://github.com/jruby/jruby/issues/4404
+      gemfile: gemfiles/rails50.gemfile
+    - rvm: jruby-head # FIXME: (uwe) Low coverage: https://github.com/jruby/jruby/issues/4404
+      gemfile: gemfiles/rails42.gemfile
+
+before_install: gem query -i -n ^bundler$ >/dev/null || gem install bundler

data/Rakefile

@@ -8,7 +8,3 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
-
-require 'rubocop/rake_task'
-RuboCop::RakeTask.new
-Rake::Task[:test].enhance [:'rubocop:auto_correct']

data/capybara-screenshot-diff.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-reporters'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop', '~> 0.39'
   spec.add_development_dependency 'simplecov', '~> 0.11'
 end

data/gemfiles/common.gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'capybara', '~> 2.0'
+gem 'chunky_png', '~> 1.3'
+gem 'minitest', '~> 5.0'
+gem 'minitest-reporters'
+gem 'rake'
+gem 'rubocop', '~> 0.39'
+gem 'simplecov', '~> 0.11'

data/gemfiles/rails42.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{__dir__}/common.gemfile")
+
+gem 'actionpack', '~>4.2.7'

data/gemfiles/rails50.gemfile

@@ -0,0 +1,3 @@
+eval File.read("#{__dir__}/common.gemfile")
+
+gem 'actionpack', '~>5.0.1'

data/lib/capybara/screenshot/diff/capybara_setup.rb

@@ -130,7 +130,7 @@ module ActionDispatch
         else
           committed_file_name = org_name
           redirect_target = "#{committed_file_name} #{SILENCE_ERRORS}"
-          `git show HEAD~0:#{self.class.screenshot_area}/#{name}.png > #{redirect_target}`
+          `git show HEAD~0:./#{self.class.screenshot_area}/#{name}.png > #{redirect_target}`
           if File.size(committed_file_name) == 0
             FileUtils.rm_f committed_file_name
           end

data/lib/capybara/screenshot/diff/version.rb

@@ -2,7 +2,7 @@
 module Capybara
   module Screenshot
     module Diff
-      VERSION = '0.3.0'.freeze
+      VERSION = '0.4.0'.freeze
     end
   end
 end

data/matrix_test.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby -w
+
+system('rubocop --auto-correct') || exit(1)
+
+update_gemfiles = ARGV.delete('--update')
+
+require 'yaml'
+travis = YAML.load(File.read('.travis.yml'))
+
+def run_script(ruby, env, gemfile)
+  env.scan(/\b(?<key>[A-Z_]+)="(?<value>.+?)"/) do |key, value|
+    ENV[key] = value
+  end
+  puts '*' * 80
+  puts "Testing #{ruby} #{gemfile} #{env}"
+  puts
+  system "chruby-exec #{ruby} -- bundle exec rake" || exit(1)
+  puts '*' * 80
+end
+
+def use_gemfile(ruby, gemfile, update_gemfiles)
+  puts '$' * 80
+  puts "Testing #{gemfile}"
+  puts
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  if update_gemfiles
+    system "chruby-exec #{ruby} -- bundle update"
+  else
+    system "chruby-exec #{ruby} -- bundle check || chruby-exec #{ruby} -- bundle install"
+  end || exit(1)
+  yield
+  puts "Testing #{gemfile} OK"
+  puts '$' * 80
+end
+
+travis['rvm'].each do |ruby|
+  next if ruby =~ /head/ # ruby-install does not support HEAD installation
+  puts '#' * 80
+  puts "Testing #{ruby}"
+  puts
+  system "ruby-install --no-reinstall #{ruby}" || exit(1)
+  bundler_gem_check_cmd = "chruby-exec #{ruby} -- gem query -i -n bundler >/dev/null"
+  system "#{bundler_gem_check_cmd} || chruby-exec #{ruby} -- gem install bundler" || exit(1)
+  travis['gemfile'].each do |gemfile|
+    if (travis['matrix']['exclude'].to_a + travis['matrix']['allowed_failures'].to_a)
+          .any? { |f| f['rvm'] == ruby && f['gemfile'] == gemfile }
+      puts 'Skipping known failure.'
+      next
+    end
+    use_gemfile(ruby, gemfile, update_gemfiles) do
+      travis['env'].each do |env|
+        run_script(ruby, env, gemfile)
+      end
+    end
+  end
+  puts "Testing #{ruby} OK"
+  puts '#' * 80
+end
+
+print "\033[0;32m"
+print '                        TESTS PASSED OK!'
+puts "\033[0m"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot-diff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -104,16 +104,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -160,10 +160,14 @@ files:
 - bin/console
 - bin/setup
 - capybara-screenshot-diff.gemspec
+- gemfiles/common.gemfile
+- gemfiles/rails42.gemfile
+- gemfiles/rails50.gemfile
 - lib/capybara/screenshot/diff.rb
 - lib/capybara/screenshot/diff/capybara_setup.rb
 - lib/capybara/screenshot/diff/image_compare.rb
 - lib/capybara/screenshot/diff/version.rb
+- matrix_test.rb
 homepage: https://github.com/donv/capybara-screenshot-diff
 licenses:
 - MIT
@@ -185,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Track your GUI changes with diff assertions