respec 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d53d945527eec47f8756eb05b37d6d4728b79814
-  data.tar.gz: 20d763a3e804d9d1562b3dfa7589cda2eb0238ea
+  metadata.gz: dfad27bdd03eab8d26196cec1c56ab386f313fb1
+  data.tar.gz: 6e6a4223f0caa56a7233fcc97816f720d0710268
 SHA512:
-  metadata.gz: c10f7f2a4e072f67d0e692183c4f39678182cab17f97b823320335a70b58b64ccab93399d836a91abfe362d11332cc358c271c836f792e74d1bd4503064c5091
-  data.tar.gz: d5faf4f588bf784f1aad11cce08a743f7d8a1cadb77b0cb121bcaec5239be5a04e3bfc001c878e06b127dc8f5933e9b4298e0c5f364646e03757305e25169806
+  metadata.gz: 7e139c64ecb48d92d2d44bd37be6c13d25cdf3a5e4bcac1f664a0b7e1c5e78990c2539883807a972a4ebe437545b86a054d7e7a3c40473d17f7175e05bbf84f7
+  data.tar.gz: fdf8cd1a0ad2d9713a15a6020a296956e822b5c9750f1f024aaa73178848a57ed3bdd1945fae847177f476e266aa8927b89a203c758eda9087429e9514f7a4f5

data/.travis.yml

@@ -2,8 +2,12 @@ language: ruby
 bundler_args: --without dev
 script: bundle exec rake ci
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
+  - 2.0.0
+  - 2.1.5
+  - 2.2.0
+  - jruby-1.7.9
+  - rbx-2.4.1
+env:
+  - RESPEC_RSPEC_VERSION='~> 2.11.0'
+  - RESPEC_RSPEC_VERSION='~> 2.14.0'
+  - RESPEC_RSPEC_VERSION='~> 3'

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 0.8.0 2015-02-02
+
+ * Support RSpec 3.
+ * Record failing example names, not locations. Requires rspec 2.11 or above.
+ * Wait until end of test suite before updating failure file.
+ * Use rspec binstub if present.
+
 == 0.7.0 2014-04-16
 
  * Allow setting failure file via argument. Useful under CI with parallel_tests.

data/Gemfile

@@ -1,2 +1,13 @@
 source 'https://rubygems.org/'
 gemspec
+
+gem 'ritual'
+gem 'temporaries'
+
+version = ENV['RESPEC_RSPEC_VERSION'] and
+  gem 'rspec', version
+
+group :dev do
+  gem 'byebug'
+  gem 'looksee'
+end

data/README.markdown

@@ -1,4 +1,4 @@
-## Respec
+## Respec [![Build Status](https://travis-ci.org/oggy/respec.png)](https://travis-ci.org/oggy/respec) [![Gem Version](https://badge.fury.io/rb/respec.svg)](http://badge.fury.io/rb/respec)
 
 Provides a command, `respec`, which wraps `rspec`, and records your
 failing examples for easy rerunning.
@@ -48,7 +48,7 @@ command line:
 If the argument doesn't name an existing file, it's assumed to be an
 example name.
 
-It'll even `bundle exec` for you automatically.
+It'll even `bundle exec` for you automatically, or use a binstub if present.
 
 There are a few other shortcuts. `respec --help` to see them all.
 

data/bin/respec

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+ROOT = File.expand_path('..', File.dirname(__FILE__))
+$:.unshift "#{ROOT}/lib"
 require 'respec'
 
 app = Respec::App.new(*ARGV)

data/lib/respec/app.rb

@@ -11,7 +11,6 @@ module Respec
         @raw_args = []
       end
       @failures_path = self.class.default_failures_path
-      @selected_failures = false
       @update_failures = true
       process_args
     end
@@ -19,14 +18,16 @@ module Respec
     attr_accessor :failures_path
 
     def command
-      @command ||= bundler_args + ['rspec'] + generated_args + raw_args + formatter_args
+      @command ||= program_args + generated_args + raw_args + formatter_args
     end
 
-    def bundler_args
-      if File.exist?(ENV['BUNDLE_GEMFILE'] || 'Gemfile')
-        ['bundle', 'exec']
+    def program_args
+      if File.exist?('bin/rspec')
+        ['bin/rspec']
+      elsif File.exist?(ENV['BUNDLE_GEMFILE'] || 'Gemfile')
+        ['bundle', 'exec', 'rspec']
       else
-        []
+        ['rspec']
       end
     end
 
@@ -100,8 +101,7 @@ module Respec
                 STDERR.puts "No specs failed!"
                 []
               else
-                @selected_failures = true
-                failures
+                failures.flat_map { |f| ['-e', f] }
               end
             else
               warn "no fail file - ignoring 'f' argument"
