guard-test 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ee6274ab427ac89be87d7e4ac1c032c49fb8d6f
-  data.tar.gz: da63a94de78940c70867ab64c8ff96bc85978989
+  metadata.gz: e6545f67730c6d67d0c3019c5a5e474c70d1a7f6
+  data.tar.gz: 761a6bdc0b36ff34f263bcf6f1413d77b9f1923a
 SHA512:
-  metadata.gz: 65bd7b166b2a373fed1cf6f007317ecbc121d791d89382f565927d168474300b9c630ddd6b240138205a2b2cdf3c28b471152aaebd6f7ed3faecd226967f3d97
-  data.tar.gz: 72d16dd4772206a5da9eb63f944d2f8975500a419fc0b30253a0e407350fa61ca0a959f11e72da7ed3eec773354939226099e81da6f0457802378ef29e044ad6
+  metadata.gz: 064846bc8b88760dcb64d2d7732054f1c3ec0a608337b19f06d4e05407c90a2d30ef03231595dc724959ccc764a25f9958f9b2306b9d0fe32f62b88afd529807
+  data.tar.gz: 215c3d18ad61b34dc41dd838df9f905c2bbcdb1c7cba5c9a2954f5eaa5361863a7dfa056e71dc3aa99d0f4e6d932a4f4e292ce3db105f0eda7ee50af2b95477a

data/README.md

