guard-rspec 4.5.1 → 4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe0d0080c56ffac6fbcf18c84963e61691e5b6c
-  data.tar.gz: 04e4050124a176dde61d89f456f757ecd358b4ed
+  metadata.gz: 8b73f6aa6d19416f25c3e8676cc9e86c55a90a7b
+  data.tar.gz: 9644dbe8c3990614582c08a94ab777e65be380c4
 SHA512:
-  metadata.gz: 00e48c73512d50c09971a860353e28b180423525ff6cbe89e72364037b2014c58bafdb8629664ee8d5f9cd7c76a24dfb4a165b2322298b2330afd07bdb2a5127
-  data.tar.gz: 5eda8b537e152b3e772d15dcd61920f9665499cbc2f21dfec49679033bf41b839afb663d64c8d3cf847c7c75f8895bb79a3ad2ea681ede3f5c7445a5670419c9
+  metadata.gz: 95e9c1fc933b6de01ceb7ee36fa3cee4a22c820b219447a4777e105980d0e583434861059fadd3ebb6a25954e2a801471c1a9a8138a8d54bfcb1ff90d1e5d0c9
+  data.tar.gz: 7171db95c19c8a42488fb4d384819aeb5305e9f65821c352d11aa1ac4775448ed672f031bf6887d8427378bf97b99217712f5a9ace4d3ed6d5bef82811c18bb6

data/lib/guard/rspec/dsl.rb

@@ -13,10 +13,22 @@ module Guard
         @dsl.send(:watch, expr) { |m| rspec.spec.(m[1]) }
       end
 
+      def self.detect_spec_file_for(rspec, file)
+        # TODO: when spec not found ... run specs in topmost found path?
+        # Or show warning?
+
+        path = "#{rspec.spec_dir}/#{file}_spec.rb"
+        return path unless file.start_with?("lib/")
+        return path if Dir.exist?("#{rspec.spec_dir}/lib")
+
+        without_lib = file.sub(/^lib\//, "")
+        "#{rspec.spec_dir}/#{without_lib}_spec.rb"
+      end
+
       def rspec
         @rspec ||= OpenStruct.new(to_s: "spec").tap do |rspec|
           rspec.spec_dir = "spec"
-          rspec.spec = ->(m) { "#{rspec.spec_dir}/#{m}_spec.rb" }
+          rspec.spec = ->(m) { Dsl.detect_spec_file_for(rspec, m) }
           rspec.spec_helper = "#{rspec.spec_dir}/spec_helper.rb"
           rspec.spec_files = %r{^#{rspec.spec_dir}/.+_spec\.rb$}
           rspec.spec_support = %r{^#{rspec.spec_dir}/support/(.+)\.rb$}

data/lib/guard/rspec/results.rb

@@ -0,0 +1,23 @@
+module Guard
+  class RSpec < Plugin
+    class Results
+      class InvalidData < RuntimeError
+      end
+
+      attr_reader :summary
+      attr_reader :failed_paths
+
+      def initialize(filename)
+        lines = File.readlines(filename)
+        if lines.empty? || lines.first.empty?
+          dump = lines.inspect
+          fail InvalidData, "Invalid results in: #{filename},"\
+            " lines:\n#{dump}\n"
+        end
+
+        @summary = lines.first.chomp
+        @failed_paths = lines[1..11].map(&:chomp).compact
+      end
+    end
+  end
+end

data/lib/guard/rspec/runner.rb

@@ -1,6 +1,7 @@
 require "guard/rspec/inspectors/factory"
 require "guard/rspec/command"
 require "guard/rspec/notifier"
+require "guard/rspec/results"
 
 module Guard
   class RSpec < Plugin
@@ -41,8 +42,12 @@ module Guard
         return unless _cmd_option_present(options)
         command = Command.new(paths, options)
 
-        _without_bundler_env { Kernel.system(command) }.tap do |success|
-          _process_run_result(success, all)
+        _without_bundler_env { Kernel.system(command) }.tap do |result|
+          if _command_success?(result)
+            _process_run_result(result, all)
+          else
+            notifier.notify_failure
+          end
         end
       end
 
@@ -68,13 +73,7 @@ module Guard
 
       def _command_output
         formatter_tmp_file = _tmp_file(options[:chdir])
-        lines = File.readlines(formatter_tmp_file)
-        summary = lines.first.strip
-        failed_paths = lines[1..11].map(&:strip).compact
-
-        [summary, failed_paths]
-      rescue
-        [nil, nil]
+        Results.new(formatter_tmp_file)
       ensure
         File.delete(formatter_tmp_file) if File.exist?(formatter_tmp_file)
       end
@@ -92,19 +91,9 @@ module Guard
       end
 
       def _process_run_result(result, all)
-        unless _command_success?(result)
-          notifier.notify_failure
-          return
-        end
-
-        summary, failed_paths = _command_output
-        unless summary && failed_paths
-          notifier.notify_failure
-          return
-        end
-
-        inspector.failed(failed_paths)
-        notifier.notify(summary)
+        results = _command_output
+        inspector.failed(results.failed_paths)
+        notifier.notify(results.summary)
         _open_launchy
 
         _run_all_after_pass if !all && result

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "4.5.1"
+    VERSION = "4.5.2"
   end
 end

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

@@ -35,7 +35,8 @@ RSpec.describe Guard::RSpec::Command do
 
       before do
         allow(RSpec::Core::ConfigurationOptions).to receive(:new) do
-          double(options: { formatters: formatters })
+          instance_double(RSpec::Core::ConfigurationOptions,
+                          options: { formatters: formatters })
         end
       end
 

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

@@ -0,0 +1,64 @@
+require "guard/compat/test/helper"
+
+require "guard/rspec/results"
+
+RSpec.describe Guard::RSpec::Results do
+  subject do
+    described_class.new("foo/bar.txt")
+  end
+
+  before do
+    allow(File).to receive(:readlines).with("foo/bar.txt").and_return(data)
+  end
+
+  context "with valid data" do
+    let(:data) do
+      [
+        "5 examples, 2 failures (3 pending)\n",
+        "foo1/bar1_spec.rb\n",
+        "foo1/bar2_spec.rb\n",
+      ]
+    end
+
+    describe "#summary" do
+      it "sets a summary" do
+        expect(subject.summary).to eq("5 examples, 2 failures (3 pending)")
+      end
+    end
+
+    describe "#failures" do
+      it "sets a list of failures" do
+        expect(subject.failed_paths).
+          to eq(%w(foo1/bar1_spec.rb foo1/bar2_spec.rb))
+      end
+    end
+  end
+
+  context "with no data" do
+    let(:data) do
+      []
+    end
+
+    it "crashes" do
+      expect do
+        subject.load
+      end.to raise_error(
+        Guard::RSpec::Results::InvalidData,
+        "Invalid results in: foo/bar.txt, lines:\n[]\n")
+    end
+  end
+
+  context "with invalid data" do
+    let(:data) do
+      [""]
+    end
+
+    it "crashes" do
+      expect do
+        subject.load
+      end.to raise_error(
+        Guard::RSpec::Results::InvalidData,
+        "Invalid results in: foo/bar.txt, lines:\n[\"\"]\n")
+    end
+  end
+end

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

@@ -7,8 +7,9 @@ require "guard/rspec/runner"
 RSpec.describe Guard::RSpec::Runner do
   let(:options) { { cmd: "rspec" } }
   let(:runner) { Guard::RSpec::Runner.new(options) }
-  let(:inspector) { double(Guard::RSpec::Inspectors::SimpleInspector) }
-  let(:notifier) { double(Guard::RSpec::Notifier) }
+  let(:inspector) { instance_double(Guard::RSpec::Inspectors::SimpleInspector) }
+  let(:notifier) { instance_double(Guard::RSpec::Notifier) }
+  let(:results) { instance_double(Guard::RSpec::Results) }
 
   before do
     allow(Guard::Compat::UI).to receive(:info)
@@ -19,6 +20,11 @@ RSpec.describe Guard::RSpec::Runner do
     allow(notifier).to receive(:notify)
     allow(notifier).to receive(:notify_failure)
 
+    allow(Guard::RSpec::Results).to receive(:new).
+      with("tmp/rspec_guard_result").and_return(results)
+    allow(results).to receive(:summary).and_return("Summary")
+    allow(results).to receive(:failed_paths).and_return([])
+
     $CHILD_STATUS = double("exitstatus", exitstatus: 0)
   end
 
@@ -68,7 +74,6 @@ RSpec.describe Guard::RSpec::Runner do
 
     before do
       allow(inspector).to receive(:failed)
-      allow(File).to receive(:readlines).and_return([])
     end
 
     it "builds commands with spec paths" do
@@ -136,10 +141,7 @@ RSpec.describe Guard::RSpec::Runner do
   describe "#run" do
     let(:paths) { %w(spec_path1 spec_path2) }
     before do
-      tmp_file = "tmp/rspec_guard_result"
-      allow(File).to receive(:readlines).with(tmp_file) { ["Summary\n"] }
       allow(inspector).to receive(:paths) { paths }
-      allow(inspector).to receive(:clear_paths) { true }
       allow(inspector).to receive(:failed)
     end
 
@@ -195,15 +197,12 @@ RSpec.describe Guard::RSpec::Runner do
 
     context "with failed paths" do
       before do
-        allow(File).to receive(:readlines).
-          with("tmp/rspec_guard_result") do
-          [
-            "Summary\n",
-            "./failed_spec.rb:123\n",
-            "./other/failed_spec.rb:77\n"
-          ]
-        end
+        allow(results).to receive(:failed_paths).and_return([
+          "./failed_spec.rb:123",
+          "./other/failed_spec.rb:77"
+        ])
       end
+
       it "notifies inspector about failed paths" do
         expect(inspector).to receive(:failed).
           with(["./failed_spec.rb:123", "./other/failed_spec.rb:77"])

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

@@ -14,8 +14,24 @@ RSpec.describe "Guard::RSpec" do
       expect(subject.changed("spec/spec_helper.rb")).to eq(%w(spec))
     end
 
-    it "matches Ruby files by default" do
-      expect(subject.changed("lib/foo.rb")).to eq(%w(spec/lib/foo_spec.rb))
+    describe "mapping files to specs" do
+      before do
+        allow(Dir).to receive(:exist?).with("spec/lib").and_return(has_spec_lib)
+      end
+
+      context "when spec/lib exists" do
+        let(:has_spec_lib) { true }
+        it "matches Ruby files with files in spec/lib" do
+          expect(subject.changed("lib/foo.rb")).to eq(%w(spec/lib/foo_spec.rb))
+        end
+      end
+
+      context "when spec/lib does not exist" do
+        let(:has_spec_lib) { false }
+        it "matches Ruby files with files in spec/lib" do
+          expect(subject.changed("lib/foo.rb")).to eq(%w(spec/foo_spec.rb))
+        end
+      end
     end
 
     it "matches Rails files by default" do

data/spec/lib/guard/rspec_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Guard::RSpec do
   let(:default_options) { Guard::RSpec::Options::DEFAULTS }
   let(:options) { {} }
   let(:plugin) { Guard::RSpec.new(options) }
-  let(:runner) { double(Guard::RSpec::Runner) }
+  let(:runner) { instance_double(Guard::RSpec::Runner) }
 
   before do
     allow(Guard::Compat::UI).to receive(:info)

data/spec/spec_helper.rb

@@ -8,6 +8,14 @@ end
 rspec_version = ::RSpec::Version::STRING.to_f
 old_rspec = (rspec_version < 3)
 
+if old_rspec
+  class RSpec::Core::ExampleGroup
+    def instance_double(*args)
+      double(*args)
+    end
+  end
+end
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
@@ -89,6 +97,12 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
 
   config.before do
+    %w(exist?).each do |meth|
+      allow(Dir).to receive(meth.to_sym) do |*args|
+        abort "stub me: Dir.#{meth}(#{args.map(&:inspect) * ','})!"
+      end
+    end
+
     allow(Dir).to receive(:[]) do |*args|
       abort "stub me: Dir[#{args.first}]!"
     end
@@ -99,7 +113,7 @@ RSpec.configure do |config|
       end
     end
 
-    %w(mkdir).each do |meth|
+    %w(mkdir mkdir_p).each do |meth|
       allow(FileUtils).to receive(meth.to_sym) do |*args|
         abort "stub me: FileUtils.#{meth}(#{args.map(&:inspect) * ','})!"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -140,6 +140,7 @@ files:
 - lib/guard/rspec/inspectors/simple_inspector.rb
 - lib/guard/rspec/notifier.rb
 - lib/guard/rspec/options.rb
+- lib/guard/rspec/results.rb
 - lib/guard/rspec/runner.rb
 - lib/guard/rspec/templates/Guardfile
 - lib/guard/rspec/version.rb
@@ -153,6 +154,7 @@ files:
 - spec/lib/guard/rspec/inspectors/shared_examples.rb
 - spec/lib/guard/rspec/inspectors/simple_inspector_spec.rb
 - spec/lib/guard/rspec/notifier_spec.rb
+- spec/lib/guard/rspec/results_spec.rb
 - spec/lib/guard/rspec/runner_spec.rb
 - spec/lib/guard/rspec/template_spec.rb
 - spec/lib/guard/rspec_formatter_spec.rb
@@ -192,6 +194,7 @@ test_files:
 - spec/lib/guard/rspec/inspectors/shared_examples.rb
 - spec/lib/guard/rspec/inspectors/simple_inspector_spec.rb
 - spec/lib/guard/rspec/notifier_spec.rb
+- spec/lib/guard/rspec/results_spec.rb
 - spec/lib/guard/rspec/runner_spec.rb
 - spec/lib/guard/rspec/template_spec.rb
 - spec/lib/guard/rspec_formatter_spec.rb