@@ -111,14 +111,13 @@ module Respec
         elsif arg =~ /\A\d+\z/
           i = Integer(arg)
           if (failure = failures[i - 1])
-            args << failure
-            @selected_failures = true
+            args << '-e' << failure
             @update_failures = false
           else
             warn "invalid failure: #{i} for (1..#{failures.size})"
           end
         else
-          args << '--example' << arg.gsub(/[$]/, '\\\\\\0')
+          args << '-e' << arg.gsub(/[$]/, '\\\\\\0')
         end
       end
 
@@ -138,7 +137,7 @@ module Respec
       # If we selected individual failures to rerun, don't give the files to
       # rspec, as those files will be run in their entirety.
       @generated_args = expanded
-      @generated_args.concat(files) unless @selected_failures
+      @generated_args.concat(files)
     end
 
     def failures

data/lib/respec/formatter.rb

@@ -1,32 +1,50 @@
 require 'rspec/core/formatters/base_formatter'
+require 'rspec/core/version'
 
 module Respec
-  class Formatter < RSpec::Core::Formatters::BaseFormatter
-    def start_dump
-      @failed_examples.each do |example|
-        output.puts self.class.extract_spec_location(example.metadata)
+  def self.failures_path
+    ENV['RESPEC_FAILURES'] || File.expand_path(".respec_failures")
+  end
+
+  if (RSpec::Core::Version::STRING.scan(/\d+/).map { |s| s.to_i } <=> [3]) < 0
+
+    class Formatter < RSpec::Core::Formatters::BaseFormatter
+      def initialize(output=nil)
+        super(output)
       end
-    end
 
-    def self.extract_spec_location(metadata)
-      root_metadata = metadata
-      until spec_path?(metadata[:location])
-        metadata = metadata[:example_group]
-        if !metadata
-          warn "no spec file found for #{root_metadata[:location]}"
-          return root_metadata[:location]
+      def start_dump
+        open(Respec.failures_path, 'w') do |file|
+          @failed_examples.each do |example|
+            file.puts example.metadata[:full_description]
+          end
         end
       end
-      metadata[:location]
     end
 
-    def self.spec_path?(path)
-      flags = File::FNM_PATHNAME | File::FNM_DOTMATCH
-      if File.const_defined?(:FNM_EXTGLOB)  # ruby >= 2
-        flags |= File::FNM_EXTGLOB
+  else
+
+    class Formatter < RSpec::Core::Formatters::BaseFormatter
+      def initialize(output=nil)
+        @respec_failures = []
+        super(output)
+      end
+
+      def example_failed(notification)
+        @respec_failures << notification.example.full_description
+      end
+
+      def start_dump(notification)
+        open(Respec.failures_path, 'w') do |file|
+          @respec_failures.each do |failure|
+            file.puts failure
+          end
+        end
       end
-      File.fnmatch(RSpec.configuration.pattern, path.sub(/:\d+\z/, ''), flags)
+
+      RSpec::Core::Formatters.register self, :example_failed, :start_dump
     end
+
   end
 end
 
@@ -35,5 +53,5 @@ end
 # option.
 RSpec.configure do |config|
   config.add_formatter 'progress' if config.formatters.empty?
-  config.add_formatter Respec::Formatter, ENV['RESPEC_FAILURES'] || File.expand_path(".respec_failures")
+  config.add_formatter Respec::Formatter
 end

data/lib/respec/version.rb

@@ -1,5 +1,5 @@
 module Respec
-  VERSION = [0, 7, 0]
+  VERSION = [0, 8, 0]
 
   class << VERSION
     include Comparable

data/respec.gemspec

@@ -14,7 +14,5 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  gem.add_runtime_dependency 'rspec', '>= 2.0'
-  gem.add_development_dependency 'ritual', '~> 0.4'
-  gem.add_development_dependency 'temporaries', '~> 0.4'
+  gem.add_runtime_dependency 'rspec', '>= 2.11'
 end

data/spec/integration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require_relative 'spec_helper'
 require 'rbconfig'
 
 describe Respec do

data/spec/respec/app_spec.rb

@@ -9,10 +9,6 @@ describe Respec::App do
 
   Respec::App.default_failures_path = FAIL_PATH
 
-  def write_file(path, content)
-    open(path, 'w') { |f| f.print content }
-  end
-
   def make_failures_file(*examples)
     options = examples.last.is_a?(Hash) ? examples.pop : {}
     path = options[:path] || Respec::App.default_failures_path
@@ -35,12 +31,21 @@ describe Respec::App do
     end
   end
 
