guard-rspec 4.3.1 → 4.4.1

data/gemfiles/Gemfile.rspec-2.99

@@ -0,0 +1,14 @@
+source "https://rubygems.org"
+
+gemspec path: '../'
+
+gem 'rspec', '~> 2.99'
+
+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/gemfiles/Gemfile.rspec-3.0

@@ -6,6 +6,7 @@ gem 'rspec', '~> 3.0.0'
 
 group :test do
   gem 'coveralls', require: false
+  gem "guard-compat", ">= 0.0.2", require: false
 end
 
 group :tool do

data/guard-rspec.gemspec

@@ -1,26 +1,28 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'guard/rspec/version'
+require "guard/rspec/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'guard-rspec'
+  s.name        = "guard-rspec"
   s.version     = Guard::RSpecVersion::VERSION
-  s.author      = 'Thibaud Guillaume-Gentil'
-  s.email       = 'thibaud@thibaud.gg'
-  s.summary     = 'Guard gem for RSpec'
-  s.description = 'Guard::RSpec automatically run your specs (much like autotest).'
-  s.homepage    = 'https://rubygems.org/gems/guard-rspec'
-  s.license     = 'MIT'
+  s.author      = "Thibaud Guillaume-Gentil"
+  s.email       = "thibaud@thibaud.gg"
+  s.summary     = "Guard gem for RSpec"
+  s.description = "Guard::RSpec automatically run your specs" +
+    " (much like autotest)."
 
-  s.files        = `git ls-files`.split($/)
+  s.homepage    = "https://rubygems.org/gems/guard-rspec"
+  s.license     = "MIT"
+
+  s.files        = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.test_files   = s.files.grep(%r{^spec/})
-  s.require_path = 'lib'
+  s.require_path = "lib"
 
-  s.add_dependency 'guard', '~> 2.1'
-  s.add_dependency 'rspec', '>= 2.14', '< 4.0'
+  s.add_dependency "guard", "~> 2.1"
+  s.add_dependency "rspec", ">= 2.99.0", "< 4.0"
 
-  s.add_development_dependency 'bundler', '>= 1.3.5', '< 2.0'
-  s.add_development_dependency 'rake', '~> 10.1'
-  s.add_development_dependency 'launchy', '~> 2.4'
+  s.add_development_dependency "bundler", ">= 1.3.5", "< 2.0"
+  s.add_development_dependency "rake", "~> 10.1"
+  s.add_development_dependency "launchy", "~> 2.4"
 end

data/lib/guard/rspec.rb

@@ -1,12 +1,18 @@
-require 'guard'
-require 'guard/plugin'
+require "guard/rspec/options"
+require "guard/rspec/deprecator"
+require "guard/rspec/runner"
+
+# NOTE: To avoid 'superclass mismatch for class RSpec' errors,
+# every file has to have
+#
+#   class RSpec < Plugin
+#
+# and not just
+#
+#   class RSpec
 
 module Guard
   class RSpec < Plugin
-    require 'guard/rspec/options'
-    require 'guard/rspec/deprecator'
-    require 'guard/rspec/runner'
-
     attr_accessor :options, :runner
 
     def initialize(options = {})
@@ -17,7 +23,7 @@ module Guard
     end
 
     def start
-      ::Guard::UI.info 'Guard::RSpec is running'
+      ::Guard::UI.info "Guard::RSpec is running"
       run_all if options[:all_on_start]
     end
 
@@ -41,4 +47,3 @@ module Guard
     end
   end
 end
-

data/lib/guard/rspec/command.rb

@@ -1,8 +1,10 @@
-require 'rspec/core'
-require 'pathname'
+require "rspec/core"
+require "pathname"
+
+require "guard/rspec"
 
 module Guard
-  class RSpec
+  class RSpec < Plugin
     class Command < String
       FAILURE_EXIT_CODE = 2
 
@@ -11,7 +13,7 @@ module Guard
       def initialize(paths, options = {})
         @paths = paths
         @options = options
-        super(_parts.join(' '))
+        super(_parts.join(" "))
       end
 
       private
@@ -21,23 +23,38 @@ module Guard
         parts << _visual_formatter
         parts << _guard_formatter
         parts << "--failure-exit-code #{FAILURE_EXIT_CODE}"
-        parts << paths.join(' ')
+        parts << options[:cmd_additional_args] || ""
+
+        parts << _paths(options).join(" ")
+      end
+
+      def _paths(options)
+        return paths unless chdir = options[:chdir]
+        paths.map { |path| path.sub(File.join(chdir, "/"), "") }
       end
 
       def _visual_formatter
         return if _cmd_include_formatter?
-        _rspec_formatters || '-f progress'
+        _rspec_formatters || "-f progress"
       end
 
       def _rspec_formatters
