capybara-screenshot 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7126ec4ebeb17032c6345e1609d180e2bd2f4b22
-  data.tar.gz: 5f1ada5295afadf63c2a5fa6885ee0b930f12a45
+  metadata.gz: f711d80a74075257002c14a00a6493f212c29aef
+  data.tar.gz: 4ce30deb7d3076398bd0c9ac2f9ec59659355fd8
 SHA512:
-  metadata.gz: 6c4e3ad03d2618f66168288493bc7452e17a01abe324431ebde7a282b7a9a0497b887edf2f8715e02ebae94068036e47efa7d28594bf3a17446219d587a8bd75
-  data.tar.gz: 4828c6d1f7687c3c3e26f1c7d6236ebf5a3f28f376ea740abe892ef16a7199b027b42f5b15524c5487fc329ecbdffe826045088aca6d51caf043e09eb50bbfbd
+  metadata.gz: eb7f3178a7d365d847fee3a87fc2eb0204a858d284ba3589159745af71a0cf2722167a8935987d61a451c376e1708951334ba3fab9e29564ecad3fae7abaf35b
+  data.tar.gz: 5edea2883f4c986445e7951d13c1d51b988e42d7868e78effc0cf536e26368e6090162f61b20eb7be4d37ad2fcd793401fc10638da291699510530493a8d87a0

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 .bundle
 Gemfile.lock