-  describe "#bundler_args" do
-    it "should run through bundler if a Gemfile is present" do
+  describe "#program_args" do
+    it "should run through a binstub if present" do
+      FileUtils.mkdir "#{tmp}/bin"
+      FileUtils.touch "#{tmp}/bin/rspec"
+      Dir.chdir tmp do
+        app = Respec::App.new
+        expect(app.program_args).to eq ['bin/rspec']
+      end
+    end
+
+    it "should otherwise run through bundler if a Gemfile is present" do
       FileUtils.touch "#{tmp}/Gemfile"
       Dir.chdir tmp do
         app = Respec::App.new
-        expect(app.bundler_args).to eq ['bundle', 'exec']
+        expect(app.program_args).to eq ['bundle', 'exec', 'rspec']
       end
     end
 
@@ -49,7 +54,7 @@ describe Respec::App do
         FileUtils.touch "#{tmp}/custom_gemfile"
         Dir.chdir tmp do
           app = Respec::App.new
-          expect(app.bundler_args).to eq ['bundle', 'exec']
+          expect(app.program_args).to eq ['bundle', 'exec', 'rspec']
         end
       end
     end
@@ -58,7 +63,7 @@ describe Respec::App do
       with_hash_value ENV, 'BUNDLE_GEMFILE', nil do
         Dir.chdir tmp do
           app = Respec::App.new
-          expect(app.bundler_args).to eq []
+          expect(app.program_args).to eq ['rspec']
         end
       end
     end
@@ -71,13 +76,13 @@ describe Respec::App do
     end
 
     it "should update the stored failures if 'f' is used" do
-      make_failures_file 'a.rb:1'
+      make_failures_file 'a'
       app = Respec::App.new('f')
       expect(app.formatter_args).to eq [FORMATTER_PATH]
     end
 
     it "should not update the stored failures if a numeric argument is given" do
-      make_failures_file 'a.rb:1'
+      make_failures_file 'a'
       app = Respec::App.new('1')
       expect(app.formatter_args).to eq []
     end
@@ -96,21 +101,27 @@ describe Respec::App do
     end
 
     it "should run all failures if 'f' is given" do
-      make_failures_file 'a.rb:1', 'b.rb:2'
+      make_failures_file 'a', 'b'
       app = Respec::App.new('f')
-      expect(app.generated_args).to eq ['a.rb:1', 'b.rb:2']
+      expect(app.generated_args).to eq ['-e', 'a', '-e', 'b', 'spec']
+    end
+
+    it "should pass failures with spaces in them as a single argument" do
+      make_failures_file 'a a'
+      app = Respec::App.new('f')
+      expect(app.generated_args).to eq ['-e', 'a a', 'spec']
     end
 
     it "should find the right failures if the failures file is overridden after the 'f'" do
-      make_failures_file 'a.rb:1', 'b.rb:2', path: "#{FAIL_PATH}-overridden"
+      make_failures_file 'a', 'b', path: "#{FAIL_PATH}-overridden"
       app = Respec::App.new('f', "FAILURES=#{FAIL_PATH}-overridden")
-      expect(app.generated_args).to eq ['a.rb:1', 'b.rb:2']
+      expect(app.generated_args).to eq ['-e', 'a', '-e', 'b', 'spec']
     end
 
     it "should run the n-th failure if a numeric argument 'n' is given" do
-      make_failures_file 'a.rb:1', 'b.rb:2'
+      make_failures_file 'a', 'b'
       app = Respec::App.new('2')
-      expect(app.generated_args).to eq ['b.rb:2']
+      expect(app.generated_args).to eq ['-e', 'b', 'spec']
     end
 
     it "should interpret existing file names as file name arguments" do
@@ -126,23 +137,22 @@ describe Respec::App do
     end
 
     it "should treat other arguments as example names" do
-      FileUtils.touch "#{tmp}/FILE"
-      app = Respec::App.new("#{tmp}/FILE")
-      expect(app.generated_args).to eq ["#{tmp}/FILE"]
+      app = Respec::App.new('a', 'b')
+      expect(app.generated_args).to eq ['-e', 'a', '-e', 'b', 'spec']
     end
 
-    it "should not include named files if a numeric argument is given" do
+    it "should include named files when a numeric argument is given" do
       FileUtils.touch "#{tmp}/FILE"
-      make_failures_file 'a.rb:1'
+      make_failures_file 'a'
       app = Respec::App.new("#{tmp}/FILE", '1')
-      expect(app.generated_args).to eq ['a.rb:1']
+      expect(app.generated_args).to eq ['-e', 'a', "#{tmp}/FILE"]
     end
 
-    it "should not include named files if an 'f' argument is given" do
+    it "should include named files when an 'f' argument is given" do
       FileUtils.touch "#{tmp}/FILE"
-      make_failures_file 'a.rb:1'
+      make_failures_file 'a'
       app = Respec::App.new("#{tmp}/FILE", 'f')