-        # RSpec::Core::ConfigurationOptions#parse_options method was renamed to #options
-        # in rspec-core v3.0.0.beta2 so call the first one if available. Fixes #249
+        # RSpec::Core::ConfigurationOptions#parse_options method was renamed to
+        # #options in rspec-core v3.0.0.beta2 so call the first one if
+        # available. Fixes #249
         config = ::RSpec::Core::ConfigurationOptions.new([])
         config.parse_options if config.respond_to?(:parse_options)
         formatters = config.options[:formatters] || nil
-        # RSpec's parser returns an array in the format [[formatter, output], ...], so match their format
-        # Construct a matching command line option, including output target
-        formatters && formatters.map { |formatter| "-f #{formatter.join ' -o '}" }.join(' ')
+
+        # RSpec's parser returns an array in the format
+        #
+        # [[formatter, output], ...],
+        #
+        # so match their format Construct a matching command line option,
+        # including output target
+
+        return formatters unless formatters
+        formatters.map { |entries| "-f #{entries.join " -o "}" }.join(" ")
       end
 
       def _cmd_include_formatter?
@@ -45,7 +62,8 @@ module Guard
       end
 
       def _guard_formatter
-        "-r #{File.dirname(__FILE__)}/formatter.rb -f Guard::RSpec::Formatter"
+        dir = Pathname.new(__FILE__).dirname.dirname
+        "-r #{dir + "rspec_formatter.rb"} -f Guard::RSpecFormatter"
       end
     end
   end

data/lib/guard/rspec/deprecator.rb

@@ -1,5 +1,5 @@
 module Guard
-  class RSpec
+  class RSpec < Plugin
     class Deprecator
       attr_accessor :options
 
@@ -23,41 +23,62 @@ module Guard
       private
 
       def _spec_opts_env
-        return if ENV['SPEC_OPTS'].nil?
-        UI.warning "The SPEC_OPTS environment variable is present. This can conflict with guard-rspec."
+        return if ENV["SPEC_OPTS"].nil?
+        UI.warning(
+          "The SPEC_OPTS environment variable is present." +
+          " This can conflict with guard-rspec."
+        )
       end
 
       def _version_option
         return unless options.key?(:version)
-        _deprecated('The :version option is deprecated. Only RSpec ~> 2.14 is now supported.')
+        _deprecated(
+          "The :version option is deprecated." +
+          " Only RSpec ~> 2.14 is now supported."
+        )
       end
 
       def _exclude_option
         return unless options.key?(:exclude)
-        _deprecated('The :exclude option is deprecated. Please Guard ignore method instead. https://github.com/guard/guard#ignore')
+        _deprecated(
+          "The :exclude option is deprecated." +
+          " Please Guard ignore method instead." +
+          " https://github.com/guard/guard#ignore"
+        )
       end
 
       def _use_cmd_option
-        %w[color drb fail_fast formatter env bundler binstubs rvm cli spring turnip zeus foreman].each do |option|
+        %w(color drb fail_fast formatter env bundler
+           binstubs rvm cli spring turnip zeus foreman).each do |option|
           next unless options.key?(option.to_sym)
-          _deprecated("The :#{option} option is deprecated. Please customize the new :cmd option to fit your need.")
+          _deprecated(
+            "The :#{option} option is deprecated." +
+            " Please customize the new :cmd option to fit your need."
+          )
         end
       end
 
       def _keep_failed_option
         return unless options.key?(:keep_failed)
-        _deprecated('The :keep_failed option is deprecated. Please set new :failed_mode option value to :keep instead. https://github.com/guard/guard-rspec#list-of-available-options')
+        _deprecated(
+          "The :keep_failed option is deprecated." +
+          " Please set new :failed_mode option value to" +
+          " :keep instead." +
+          " https://github.com/guard/guard-rspec#list-of-available-options")
       end
 
       def _focus_on_failed_option
         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. https://github.com/guard/guard-rspec#list-of-available-options')
+        _deprecated(
+          "The :focus_on_failed option is deprecated." +
+          " Focus mode is the default and can be changed using new" +
+          " :failed_mode option." +
+          " https://github.com/guard/guard-rspec#list-of-available-options")
       end
 
       def _deprecated(message)
