guard-rspec 1.2.2 → 2.0.0

data/README.md

@@ -2,7 +2,7 @@
 
 RSpec guard allows to automatically & intelligently launch specs when files are modified.
 
-* Compatible with RSpec 1.x & RSpec 2.x (>= 2.4 needed for the notification feature).
+* Compatible with RSpec >= 2.11 (use guard-rspec 1.2.x for older release, including RSpec 1.x)
 * Tested against Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest versions of JRuby & Rubinius.
 
 ## Install
@@ -66,14 +66,6 @@ Please read [Guard doc](https://github.com/guard/guard#readme) for more informat
 
 ## Options
 
-By default, Guard::RSpec automatically detect your RSpec version (with the `spec_helper.rb` syntax or with Bundler) but you can force the version with the `:version` option:
-
-``` ruby
-guard 'rspec', :version => 2 do
-  # ...
-end
-```
-
 You can pass any of the standard RSpec CLI options using the `:cli` option:
 
 ``` ruby
@@ -96,6 +88,13 @@ guard 'rspec', :spec_paths => "test" do
   # ...
 end
 ```
+If you want to set an environment variable, you can configure `:env` option with a hash:
+
+``` ruby
+guard 'rspec', :env => {'RAILS_ENV' => 'guard'} do
+  # ...
+end
+```
 [Turnip](https://github.com/jnicklas/turnip) is supported (Ruby 1.9.X only), but you must enable it:
 ``` ruby
 guard 'rspec', :turnip => true do
@@ -109,7 +108,6 @@ Former `:color`, `:drb`, `:fail_fast` and `:formatter` options are deprecated an
 ### List of available options:
 
 ``` ruby
-:version => 1                # force use RSpec version 1, default: 2
 :cli => "-c -f doc"          # pass arbitrary RSpec CLI arguments, default: "-f progress"
 :bundler => false            # use "bundle exec" to run the RSpec command, default: true
 :binstubs => true            # use "bin/rspec" to run the RSpec command (takes precedence over :bundle), default: false

data/lib/guard/rspec.rb

@@ -24,7 +24,7 @@ module Guard
 
     # Call once when guard starts
     def start
-      UI.info "Guard::RSpec is running, with RSpec #{@runner.rspec_version}!"
+      UI.info "Guard::RSpec is running"
       run_all if @options[:all_on_start]
     end
 

data/lib/guard/rspec/formatter.rb

@@ -1,7 +1,14 @@
-require "#{File.dirname(__FILE__)}/../rspec"
+require 'guard/rspec'
 require 'guard/notifier'
+require "rspec/core/formatters/base_formatter"
 
-module Guard::RSpec::Formatter
+class Guard::RSpec::Formatter < RSpec::Core::Formatters::BaseFormatter
+
+  def dump_summary(duration, total, failures, pending)
+    message = guard_message(total, failures, pending, duration)
+    image   = guard_image(failures, pending)
+    notify(message, image)
+  end
 
   def guard_message(example_count, failure_count, pending_count, duration)
     message = "#{example_count} examples, #{failure_count} failures"

data/lib/guard/rspec/runner.rb

@@ -1,12 +1,9 @@
 require 'drb/drb'
-require 'pathname'
-
-require 'rspec/core' rescue LoadError
+require 'rspec'
 
 module Guard
   class RSpec
     class Runner
-      attr_reader :rspec_version
 
       FAILURE_EXIT_CODE = 2
 
@@ -16,6 +13,7 @@ module Guard
           :binstubs     => false,
           :rvm          => nil,
           :cli          => nil,
+          :env          => nil,
           :notification => true,
           :turnip       => false
         }.merge(options)
@@ -38,15 +36,8 @@ module Guard
         end
       end
 
-      def rspec_version
-        @rspec_version ||= @options[:version] || determine_rspec_version
-      end
-
       def rspec_executable
-        @rspec_executable ||= begin
-          exec = rspec_class.downcase
-          binstubs? ? "#{binstubs}/#{exec}" : exec
-        end
+        @rspec_executable ||= binstubs? ? "#{binstubs}/rspec" : "rspec"
       end
 
       def failure_exit_code_supported?
@@ -59,52 +50,32 @@ module Guard
         end
       end
 
-      def rspec_class
-        @rspec_class ||= case rspec_version
-                         when 1
-                           "Spec"
-                         when 2, 3
-                           "RSpec"
-                         end
-      end
-
       def parsed_or_default_formatter
         @parsed_or_default_formatter ||= begin
-          file_name = "#{Dir.pwd}/.rspec"
-          parsed_formatter = if File.exist?(file_name)
-            formatters = File.read(file_name).scan(formatter_regex).flatten
-            formatters.map { |formatter| "-f #{formatter}" }.join(' ')
-          end
-
-          parsed_formatter.nil? || parsed_formatter.empty? ? '-f progress' : parsed_formatter
+          # Use RSpec's parser to parse formatters
+          formatters = ::RSpec::Core::ConfigurationOptions.new([]).parse_options()[:formatters]
+          # Use a default formatter if none exists.
+          # RSpec's parser returns an array in the format [[formatter, output], ...], so match their format
+          formatters = [['progress']] if formatters.nil? || formatters.empty?
+          # Construct a matching command line option, including output target
+          formatters.map { |formatter| "-f #{formatter.join ' -o '}" }.join ' '
         end
       end
 
     private
 
+      def environment_variables
+        return if @options[:env].nil?
+        "export " + @options[:env].map {|key, value| "#{key}=#{value}"}.join(' ') + ';'
+      end
+
       def rspec_arguments(paths, options)
         arg_parts = []
         arg_parts << options[:cli]
         if @options[:notification]
           arg_parts << parsed_or_default_formatter unless options[:cli] =~ formatter_regex
-
-          formatter_file = "(undefined)"
-          formatter_class_name = "(undefined)"
-
-          case rspec_version
-          when 1, 2
-            formatter_class_name = "Guard::RSpec::Formatter::Notification#{rspec_class}"
-            formatter_file = "rspec/formatters/notification_#{rspec_class.downcase}.rb"
-          when 3
-            formatter_class_name = "Guard::RSpecFormatter"
-            formatter_file = "rspec_formatter.rb"
-          else
-            fail "Guard::RSpec fatal error: UNKNOWN RSPEC VERSION: #{rspec_version.inspect}"
-          end
-
-          lib_guard = Pathname(__FILE__).dirname.dirname
-          arg_parts << "-r #{lib_guard + formatter_file}"
-          arg_parts << formatter_arg(formatter_class_name)
+          arg_parts << "-r #{File.dirname(__FILE__)}/formatter.rb"
+          arg_parts << "-f Guard::RSpec::Formatter --out /dev/null"
         end
         arg_parts << "--failure-exit-code #{FAILURE_EXIT_CODE}" if failure_exit_code_supported?
         arg_parts << "-r turnip/rspec" if @options[:turnip]
@@ -113,17 +84,9 @@ module Guard
         arg_parts.compact.join(' ')
       end
 
-      def formatter_arg(formatter_name)
-        case rspec_version
-        when 1
-          "-f #{formatter_name}:/dev/null"
-        when 2, 3
-          "-f #{formatter_name} --out /dev/null"
-        end
-      end
-
       def rspec_command(paths, options)
         cmd_parts = []
+        cmd_parts << environment_variables
         cmd_parts << "rvm #{@options[:rvm].join(',')} exec" if @options[:rvm].respond_to?(:join)
         cmd_parts << "bundle exec" if bundle_exec?
         cmd_parts << rspec_executable
@@ -142,8 +105,7 @@ module Guard
       end
 
       def rspec_command_exited_with_an_exception?
-        return !$?.zero? unless failure_exit_code_supported?
-        $?.exitstatus != FAILURE_EXIT_CODE
+        failure_exit_code_supported? && $?.exitstatus != FAILURE_EXIT_CODE
       end
 
       # We can optimize this path by hitting up the drb server directly, circumventing the overhead
@@ -166,20 +128,15 @@ module Guard
       end
 
       def drb_used?
-        if @drb_used.nil?
-          @drb_used = @options[:cli] && @options[:cli].include?('--drb')
-        else
-          @drb_used
-        end
+        @drb_used ||= @options[:cli] && @options[:cli].include?('--drb')
       end
 
-      # RSpec 1 & 2 use the same DRb call signature, and we can avoid loading a large chunk of rspec
+      # W we can avoid loading a large chunk of rspec
       # just to let DRb know what to do.
       #
       # For reference:
       #
-      # * RSpec 1: https://github.com/myronmarston/rspec-1/blob/master/lib/spec/runner/drb_command_line.rb
-      # * RSpec 2: https://github.com/rspec/rspec-core/blob/master/lib/rspec/core/drb_command_line.rb
+      # * RSpec: https://github.com/rspec/rspec-core/blob/master/lib/rspec/core/drb_command_line.rb
       def drb_service(port)
         require "drb/drb"
 
@@ -199,54 +156,25 @@ module Guard
       end
 
       def bundler_allowed?
-        if @bundler_allowed.nil?
-          @bundler_allowed = File.exist?("#{Dir.pwd}/Gemfile")
-        else
-          @bundler_allowed
-        end
+        @bundler_allowed ||= File.exist?("#{Dir.pwd}/Gemfile")
       end
 
       def bundler?
-        if @bundler.nil?
-          @bundler = bundler_allowed? && @options[:bundler]
-        else
-          @bundler
-        end
+        @bundler ||= bundler_allowed? && @options[:bundler]
       end
 
       def binstubs?
-        if @binstubs.nil?
-          @binstubs = !!@options[:binstubs]
-        else
-          @binstubs
-        end
+        @binstubs ||= !!@options[:binstubs]
       end
 
       def binstubs
-        if @options[:binstubs] == true
-          "bin"
-        else
-          @options[:binstubs]
-        end
+        @options[:binstubs] == true ? "bin" : @options[:binstubs]
       end
 
       def bundle_exec?
         bundler? && !binstubs?
       end
 
-      def determine_rspec_version
-        Integer(::RSpec::Core::Version::STRING.split(".").first)
-      rescue NameError
-        if File.exist?("#{Dir.pwd}/spec/spec_helper.rb")
-          File.new("#{Dir.pwd}/spec/spec_helper.rb").read.include?("Spec::Runner") ? 1 : 2
-        elsif bundler_allowed?
-          ENV['BUNDLE_GEMFILE'] = "#{Dir.pwd}/Gemfile"
-          /[\/ ]rspec-1\./ =~ `bundle show rspec 2>&1` ? 1 : 2
-        else
-          2
-        end
-      end
-
       def deprecations_warnings
         [:color, :drb, [:fail_fast, "fail-fast"], [:formatter, "format"]].each do |option|
           key, value = option.is_a?(Array) ? option : [option, option.to_s]
@@ -255,12 +183,15 @@ module Guard
             UI.info %{DEPRECATION WARNING: The :#{key} option is deprecated. Pass standard command line argument "--#{value}" to RSpec with the :cli option.}
           end
         end
+        if @options.key?(:version)
+            @options.delete(:version)
+            UI.info %{DEPRECATION WARNING: The :version option is deprecated. Only RSpec 2 is now supported.}
+        end
       end
 
       def formatter_regex
         @formatter_regex ||= /(?:^|\s)(?:-f\s*|--format(?:=|\s+))([\w:]+)/
       end
-
     end
   end
 end

data/lib/guard/rspec/templates/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec', :version => 2 do
+guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
@@ -10,10 +10,10 @@ guard 'rspec', :version => 2 do
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('config/routes.rb')                           { "spec/routing" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  
+
   # Capybara request specs
   watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-  
+
   # Turnip features and steps
   watch(%r{^spec/acceptance/(.+)\.feature$})
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }

data/lib/guard/rspec/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module RSpecVersion
-    VERSION = "1.2.2"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,57 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: guard-rspec
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: '2.11'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '1.1'
 description: Guard::RSpec automatically run your specs (much like autotest).
 email:
 - thibaud@thibaud.me
@@ -59,45 +66,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- lib/guard/rspec.rb
-- lib/guard/rspec/command.rb.orig
-- lib/guard/rspec/dsl.rb.orig
 - lib/guard/rspec/formatter.rb
-- lib/guard/rspec/formatters/notification_rspec.rb
-- lib/guard/rspec/formatters/notification_spec.rb
 - lib/guard/rspec/inspector.rb
-- lib/guard/rspec/results.rb.orig
 - lib/guard/rspec/runner.rb
-- lib/guard/rspec/runner.rb.orig
 - lib/guard/rspec/templates/Guardfile
-- lib/guard/rspec/templates/Guardfile.orig
 - lib/guard/rspec/version.rb
-- lib/guard/rspec/version.rb.orig
-- lib/guard/rspec_formatter.rb
-- lib/guard/rspec_formatter.rb.orig
+- lib/guard/rspec.rb
+- LICENSE
+- README.md
 homepage: http://rubygems.org/gems/guard-rspec
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-rspec
-rubygems_version: 2.4.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Guard gem for RSpec
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8b5d7c7623699fd71c39dc1e907b04b7a50600ca
-  data.tar.gz: 8acb79a0ea41075758dbb6ad22c9a4b2619140fa
-SHA512:
-  metadata.gz: 07d0e950425323cfb7198bee3566e923a24b07e342554776a51bb1a341f2b2d132ffecfde4b5b91e29f96012ae97d8f72af657d643d852de2e7973aa1a23a012
-  data.tar.gz: 364fa4dc0e0acf4d75e39df847f415080562f58fb70c937a27a85fc040fdb5e4c8be82a87e21f7436f9bf7c08e555e96e7d223af640727e72f4980fab3379b4c

data/lib/guard/rspec/command.rb.orig

@@ -1,70 +0,0 @@
-require "rspec/core"
-require "pathname"
-
-require "guard/rspec"
-
-module Guard
-  class RSpec < Plugin
-    class Command < String
-      FAILURE_EXIT_CODE = 2
-
-      attr_accessor :paths, :options
-
-      def initialize(paths, options = {})
-        @paths = paths
-        @options = options
-        super(_parts.join(" "))
-      end
-
-      private
-
-      def _parts
-        parts = [options[:cmd]]
-        parts << _visual_formatter
-        parts << _guard_formatter
-        parts << "--failure-exit-code #{FAILURE_EXIT_CODE}"
-        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"
-      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
-        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
-
-        return formatters unless formatters
-        formatters.map { |entries| "-f #{entries.join " -o "}" }.join(" ")
-      end
-
-      def _cmd_include_formatter?
-        options[:cmd] =~ /(?:^|\s)(?:-f\s*|--format(?:=|\s+))([\w:]+)/
-      end
-
-      def _guard_formatter
-        dir = Pathname.new(__FILE__).dirname.dirname
-        "-r #{dir + "rspec_formatter.rb"} -f Guard::RSpecFormatter"
-      end
-    end
-  end
-end

data/lib/guard/rspec/dsl.rb.orig

@@ -1,52 +0,0 @@
-require "ostruct"
-
-require "guard/rspec"
-
-module Guard
-  class RSpec < Plugin
-    class Dsl
-      def initialize(dsl)
-        @dsl = dsl
-      end
-
-      def watch_spec_files_for(expr)
-        @dsl.send(:watch, expr) { |m| rspec.spec.(m[1]) }
-      end
-
-      def rspec
-        @rspec ||= OpenStruct.new(to_s: "spec").tap do |rspec|
-          rspec.spec_dir = "spec"
-          rspec.spec = ->(m) { "#{rspec.spec_dir}/#{m}_spec.rb" }
-          rspec.spec_helper = "#{rspec.spec_dir}/spec_helper.rb"
-          rspec.spec_files = %r{^#{rspec.spec_dir}/.+_spec\.rb$}
-          rspec.spec_support = %r{^#{rspec.spec_dir}/support/(.+)\.rb$}
-        end
-      end
-
-      def ruby
-        # Ruby apps
-        @ruby || OpenStruct.new.tap do |ruby|
-          ruby.lib_files = %r{^(lib/.+)\.rb$}
-        end
-      end
-
-      def rails(options = {})
-        # Rails example
-        @rails ||= OpenStruct.new.tap do |rails|
-          exts = options.dup.delete(:view_extensions) || %w(erb haml slim)
-
-          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.controllers = %r{^app/controllers/(.+)_controller\.rb$}
-          rails.routes = "config/routes.rb"
-          rails.app_controller = "app/controllers/application_controller.rb"
-          rails.spec_helper = "#{rspec.spec_dir}/rails_helper.rb"
-        end
-      end
-    end
-  end
-end

data/lib/guard/rspec/formatters/notification_rspec.rb

@@ -1,13 +0,0 @@
-require "#{File.dirname(__FILE__)}/../formatter"
-require "rspec/core/formatters/base_formatter"
-
-class Guard::RSpec::Formatter::NotificationRSpec < RSpec::Core::Formatters::BaseFormatter
-  include Guard::RSpec::Formatter
-
-  def dump_summary(duration, total, failures, pending)
-    message = guard_message(total, failures, pending, duration)
-    image   = guard_image(failures, pending)
-    notify(message, image)
-  end
-
-end

data/lib/guard/rspec/formatters/notification_spec.rb

@@ -1,13 +0,0 @@
-require "#{File.dirname(__FILE__)}/../formatter"
-require "spec/runner/formatter/base_formatter"
-
-class Guard::RSpec::Formatter::NotificationSpec < Spec::Runner::Formatter::BaseFormatter
-  include Guard::RSpec::Formatter
-
-  def dump_summary(duration, total, failures, pending)
-    message = guard_message(total, failures, pending, duration)
-    image   = guard_image(failures, pending)
-    notify(message, image)
-  end
-
-end

data/lib/guard/rspec/runner.rb.orig

@@ -1,118 +0,0 @@
-require "guard/rspec/inspectors/factory"
-require "guard/rspec/command"
-require "guard/rspec/notifier"
-
-module Guard
-  class RSpec < Plugin
-    class Runner
-      # NOTE: must match with const in RspecFormatter!
-      TEMPORARY_FILE_PATH ||= "tmp/rspec_guard_result"
-
-      attr_accessor :options, :inspector, :notifier
-
-      def initialize(options = {})
-        @options = options
-        @inspector = Inspectors::Factory.create(@options)
-        @notifier = Notifier.new(@options)
-      end
-
-      def run_all
-        paths = options[:spec_paths]
-        options = @options.merge(@options[:run_all])
-        return true if paths.empty?
-        Compat::UI.info(options[:message], reset: true)
-        _run(true, paths, options)
-      end
-
-      def run(paths)
-        paths = inspector.paths(paths)
-        return true if paths.empty?
-        Compat::UI.info("Running: #{paths.join(" ")}", reset: true)
-        _run(false, paths, options)
-      end
-
-      def reload
-        inspector.reload
-      end
-
-      private
-
-      def _run(all, paths, options)
-        return unless _cmd_option_present(options)
-        command = Command.new(paths, options)
-
-        _without_bundler_env { Kernel.system(command) }.tap do |success|
-          _process_run_result(success, all)
-        end
-      end
-
-      def _without_bundler_env
-        if defined?(::Bundler)
-          ::Bundler.with_clean_env { yield }
-        else
-          yield
-        end
-      end
-
-      def _cmd_option_present(options)
-        return true if options[:cmd]
-        Compat::UI.error("No cmd option specified, unable to run specs!")
-        notifier.notify_failure
-        false
-      end
-
-      def _command_success?(success)
-        return false if success.nil?
-        [Command::FAILURE_EXIT_CODE, 0].include?($CHILD_STATUS.exitstatus)
-      end
-
-      def _command_output
-        formatter_tmp_file = _tmp_file(options[:chdir])
-        lines = File.readlines(formatter_tmp_file)
-        summary = lines.first.strip
-        failed_paths = lines[1..11].map(&:strip).compact
-
-        [summary, failed_paths]
-      rescue
-        [nil, nil]
-      ensure
-        File.delete(formatter_tmp_file) if File.exist?(formatter_tmp_file)
-      end
-
-      def _open_launchy
-        return unless options[:launchy]
-        require "launchy"
-        pn = Pathname.new(options[:launchy])
-        ::Launchy.open(options[:launchy]) if pn.exist?
-      end
-
-      def _run_all_after_pass
-        return unless options[:all_after_pass]
-        run_all
-      end
-
-      def _process_run_result(result, all)
-        unless _command_success?(result)
-          notifier.notify_failure
-          return
-        end
-
-        summary, failed_paths = _command_output
-        unless summary && failed_paths
-          notifier.notify_failure
-          return
-        end
-
-        inspector.failed(failed_paths)
-        notifier.notify(summary)
-        _open_launchy
-
-        _run_all_after_pass if !all && result
-      end
-
-      def _tmp_file(chdir)
-        chdir ? File.join(chdir, TEMPORARY_FILE_PATH) : TEMPORARY_FILE_PATH
-      end
-    end
-  end
-end

data/lib/guard/rspec/templates/Guardfile.orig

@@ -1,52 +0,0 @@
-# Note: The cmd option is now required due to the increasing number of ways
-#       rspec may be run, below are examples of the most common uses.
-#  * bundler: 'bundle exec rspec'
-#  * bundler binstubs: 'bin/rspec'
-#  * spring: 'bin/rspec' (This will use spring if running and you have
-#                          installed the spring binstubs per the docs)
-#  * zeus: 'zeus rspec' (requires the server to be started separately)
-#  * 'just' rspec: 'rspec'
-
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
-  dsl = Guard::RSpec::Dsl.new(self)
-
-  # Feel free to open issues for suggestions and improvements
-
-  # RSpec files
-  rspec = dsl.rspec
-  watch(rspec.spec_helper) { rspec.spec_dir }
-  watch(rspec.spec_support) { rspec.spec_dir }
-  watch(rspec.spec_files)
-
-  # Ruby files
-  ruby = dsl.ruby
-  dsl.watch_spec_files_for(ruby.lib_files)
-
-  # Rails files
-  rails = dsl.rails(view_extensions: %w(erb haml slim))
-  dsl.watch_spec_files_for(rails.app_files)
-  dsl.watch_spec_files_for(rails.views)
-
-  watch(rails.controllers) do |m|
-    [
-      rspec.spec.("routing/#{m[1]}_routing"),
-      rspec.spec.("controllers/#{m[1]}_controller"),
-      rspec.spec.("acceptance/#{m[1]}")
-    ]
-  end
-
-  # Rails config changes
-  watch(rails.spec_helper)     { rspec.spec_dir }
-  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
-  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
-
-  # Capybara features specs
-  watch(rails.view_dirs)     { |m| rspec.spec.("features/#{m[1]}") }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
-    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
-  end
-end

data/lib/guard/rspec/version.rb.orig

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

data/lib/guard/rspec_formatter.rb

@@ -1,113 +0,0 @@
-# NOTE: This class only exists for RSpec and should not be used by
-# other classes in this project!
-
-require "pathname"
-require "fileutils"
-
-#require "rspec"
-require "rspec/core/formatters/base_formatter"
-
-module Guard
-  class RSpecFormatter < ::RSpec::Core::Formatters::BaseFormatter
-    TEMPORARY_FILE_PATH ||= "tmp/rspec_guard_result"
-
-    def self.rspec_3?
-      ::RSpec::Core::Version::STRING.split(".").first == "3"
-    end
-
-    if rspec_3?
-      ::RSpec::Core::Formatters.register self, :dump_summary, :example_failed
-
-      def example_failed(failure)
-        examples.push failure.example
-      end
-
-      def examples
-        @examples ||= []
-      end
-    end
-
-    # rspec issue https://github.com/rspec/rspec-core/issues/793
-    def self.extract_spec_location(metadata)
-      root_metadata = metadata
-      location = metadata[:location]
-
-      until spec_path?(location)
-        metadata = metadata[:example_group]
-
-        unless metadata
-          STDERR.puts "no spec file found for #{root_metadata[:location]}"
-          return root_metadata[:location]
-        end
-
-        # rspec issue https://github.com/rspec/rspec-core/issues/1243
-        location = (metadata[:location] || "").split(":").first
-      end
-
-      location
-    end
-
-    def self.spec_path?(path)
-      path ||= ""
-      flags = File::FNM_PATHNAME | File::FNM_DOTMATCH
-      if File.const_defined?(:FNM_EXTGLOB) # ruby >= 2
-        flags |= File::FNM_EXTGLOB
-      end
-      pattern = ::RSpec.configuration.pattern
-      path = path.sub(/:\d+\z/, "")
-      path = Pathname.new(path).cleanpath.to_s
-      File.fnmatch(pattern, path, flags)
-    end
-
-    def dump_summary(*args)
-      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|
-        f.puts _message(total, failures, pending, duration)
-        f.puts _failed_paths.join("\n") if failures > 0
-      end
-    end
-
-    def _write(&block)
-      file = File.expand_path(TEMPORARY_FILE_PATH)
-      FileUtils.mkdir_p(File.dirname(file))
-      File.open(file, "w", &block)
-    end
-
-    def _failed_paths
-      klass = self.class
-      failed = examples.select { |example| _status_failed?(example) }
-      failed.map { |e| klass.extract_spec_location(e.metadata) }.sort.uniq
-    end
-
-    def _message(example_count, failure_count, pending_count, duration)
-      message = "#{example_count} examples, #{failure_count} failures"
-      if pending_count > 0
-        message << " (#{pending_count} pending)"
-      end
-      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/lib/guard/rspec_formatter.rb.orig

@@ -1,116 +0,0 @@
-# NOTE: This class only exists for RSpec and should not be used by
-# other classes in this project!
-
-require "pathname"
-require "fileutils"
-
-require "rspec"
-require "rspec/core/formatters/base_formatter"
-
-module Guard
-  class RSpecFormatter < ::RSpec::Core::Formatters::BaseFormatter
-    TEMPORARY_FILE_PATH ||= "tmp/rspec_guard_result"
-
-    def self.rspec_3?
-      ::RSpec::Core::Version::STRING.split(".").first == "3"
-    end
-
-    if rspec_3?
-      ::RSpec::Core::Formatters.register self, :dump_summary, :example_failed
-
-      def example_failed(failure)
-        examples.push failure.example
-      end
-
-      def examples
-        @examples ||= []
-      end
-    end
-
-    # rspec issue https://github.com/rspec/rspec-core/issues/793
-    def self.extract_spec_location(metadata)
-      root_metadata = metadata
-      location = metadata[:location]
-
-      until spec_path?(location)
-        metadata = metadata[:example_group]
-
-        unless metadata
-          STDERR.puts "no spec file found for #{root_metadata[:location]}"
-          return root_metadata[:location]
-        end
-
-        # rspec issue https://github.com/rspec/rspec-core/issues/1243
-        location = (metadata[:location] || "").split(":").first
-      end
-
-      location
-    end
-
-    def self.spec_path?(path)
-      path ||= ""
-      flags = File::FNM_PATHNAME | File::FNM_DOTMATCH
-      if File.const_defined?(:FNM_EXTGLOB) # ruby >= 2
-        flags |= File::FNM_EXTGLOB
-      end
-      pattern = ::RSpec.configuration.pattern
-      path = path.sub(/:\d+\z/, "")
-      path = Pathname.new(path).cleanpath.to_s
-      File.fnmatch(pattern, path, flags)
-    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
-    end
-
-    # Write summary to temporary file for runner
-    def write_summary(duration, total, failures, pending)
-      _write do |f|
-        f.puts _message(total, failures, pending, duration)
-        f.puts _failed_paths.join("\n") if failures > 0
-      end
-    end
-
-    private
-
-    def _write(&block)
-      file = File.expand_path(TEMPORARY_FILE_PATH)
-      FileUtils.mkdir_p(File.dirname(file))
-      File.open(file, "w", &block)
-    end
-
-    def _failed_paths
-      failed = examples.select do |e|
-        if self.class.rspec_3?
-          e.execution_result.status.to_s == "failed"
-        else
-          e.execution_result[:status].to_s == "failed"
-        end
-      end
-
-      klass = self.class
-      failed.map { |e| klass.extract_spec_location(e.metadata) }.sort.uniq
-    end
-
-    def _message(example_count, failure_count, pending_count, duration)
-      message = "#{example_count} examples, #{failure_count} failures"
-      if pending_count > 0
-        message << " (#{pending_count} pending)"
-      end
-      message << " in #{duration.round(4)} seconds"
-      message
-    end
-  end
-end