-      expect(app.generated_args).to eq ['a.rb:1']
+      expect(app.generated_args).to eq ['-e', 'a', "#{tmp}/FILE"]
     end
 
     it "should explicitly add the spec directory if no files are given or errors to rerun" do
@@ -156,16 +166,16 @@ describe Respec::App do
       expect(app.generated_args).to eq ["#{tmp}/FILE"]
     end
 
-    it "should not add the spec directory if a numeric argument is given" do
-      make_failures_file 'a.rb:1'
+    it "should add the spec directory if a numeric argument is given without explicit files" do
+      make_failures_file 'a'
       app = Respec::App.new('1')
-      expect(app.generated_args).to eq ["a.rb:1"]
+      expect(app.generated_args).to eq ['-e', 'a', 'spec']
     end
 
-    it "should not add the spec directory if an 'f' argument is given" do
-      make_failures_file 'a.rb:1'
+    it "should add the spec directory when an 'f' argument is given without explicit files" do
+      make_failures_file 'a'
       app = Respec::App.new('f')
-      expect(app.generated_args).to eq ["a.rb:1"]
+      expect(app.generated_args).to eq ['-e', 'a', 'spec']
     end
   end
 

data/spec/respec/formatter_spec.rb

@@ -1,29 +1,57 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require_relative '../spec_helper'
+require 'rspec/version'
 
 describe Respec::Formatter do
-  describe ".extract_spec_location" do
-    use_attribute_value RSpec.configuration, :pattern, "**/*_spec.rb"
+  use_temporary_directory TMP
+  let(:formatter) { Respec::Formatter.new }
 
-    it "should find the spec file for normal examples" do
-      metadata = {:location => './spec/models/user_spec.rb:47'}
-      expect(described_class.extract_spec_location(metadata)).
-        to eq './spec/models/user_spec.rb:47'
-    end
+  def failures
+    File.read("#{TMP}/failures.txt")
+  end
 
-    it "should find the spec file for shared examples" do
-      metadata = {
-        :location => './spec/support/breadcrumbs.rb:75',
-        :example_group => {:location => './spec/requests/breadcrumbs_spec.rb:218'},
-      }
-      expect(described_class.extract_spec_location(metadata)).
-        to eq './spec/requests/breadcrumbs_spec.rb:218'
-    end
+  describe Respec::Formatter do
+    if (RSpec::Core::Version::STRING.scan(/\d+/).map { |s| s.to_i } <=> [3]) < 0
+
+      before { Respec.stub(failures_path: "#{TMP}/failures.txt") }
+
+      def make_failing_example(description)
+        metadata = {full_description: description}
+        mock(RSpec::Core::Example.allocate, metadata: metadata)
+      end
+
+      it "records failed example names and dumps them at the end" do
+        failed_examples = [make_failing_example('example 1'), make_failing_example('example 2')]
+        formatter.instance_variable_set(:@failed_examples, failed_examples)
+        formatter.start_dump
+        expect(failures).to eq "example 1\nexample 2\n"
+      end
+
+      it "empties the failure file if no examples failed" do
+        formatter.start_dump
+        expect(failures).to eq ''
+      end
+
+    else
+
+      before { allow(Respec).to receive(:failures_path).and_return("#{TMP}/failures.txt") }
+
+      def make_failure_notification(description)
+        example = double(RSpec::Core::Example.allocate, full_description: description)
+        RSpec::Core::Notifications::FailedExampleNotification.new(example)
+      end
+
+      it "records failed example names and dumps them at the end" do
+        formatter.example_failed(make_failure_notification('example 1'))
+        formatter.example_failed(make_failure_notification('example 2'))
+        formatter.start_dump(RSpec::Core::Notifications::NullNotification)
+        expect(failures).to eq "example 1\nexample 2\n"
+      end
+
+      it "empties the failure file if no examples failed" do
+        formatter.start_dump(RSpec::Core::Notifications::NullNotification)
+        expect(failures).to eq ''
+      end
 
-    it "should warn when no spec file is found, and return the root location" do
-      Respec::Formatter.should_receive(:warn)
-      metadata = {:location => './spec/models/user.rb:47'}
-      expect(described_class.extract_spec_location(metadata)).
-        to eq './spec/models/user.rb:47'
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
-require 'respec'
-require 'temporaries'
-
 ROOT = File.expand_path('..', File.dirname(__FILE__))
 TMP = "#{ROOT}/spec/tmp"
+
+$:.unshift "#{ROOT}/lib"
+require 'respec'
+require 'temporaries'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: respec
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - George Ogata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,42 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: ritual
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: temporaries
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.11'
 description: 
 email:
 - george.ogata@gmail.com
@@ -97,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rerun failing RSpec examples easily.