-        UI.warning %{Guard::RSpec DEPRECATION WARNING: #{message}}
+        UI.warning %(Guard::RSpec DEPRECATION WARNING: #{message})
       end
-
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Guard
-  class RSpec
+  class RSpec < Plugin
     module Inspectors
       class BaseInspector
         attr_accessor :options, :spec_paths
@@ -7,44 +7,65 @@ module Guard
         def initialize(options = {})
           @options = options
           @spec_paths = @options[:spec_paths]
+          @chdir = @options[:chdir]
         end
 
-        def paths(paths)
-          raise _abstract
+        def paths(_paths)
+          fail NotImplementedError
         end
 
-        def failed(locations)
-          raise _abstract
+        def failed(_locations)
+          fail NotImplementedError
         end
 
         def reload
-          raise _abstract
+          fail NotImplementedError
         end
 
         private
 
-        def _abstract
-          'Must be implemented in subclass'
-        end
-
         # Leave only spec/feature files from spec_paths, remove others
         def _clean(paths)
           paths.uniq!
           paths.compact!
           spec_dirs = _select_only_spec_dirs(paths)
           spec_files = _select_only_spec_files(paths)
-          spec_dirs + spec_files
+          (spec_dirs + spec_files).uniq
         end
 
         def _select_only_spec_dirs(paths)
-          paths.select { |p| File.directory?(p) || spec_paths.include?(p) }
+          chdir_paths = _spec_paths_with_chdir
+          paths.select do |path|
+            File.directory?(path) || chdir_paths.include?(path)
+          end
         end
 
         def _select_only_spec_files(paths)
-          spec_files = spec_paths.collect { |path| Dir[File.join(path, "**{,/*/**}", "*[_.]spec.rb")] }
-          feature_files = spec_paths.collect { |path| Dir[File.join(path, "**{,/*/**}", "*.feature")] }
+          spec_files = _collect_files("*[_.]spec.rb")
+          feature_files = _collect_files("*.feature")
           files = (spec_files + feature_files).flatten
-          paths.select { |p| files.include?(p) }
+
+          paths.select do |path|
+            (files & [@chdir ? File.join(@chdir, path) : path]).any?
+          end
+        end
+
+        def _spec_paths_with_chdir
+          _paths_with_chdir(spec_paths, @chdir)
+        end
+
+        def _collect_files(pattern)
+          base_paths = _spec_paths_with_chdir
+          base_paths.map do |path|
+            # TODO: not tested properly
+            Dir[File.join(path, "**{,/*/**}", pattern)]
+          end
+        end
+
+        def _paths_with_chdir(paths, chdir)
+          paths.map do |path|
+            chdir ? File.join(chdir, path) : path
+          end
         end
       end
     end

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

@@ -1,17 +1,17 @@
-require 'guard/rspec/inspectors/simple_inspector.rb'
-require 'guard/rspec/inspectors/keeping_inspector.rb'
-require 'guard/rspec/inspectors/focused_inspector.rb'
+require "guard/rspec/inspectors/simple_inspector.rb"
+require "guard/rspec/inspectors/keeping_inspector.rb"
+require "guard/rspec/inspectors/focused_inspector.rb"
 
 module Guard
-  class RSpec
+  class RSpec < Plugin
     module Inspectors
       class Factory
         class << self
           def create(options = {})
             case options[:failed_mode]
-              when :focus ; FocusedInspector.new(options)
-              when :keep  ; KeepingInspector.new(options)
-              else        ; SimpleInspector.new(options)
+            when :focus  then FocusedInspector.new(options)
+            when :keep   then KeepingInspector.new(options)
+            else; SimpleInspector.new(options)
             end
           end
 
@@ -21,4 +21,3 @@ module Guard
     end
   end
 end
-

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

@@ -1,7 +1,7 @@
-require 'guard/rspec/inspectors/base_inspector.rb'
+require "guard/rspec/inspectors/base_inspector.rb"
 
 module Guard
-  class RSpec
+  class RSpec < Plugin
     module Inspectors
       # Inspector that focuses on set of paths if any of them is failing.
       # Returns only that set of paths on all future calls to #paths

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

@@ -1,7 +1,7 @@
-require 'guard/rspec/inspectors/base_inspector.rb'
+require "guard/rspec/inspectors/base_inspector.rb"
 
 module Guard
-  class RSpec
+  class RSpec < Plugin
     module Inspectors
       # Inspector that remembers all failed paths and
       # returns that paths in future calls to #paths method
@@ -51,8 +51,8 @@ end
 #  bit it doesn't work because of bug with RSpec
 #  https://github.com/rspec/rspec-core/issues/952
 #
-#module Guard
-#  class RSpec
+# module Guard
+#  class RSpec < Plugin
 #    module Inspectors
 #      # Inspector that remembers all failed paths and
 #      # returns that paths in future calls to #paths method
@@ -82,7 +82,8 @@ end
 #        # Return paths + failed locations.
 #        # Do not include location in result if its path is already included.
 #        def _with_failed_locations(paths)
-#          locations = failed_locations.select { |l| !paths.include?(_location_path(l)) }
+#          locations = failed_locations.select { |l|
+#          !paths.include?(_location_path(l)) }
 #          paths | locations
 #        end
 #
@@ -93,4 +94,4 @@ end
 #      end
 #    end
 #  end
-#end
+# end

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

@@ -1,14 +1,14 @@
-require 'guard/rspec/inspectors/base_inspector.rb'
+require "guard/rspec/inspectors/base_inspector"
 
 module Guard
-  class RSpec
+  class RSpec < Plugin
     module Inspectors
       class SimpleInspector < BaseInspector
         def paths(paths)
           _clean(paths)
         end
 
-        def failed(locations)
+        def failed(_locations)
           # Don't care
         end