guard-rspec 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d48b933d340431f5f5b7b085bef8117d1129d35
-  data.tar.gz: 0835819d0edaf6f2b2002c038ade70ca674179a8
+  metadata.gz: 68ca1733c0e0f32c09688a1bc91d098a383c0dfc
+  data.tar.gz: 683059e58e8673b87957cc8d81a971916e617b0b
 SHA512:
-  metadata.gz: 7e98fd04b6e6da3de1fb92e359dd4576a02834cb83d1ab02dd14ea27a8154d7598ef97eb453698b5970b6569326e2d7cc375635a2f9988f159dbdedfb021a792
-  data.tar.gz: 32a7a4a69aa9f826dab8b7639d36fa259eb719d1530e46e217f7d60a33b8b48dd2fe8e5199d7d39372deaad0a70670ac01dcc08e3a10b874ce9f5accd77fcd52
+  metadata.gz: e2b2ccf857787b9a517d8ecc25c80f608c70b374aaa488f16b143945185450c828bc77c0ca9c2ffa5c98988979a5aa9c98f7f5bd00156f26dbeceb7d88f918e5
+  data.tar.gz: 2a388ad2d0d7679fbd4eb2ccbe2748d43eb7d617167d54ccafc65483c854df51f5e38c6a5f7496a9aca2e946a29c7a84aae3008f3095943d38dfd84a6169b255

data/README.md

@@ -66,6 +66,16 @@ guard :rspec, cmd: 'spring rspec -f doc' do
 end
 ```
 
+### Running with bundler
+
+Running `bundle exec guard` will not run the specs with bundler. You need to change the `cmd` option to `bundle exec rspec`:
+
+``` ruby
+guard :rspec, cmd: 'bundle exec rspec' do
+  # ...
+end
+```
+
 ### List of available options:
 
 ``` ruby

data/lib/guard/rspec/formatter.rb

@@ -6,10 +6,37 @@ module Guard
     class Formatter < ::RSpec::Core::Formatters::BaseFormatter
       TEMPORARY_FILE_PATH = './tmp/rspec_guard_result'
 
+      # rspec issue https://github.com/rspec/rspec-core/issues/793
+      def self.extract_spec_location(metadata)
+        root_metadata = metadata
+        location = metadata[:location]
+
+        until spec_path?(location)
+          metadata = metadata[:example_group]
+
+          if !metadata
+            Guard::UI.warning "no spec file found for #{root_metadata[:location]}"
+            return root_metadata[:location]
+          end
+
+          location = (metadata[:location] || "").split(':').first # rspec issue https://github.com/rspec/rspec-core/issues/1243
+        end
+
+        location
+      end
+
+      def self.spec_path?(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
+
       # Write summary to temporary file for runner
       def dump_summary(duration, total, failures, pending)
-        FileUtils.mkdir_p('tmp')
-        File.open(TEMPORARY_FILE_PATH, 'w') do |f|
+        write do |f|
           f.puts _message(total, failures, pending, duration)
           f.puts _failed_paths.join("\n") if failures > 0
         end
@@ -19,9 +46,14 @@ module Guard
 
       private
 
+      def write(&block)
+        FileUtils.mkdir_p('tmp')
+        File.open(TEMPORARY_FILE_PATH, 'w', &block)
+      end
+
       def _failed_paths
         failed = examples.select { |e| e.execution_result[:status] == 'failed' }
-        failed.map { |e| e.metadata[:location] }
+        failed.map { |e| self.class.extract_spec_location(e.metadata) }.sort.uniq
       end
 
       def _message(example_count, failure_count, pending_count, duration)

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = '4.2.3'
+    VERSION = '4.2.4'
   end
 end

data/spec/lib/guard/rspec/formatter_spec.rb

@@ -3,29 +3,76 @@ require 'spec_helper.rb'
 require 'guard/rspec/formatter'
 
 describe Guard::RSpec::Formatter do
-  let(:formatter) { Guard::RSpec::Formatter.new(StringIO.new) }
+  let(:writer){
+    StringIO.new
+  }
+  let(:formatter) {
+    Guard::RSpec::Formatter.new(StringIO.new).tap{|formatter|
+      formatter.stub(:write) do |&block|
+        block.call writer
+      end
+    }
+  }
 
   describe '#dump_summary' do
-    after { File.delete('./tmp/rspec_guard_result') }
+
+    let(:result){
+      writer.rewind
+      writer.read
+    }
+
 
     context 'with failures' do
+      let(:spec_filename){
+        'failed_location_spec.rb'
+      }
+
       let(:failed_example) { double(
         execution_result: { status: 'failed' },
-        metadata: { location: 'failed_location' }
+        metadata: { location: spec_filename }
       ) }
 
       it 'writes summary line and failed location in tmp dir' do
         allow(formatter).to receive(:examples) { [failed_example] }
         formatter.dump_summary(123, 3, 1, 0)
-        result = File.open('./tmp/rspec_guard_result').read
-        expect(result).to match /^3 examples, 1 failures in 123\.0 seconds\nfailed_location\n$/
+        expect(result).to match /^3 examples, 1 failures in 123\.0 seconds\n#{spec_filename}\n$/
       end
+
+      it 'writes only uniq filenames out' do
+        allow(formatter).to receive(:examples) { [failed_example, failed_example] }
+        formatter.dump_summary(123, 3, 1, 0)
+        expect(result).to match /^3 examples, 1 failures in 123\.0 seconds\n#{spec_filename}\n$/
+      end
+
+    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 start_with './spec/requests/breadcrumbs_spec.rb'
+    end
+
+    it "should return only the spec file without line number 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'
+    end
+
+    it "should return location of the root spec when a shared examples has no location" do
+      metadata = {:location => './spec/support/breadcrumbs.rb:75',
+                  :example_group => {}
+      }
+
+      expect(described_class.extract_spec_location(metadata)).to eq metadata[:location]
     end
 
     context 'with only success' do
       it 'notifies success' do
         formatter.dump_summary(123, 3, 0, 0)
-        result = File.open('./tmp/rspec_guard_result').read
         expect(result).to match /^3 examples, 0 failures in 123\.0 seconds\n$/
       end
     end
@@ -33,7 +80,6 @@ describe Guard::RSpec::Formatter do
     context 'with pending' do
       it "notifies pending too" do
         formatter.dump_summary(123, 3, 0, 1)
-        result = File.open('./tmp/rspec_guard_result').read
         expect(result).to match /^3 examples, 0 failures \(1 pending\) in 123\.0 seconds\n$/
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard