guard-rspec 4.6.5 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f680214b513178f42ad7f47d9fa8f6059eb5df
-  data.tar.gz: 9ed784b1fe3be511dfaec7d934cc88b2c7d674bf
+  metadata.gz: 0fc28c16ceeddadc68019093ed5e2d48362f5c3c
+  data.tar.gz: 3b52eda168c7398bca052b5c01497b97dd2d11bd
 SHA512:
-  metadata.gz: ebe1c445d9b2b52cb5f5b50d92d4d7bc8611034c95972dd79e1b29cd85a9e85a0ae9649c1e1eee4d820266306c1dabb8ba8fec42c83d4bd7d76ef4cdc6b7790d
-  data.tar.gz: 9d758975348f80fa7dafcd71aeed1cdbdfd49dd32a82ab7ec60576f51da23600112dae3ac8c8edffb3a4ece91a1396c6ba74a49fcaaa81e152ad7a0f7c1bbbcf
+  metadata.gz: c2770e272f1965dd1cce1878f5dcb9617dff9519c453f6806fa8c7945603476edfe5cf33289a4d95267f154eb15cee8ba10459263b00ca987436e94c16909736
+  data.tar.gz: 293ed7b6f57587da0b3b4df12a8b0520b0d33b2fe16b17c8222ceb09c458dae57de5a7b8da95d74d65b69e16fc8be3452adc01055ebc3bcf65bf4acbb3c70aee

data/.rubocop.yml

@@ -1,2 +1,2 @@
 inherit_from:
-  .hound.yml
+  .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -1,6 +1,40 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-05-27 21:27:40 +0200 using RuboCop version 0.25.0.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-05-22 06:08:35 +0200 using RuboCop version 0.40.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: 15
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/guard/rspec.rb'
+    - 'lib/guard/rspec/command.rb'
+    - 'lib/guard/rspec/deprecator.rb'
+    - 'lib/guard/rspec/dsl.rb'
+    - 'lib/guard/rspec/inspectors/base_inspector.rb'
+    - 'lib/guard/rspec/inspectors/factory.rb'
+    - '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/rspec_process.rb'
+    - 'lib/guard/rspec/runner.rb'
+    - 'lib/guard/rspec_formatter.rb'
+
+# Offense count: 148
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: leading, trailing
+Style/DotPosition:
+  Enabled: false
+
+# Offense count: 654
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Enabled: false

data/.travis.yml

@@ -1,13 +1,14 @@
 language: ruby
 bundler_args: --without tool
 rvm:
-  - 2.2.2
-  - jruby-head
+  - 2.2.5
+  - 2.3.1
+  - jruby-9.0.5.0
 gemfile:
-  - gemfiles/Gemfile.rspec-2.14
   - gemfiles/Gemfile.rspec-2.99
-  - gemfiles/Gemfile.rspec-3.3
+  - gemfiles/Gemfile.rspec-3.4
 matrix:
   allow_failures:
-    - rvm: jruby-head
+    - rvm: jruby-9.0.50
 sudo: false
+cache: bundler

data/Gemfile

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

data/Guardfile

@@ -13,16 +13,16 @@ group :specs, halt_on_fail: true do
     dsl.watch_spec_files_for(dsl.ruby.lib_files)
 
     watch(%r{^(lib/guard/rspec/template)s/Guardfile$}) do
-      rspec.spec.("lib/guard/rspec/template")
+      rspec.spec.call("lib/guard/rspec/template")
     end
 
     watch(%r{^lib/guard/rspec/dsl.rb$}) do
-      rspec.spec.("lib/guard/rspec/template")
+      rspec.spec.call("lib/guard/rspec/template")
     end
   end
 
   guard :rubocop, all_on_start: false do
-    watch(%r{.+\.rb$})
+    watch(/.+\.rb$/)
     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
   end
 end

data/README.md

@@ -4,8 +4,8 @@
 
 Guard::RSpec allows to automatically & intelligently launch specs when files are modified.
 
