guard-rspec 4.6.4 → 4.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b12fb48580695950c8de23fee6eafe3018f160
-  data.tar.gz: 5b4a3fc56f713c6061fd282e422cccb960141dbe
+  metadata.gz: 36f680214b513178f42ad7f47d9fa8f6059eb5df
+  data.tar.gz: 9ed784b1fe3be511dfaec7d934cc88b2c7d674bf
 SHA512:
-  metadata.gz: 812a1cf6163606ada0a1bc33c14386c7a3fd9fbe5da3699f1b99b5acbd8251db4047bd2c8fd9424a69ff3ccce53bd329552f6a52977f72681fa2befc75f0a146
-  data.tar.gz: 67efd2a4f6b8f9ea6e6d92c9ed6899cd8f77683c42e4427e495bf0ed6901c0c23141d96e4fdf5bf298c2fd1674620b1e03cc3a068da528204c2078e06541c3dd
+  metadata.gz: ebe1c445d9b2b52cb5f5b50d92d4d7bc8611034c95972dd79e1b29cd85a9e85a0ae9649c1e1eee4d820266306c1dabb8ba8fec42c83d4bd7d76ef4cdc6b7790d
+  data.tar.gz: 9d758975348f80fa7dafcd71aeed1cdbdfd49dd32a82ab7ec60576f51da23600112dae3ac8c8edffb3a4ece91a1396c6ba74a49fcaaa81e152ad7a0f7c1bbbcf

data/.hound.yml

@@ -196,9 +196,6 @@ StringLiterals:
 VariableInterpolation:
   Enabled: false
 
-TrailingComma:
-  Enabled: false
-
 TrivialAccessors:
   Enabled: false
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014 Thibaud Guillaume-Gentil
+Copyright (c) 2010-2016 Thibaud Guillaume-Gentil
 
 MIT License
 

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.5, 2.2.0 JRuby and Rubinius.
+* Tested against Ruby 2.2.x, JRuby and Rubinius.
 
 ## Install
 

data/guard-rspec.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |s|
   s.email       = "thibaud@thibaud.gg"
   s.summary     = "Guard gem for RSpec"
   s.description = "Guard::RSpec automatically run your specs" +
-    " (much like autotest)."
+                  " (much like autotest)."
 
-  s.homepage    = "https://rubygems.org/gems/guard-rspec"
+  s.homepage    = "https://github.com/guard/guard-rspec"
   s.license     = "MIT"
 
   s.files        = `git ls-files`.split($INPUT_RECORD_SEPARATOR)

data/lib/guard/rspec.rb

@@ -25,7 +25,7 @@ module Guard
     end
 
     def start
-      Guard::Compat::UI.info "Guard::RSpec is running"
+      Compat::UI.info "Guard::RSpec is running"
       run_all if options[:all_on_start]
     end
 

data/lib/guard/rspec/deprecator.rb

@@ -71,8 +71,8 @@ module Guard
         return unless options.key?(:focus_on_failed)
         _deprecated(
           "The :focus_on_failed option is deprecated." +
-          " Focus mode is the default and can be changed using new" +
-          " :failed_mode option." +
+          " Please set new :failed_mode option value to" +
+          " :focus instead." +
           " https://github.com/guard/guard-rspec#list-of-available-options")
       end
 

data/lib/guard/rspec/dsl.rb

@@ -37,7 +37,7 @@ module Guard
 
       def ruby
         # Ruby apps
-        @ruby || OpenStruct.new.tap do |ruby|
+        @ruby ||= OpenStruct.new.tap do |ruby|
           ruby.lib_files = %r{^(lib/.+)\.rb$}
         end
       end

data/lib/guard/rspec/inspectors/focused_inspector.rb

@@ -25,8 +25,8 @@ module Guard
         def failed(locations)
           if locations.empty?
             @focused_locations = []
-          else
-            @focused_locations = locations if focused_locations.empty?
+          elsif focused_locations.empty?
+            @focused_locations = locations
           end
         end
 

data/lib/guard/rspec/options.rb

@@ -5,14 +5,14 @@ module Guard
         all_on_start:    false,
         all_after_pass:  false,
         run_all:         { message: "Running all specs" },
-        failed_mode:     :none,  # :keep and :focus are other posibilities
+        failed_mode:     :none, # :keep and :focus are other posibilities
         spec_paths:      %w(spec),
         cmd:             nil,
         cmd_additional_args: nil,
         launchy:         nil,
         notification:    true,
         title:           "RSpec results"
-      }
+      }.freeze
 
       class << self
         def with_defaults(options = {})

data/lib/guard/rspec/rspec_process.rb

@@ -56,8 +56,6 @@ module Guard
         end
       end
 
-      private
-
       attr_reader :command
       attr_reader :exit_code
       attr_reader :formatter_tmp_file

data/lib/guard/rspec/runner.rb

@@ -16,7 +16,7 @@ module Guard
       end
 
       # NOTE: must match with const in RSpecFormatter!
-      TEMPORARY_FILE_PATH ||= "tmp/rspec_guard_result"
+      TEMPORARY_FILE_PATH ||= "tmp/rspec_guard_result".freeze
 
       attr_accessor :options, :inspector, :notifier
 

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "4.6.4"
+    VERSION = "4.6.5".freeze
   end
 end

data/lib/guard/rspec_defaults.rb

@@ -1,5 +1,5 @@
 module Guard
   class RSpecDefaults
-    TEMPORARY_FILE_PATH = "tmp/rspec_guard_result"
+    TEMPORARY_FILE_PATH = "tmp/rspec_guard_result".freeze
   end
 end

data/lib/guard/rspec_formatter.rb

@@ -7,18 +7,22 @@ require "fileutils"
 require "rspec"
 require "rspec/core/formatters/base_formatter"
 
-require "guard/rspec_defaults"
+require_relative "rspec_defaults"
 
 module Guard
   class RSpecFormatter < ::RSpec::Core::Formatters::BaseFormatter
     WIKI_ENV_WARN_URL =
-      "https://github.com/guard/guard-rspec/wiki/Warning:-no-environment"
+      "https://github.com/guard/guard-rspec/wiki/Warning:-no-environment".freeze
 
-    NO_ENV_WARNING_MSG = "no environment passed - see #{WIKI_ENV_WARN_URL}"
-    NO_RESULTS_VALUE_MSG = ":results_file value unknown (using defaults)"
+    NO_ENV_WARNING_MSG =
+      "no environment passed - see #{WIKI_ENV_WARN_URL}".freeze
 
-    UNSUPPORTED_PATTERN = "Your RSpec.configuration.pattern uses characters "\
-      "unsupported by your Ruby version (File::FNM_EXTGLOB is undefined)"
+    NO_RESULTS_VALUE_MSG =
+      ":results_file value unknown (using defaults)".freeze
+
+    UNSUPPORTED_PATTERN =
+      "Your RSpec.configuration.pattern uses characters "\
+      "unsupported by your Ruby version (File::FNM_EXTGLOB is undefined)".freeze
 
     class Error < RuntimeError
       class UnsupportedPattern < Error
@@ -44,40 +48,54 @@ module Guard
       end
     end
 
-    # rspec issue https://github.com/rspec/rspec-core/issues/793
-    def self.extract_spec_location(metadata)
-      root_metadata = metadata
-      location = metadata[:location]
+    class << self
+      # rspec issue https://github.com/rspec/rspec-core/issues/793
+      def extract_spec_location(metadata)
+        root_metadata = metadata
+        location = metadata[:location]
+
+        until spec_path?(location)
+          metadata = metadata[:parent_example_group] || metadata[:example_group]
 
-      until spec_path?(location)
-        metadata = metadata[:parent_example_group] || metadata[:example_group]
+          unless metadata
+            STDERR.puts "no spec file location in #{root_metadata.inspect}"
+            return root_metadata[:location]
+          end
 
-        unless metadata
-          STDERR.puts "no spec file location in #{root_metadata.inspect}"
-          return root_metadata[:location]
+          # rspec issue https://github.com/rspec/rspec-core/issues/1243
+          location = first_colon_separated_entry(metadata[:location])
         end
 
-        # rspec issue https://github.com/rspec/rspec-core/issues/1243
-        location = (metadata[:location] || "").split(":").first
+        location
       end
 
-      location
-    end
+      def spec_path?(path)
+        pattern = ::RSpec.configuration.pattern
+
+        flags = supported_fnmatch_flags(pattern)
+        path ||= ""
+        path = path.sub(/:\d+\z/, "")
+        path = Pathname.new(path).cleanpath.to_s
+        stripped = "{#{pattern.gsub(/\s*,\s*/, ',')}}"
+        File.fnmatch(stripped, path, flags)
+      end
 
-    def self.spec_path?(path)
-      pattern = ::RSpec.configuration.pattern
+      private
 
-      flags = File::FNM_PATHNAME | File::FNM_DOTMATCH
-      if File.const_defined?(:FNM_EXTGLOB) # ruby >= 2
-        flags |= File::FNM_EXTGLOB
-      elsif pattern =~ /[{}]/
-        fail Error::UnsupportedPattern
+      def first_colon_separated_entry(entries)
+        (entries || "").split(":").first
       end
 
-      path ||= ""
-      path = path.sub(/:\d+\z/, "")
-      path = Pathname.new(path).cleanpath.to_s
-      File.fnmatch(pattern, path, flags)
+      def supported_fnmatch_flags(pattern)
+        flags = File::FNM_PATHNAME | File::FNM_DOTMATCH
+
+        # ruby >= 2
+        return flags |= File::FNM_EXTGLOB if File.const_defined?(:FNM_EXTGLOB)
+
+        fail Error::UnsupportedPattern if pattern =~ /[{}]/
+
+        flags
+      end
     end
 
     def dump_summary(*args)
@@ -134,8 +152,8 @@ module Guard
     def _results_file
       path = ENV["GUARD_RSPEC_RESULTS_FILE"]
       if path.nil?
-        STDERR.puts "Guard::RSpec: Warning: #{NO_ENV_WARNING_MSG}\n" \
-          "Guard::RSpec: Warning: #{NO_RESULTS_VALUE_MSG}"
+        STDERR.puts("Guard::RSpec: Warning: #{NO_ENV_WARNING_MSG}\n" \
+                    "Guard::RSpec: Warning: #{NO_RESULTS_VALUE_MSG}")
         path = RSpecDefaults::TEMPORARY_FILE_PATH
       end
 

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

@@ -84,8 +84,8 @@ RSpec.describe Guard::RSpec::Deprecator do
         expect(Guard::Compat::UI).to receive(:warning).with(
           "Guard::RSpec DEPRECATION WARNING:" +
           " The :focus_on_failed option is deprecated." +
-          " Focus mode is the default and can be changed using new" +
-          " :failed_mode option." +
+          " Please set new :failed_mode option value to" +
+          " :focus instead." +
           " https://github.com/guard/guard-rspec#list-of-available-options")
         deprecator.warns_about_deprecated_options
       end

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

@@ -58,11 +58,13 @@ RSpec.describe klass do
 
     # Line numbers in failed_locations needs to be omitted because of
     # https://github.com/rspec/rspec-core/issues/952
-    expect(inspector.paths(other_paths)).to match_array([
-      "spec/lib/guard/rspec/deprecator_spec.rb",
-      "spec/lib/guard/rspec/runner_spec.rb",
-      "spec/lib/guard/rspec/inspectors/simple_inspector_spec.rb"
-    ])
+    expect(inspector.paths(other_paths)).to match_array(
+      [
+        "spec/lib/guard/rspec/deprecator_spec.rb",
+        "spec/lib/guard/rspec/runner_spec.rb",
+        "spec/lib/guard/rspec/inspectors/simple_inspector_spec.rb"
+      ]
+    )
     inspector.failed(other_failed_locations)
 
     # Now it returns other failed locations
