guard-rspec 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e488eab45fd07c9466727bcd31beec13cae327eb
-  data.tar.gz: b5ee0d60b588f120f02bccee664aa73532fb217c
+  metadata.gz: 9fe0d0080c56ffac6fbcf18c84963e61691e5b6c
+  data.tar.gz: 04e4050124a176dde61d89f456f757ecd358b4ed
 SHA512:
-  metadata.gz: f38b12805d768019e5956c51ce3689db31208ca5b1aa8e8a6f2bb3b076fc154415831f2bbbbbc9e24eda3f189b496896b905a1353e7129c567ba522e4e187819
-  data.tar.gz: 70e4e5af6118881f2893f9acfe3bbe00b070fe3cab363747605c1c4e3b86f8c1996a4d20cc1e18b416fd6e57624b975763ce137a5c4a5590eae8dbbad73aafed
+  metadata.gz: 00e48c73512d50c09971a860353e28b180423525ff6cbe89e72364037b2014c58bafdb8629664ee8d5f9cd7c76a24dfb4a165b2322298b2330afd07bdb2a5127
+  data.tar.gz: 5eda8b537e152b3e772d15dcd61920f9665499cbc2f21dfec49679033bf41b839afb663d64c8d3cf847c7c75f8895bb79a3ad2ea681ede3f5c7445a5670419c9

data/.rubocop_todo.yml

@@ -1,10 +1,6 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-11-06 03:19:15 +0100 using RuboCop version 0.27.0.
+# on 2015-05-27 21:27:40 +0200 using RuboCop version 0.25.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-Metrics/AbcSize:
-  Max: 20

data/.travis.yml

@@ -1,16 +1,18 @@
 language: ruby
 bundler_args: --without tool
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1.5
+  - 2.2.0
   - jruby-19mode
   - rbx
 gemfile:
   - gemfiles/Gemfile.rspec-2.14
   - gemfiles/Gemfile.rspec-2.99
   - gemfiles/Gemfile.rspec-3.0
+  - gemfiles/Gemfile.rspec-3.2
 matrix:
   allow_failures:
     - rvm: jruby-19mode
     - rvm: rbx
+    - rvm: 1.9.3

data/Gemfile

@@ -8,7 +8,7 @@ end
 
 group :development do
   gem "rspec", "~> 3.1"
-  gem "rubocop", "0.25.0", require: false
+  gem "rubocop", require: false
   gem "guard-rubocop", require: false
   gem "guard-compat", ">= 0.0.2", require: false
 end

data/README.md

@@ -5,7 +5,7 @@
 Guard::RSpec allows to automatically & intelligently launch specs when files are modified.
 
 * Compatible with RSpec >2.14 & 3
-* Tested against Ruby 1.9.3, 2.0.0, 2.1.2, JRuby and Rubinius.
+* Tested against Ruby 1.9.3, 2.0.0, 2.1.5, 2.2.0 JRuby and Rubinius.
 
 ## Install
 

data/Rakefile

@@ -1,26 +1,38 @@
+require "nenv"
 require "bundler/gem_tasks"
+require "yaml"
+
+default_tasks = []
 
 require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec)
-task default: :spec
+default_tasks << RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = Nenv.ci?
+end
+
+unless Nenv.ci?
+  require "rubocop/rake_task"
+  default_tasks << RuboCop::RakeTask.new(:rubocop)
+end
+
+task default: default_tasks.map(&:name)
 
 namespace :test do
   desc "Locally run tests like Travis and HoundCI would"
   task :all_versions do
+    system(*%w(bundle install --quiet)) || abort
     system(*%w(bundle update --quiet)) || abort
     system(*%w(bundle exec rubocop -c .hound.yml)) || abort
 
-    gemfiles = Dir["gemfiles/Gemfile.rspec-*"]
-
-    actual_gemfiles = gemfiles.select { |f| /\d\.\d{1,2}$/ =~ f }
-    actual_gemfiles.each do |gemfile|
+    travis = YAML.load(IO.read(".travis.yml"))
+    travis["gemfile"].each do |gemfile|
       STDOUT.puts
       STDOUT.puts "----------------------------------------------------- "
       STDOUT.puts " >> Running tests using Gemfile: #{gemfile} <<"
       STDOUT.puts "----------------------------------------------------- "
