rspec-rerun 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134c8ec35696f70df71be92ceb94e794a771ce31
-  data.tar.gz: a528f3dcb318a4de70865851fe2ffc50956a7791
+  metadata.gz: 6d388b330116565e3727f28033b49af020d54bf5
+  data.tar.gz: 0459c3704ff72c816994e5b033fcd759c039d43b
 SHA512:
-  metadata.gz: afa781d2506ec6b588878d5de5d8b0debbcb1269a9c0779ab53e63ead1a592068a48c0ab08a3ed219cb84950edcf1e2bc0d8a52b0e722f208be4cb1a1181dab3
-  data.tar.gz: 79b82066a6ed3aeca3f573319237e44d668057fa365888c17765af257bc5fedb83d5052277ba4714af5f53b1ebe8ff87aa8729e9b805ffeed3cbe2d707fda3ce
+  metadata.gz: 3b82514b1a26c9c18d10e7012a75b9f21c9b00c10110b19b9b9d18c3c22f38f79e4096bb6c4a683f33c8823b1d722369ceee24785014258448e60e8b3a6bc2e9
+  data.tar.gz: 6e22e346348305c388dd4b886c9afaed3c1f7874ee5199a2a2910d40781bb4c2f86f6e57bf34ed1f1fbd1c895e27567c31ae700f5d6c0724cf3ee117399b2ae6

data/.gitignore

@@ -1,3 +1,4 @@
 Gemfile.lock
 pkg
 rspec.failures
+.bundle

data/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   Exclude:
-    - vendor/**
+    - vendor/**/*
 
 LineLength:
   Enabled: false

data/.travis.yml

@@ -4,7 +4,6 @@ cache: bundler
 
 rvm:
   - 2.1.2
-  - 2.1.0
   - 2.0.0
   - 1.9.3
   - rbx-2.2.10