+gemfiles/*.lock
 pkg/*
 .rvmrc
 bin

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
-script: "bundle exec rspec"
+script: "rake travis:ci"
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - jruby-19mode # JRuby in 1.9 mode
+  - ruby-head
+  - jruby-19mode
+  - jruby-head
 gemfile:
   - gemfiles/cucumber.1.2.gemfile
   - gemfiles/cucumber.1.3.0.gemfile

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+18 September 2014 - 1.0.0 -> 1.0.1
+-----------
+
+* Hot fix for RSpec version issue that assumed RSpec base library was always available, now uses `RSpec::Core::VERSION`
+* Improve Travis CI performance and stability
+
 18 September 2014 - 0.3.22 -> 1.0.0
 -----------
 

data/Rakefile

@@ -5,6 +5,36 @@ Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+rspec_rake_task = RSpec::Core::RakeTask.new(:spec)
 
 task default: [:spec]
+
+def target_gem
+  gem_file = ENV['BUNDLE_GEMFILE'] || ''
+  targets = %w(cucumber spinach rspec)
+
+  target = gem_file.match(/(#{targets.join('|')})/)
+  if target && targets.include?(target[1])
+    target[1].to_sym
+  else
+    []
+  end
+end
+
+namespace :travis do
+  task :ci => target_gem do
+    Rake::Task['spec'].invoke
+  end
+
+  task :cucumber do
+    rspec_rake_task.pattern = 'spec/cucumber'
+  end
+
+  task :spinach do
+    rspec_rake_task.pattern = 'spec/spinach'
+  end
+
+  task :rspec do
+    rspec_rake_task.pattern = 'spec/rspec'
+  end
+end

data/lib/capybara-screenshot/rspec/text_reporter.rb

@@ -6,7 +6,7 @@ module Capybara
       module TextReporter
         extend BaseReporter
 
-        if ::RSpec::Version::STRING.to_i <= 2
+        if ::RSpec::Core::Version::STRING.to_i <= 2
           enhance_with_screenshot :dump_failure_info
         else
           enhance_with_screenshot :example_failed

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/spec/cucumber/cucumber_spec.rb

@@ -1,64 +1,60 @@
 require "spec_helper"
-require "gherkin"
 
-# If Gherkin Parser is not available, then we are using an old Spinach Gemset
-if defined?(Gherkin::Parser::Parser)
-  describe "Using Capybara::Screenshot with Cucumber" do
-    include Aruba::Api
-    include CommonSetup
+describe "Using Capybara::Screenshot with Cucumber" do
+  include Aruba::Api
+  include CommonSetup
 
-    before do
-      clean_current_dir
-    end
-
-    def run_failing_case(failure_message, code)
-      write_file('features/support/env.rb', <<-RUBY)
-        #{ensure_load_paths_valid}
-        require 'cucumber/support/env.rb'
-        #{setup_test_app}
-      RUBY
-
-      write_file('features/step_definitions/step_definitions.rb', <<-RUBY)
-        %w(lib spec).each do |include_folder|
-          $LOAD_PATH.unshift(File.join('#{gem_root}', include_folder))
-        end
-        require 'cucumber/step_definitions/step_definitions.rb'
-      RUBY
+  before do
+    clean_current_dir
+  end
 
-      write_file('features/cucumber.feature', code)
-      cmd = 'bundle exec cucumber'
-      run_simple cmd, false
-      expect(output_from(cmd)).to match failure_message
-    end
+  def run_failing_case(failure_message, code)
+    write_file('features/support/env.rb', <<-RUBY)
+      #{ensure_load_paths_valid}
+      require 'cucumber/support/env.rb'
+      #{setup_test_app}
+    RUBY
+
+    write_file('features/step_definitions/step_definitions.rb', <<-RUBY)
+      %w(lib spec).each do |include_folder|
+        $LOAD_PATH.unshift(File.join('#{gem_root}', include_folder))
+      end
+      require 'cucumber/step_definitions/step_definitions.rb'
+    RUBY
+
+    write_file('features/cucumber.feature', code)
+    cmd = 'bundle exec cucumber'
+    run_simple_with_retry cmd, false
+    expect(output_from(cmd)).to match failure_message
+  end
 
-    it "saves a screenshot on failure" do
-      run_failing_case(%q{Unable to find link or button "you'll never find me"}, <<-CUCUMBER)
-        Feature: Failure
-          Scenario: Failure
-            Given I visit "/"
-            And I click on a missing link
-      CUCUMBER
-      check_file_content('tmp/my_screenshot.html', 'This is the root page', true)
-    end
+  it "saves a screenshot on failure" do
+    run_failing_case(%q{Unable to find link or button "you'll never find me"}, <<-CUCUMBER)
+      Feature: Failure
+        Scenario: Failure
+          Given I visit "/"
+          And I click on a missing link
+    CUCUMBER
+    check_file_content('tmp/my_screenshot.html', 'This is the root page', true)
+  end
 
-    it "saves a screenshot on an error" do
-      run_failing_case(%q{you can't handle me}, <<-CUCUMBER)
-        Feature: Failure
-          Scenario: Failure
-            Given I visit "/"
-            And I trigger an unhandled exception
-      CUCUMBER
-      check_file_content('tmp/my_screenshot.html', 'This is the root page', true)
-    end
+  it "saves a screenshot on an error" do
+    run_failing_case(%q{you can't handle me}, <<-CUCUMBER)
+      Feature: Failure
+        Scenario: Failure
+          Given I visit "/"
+          And I trigger an unhandled exception
+    CUCUMBER
+    check_file_content('tmp/my_screenshot.html', 'This is the root page', true)
+  end
 
-    it "saves a screenshot for the correct session for failures using_session" do
-      run_failing_case(%q{Unable to find link or button "you'll never find me"}, <<-CUCUMBER)
-        Feature: Failure
-          Scenario: Failure in different session
-            Given I visit "/"
-            And I click on a missing link on a different page in a different session
-      CUCUMBER
-      check_file_content('tmp/my_screenshot.html', 'This is a different page', true)
-    end
+  it "saves a screenshot for the correct session for failures using_session" do
+    run_failing_case(%q{Unable to find link or button "you'll never find me"}, <<-CUCUMBER)
+      Feature: Failure
+        Scenario: Failure in different session
+          Given I visit "/"
+          And I click on a missing link on a different page in a different session
+    CUCUMBER
+    check_file_content('tmp/my_screenshot.html', 'This is a different page', true)
   end
 end

data/spec/feature/minitest_spec.rb

@@ -27,7 +27,7 @@ describe "Using Capybara::Screenshot with MiniTest" do
     RUBY
 
     cmd = 'bundle exec ruby test_failure.rb'
-    run_simple cmd, false
+    run_simple_with_retry cmd, false
     expect(output_from(cmd)).to include %q{Unable to find link or button "you'll never find me"}
   end
 

data/spec/feature/testunit_spec.rb

@@ -33,7 +33,7 @@ describe "Using Capybara::Screenshot with Test::Unit" do
     RUBY
 
     cmd = "bundle exec ruby #{integration_path}/test_failure.rb"
-    run_simple cmd, false
+    run_simple_with_retry cmd, false
     expect(output_from(cmd)).to include %q{Unable to find link or button "you'll never find me"}
   end
 

data/spec/rspec/rspec_spec.rb

@@ -23,7 +23,7 @@ describe Capybara::Screenshot::RSpec do
       RUBY
 
       cmd = "bundle exec rspec #{"--format #{format} " if format}spec/test_failure.rb"
-      run_simple cmd, false
+      run_simple_with_retry cmd, false
 
       if error_message.kind_of?(Regexp)
         expect(output_from(cmd)).to match(error_message)
@@ -52,7 +52,7 @@ describe Capybara::Screenshot::RSpec do
     }
 
     # Textmate formatter is only included in RSpec 2
-    if RSpec::Version::STRING.to_i == 2
+    if RSpec::Core::Version::STRING.to_i == 2
       formatters[:textmate] = %r{TextMate\.system\(.*open file://\./tmp/screenshot.html}
     end
 

data/spec/spec_helper.rb

@@ -16,7 +16,7 @@ require 'aruba/jruby'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  if RSpec::Version::STRING.to_i == 2
+  if RSpec::Core::Version::STRING.to_i == 2
     config.treat_symbols_as_metadata_keys_with_true_values = true
   end
   config.run_all_when_everything_filtered = true

data/spec/spinach/spinach_spec.rb

@@ -17,7 +17,7 @@ describe "Using Capybara::Screenshot with Spinach" do
 
     write_file('spinach.feature', code)
     cmd = 'bundle exec spinach -f .'
-    run_simple cmd, false
+    run_simple_with_retry cmd, false
     expect(output_from(cmd)).to match failure_message
   end
 

data/spec/support/common_setup.rb

@@ -20,9 +20,16 @@ module CommonSetup
     end
 
     target.before do
-      if ENV['BUNDLE_GEMFILE'] && ENV['BUNDLE_GEMFILE'].match(/^\./)
-        ENV['BUNDLE_GEMFILE'] = File.expand_path(ENV['BUNDLE_GEMFILE'].gsub(/^\./, gem_root))
+      if ENV['BUNDLE_GEMFILE'] && ENV['BUNDLE_GEMFILE'].match(/^\.|^[^\/\.]/)
+        ENV['BUNDLE_GEMFILE'] = File.join(gem_root, ENV['BUNDLE_GEMFILE'])
       end
     end
+
+    def run_simple_with_retry(*args)
+      run_simple(*args)
+    rescue ChildProcess::TimeoutError => e
+      puts "run_simple(#{args.join(', ')}) failed. Will retry once. `#{e.message}`"
+      run_simple(*args)
+    end
   end
 end

data/spec/unit/rspec_reporters/text_reporter_spec.rb

@@ -34,7 +34,7 @@ describe Capybara::Screenshot::RSpec::TextReporter do
   end
 
   let(:example_failed_method) do
-    if ::RSpec::Version::STRING.to_i <= 2
+    if ::RSpec::Core::Version::STRING.to_i <= 2
       :dump_failure_info
     else
       :example_failed
@@ -43,7 +43,7 @@ describe Capybara::Screenshot::RSpec::TextReporter do
 
   def example_failed_method_argument_double(metadata = {})
     example = double("example", metadata: metadata)
-    if ::RSpec::Version::STRING.to_i <= 2
+    if ::RSpec::Core::Version::STRING.to_i <= 2
       example
     else
       double("notification").tap do |notification|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matthew O'Riordan
@@ -14,160 +14,160 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: spinach
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: When a Cucumber step fails, it is useful to create a screenshot image
@@ -178,9 +178,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -189,21 +189,13 @@ files:
 - Rakefile
 - capybara-screenshot.gemspec
 - gemfiles/cucumber.1.2.gemfile
-- gemfiles/cucumber.1.2.gemfile.lock
 - gemfiles/cucumber.1.3.0.gemfile
-- gemfiles/cucumber.1.3.0.gemfile.lock
 - gemfiles/latest.gemfile
-- gemfiles/latest.gemfile.lock
 - gemfiles/rspec.2.14.gemfile
-- gemfiles/rspec.2.14.gemfile.lock
 - gemfiles/rspec.2.99.gemfile
-- gemfiles/rspec.2.99.gemfile.lock
 - gemfiles/rspec.3.0.gemfile
-- gemfiles/rspec.3.0.gemfile.lock
 - gemfiles/spinach.0.7.gemfile
-- gemfiles/spinach.0.7.gemfile.lock
 - gemfiles/spinach.0.8.0.gemfile
-- gemfiles/spinach.0.8.0.gemfile.lock
 - lib/capybara-screenshot.rb
 - lib/capybara-screenshot/capybara.rb
 - lib/capybara-screenshot/cucumber.rb
@@ -249,17 +241,17 @@ 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: capybara-screenshot
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Automatically create snapshots when Cucumber steps fail with Capybara and