@@ -1,11 +1,13 @@
+:exclamation: [Guard::Minitest](https://github.com/guard/guard-minitest) is a better alternative to Guard::Test, you should definitely check it out: https://github.com/guard/guard-minitest. :exclamation:
+
 # Guard::Test
 
 [![Gem Version](https://img.shields.io/gem/v/guard-test.svg?style=flat)](https://rubygems.org/gems/guard-test) [![Build Status](https://travis-ci.org/guard/guard-test.svg?branch=master)](https://travis-ci.org/guard/guard-test) [![Dependency Status](https://gemnasium.com/guard/guard-test.svg)](https://gemnasium.com/guard/guard-test) [![Code Climate](https://codeclimate.com/github/guard/guard-test/badges/gpa.svg)](https://codeclimate.com/github/guard/guard-test) [![Test Coverage](https://codeclimate.com/github/guard/guard-test/badges/coverage.svg)](https://codeclimate.com/github/guard/guard-test)
 
-Guard::Test allows to automatically & intelligently launch tests when files are modified or created.
+Guard::Test allows to automatically & intelligently launch tests when you create or modify files.
 
 * Compatible with Test::Unit 2.
-* Tested against Ruby 1.9.3, 2.0.0, 2.1.0, 2.2.0, Rubinius & JRuby (1.9 mode only).
+* Tested against Ruby 2.1, 2.2, Rubinius & JRuby (1.9 mode only).
 
 ## Install
 
@@ -53,7 +55,7 @@ Or remove the test if it isn't necessary.
 
 Please read the [Guard usage doc](https://github.com/guard/guard#readme).
 
-By default, Guard::Test watch for files matching `test_*.rb` or `*_test{s,}.rb` in the `test` directory (this directory can be changed with the `test_paths` option, see below).
+By default, Guard::Test watch for files matching `test_*.rb` or `*_test{s,}.rb` in the `test` directory (you can change this directory with the `test_paths` option, see below).
 
 ## Guardfile
 

data/lib/guard/test/command.rb

@@ -0,0 +1,25 @@
+module Guard
+  class Test < Plugin
+    class Command < String
+
+      attr_accessor :paths, :options
+
+      def initialize(paths, options = {})
+        @paths = paths
+        @options = options
+        super(_parts.join(' '))
+      end
+
+      private
+
+      def _parts
+        parts = [options[:cmd]]
+        parts << '-Ilib:test'
+        parts << "-r #{File.dirname(__FILE__)}/guard_test_runner.rb"
+        parts << "-e \"%w[#{paths.join(' ')}].each { |p| load p }\""
+        # parts << Array(options[:include]).map { |path| "-I\"#{path}\"" } unless zeus? || spring?
+        parts << '-- --use-color --runner=guard_test'
+      end
+    end
+  end
+end

data/lib/guard/test/deprecator.rb

@@ -0,0 +1,39 @@
+module Guard
+  class Test < Plugin
+    class Deprecator
+      attr_accessor :options
+
+      def self.warns_about_deprecated_options(options = {})
+        new(options).warns_about_deprecated_options
+      end
+
+      def initialize(options = {})
+        @options = options
+      end
+
+      def warns_about_deprecated_options
+        _use_cmd_option
+        _keep_failed_option
+      end
+
+      private
+
+      def _use_cmd_option
+        %w[bundler rubygems cli rvm drb spring zeus include].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.")
+        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-test#list-of-available-options')
+      end
+
+      def _deprecated(message)
+        UI.warning %{Guard::RSpec DEPRECATION WARNING: #{message}}
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+module Guard
+  class Test < Plugin
+    module Inspectors
+
+      class BaseInspector
+        attr_accessor :options, :test_paths
+
+        def initialize(options = {})
+          @options = options
+          @test_paths = @options[:test_paths]
+        end
+
+        def paths(paths)
+          raise _abstract
+        end
+
+        def failed(locations)
+          raise _abstract
+        end
+
+        def reload
+          raise _abstract
+        end
+
+        private
+
+        def _abstract
+          'Must be implemented in subclass'
+        end
+
+        def _clean(paths)
+          cleaned_paths = paths.dup
+
+          paths.each do |path|
+            if _test_folder?(path)
+              cleaned_paths.delete(path)
+              cleaned_paths += _check_test_files(path)
+            else
+              cleaned_paths.delete(path) unless _test_file?(path)
+            end
+          end
+
+          cleaned_paths.uniq!
+          cleaned_paths.compact!
+          _clear_test_files_list
+          puts "cleaned #{cleaned_paths}"
+
+          cleaned_paths.sort - ['test/test_helper.rb']
+        end
+
+        def _test_folder?(path)
+          paths = test_paths.join("|")
+          path.match(%r{^\/?(#{paths})}) && !path.match(/\..+$/) && File.directory?(path)
+        end
+
+        def _test_file?(path)
+          _test_files.include?(path)
+        end
+
+        def _test_files
+          @_test_files ||= test_paths.collect { |path| _check_test_files(path) }.flatten
+        end
+
+        def _clear_test_files_list
+          @_test_files = nil
+        end
+
+        def _check_test_files(path)
+          Dir[File.join(path, '**', 'test_*.rb')] +
+          Dir[File.join(path, '**', '*_test{s,}.rb')]
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'guard/test/inspectors/focused_inspector'
+require 'guard/test/inspectors/keeping_inspector'
+require 'guard/test/inspectors/simple_inspector'
+
+module Guard
+  class Test < 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)
+            end
+          end
+
+          private :new
+        end
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,39 @@
+require 'guard/test/inspectors/base_inspector'
+
+module Guard
+  class Test < 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
+      # until they all pass
+      class FocusedInspector < BaseInspector
+        def initialize(options = {})
+          super
+          @focused_locations = []
+        end
+
+        def paths(paths)
+          if @focused_locations.any?
+            @focused_locations
+          else
+            _clean(paths)
+          end
+        end
+
+        def failed(locations)
+          if locations.empty?
+            @focused_locations = []
+          else
+            @focused_locations = locations if @focused_locations.empty?
+          end
+        end
+
+        def reload
+          @focused_locations = []
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+require 'guard/test/inspectors/base_inspector'
+
+module Guard
+  class Test < Plugin
+    module Inspectors
+
+      # Inspector that remembers all failed paths and
+      # returns that paths in future calls to #paths method
+      # along with any new paths passed as parameter to #paths
+      class KeepingInspector < BaseInspector
+        def initialize(options = {})
+          super
+          @failed_locations = []
+        end
+
+        def paths(paths)
+          _with_failed_locations(_clean(paths))
+        end
+
+        def failed(locations)
+          @failed_locations = locations
+        end
+
+        def reload
+          @failed_locations = []
+        end
+
+        private
+
+        # Return paths + failed locations.
+        # Do not include location in result if its path is already included.
+        def _with_failed_locations(paths)
+          failed_paths = @failed_locations.map { |l| _location_path(l) }
+          (paths | failed_paths).uniq
+        end
+
+        # Extract file path from location
+        def _location_path(location)
+          location.match(/^(\.\/)?(.*?)(:\d+)?$/)[2]
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+require 'guard/test/inspectors/base_inspector'
+
+module Guard
+  class Test < Plugin
+    module Inspectors
+
+      class SimpleInspector < BaseInspector
+        def paths(paths)
+          _clean(paths)
+        end
+
+        def failed(locations)
+          # Don't care
+        end
+
+        def reload
+          # Nothing to reload
+        end
+      end
+
+    end
+  end
+end

data/lib/guard/test/options.rb

@@ -0,0 +1,33 @@
+module Guard
+  class Test
+    module Options
+      DEFAULTS = {
+          all_on_start:   false,
+          all_after_pass: false,
+          run_all:        { message: 'Running all tests' },
+          failed_mode:    :focus, # :keep and :none are other posibilities
+          test_paths:     %w[test],
+          cmd:            'ruby',
+          notification:   true
+      }.freeze
+
+      class << self
+        def with_defaults(options = {})
+          _deep_merge(DEFAULTS, options).freeze
+        end
+
+        private
+
+        def _deep_merge(hash1, hash2)
+          hash1.merge(hash2) do |key, oldval, newval|
+            if oldval.instance_of?(Hash) && newval.instance_of?(Hash)
+              _deep_merge(oldval, newval)
+            else
+              newval
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/guard/test/runner.rb

@@ -100,7 +100,7 @@ module Guard
       def includes_and_requires(paths)
         parts = []
         parts << Array(options[:include]).map { |path| "-I\"#{path}\"" } unless zeus? || spring?
-        parts << paths if zeus? || spring?
+        parts << paths if zeus? || spring? || drb?
         parts << '-r bundler/setup' if bundler?
         parts << '-r rubygems' if rubygems?
 

data/lib/guard/test/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module TestVersion
-    VERSION = '2.0.6'
+    VERSION = '2.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-test
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Rémy Coutable
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -62,9 +62,17 @@ files:
 - LICENSE
 - README.md
 - lib/guard/test.rb
+- lib/guard/test/command.rb
+- lib/guard/test/deprecator.rb
 - lib/guard/test/guard_test_runner.rb
 - lib/guard/test/inspector.rb
+- lib/guard/test/inspectors/base_inspector.rb
+- lib/guard/test/inspectors/factory.rb
+- lib/guard/test/inspectors/focused_inspector.rb
+- lib/guard/test/inspectors/keeping_inspector.rb
+- lib/guard/test/inspectors/simple_inspector.rb
 - lib/guard/test/notifier.rb
+- lib/guard/test/options.rb
 - lib/guard/test/runner.rb
 - lib/guard/test/templates/Guardfile
 - lib/guard/test/version.rb
@@ -88,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Guard plugin for Test::Unit 2