-* Compatible with RSpec >2.14 & 3
-* Tested against Ruby 2.2.x, JRuby and Rubinius.
+* Compatible with RSpec >2.99 & 3
+* Tested against Ruby 2.2.x, JRuby 9.0.5.0 ~~and Rubinius~~.
 
 ## Install
 
@@ -66,6 +66,8 @@ guard :rspec, cmd: 'spring rspec -f doc' do
 end
 ```
 
+NOTE: the above example assumes you have the `spring rspec` command installed - see here: https://github.com/jonleighton/spring-commands-rspec
+
 ### Running with bundler
 
 Running `bundle exec guard` will not run the specs with bundler. You need to change the `cmd` option to `bundle exec rspec`:

data/gemfiles/{Gemfile.rspec-2.14 → Gemfile.rspec-3.4}

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec path: '../'
 
-gem 'rspec', '~> 2.14'
+gem 'rspec', '~> 3.4.0'
 
 group :test do
   gem 'coveralls', require: false

data/guard-rspec.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.author      = "Thibaud Guillaume-Gentil"
   s.email       = "thibaud@thibaud.gg"
   s.summary     = "Guard gem for RSpec"
-  s.description = "Guard::RSpec automatically run your specs" +
+  s.description = "Guard::RSpec automatically run your specs" \
                   " (much like autotest)."
 
   s.homepage    = "https://github.com/guard/guard-rspec"

data/lib/guard/rspec/command.rb

@@ -29,7 +29,8 @@ module Guard
       end
 
       def _paths(options)
-        return paths unless chdir = options[:chdir]
+        chdir = options[:chdir]
+        return paths unless chdir
         paths.map { |path| path.sub(File.join(chdir, "/"), "") }
       end
 

data/lib/guard/rspec/deprecator.rb

@@ -25,7 +25,7 @@ module Guard
       def _spec_opts_env
         return if ENV["SPEC_OPTS"].nil?
         Compat::UI.warning(
-          "The SPEC_OPTS environment variable is present." +
+          "The SPEC_OPTS environment variable is present." \
           " This can conflict with guard-rspec."
         )
       end
@@ -33,7 +33,7 @@ module Guard
       def _version_option
         return unless options.key?(:version)
         _deprecated(
-          "The :version option is deprecated." +
+          "The :version option is deprecated." \
           " Only RSpec ~> 2.14 is now supported."
         )
       end
@@ -41,8 +41,8 @@ module Guard
       def _exclude_option
         return unless options.key?(:exclude)
         _deprecated(
-          "The :exclude option is deprecated." +
-          " Please Guard ignore method instead." +
+          "The :exclude option is deprecated." \
+          " Please Guard ignore method instead." \
           " https://github.com/guard/guard#ignore"
         )
       end
@@ -52,7 +52,7 @@ module Guard
            binstubs rvm cli spring turnip zeus foreman).each do |option|
           next unless options.key?(option.to_sym)
           _deprecated(
-            "The :#{option} option is deprecated." +
+            "The :#{option} option is deprecated." \
             " Please customize the new :cmd option to fit your need."
           )
         end
@@ -61,19 +61,21 @@ module Guard
       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")
+          "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." +
-          " Please set new :failed_mode option value to" +
-          " :focus instead." +
-          " https://github.com/guard/guard-rspec#list-of-available-options")
+          "The :focus_on_failed option is deprecated." \
+          " Please set new :failed_mode option value to" \
+          " :focus instead." \
+          " https://github.com/guard/guard-rspec#list-of-available-options"
+        )
       end
 
       def _deprecated(message)

data/lib/guard/rspec/dsl.rb

@@ -10,7 +10,7 @@ module Guard
       end
 
       def watch_spec_files_for(expr)
-        @dsl.send(:watch, expr) { |m| rspec.spec.(m[1]) }
+        @dsl.send(:watch, expr) { |m| rspec.spec.call(m[1]) }
       end
 
       def self.detect_spec_file_for(rspec, file)
@@ -21,7 +21,7 @@ module Guard
         return path unless file.start_with?("lib/")
         return path if Dir.exist?("#{rspec.spec_dir}/lib")
 
-        without_lib = file.sub(/^lib\//, "")
+        without_lib = file.sub(%r{^lib/}, "")
         "#{rspec.spec_dir}/#{without_lib}_spec.rb"
       end
 
@@ -44,9 +44,17 @@ module Guard
 
       def rails(options = {})
         # Rails example
-        @rails ||= OpenStruct.new.tap do |rails|
-          exts = _view_extensions(options) * "|"
+        @rails ||= _build_rails_rules(_view_extensions(options) * "|")
+      end
+
+      private
+
+      def _view_extensions(options)
+        options.dup.delete(:view_extensions) || %w(erb haml slim)
+      end
 
+      def _build_rails_rules(exts)
+        OpenStruct.new.tap do |rails|
           rails.app_files = %r{^app/(.+)\.rb$}
 
           rails.views = %r{^app/(views/.+/[^/]*\.(?:#{exts}))$}
@@ -59,12 +67,6 @@ 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/inspectors/base_inspector.rb

@@ -11,15 +11,15 @@ module Guard
         end
 
         def paths(_paths)
-          fail NotImplementedError
+          raise NotImplementedError
         end
 
         def failed(_locations)
-          fail NotImplementedError
+          raise NotImplementedError
         end
 
         def reload
-          fail NotImplementedError
+          raise NotImplementedError
         end
 
         private

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

@@ -37,7 +37,7 @@ module Guard
 
         # Extract file path from location
         def _location_path(location)
-          location.match(/^(\.\/)?(.*?)(:\d+)?$/)[2]
+          location.match(%r{^(\./)?(.*?)(:\d+)?$})[2]
         end
       end
     end

data/lib/guard/rspec/notifier.rb

@@ -48,8 +48,7 @@ module Guard
       def _priority(image)
         { failed:   2,
           pending: -1,
-          success: -2
-        }[image]
+          success: -2 }[image]
       end
     end
   end

data/lib/guard/rspec/results.rb

@@ -11,7 +11,7 @@ module Guard
         lines = File.readlines(filename)
         if lines.empty? || lines.first.empty?
           dump = lines.inspect
-          fail InvalidData, "Invalid results in: #{filename},"\
+          raise InvalidData, "Invalid results in: #{filename},"\
             " lines:\n#{dump}\n"
         end
 

data/lib/guard/rspec/rspec_process.rb

@@ -26,8 +26,13 @@ module Guard
       def _run
         _without_bundler_env do
           exit_code = _really_run
+
+          msg = "Guard::RSpec: RSpec command %s exited with: %s"
+          Compat::UI.debug(format(msg, command, exit_code.inspect))
+
           unless [0, Command::FAILURE_EXIT_CODE].include?(exit_code)
-            fail Failure, "Failed: #{command.inspect} (exit code: #{exit_code})"
+            msg = "Failed: %s (exit code: %d)"
+            raise Failure, format(msg, command.inspect, exit_code)
           end
           exit_code
         end
@@ -35,15 +40,27 @@ module Guard
 
       def _really_run
         env = { "GUARD_RSPEC_RESULTS_FILE" => formatter_tmp_file }
+
+        _warn_unless_absolute_path(formatter_tmp_file)
+
+        Compat::UI.debug("Guard::RSpec: results file: #{formatter_tmp_file}")
+
         pid = Kernel.spawn(env, command) # use spawn to stub in JRuby
         result = ::Process.wait2(pid)
         result.last.exitstatus
       rescue Errno::ENOENT => ex
-        fail Failure, "Failed: #{command.inspect} (#{ex})"
+        raise Failure, "Failed: #{command.inspect} (#{ex})"
       end
 
       def _read_results
         Results.new(formatter_tmp_file)
+      rescue Errno::ENOENT
+        msg = "Guard::RSpec cannot open results file: %s. This is likely a bug"\
+          "so please report this at"\
+          " http://github.com/guard/guard-rspec/issues/new along with as much"\
+          "information as possible to reproduce this issue."
+        Compat::UI.error(format(msg, formatter_tmp_file.inspect))
+        raise
       ensure
         File.delete(formatter_tmp_file) if File.exist?(formatter_tmp_file)
       end
@@ -56,6 +73,14 @@ module Guard
         end
       end
 
+      def _warn_unless_absolute_path(formatter_tmp_file)
+        return if Pathname(formatter_tmp_file).absolute?
+
+        msg = "Guard::RSpec: The results file %s is not an absolute path."\
+          " Please provide an absolute path to avoid issues."
+        Compat::UI.warning(format(msg, formatter_tmp_file.inspect))
+      end
+
       attr_reader :command
       attr_reader :exit_code
       attr_reader :formatter_tmp_file

data/lib/guard/rspec/runner.rb

@@ -15,9 +15,6 @@ module Guard
         end
       end
 
-      # NOTE: must match with const in RSpecFormatter!
-      TEMPORARY_FILE_PATH ||= "tmp/rspec_guard_result".freeze
-
       attr_accessor :options, :inspector, :notifier
 
       def initialize(options = {})
@@ -52,7 +49,7 @@ module Guard
       private
 
       def _run(paths, options, &block)
-        fail NoCmdOptionError unless options[:cmd]
+        raise NoCmdOptionError unless options[:cmd]
         command = Command.new(paths, options)
         _really_run(command, options, &block)
       rescue RSpecProcess::Failure, NoCmdOptionError => ex
@@ -73,11 +70,8 @@ module Guard
         _open_launchy
 
         all_green = process.all_green?
-        if block_given?
-          yield all_green
-        else
-          all_green
-        end
+        return yield all_green if block_given?
+        all_green
       end
 
       def _open_launchy
@@ -88,9 +82,18 @@ module Guard
       end
 
       def _results_file(results_file, chdir)
-        results_file ||= RSpecDefaults::TEMPORARY_FILE_PATH
+        results_file ||= File.expand_path(RSpecDefaults::TEMPORARY_FILE_PATH)
+        return results_file unless Pathname(results_file).relative?
+        results_file = File.join(chdir, results_file) if chdir
         return results_file unless Pathname(results_file).relative?
-        chdir ? File.join(chdir, results_file) : results_file
+
+        unless Pathname(results_file).absolute?
+          msg = "Guard::RSpec: The results file %s is not an absolute path."\
+            " Please provide an absolute path to avoid issues."
+          Compat::UI.warning(format(msg, results_file.inspect))
+        end
+
+        File.expand_path(results_file)
       end
     end
   end

data/lib/guard/rspec/templates/Guardfile

@@ -30,9 +30,9 @@ guard :rspec, cmd: "bundle exec rspec" do
 
   watch(rails.controllers) do |m|
     [
-      rspec.spec.("routing/#{m[1]}_routing"),
-      rspec.spec.("controllers/#{m[1]}_controller"),
-      rspec.spec.("acceptance/#{m[1]}")
+      rspec.spec.call("routing/#{m[1]}_routing"),
+      rspec.spec.call("controllers/#{m[1]}_controller"),
+      rspec.spec.call("acceptance/#{m[1]}")
     ]
   end
 
@@ -42,8 +42,8 @@ guard :rspec, cmd: "bundle exec rspec" do
   watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
 
   # Capybara features specs
-  watch(rails.view_dirs)     { |m| rspec.spec.("features/#{m[1]}") }
-  watch(rails.layouts)       { |m| rspec.spec.("features/#{m[1]}") }
+  watch(rails.view_dirs)     { |m| rspec.spec.call("features/#{m[1]}") }
+  watch(rails.layouts)       { |m| rspec.spec.call("features/#{m[1]}") }
 
   # Turnip features and steps
   watch(%r{^spec/acceptance/(.+)\.feature$})