@@ -16,3 +15,8 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+
+env:
+  - RSPEC_VERSION=2
+  - RSPEC_VERSION=3
+

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+0.3.0 (3/10/2015)
+-----------------
+
+* [#22](https://github.com/dblock/rspec-rerun/pull/22): Added support for RSpec 3 - [@nightscape](https://github.com/nightscape), [@dblock](https://github.com/dblock).
+* [#23](https://github.com/dblock/rspec-rerun/issues/23): Fixed dual formatter error - [@KurtPreston](https://github.com/KurtPreston).
+* [#26](https://github.com/dblock/rspec-rerun/pull/26): Allow disabling RSpec verbose output - [@KurtPreston](https://github.com/KurtPreston).
+* [#26](https://github.com/dblock/rspec-rerun/pull/26): Added support for running on a specific tag - [@KurtPreston](https://github.com/KurtPreston).
+
 0.2.0
 -----
 

data/Gemfile

@@ -1,3 +1,13 @@
 source "http://rubygems.org"
 
 gemspec
+
+case rspec_version = ENV['RSPEC_VERSION'] || '~> 3.0'
+when /2/
+  gem 'rspec', '~> 2.11'
+when /3/
+  gem 'rspec', '~> 3.0'
+  gem 'rspec-legacy_formatters'
+else
+  gem 'rspec', rspec_version
+end

data/README.md

@@ -1,6 +1,9 @@
 ![rspec-rerun](https://raw.github.com/dblock/rspec-rerun/master/rspec-rerun.png)
 
-[![Build Status](https://secure.travis-ci.org/dblock/rspec-rerun.png)](http://travis-ci.org/dblock/rspec-rerun)
+[![Gem Version](http://img.shields.io/gem/v/rspec-rerun.svg)](http://badge.fury.io/rb/rspec-rerun)
+[![Build Status](http://img.shields.io/travis/dblock/rspec-rerun.svg)](https://travis-ci.org/dblock/rspec-rerun)
+[![Dependency Status](https://gemnasium.com/dblock/rspec-rerun.svg)](https://gemnasium.com/dblock/rspec-rerun)
+[![Code Climate](https://codeclimate.com/github/dblock/rspec-rerun.svg)](https://codeclimate.com/github/dblock/rspec-rerun)
 
 The **rspec-rerun** gem is a drop-in solution to retry (rerun) failed RSpec examples. It may be useful, for example, with finicky Capybara tests. The strategy to rerun failed specs is to output a file called `rspec.failures` that contains a list of failed examples and to feed that file back to RSpec via `-e`.
 
@@ -8,10 +11,12 @@ Usage
 -----
 
 Add `rspec-rerun` to `Gemfile` in the `:development` and `:test` groups.
+If you're using RSpec 3, also add `rspec-legacy_formatters`.
 
 ``` ruby
 group :development, :test do
-  gem "rspec-rerun"
+  gem 'rspec-rerun'
+  gem 'rspec-legacy_formatters'
 end
 ```
 
@@ -19,7 +24,7 @@ Require `rspec-rerun` and change the default task in `Rakefile`.
 
 ``` ruby
 require 'rspec-rerun'
-task :default => "rspec-rerun:spec"
+task :default => 'rspec-rerun:spec'
 ```
 
 Run `rake` or `rake rspec-rerun:spec`. Failed examples will be rerun automatically.
@@ -35,6 +40,8 @@ You can set the following global environment variables:
 
 * `RSPEC_RERUN_RETRY_COUNT`: number of retries, defaults to the value of `retry_count` or 1
 * `RSPEC_RERUN_PATTERN`: spec file pattern, defaults to the value defined by `RSpec::Core::RakeTask`
+* `RSPEC_RERUN_TAG`: only execute the tag specified
+* `RSPEC_RERUN_VERBOSE`: if 'false', don't show the rspec command invoked by Rake
 
 Git Ignore
 ----------

data/lib/rspec-rerun.rb

@@ -1,6 +1,5 @@
 require 'rspec-rerun/version'
-
-require 'rspec-rerun/formatters/failures_formatter.rb'
+require 'rspec-rerun/formatters/failures_formatter'
 
 if defined?(Rake)
   Dir[File.join(File.dirname(__FILE__), '../lib/tasks/**/*.rake')].each do |f|

data/lib/rspec-rerun/formatters/failures_formatter.rb

@@ -1,3 +1,19 @@
+require 'rspec/core'
+require 'rspec-rerun/rspec'
+
+if RSpec::Rerun.rspec3?
+  begin
+    require 'rspec/legacy_formatters'
+  rescue LoadError => e
+    STDERR.puts '*' * 80
+    STDERR.puts e.message
+    STDERR.puts 'Please add rspec-legacy_formatters to your Gemfile.'
+    STDERR.puts 'See https://github.com/dblock/rspec-rerun/pull/22 for details.'
+    STDERR.puts '*' * 80
+    raise
+  end
+end
+
 require 'rspec/core/formatters/base_formatter'
 
 module RSpec

data/lib/rspec-rerun/rspec.rb

@@ -0,0 +1,8 @@
+module RSpec
+  module Rerun
+    def self.rspec3?
+      require 'rspec'
+      ::RSpec.const_defined?(:Support)
+    end
+  end
+end

data/lib/rspec-rerun/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Rerun
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/tasks/rspec.rake

@@ -1,47 +1,38 @@
 require 'rspec/core/rake_task'
 
 desc "Run RSpec examples."
-RSpec::Core::RakeTask.new("rspec-rerun:run") do |t|
-  dot_rspec = [".rspec", File.expand_path("~/.rspec")].detect { |f| File.exist?(f) }
-  dot_rspec = (dot_rspec ? File.read(dot_rspec).split(/\n+/).map { |l| l.shellsplit } : [])
-  dot_rspec.concat ["--format", "progress"] unless dot_rspec.include?("--format")
-
-  t.pattern = ENV['RSPEC_RERUN_PATTERN'] if ENV['RSPEC_RERUN_PATTERN']
+RSpec::Core::RakeTask.new("rspec-rerun:run") do |t, args|
+  t.pattern = args[:pattern] if args[:pattern]
   t.fail_on_error = false
-  t.rspec_opts = [
-    "--require", File.join(File.dirname(__FILE__), '../rspec-rerun'),
-    "--format", "RSpec::Rerun::Formatters::FailuresFormatter",
-    *dot_rspec
-  ].flatten
+  t.verbose = false if args[:verbose] == false
+  t.rspec_opts = rspec_opts(args)
 end
 
 desc "Re-run failed RSpec examples."
-RSpec::Core::RakeTask.new("rspec-rerun:rerun") do |t|
+RSpec::Core::RakeTask.new("rspec-rerun:rerun") do |t, args|
   failing_specs = File.read(RSpec::Rerun::Formatters::FailuresFormatter::FILENAME).split
 
-  t.pattern = ENV['RSPEC_RERUN_PATTERN'] if ENV['RSPEC_RERUN_PATTERN']
+  t.pattern = args[:pattern] if args[:pattern]
   t.fail_on_error = false
-  t.rspec_opts = [
-    failing_specs.join(' '),
-    "--require", File.join(File.dirname(__FILE__), '../rspec-rerun'),
-    "--format", "RSpec::Rerun::Formatters::FailuresFormatter",
-    File.exist?(".rspec") ? File.read(".rspec").split(/\n+/).map { |l| l.shellsplit } : nil
-  ].flatten
+  t.verbose = false if args[:verbose] == false
+  t.rspec_opts =  rspec_opts(args, failing_specs.join(' '))
 end
 
 desc "Run RSpec code examples."
-task "rspec-rerun:spec", :retry_count do |t, args|
-  retry_count = (args[:retry_count] || ENV['RSPEC_RERUN_RETRY_COUNT'] || 1).to_i
+task "rspec-rerun:spec" do |t, args|
+  parsed_args = parse_args(args)
+  retry_count = (parsed_args[:retry_count] || 1).to_i
+
   fail "retry count must be >= 1" if retry_count <= 0
   FileUtils.rm_f RSpec::Rerun::Formatters::FailuresFormatter::FILENAME
-  Rake::Task["rspec-rerun:run"].execute
+  Rake::Task["rspec-rerun:run"].execute(parsed_args)
   while !$?.success? && retry_count > 0
     retry_count -= 1
     failed_count = File.read(RSpec::Rerun::Formatters::FailuresFormatter::FILENAME).split(/\n+/).count
     msg = "[#{Time.now}] Failed, re-running #{failed_count} failure#{failed_count == 1 ? '' : 's'}"
     msg += ", #{retry_count} #{retry_count == 1 ? 'retry' : 'retries'} left" if retry_count > 0
     $stderr.puts "#{msg} ..."
-    Rake::Task["rspec-rerun:rerun"].execute
+    Rake::Task["rspec-rerun:rerun"].execute(parsed_args)
   end
   if !$?.success?
     failed_count = File.read(RSpec::Rerun::Formatters::FailuresFormatter::FILENAME).split(/\n+/).count
@@ -49,3 +40,55 @@ task "rspec-rerun:spec", :retry_count do |t, args|
     fail "#{failed_count} failure#{failed_count == 1 ? '' : 's'}"
   end
 end
+
+def dot_rspec_params
+  dot_rspec_file = [".rspec", File.expand_path("~/.rspec")].detect { |f| File.exist?(f) }
+  dot_rspec = if dot_rspec_file
+                file_contents = File.read(dot_rspec_file)
+                file_contents.split(/\n+/).map { |l| l.shellsplit }.flatten
+              else
+                []
+              end
+  dot_rspec.concat ["--format", "progress"] unless dot_rspec.include?("--format")
+  dot_rspec
+end
+
+def rspec_opts(args, spec_files = nil)
+  opts = [
+    spec_files,
+    "--require", File.join(File.dirname(__FILE__), '../rspec-rerun'),
+    "--format", "RSpec::Rerun::Formatters::FailuresFormatter",
+    *dot_rspec_params
+  ].compact.flatten
+  if args[:tag]
+    opts << "--tag"
+    opts << args[:tag]
+  end
+  opts
+end
+
+def parse_args(args)
+  opts = args.extras
+
+  # Error on multiple arguments
+  if opts.size > 1
+    raise ArgumentError "rspec-rerun can take an integer (retry_count) or options hash"
+  else
+    opts = opts[0]
+  end
+
+  # Handle if opts is just a retry_count integer
+  opts = if opts.is_a? Hash
+    opts
+  else
+    {retry_count: opts}
+  end
+
+  # Parse environment variables
+  opts[:pattern] ||= ENV['RSPEC_RERUN_PATTERN'] if ENV['RSPEC_RERUN_PATTERN']
+  opts[:tag] ||= ENV['RSPEC_RERUN_TAG'] if ENV['RSPEC_RERUN_PATTERN']
+  opts[:retry_count] ||= ENV['RSPEC_RERUN_RETRY_COUNT'] if ENV['RSPEC_RERUN_RETRY_COUNT']
+  opts[:verbose] = (ENV['RSPEC_RERUN_VERBOSE'] != 'false') if opts[:verbose].nil?
+
+  opts
+end

data/rspec-rerun.gemspec

@@ -1,4 +1,5 @@
 require './lib/rspec-rerun/version'
+require './lib/rspec-rerun/rspec'
 
 Gem::Specification.new do |s|
   s.name = 'rspec-rerun'
@@ -11,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.test_files = s.files.grep(/^(spec)\//)
 
-  s.add_runtime_dependency 'rspec', '>= 2.11.0', '< 3'
+  s.add_runtime_dependency 'rspec'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler'

data/spec/rspec-rerun/tasks/rspec_task_spec.rb

@@ -53,6 +53,30 @@ describe 'RakeTask' do
     end.to raise_error RuntimeError, /failed with exit code 1/
   end
 
+  context 'verbose output' do
+    it 'displays the rspec command by default' do
+      `cd #{root} && RSPEC_RERUN_MARKER=#{@filename} RSPEC_RERUN_PATTERN=spec-runs/succeeds_spec.rb rake rspec-rerun:spec`.should include('rspec')
+    end
+
+    context 'when the RSPEC_RERUN_VERBOSE flag is set to false' do
+      it "doesn't display the rspec command" do
+        `cd #{root} && RSPEC_RERUN_VERBOSE=false RSPEC_RERUN_MARKER=#{@filename} RSPEC_RERUN_PATTERN=spec-runs/succeeds_spec.rb rake rspec-rerun:spec`.should_not include('rspec')
+      end
+    end
+  end
+
+  context 'tag execution' do
+    it 'does not scope by tag by default' do
+      `cd #{root} && RSPEC_RERUN_MARKER=#{@filename} RSPEC_RERUN_PATTERN=spec-runs/succeeds_spec.rb rake rspec-rerun:spec`.should_not include('--tag')
+    end
+
+    context 'when the RSPEC_RERUN_TAG flag is set' do
+      it 'scopes rspec to the tag' do
+        `cd #{root} && RSPEC_RERUN_TAG=test RSPEC_RERUN_MARKER=#{@filename} RSPEC_RERUN_PATTERN=spec-runs/succeeds_spec.rb rake rspec-rerun:spec`.should include('--tag test')
+      end
+    end
+  end
+
   context 'preserving .rspec' do
     let(:dot_rspec) { "#{root}/.rspec" }
     let(:home_rspec) { File.expand_path('~/.rspec') }
@@ -77,6 +101,12 @@ describe 'RakeTask' do
       run.should include '--format progress'
     end
 
+    it 'only uses the formatter specified by the .rspec file' do
+      File.write(dot_rspec, '--format documentation')
+      run.should include '--format documentation'
+      run.should_not include '--format progress'
+    end
+
     it 'also uses given formatter' do
       File.write(dot_rspec, "--color\n--format documentation")
       run.should include '--format documentation'

data/spec/spec_helper.rb

@@ -11,3 +11,11 @@ require 'tmpdir'
     require file
   end
 end
+
+if RSpec::Rerun.rspec3?
+  RSpec.configure do |config|
+    config.expect_with :rspec do |c|
+      c.syntax = [:should, :expect]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rerun
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.11.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +83,7 @@ files:
 - Rakefile
 - lib/rspec-rerun.rb
 - lib/rspec-rerun/formatters/failures_formatter.rb
+- lib/rspec-rerun/rspec.rb
 - lib/rspec-rerun/version.rb
 - lib/tasks/rspec.rake
 - rspec-rerun.gemspec
@@ -122,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Re-run failed RSpec tests.