@@ -70,18 +72,24 @@ RSpec.describe klass do
       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"
-    ])
+    ).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))).
-      to match_array([
+    expect(
+      inspector.paths(%w(spec/lib/guard/rspec/runner_spec.rb))
+    ).to match_array(
+      [
         "spec/lib/guard/rspec/runner_spec.rb",
         "spec/lib/guard/rspec/inspectors/simple_inspector_spec.rb"
-      ])
+      ]
+    )
+
     inspector.failed([])
 
     # Now there is no failed locations

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

@@ -6,7 +6,7 @@ RSpec.describe Guard::RSpec::Notifier do
   let(:options) { { notification: true, title: "RSpec results" } }
   let(:notifier) { Guard::RSpec::Notifier.new(options) }
 
-  def expect_notification(title = "RSpec results", message, image, priority)
+  def expect_notification(message, image, priority, title = "RSpec results")
     expect(Guard::Compat::UI).to receive(:notify).
       with(message,  title: title, image: image, priority: priority)
   end
@@ -21,7 +21,7 @@ RSpec.describe Guard::RSpec::Notifier do
       let(:options) { { notification: true, title: "Failure title" } }
 
       it "notifies with the title" do
-        expect_notification("Failure title", "Failed", :failed, 2)
+        expect_notification("Failed", :failed, 2, "Failure title")
         notifier.notify_failure
       end
     end
@@ -64,7 +64,7 @@ RSpec.describe Guard::RSpec::Notifier do
       let(:options) { { notification: true, title: "Custom title" } }
 
       it "notifies with the title" do
-        expect_notification("Custom title", "This is summary", :success, -2)
+        expect_notification("This is summary", :success, -2, "Custom title")
         notifier.notify("This is summary")
       end
     end

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

@@ -16,7 +16,7 @@ RSpec.describe Guard::RSpec::Results do
       [
         "5 examples, 2 failures (3 pending)\n",
         "foo1/bar1_spec.rb\n",
-        "foo1/bar2_spec.rb\n",
+        "foo1/bar2_spec.rb\n"
       ]
     end
 

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

@@ -272,10 +272,12 @@ RSpec.describe Guard::RSpec::Runner do
 
     context "with failed paths" do
       before do
-        allow(results).to receive(:failed_paths).and_return([
-          "./failed_spec.rb:123",
-          "./other/failed_spec.rb:77"
-        ])
+        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

data/spec/lib/guard/rspec_formatter_spec.rb

@@ -50,7 +50,8 @@ RSpec.describe Guard::RSpecFormatter do
 
       around do |example|
         env_var = "GUARD_RSPEC_RESULTS_FILE"
-        old, ENV[env_var] = ENV[env_var], "foobar.txt"
+        old = ENV[env_var]
+        ENV[env_var] = "foobar.txt"
         example.run
         ENV[env_var] = old
       end
@@ -254,5 +255,22 @@ RSpec.describe Guard::RSpecFormatter do
         end
       end
     end
+
+    context "when RSpec 3.0 is configured to use multiple patterns" do
+      before do
+        allow(::RSpec.configuration).to receive(:pattern).
+          and_return("**{,/*/**}/*_spec.rb,**/*.feature")
+      end
+
+      it "matches a spec file with the first pattern" do
+        expect(described_class.spec_path?("./spec/foo_spec.rb")).
+          to be_truthy
+      end
+
+      it "matches a spec file with the second pattern" do
+        expect(described_class.spec_path?("./spec/acceptance/bar.feature")).
+          to be_truthy
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 4.6.4
+  version: 4.6.5
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -162,7 +162,7 @@ files:
 - spec/lib/guard/rspec_formatter_spec.rb
 - spec/lib/guard/rspec_spec.rb
 - spec/spec_helper.rb
-homepage: https://rubygems.org/gems/guard-rspec
+homepage: https://github.com/guard/guard-rspec
 licenses:
 - MIT
 metadata: {}
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Guard gem for RSpec