-      ENV["BUNDLE_GEMFILE"] = gemfile
-      system(*%w(bundle update --quiet)) || abort
-      system(*%w(bundle exec rspec)) || abort
+      env = { "BUNDLE_GEMFILE" => gemfile }
+      system(env, *%w(bundle install --quiet)) || abort
+      system(env, *%w(bundle update --quiet)) || abort
+      system(env, *%w(bundle exec rspec)) || abort
     end
   end
 end

data/gemfiles/Gemfile.rspec-3.2

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gemspec path: '../'
+
+gem 'rspec', '~> 3.2.0'
+
+group :test do
+  gem 'coveralls', require: false
+  gem "guard-compat", ">= 0.0.2", require: false
+end
+
+group :tool do
+  gem 'ruby_gntp', require: false
+end

data/lib/guard/rspec/command.rb

@@ -54,7 +54,7 @@ module Guard
         # including output target
 
         return formatters unless formatters
-        formatters.map { |entries| "-f #{entries.join " -o "}" }.join(" ")
+        formatters.map { |entries| "-f #{entries.join ' -o '}" }.join(" ")
       end
 
       def _cmd_include_formatter?
@@ -63,7 +63,7 @@ module Guard
 
       def _guard_formatter
         dir = Pathname.new(__FILE__).dirname.dirname
-        "-r #{dir + "rspec_formatter.rb"} -f Guard::RSpecFormatter"
+        "-r #{dir + 'rspec_formatter.rb'} -f Guard::RSpecFormatter"
       end
     end
   end

data/lib/guard/rspec/dsl.rb

@@ -33,13 +33,13 @@ module Guard
       def rails(options = {})
         # Rails example
         @rails ||= OpenStruct.new.tap do |rails|
-          exts = options.dup.delete(:view_extensions) || %w(erb haml slim)
+          exts = _view_extensions(options) * "|"
 
           rails.app_files = %r{^app/(.+)\.rb$}
 
-          rails.views = %r{^app/(views/.+/[^/]*\.(?:#{exts * "|"}))$}
-          rails.view_dirs = %r{^app/views/(.+)/[^/]*\.(?:#{exts * "|"})$}
-          rails.layouts = %r{^app/layouts/(.+)/.*\.("#{exts * "|"}")$}
+          rails.views = %r{^app/(views/.+/[^/]*\.(?:#{exts}))$}
+          rails.view_dirs = %r{^app/views/(.+)/[^/]*\.(?:#{exts})$}
+          rails.layouts = %r{^app/layouts/(.+)/[^/]*\.(?:#{exts})$}
 
           rails.controllers = %r{^app/controllers/(.+)_controller\.rb$}
           rails.routes = "config/routes.rb"
@@ -47,6 +47,12 @@ module Guard
           rails.spec_helper = "#{rspec.spec_dir}/rails_helper.rb"
         end
       end
+
+      private
+
+      def _view_extensions(options)
+        options.dup.delete(:view_extensions) || %w(erb haml slim)
+      end
     end
   end
 end

data/lib/guard/rspec/runner.rb

@@ -27,7 +27,7 @@ module Guard
       def run(paths)
         paths = inspector.paths(paths)
         return true if paths.empty?
-        Compat::UI.info("Running: #{paths.join(" ")}", reset: true)
+        Compat::UI.info("Running: #{paths.join(' ')}", reset: true)
         _run(false, paths, options)
       end
 
@@ -76,7 +76,7 @@ module Guard
       rescue
         [nil, nil]
       ensure
-        File.delete(formatter_tmp_file) if File.exists?(formatter_tmp_file)
+        File.delete(formatter_tmp_file) if File.exist?(formatter_tmp_file)
       end
 
       def _open_launchy
@@ -100,6 +100,7 @@ module Guard
         summary, failed_paths = _command_output
         unless summary && failed_paths
           notifier.notify_failure
+          return
         end
 
         inspector.failed(failed_paths)

data/lib/guard/rspec/templates/Guardfile

@@ -43,6 +43,7 @@ guard :rspec, cmd: "bundle exec rspec" do
 
   # Capybara features specs
   watch(rails.view_dirs)     { |m| rspec.spec.("features/#{m[1]}") }
+  watch(rails.layouts)       { |m| rspec.spec.("features/#{m[1]}") }
 
   # Turnip features and steps
   watch(%r{^spec/acceptance/(.+)\.feature$})

data/lib/guard/rspec/version.rb

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

data/lib/guard/rspec_formatter.rb

@@ -2,6 +2,7 @@
 # other classes in this project!
 
 require "pathname"
+require "fileutils"
 
 require "rspec"
 require "rspec/core/formatters/base_formatter"
@@ -59,21 +60,19 @@ module Guard
     end
 
     def dump_summary(*args)
-      if self.class.rspec_3?
-        notification = args[0]
-        write_summary(
-          notification.duration,
-          notification.example_count,
-          notification.failure_count,
-          notification.pending_count
-        )
-      else
-        write_summary(*args)
-      end
-    rescue
-      # nothing really we can do, at least don"t kill the test runner
+      return write_summary(*args) unless self.class.rspec_3?
+
+      notification = args[0]
+      write_summary(
+        notification.duration,
+        notification.example_count,
+        notification.failure_count,
+        notification.pending_count
+      )
     end
 
+    private
+
     # Write summary to temporary file for runner
     def write_summary(duration, total, failures, pending)
       _write do |f|
@@ -82,8 +81,6 @@ module Guard
       end
     end
 
-    private
-
     def _write(&block)
       file = File.expand_path(TEMPORARY_FILE_PATH)
       FileUtils.mkdir_p(File.dirname(file))
@@ -91,11 +88,8 @@ module Guard
     end
 
     def _failed_paths
-      failed = examples.select do |e|
-        e.execution_result[:status].to_s == "failed"
-      end
-
       klass = self.class
+      failed = examples.select { |example| _status_failed?(example) }
       failed.map { |e| klass.extract_spec_location(e.metadata) }.sort.uniq
     end
 
@@ -107,5 +101,13 @@ module Guard
       message << " in #{duration.round(4)} seconds"
       message
     end
+
+    def _status_failed?(example)
+      if self.class.rspec_3?
+        example.execution_result.status.to_s == "failed"
+      else
+        example.execution_result[:status].to_s == "failed"
+      end
+    end
   end
 end

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

@@ -9,7 +9,6 @@ RSpec.describe Guard::RSpec::Command do
   let(:command) { Guard::RSpec::Command.new(paths, options) }
 
   describe ".initialize" do
-
     it "sets paths at the end" do
       expect(command).to match /path1 path2$/
     end
@@ -80,12 +79,9 @@ RSpec.describe Guard::RSpec::Command do
         }
       end
 
-      it "removes chdir part from the path
-        as it should be present in the cmd" do
-
+      it "strips path of chdir" do
         expect(command).to match %r{path1 path2}
       end
     end
   end
-
 end

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

@@ -6,7 +6,6 @@ RSpec.describe Guard::RSpec::Deprecator do
   let(:deprecator) { Guard::RSpec::Deprecator.new(options) }
 
   describe "#warns_about_deprecated_options" do
-
     describe "handling of environment variable SPEC_OPTS" do
       it "shows warning if SPEC_OPTS is set" do
         ENV["SPEC_OPTS"] = "-f p"

data/spec/lib/guard/rspec/inspectors/base_inspector_spec.rb

@@ -55,7 +55,6 @@ RSpec.describe Guard::RSpec::Inspectors::BaseInspector do
           let(:paths) { ["#{chdir}/spec"] }
 
           it "returns matching paths" do
-
             allow(Dir).to receive(:[]).
               with("moduleA/spec/**{,/*/**}/*[_.]spec.rb").
               and_return(paths)

data/spec/lib/guard/rspec/inspectors/keeping_inspector_spec.rb

@@ -68,13 +68,13 @@ RSpec.describe klass do
     # Now it returns other failed locations
     expect(
       inspector.paths(
-        %w(spec/lib/guard/rspec/inspectors/base_inspector_spec.rb))
-      ).
-      to match_array([
-        "spec/lib/guard/rspec/runner_spec.rb",
-        "spec/lib/guard/rspec/inspectors/simple_inspector_spec.rb",
-        "spec/lib/guard/rspec/inspectors/base_inspector_spec.rb"
-      ])
+        %w(spec/lib/guard/rspec/inspectors/base_inspector_spec.rb)
+      )
+    ).to match_array([
+      "spec/lib/guard/rspec/runner_spec.rb",
+      "spec/lib/guard/rspec/inspectors/simple_inspector_spec.rb",
+      "spec/lib/guard/rspec/inspectors/base_inspector_spec.rb"
+    ])
     inspector.failed(other_failed_locations)
 
     expect(inspector.paths(%w(spec/lib/guard/rspec/runner_spec.rb))).

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

@@ -33,24 +33,30 @@ RSpec.describe "Guard::RSpec" do
 
       expect(subject.changed("app/controllers/application_controller.rb")).
         to eq(
-        %w(
-          spec/controllers/application_controller_spec.rb
-          spec/routing/application_routing_spec.rb
-          spec/acceptance/application_spec.rb
-          spec/controllers
+          %w(
+            spec/controllers/application_controller_spec.rb
+            spec/routing/application_routing_spec.rb
+            spec/acceptance/application_spec.rb
+            spec/controllers
+          )
         )
-      )
 
       expect(subject.changed("app/controllers/foo_controller.rb")).
         to match_array(
-        %w(
-          spec/controllers/foo_controller_spec.rb
-          spec/routing/foo_routing_spec.rb
-          spec/acceptance/foo_spec.rb
+          %w(
+            spec/controllers/foo_controller_spec.rb
+            spec/routing/foo_routing_spec.rb
+            spec/acceptance/foo_spec.rb
+          )
         )
-      )
 
       expect(subject.changed("config/routes.rb")).to eq(%w(spec/routing))
+
+      expect(subject.changed("app/layouts/foo/bar.slim")).to eq(
+        %w(
+          spec/features/foo_spec.rb
+        )
+      )
     end
   end
 end

data/spec/lib/guard/rspec_formatter_spec.rb

@@ -6,15 +6,41 @@ RSpec.describe Guard::RSpecFormatter do
     it { is_expected.to be_relative }
   end
 
-  describe "#write_summary" do
+  describe "#dump_summary" do
+    def rspec_summary_args(*args)
+      return args unless ::RSpec::Core::Version::STRING.start_with?("3.")
+
+      n = Struct.new(:duration, :example_count, :failure_count, :pending_count)
+      [n.new(*args)]
+    end
+
+    let(:example_dump_summary_args) { rspec_summary_args(123, 3, 1, 0) }
+    let(:summary_with_no_failures) { rspec_summary_args(123, 3, 0, 0) }
+    let(:summary_with_only_pending) { rspec_summary_args(123, 3, 0, 1) }
+
+    let(:failed_example) do
+      result =
+        if ::RSpec::Core::Version::STRING.start_with?("3.")
+          double(status: "failed")
+        else
+          { status: "failed" }
+        end
+
+      double(execution_result: result, metadata: { location: spec_filename })
+    end
+
     let(:writer) do
       StringIO.new
     end
 
+    let(:stub_formatter) { true }
+
     let(:formatter) do
-      described_class.new(StringIO.new).tap do |formatter|
-        allow(formatter).to receive(:_write) do |&block|
-          block.call writer
+      described_class.new(StringIO.new).tap do |formatter_stub|
+        if stub_formatter
+          allow(formatter_stub).to receive(:_write) do |&block|
+            block.call writer
+          end
         end
       end
     end
@@ -25,9 +51,7 @@ RSpec.describe Guard::RSpecFormatter do
     end
 
     context "without stubbed IO" do
-      let(:formatter) do
-        described_class.new(StringIO.new)
-      end
+      let(:stub_formatter) { false }
 
       it "creates temporary file and and writes to it" do
         file = File.expand_path(described_class::TEMPORARY_FILE_PATH)
@@ -40,27 +64,38 @@ RSpec.describe Guard::RSpecFormatter do
           block.call writer
         end
 
-        formatter.write_summary(123, 1, 2, 3)
+        formatter.dump_summary(*example_dump_summary_args)
+      end
+
+      context "when writing file fails" do
+        it "outputs an error" do
+          allow(FileUtils).to receive(:mkdir_p).and_raise(Errno::EACCES)
+          expect do
+            formatter.dump_summary(*example_dump_summary_args)
+          end.to raise_error(Errno::EACCES)
+        end
+      end
+
+      context "when writer fails" do
+        it "outputs an error" do
+          allow(FileUtils).to receive(:mkdir_p).and_raise(TypeError, "foo")
+          expect do
+            formatter.dump_summary(*example_dump_summary_args)
+          end.to raise_error(TypeError, "foo")
+        end
       end
     end
 
     context "with failures" do
       let(:spec_filename) { "failed_location_spec.rb" }
 
-      let(:failed_example) do
-        double(
-          execution_result: { status: "failed" },
-          metadata: { location: spec_filename }
-        )
-      end
-
       def expected_output(spec_filename)
         /^3 examples, 1 failures in 123\.0 seconds\n#{spec_filename}\n$/
       end
 
       it "writes summary line and failed location in tmp dir" do
         allow(formatter).to receive(:examples) { [failed_example] }
-        formatter.write_summary(123, 3, 1, 0)
+        formatter.dump_summary(*example_dump_summary_args)
         expect(result).to match expected_output(spec_filename)
       end
 
@@ -68,24 +103,16 @@ RSpec.describe Guard::RSpecFormatter do
         allow(formatter).to receive(:examples).
           and_return([failed_example, failed_example])
 
-        formatter.write_summary(123, 3, 1, 0)
+        formatter.dump_summary(*example_dump_summary_args)
         expect(result).to match expected_output(spec_filename)
       end
 
-      context "for rspec 3" do
-        let(:notification) do
-          Struct.new(:duration, :example_count, :failure_count, :pending_count).
-            new(123, 3, 1, 0)
-        end
-        before do
-          allow(formatter.class).to receive(:rspec_3?).and_return(true)
-        end
+      let(:notification) { example_dump_summary_args }
 
-        it "writes summary line and failed location" do
-          allow(formatter).to receive(:examples) { [failed_example] }
-          formatter.dump_summary(notification)
-          expect(result).to match expected_output(spec_filename)
-        end
+      it "writes summary line and failed location" do
+        allow(formatter).to receive(:examples) { [failed_example] }
+        formatter.dump_summary(*notification)
+        expect(result).to match expected_output(spec_filename)
       end
     end
 
@@ -127,14 +154,14 @@ RSpec.describe Guard::RSpecFormatter do
 
     context "with only success" do
       it "notifies success" do
-        formatter.write_summary(123, 3, 0, 0)
+        formatter.dump_summary(*summary_with_no_failures)
         expect(result).to match /^3 examples, 0 failures in 123\.0 seconds\n$/
       end
     end
 
     context "with pending" do
       it "notifies pending too" do
-        formatter.write_summary(123, 3, 0, 1)
+        formatter.dump_summary(*summary_with_only_pending)
         expect(result).to match(
           /^3 examples, 0 failures \(1 pending\) in 123\.0 seconds\n$/
         )

data/spec/lib/guard/rspec_spec.rb

@@ -88,5 +88,4 @@ RSpec.describe Guard::RSpec do
       plugin.run_on_modifications(paths)
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -35,7 +35,6 @@ RSpec.configure do |config|
     unless old_rspec
       mocks.verify_partial_doubles = true
     end
-
   end
 
   # These two settings work together to allow you to limit a spec run
@@ -96,13 +95,13 @@ RSpec.configure do |config|
 
     %w(directory? delete readlines).each do |meth|
       allow(File).to receive(meth.to_sym) do |*args|
-        abort "stub me: File.#{meth}(#{args.map(&:inspect) * ","})!"
+        abort "stub me: File.#{meth}(#{args.map(&:inspect) * ','})!"
       end
     end
 
     %w(mkdir).each do |meth|
       allow(FileUtils).to receive(meth.to_sym) do |*args|
-        abort "stub me: FileUtils.#{meth}(#{args.map(&:inspect) * ","})!"
+        abort "stub me: FileUtils.#{meth}(#{args.map(&:inspect) * ','})!"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -127,6 +127,7 @@ files:
 - gemfiles/Gemfile.rspec-2.14
 - gemfiles/Gemfile.rspec-2.99
 - gemfiles/Gemfile.rspec-3.0
+- gemfiles/Gemfile.rspec-3.2
 - guard-rspec.gemspec
 - lib/guard/rspec.rb
 - lib/guard/rspec/command.rb
@@ -177,7 +178,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: Guard gem for RSpec