respec 0.4.1 → 0.5.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.5.0 2013-03-02
+
+ * Fix rerunning of specs defined in non-spec files (e.g. support files).
+
 == 0.4.1 2012-11-15
 
  * Run spec directory by default, like rspec.

data/lib/respec/formatter.rb

@@ -4,9 +4,29 @@ module Respec
   class Formatter < RSpec::Core::Formatters::BaseFormatter
     def start_dump
       @failed_examples.each do |example|
-        output.puts example.metadata[:location]
+        output.puts self.class.extract_spec_location(example.metadata)
       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]
+        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
+      end
+      File.fnmatch(RSpec.configuration.pattern, path.sub(/:\d+\z/, ''), flags)
+    end
   end
 end
 

data/lib/respec/version.rb

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

data/spec/integration_spec.rb

@@ -23,7 +23,7 @@ describe Respec do
     source = "describe 'test' do\n"
     (0...2).map do |i|
       if i < num_failures
-        source << "  it('#{i}') { 1.should == 2 }\n"
+        source << "  it('#{i}') { expect(1).to == 2 }\n"
       else
         source << "  it('#{i}') {}\n"
       end
@@ -40,18 +40,18 @@ describe Respec do
     Dir.chdir tmp do
       make_spec(:num_failures => 2)
       status, output = respec(spec_path)
-      status.should_not be_success
-      output.should include('2 examples, 2 failures')
+      expect(status).to_not be_success
+      expect(output).to include('2 examples, 2 failures')
 
       make_spec(:num_failures => 1)
       status, output = respec("#{spec_path} f")
-      status.should_not be_success
-      output.should include('2 examples, 1 failure')
+      expect(status).to_not be_success
+      expect(output).to include('2 examples, 1 failure')
 
       make_spec(:num_failures => 0)
       status, output = respec("#{spec_path} f")
-      status.should be_success
-      output.should include('1 example, 0 failures')
+      expect(status).to be_success
+      expect(output).to include('1 example, 0 failures')
     end
   end
 end

data/spec/respec/app_spec.rb

@@ -26,7 +26,7 @@ describe Respec::App do
       FileUtils.touch "#{tmp}/Gemfile"
       Dir.chdir tmp do
         app = Respec::App.new
-        app.bundler_args.should == ['bundle', 'exec']
+        expect(app.bundler_args).to eq ['bundle', 'exec']
       end
     end
 
@@ -35,7 +35,7 @@ describe Respec::App do
         FileUtils.touch "#{tmp}/custom_gemfile"
         Dir.chdir tmp do
           app = Respec::App.new
-          app.bundler_args.should == ['bundle', 'exec']
+          expect(app.bundler_args).to eq ['bundle', 'exec']
         end
       end
     end
@@ -44,7 +44,7 @@ describe Respec::App do
       with_hash_value ENV, 'BUNDLE_GEMFILE', nil do
         Dir.chdir tmp do
           app = Respec::App.new
-          app.bundler_args.should == []
+          expect(app.bundler_args).to eq []
         end
       end
     end
@@ -53,19 +53,19 @@ describe Respec::App do
   describe "#formatter_args" do
     it "should update the stored failures if no args are given" do
       app = Respec::App.new
-      app.formatter_args.should == [FORMATTER_PATH]
+      expect(app.formatter_args).to eq [FORMATTER_PATH]
     end
 
     it "should update the stored failures if 'f' is used" do
       make_failures_file 'a.rb:1'
       app = Respec::App.new('f')
-      app.formatter_args.should == [FORMATTER_PATH]
+      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'
       app = Respec::App.new('1')
-      app.formatter_args.should == []
+      expect(app.formatter_args).to eq []
     end
   end
 
@@ -73,86 +73,86 @@ describe Respec::App do
     it "should pass all arguments that start with '-' to rspec" do
       FileUtils.touch "#{tmp}/file"
       app = Respec::App.new('-a', '-b', '-c', "#{tmp}/file")
-      app.generated_args.should == ['-a', '-b', '-c', "#{tmp}/file"]
+      expect(app.generated_args).to eq ['-a', '-b', '-c', "#{tmp}/file"]
     end
 
     it "should pass arguments for rspec options that need them" do
       FileUtils.touch "#{tmp}/file"
-      Respec::App.new('-I', 'lib', '-t', 'mytag', "#{tmp}/file").generated_args.should == ['-I', 'lib', '-t', 'mytag', "#{tmp}/file"]
+      expect(Respec::App.new('-I', 'lib', '-t', 'mytag', "#{tmp}/file").generated_args).to eq ['-I', 'lib', '-t', 'mytag', "#{tmp}/file"]
     end
 
     it "should run all failures if 'f' is given" do
       make_failures_file 'a.rb:1', 'b.rb:2'
       app = Respec::App.new('f')
-      app.generated_args.should == ['a.rb:1', 'b.rb:2']
+      expect(app.generated_args).to eq ['a.rb:1', 'b.rb:2']
     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'
       app = Respec::App.new('2')
-      app.generated_args.should == ['b.rb:2']
+      expect(app.generated_args).to eq ['b.rb:2']
     end
 
     it "should interpret existing file names as file name arguments" do
       FileUtils.touch "#{tmp}/existing.rb"
       app = Respec::App.new("#{tmp}/existing.rb")
-      app.generated_args.should == ["#{tmp}/existing.rb"]
+      expect(app.generated_args).to eq ["#{tmp}/existing.rb"]
     end
 
     it "should pass existing file names with line numbers directly to rspec" do
       FileUtils.touch "#{tmp}/existing.rb"
       app = Respec::App.new("#{tmp}/existing.rb:123")
-      app.generated_args.should == ["#{tmp}/existing.rb:123"]
+      expect(app.generated_args).to eq ["#{tmp}/existing.rb:123"]
     end
 
     it "should treat other arguments as example names" do
       FileUtils.touch "#{tmp}/FILE"
       app = Respec::App.new("#{tmp}/FILE")
-      app.generated_args.should == ["#{tmp}/FILE"]
+      expect(app.generated_args).to eq ["#{tmp}/FILE"]
     end
 
     it "should not include named files if a numeric argument is given" do
       FileUtils.touch "#{tmp}/FILE"
       make_failures_file 'a.rb:1'
       app = Respec::App.new("#{tmp}/FILE", '1')
-      app.generated_args.should == ['a.rb:1']
+      expect(app.generated_args).to eq ['a.rb:1']
     end
 
     it "should not include named files if an 'f' argument is given" do
       FileUtils.touch "#{tmp}/FILE"
       make_failures_file 'a.rb:1'
       app = Respec::App.new("#{tmp}/FILE", 'f')
-      app.generated_args.should == ['a.rb:1']
+      expect(app.generated_args).to eq ['a.rb:1']
     end
 
     it "should explicitly add the spec directory if no files are given or errors to rerun" do
       app = Respec::App.new
-      app.generated_args.should == ['spec']
+      expect(app.generated_args).to eq ['spec']
     end
 
     it "should not add the spec directory if any files are given" do
       FileUtils.touch "#{tmp}/FILE"
       app = Respec::App.new("#{tmp}/FILE")
-      app.generated_args.should == ["#{tmp}/FILE"]
+      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'
       app = Respec::App.new('1')
-      app.generated_args.should == ["a.rb:1"]
+      expect(app.generated_args).to eq ["a.rb:1"]
     end
 
     it "should not add the spec directory if an 'f' argument is given" do
       make_failures_file 'a.rb:1'
       app = Respec::App.new('f')
-      app.generated_args.should == ["a.rb:1"]
+      expect(app.generated_args).to eq ["a.rb:1"]
     end
   end
 
   describe "#raw_args" do
     it "should pass arguments after '--' directly to rspec" do
       app = Respec::App.new('--', '--blah')
-      app.raw_args.should == ['--blah']
+      expect(app.raw_args).to eq ['--blah']
     end
   end
 
@@ -161,7 +161,7 @@ describe Respec::App do
       Dir.chdir tmp do
         FileUtils.touch 'Gemfile'
         app = Respec::App.new('--', '-t', 'TAG')
-        app.command.should == ['bundle', 'exec', 'rspec', 'spec', '-t', 'TAG', FORMATTER_PATH]
+        expect(app.command).to eq ['bundle', 'exec', 'rspec', 'spec', '-t', 'TAG', FORMATTER_PATH]
       end
     end
   end

data/spec/respec/formatter_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe Respec::Formatter do
+  describe ".extract_spec_location" do
+    use_attribute_value RSpec.configuration, :pattern, "**/*_spec.rb"
+
+    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
+
+    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
+
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: respec
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -82,6 +82,7 @@ files:
 - respec.gemspec
 - spec/integration_spec.rb
 - spec/respec/app_spec.rb
+- spec/respec/formatter_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/oggy/respec
 licenses:
@@ -96,25 +97,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2382265690551011023
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2382265690551011023
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rerun failing RSpec examples easily.
 test_files:
 - spec/integration_spec.rb
 - spec/respec/app_spec.rb
+- spec/respec/formatter_spec.rb
 - spec/spec_helper.rb
+has_rdoc: