guard-rspec 4.6.1 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6f8f0ec11addb557bcea8e0b4e67b2f53bc9fc0
-  data.tar.gz: 72f89cda0c8952689eac3466d5450e458d3ecbde
+  metadata.gz: 04c187f95cb55d3b3c177679cf1f57f09fbe654e
+  data.tar.gz: 50adaf9c367ab6346a7433265916e6db9439ae60
 SHA512:
-  metadata.gz: f87137e2042acd5bd024d0d094c020411dc55c9b68c7edec9b87c8fb7f5238445af78f65e0041653137d6e6187e1f1d74b4eb13066b687129258a1d18dc5c934
-  data.tar.gz: 9d6b60cdb428ac5f33a0a8ebdc12d33f053bfb2184c6c56200d18cc48137aab79e28ce3fddf5ed2913efaca45c00249fa80e4f942c9a45569b8f5bec34ac1de3
+  metadata.gz: a496bc4e6a816e4b9b12807f42e2ff27a062ad8564bb06caa937282941f8071bccd68c7d9ec77e445960821456a3cd19dc2d15ba6b7e059fef6af9c7573024fe
+  data.tar.gz: f1ab9ca51ee6b43dc752b7d6c41cb6906ff2cab54a42d45fc89fddb2ff4aa5b4f059c374963a9d4e5eba9148d51e661e0ed278555a9a21c24cdca607aa376a18

data/README.md

@@ -109,32 +109,11 @@ guard :rspec, cmd: 'rspec -f html -o ./tmp/spec_results.html', launchy: './tmp/s
 end
 ```
 
-### Integration with Zeus
+### Zeus Integration
 
-First, know that Guard::Zeus also generates a Guardfile template with RSpec commands - if you prefer Guard::RSpec, you may want to keep Guard::Zeus, but without the RSpec running commands (so you can manage the Guard::Zeus server instead of running it manually).
-
-Second, since Guard::RSpec 4.6.x, the output file name is passed using environment variables - but Zeus doesn't pass these when rerunning tests, so you get this error: #334
-
-The workaround is to create a custom Zeus plan:
-
-1. `zeus init`
-2. edit `custom_plan.rb` to contain the following:
-
-```ruby
-require 'zeus/rails'
-
-class CustomPlan < Zeus::Rails
-  def test(*args)
-    ENV['GUARD_RSPEC_RESULTS_FILE'] = 'tmp/guard_rspec_results.txt' # Guard::RSpec::Runner::TEMPORARY_FILE_PATH
-    super
-  end
-end
-
-Zeus.plan = CustomPlan.new
-```
-
-And that's it. (I'd like things to work without this, but I don't know how.)
+You can use plain `Zeus` or you can use `Guard::Zeus` for managing the `Zeus` server (but you'll want to remove the spec watchers from `Guard::Zeus`, or you'll have tests running multiple times).
 
+Also, if you get warnings about empty environment, be sure to [read about this workaround](https://github.com/guard/guard-rspec/wiki/Warning:-no-environment)
 
 ### Using parallel_tests
 

data/lib/guard/rspec/runner.rb

@@ -39,7 +39,9 @@ module Guard
         return true if paths.empty?
         Compat::UI.info("Running: #{paths.join(' ')}", reset: true)
         _run(paths, options) do |all_green|
-          run_all if options[:all_after_pass] && all_green
+          next false unless all_green
+          next true unless options[:all_after_pass]
+          run_all
         end
       end
 
@@ -53,7 +55,6 @@ module Guard
         fail NoCmdOptionError unless options[:cmd]
         command = Command.new(paths, options)
         _really_run(command, options, &block)
-        true
       rescue RSpecProcess::Failure, NoCmdOptionError => ex
         Compat::UI.error(ex.to_s)
         notifier.notify_failure
@@ -71,7 +72,12 @@ module Guard
         notifier.notify(results.summary)
         _open_launchy
 
-        yield process.all_green? if block_given?
+        all_green = process.all_green?
+        if block_given?
+          yield all_green
+        else
+          all_green
+        end
       end
 
       def _open_launchy

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "4.6.1"
+    VERSION = "4.6.2"
   end
 end

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

@@ -137,6 +137,20 @@ RSpec.describe Guard::RSpec::Runner do
         expect(notifier).to have_received(:notify_failure)
       end
     end
+
+    describe "return value" do
+      subject { runner.run_all }
+
+      it { is_expected.to be true }
+
+      context "when process is not all green" do
+        before do
+          allow(process).to receive(:all_green?).and_return(false)
+        end
+
+        it { is_expected.to be false }
+      end
+    end
   end
 
   describe "#run" do
@@ -284,5 +298,35 @@ RSpec.describe Guard::RSpec::Runner do
       expect(notifier).to receive(:notify_failure)
       runner.run(paths)
     end
+
+    describe "return value" do
+      subject { runner.run(paths) }
+
+      it { is_expected.to be true }
+
+      context "with all_after_pass option" do
+        let(:options) do
+          { cmd: "rspec", all_after_pass: true, run_all: {}, spec_paths: paths }
+        end
+
+        it { is_expected.to be true }
+
+        describe "when all tests fail" do
+          before do
+            allow(process).to receive(:all_green?).and_return(true, false)
+          end
+
+          it { is_expected.to be false }
+        end
+      end
+
+      context "when process is not all green" do
+        before do
+          allow(process).to receive(:all_green?).and_return(false)
+        end
+
+        it { is_expected.to be false }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.2
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard