guard 2.14.1 → 2.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 333a3157cb9d7213ed91accef45785924fd9db23
-  data.tar.gz: 8b434fd66fdc4b04d024b2acf965208ed7513ca0
+SHA256:
+  metadata.gz: c51ad2df488dd4e7fd675358a3277ab105ec798dccffb6e62c9c713ef32fb4aa
+  data.tar.gz: 2d14c133e937b466588d3d6c78892aa8557db8aa8d0649438a90a0156e035ce3
 SHA512:
-  metadata.gz: 0cda152be7d6ae11a64ff0e66c7177812ee2da867a14c591720678c03d19cd006153bfa29abed4cd2e85eb444ad55f50d274ff9bec7eaf1f938968e64284ba6e
-  data.tar.gz: 6194bb82b25b8b4b78cb9c14a919acee55422436a153a903e87b457d085257f442ce27b757abcef73c45a6f7f34b310d8999c9833c3b426f94c60a18ea5cba70
+  metadata.gz: 95881ca9d802a118f575360826d647629d840d902f83599f4225fd683a0d744c00f394ab5a6d60fd39e05723395946897d7921dc4f6e8b81f4a6a1ffa5f1214d
+  data.tar.gz: 55fe2797a631e8d521094bf2bdf5d65a04b897ff75768e2e250438ccccabc3890df269ad585dcd369dde091067eaff7603e4f483a886b12857e55ad4c6b4fe3f

data/README.md

@@ -1,13 +1,10 @@
-## IMPORTANT: [Ruby 2.1 is officially outdated and unsupported!](https://www.ruby-lang.org/en/news/2016/03/30/ruby-2-1-9-released/) Please upgrade to Ruby >=2.3 or >=2.2.6 before installing Guard!
+# Guard
 
-### (To install for older versions, update Bundler at least 1.12: `gem update bundler` and Bundler should correctly resolve to earlier gems for your given Ruby version).
+**IMPORTANT: [Ruby 2.1 is officially outdated and unsupported!](https://www.ruby-lang.org/en/news/2016/03/30/ruby-2-1-9-released/) Please upgrade to Ruby >=2.3 or >=2.2.9 before installing Guard! To install for older versions, update Bundler at least 1.12: `gem update bundler` and Bundler should correctly resolve to earlier gems for your given Ruby version.**
 
 :exclamation: Guard is currently accepting more maintainers. Please [read this](https://github.com/guard/guard/wiki/Maintainers) if you're interested in joining the team.
 
-Guard
-=====
-
-[![Gem Version](https://img.shields.io/gem/v/guard.svg?style=flat)](https://rubygems.org/gems/guard) [![Build Status](https://travis-ci.org/guard/guard.svg)](https://travis-ci.org/guard/guard) [![Dependency Status](https://gemnasium.com/guard/guard.svg)](https://gemnasium.com/guard/guard) [![Code Climate](https://codeclimate.com/github/guard/guard/badges/gpa.svg)](https://codeclimate.com/github/guard/guard) [![Test Coverage](https://codeclimate.com/github/guard/guard/badges/coverage.svg)](https://codeclimate.com/github/guard/guard) [![Inline docs](http://inch-ci.org/github/guard/guard.svg)](http://inch-ci.org/github/guard/guard)
+[![Gem Version](https://img.shields.io/gem/v/guard.svg?style=flat)](https://rubygems.org/gems/guard) [![Build Status](https://travis-ci.org/guard/guard.svg?branch=master)](https://travis-ci.org/guard/guard) [![Code Climate](https://codeclimate.com/github/guard/guard/badges/gpa.svg)](https://codeclimate.com/github/guard/guard) [![Test Coverage](https://codeclimate.com/github/guard/guard/badges/coverage.svg)](https://codeclimate.com/github/guard/guard) [![Inline docs](http://inch-ci.org/github/guard/guard.svg)](http://inch-ci.org/github/guard/guard) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 <img src="http://f.cl.ly/items/0A0M3W2x3I1P450z341U/guard-Icon.png" alt="Guard Icon" align="right" />
 Guard automates various tasks by running custom rules whenever file or directories are modified.
@@ -30,22 +27,21 @@ the following places:
 
 Before you file an issue, make sure you have read the _[known issues](#issues)_ and _[file an issue](#file-an-issue)_ sections that contains some important information.
 
-#### Features
+## Features
 
 * File system changes handled by our awesome [Listen](https://github.com/guard/listen) gem.
 * Support for visual system notifications.
-* Huge eco-system with [more than 220](https://rubygems.org/search?query=guard-) Guard plugins.
-* Tested against Ruby 2.2.6, 2.3.3, 2.4.0, JRuby & Rubinius.
+* Huge eco-system with [more than 300](https://rubygems.org/search?query=guard-) Guard plugins.
+* Tested against the latest Ruby 2.3.x, 2.4.x, 2.5.x, 2.6.x, JRuby & Rubinius. See [`.travis-ci.yml`](https://github.com/guard/guard/blob/master/.travis.yml) for the exact versions.
 
-#### Screencast
+## Screencast
 
 Two nice screencasts are available to help you get started:
 
 * [Guard](http://railscasts.com/episodes/264-guard) on RailsCast.
 * [Guard is Your Best Friend](http://net.tutsplus.com/tutorials/tools-and-tips/guard-is-your-best-friend) on Net Tuts+.
 
-Installation
-------------
+## Installation
 
 The simplest way to install Guard is to use [Bundler](http://bundler.io).
 
@@ -77,11 +73,9 @@ $ bundle exec guard
 
 If you are on Mac OS X and have problems with either Guard not reacting to file
 changes or Pry behaving strange, then you should [add proper Readline support
-to Ruby on Mac OS
-X](https://github.com/guard/guard/wiki/Add-Readline-support-to-Ruby-on-Mac-OS-X).
-
+to Ruby on macOS](https://github.com/guard/guard/wiki/Add-Readline-support-to-Ruby-on-Mac-OS-X).
 
-#### Avoiding gem/dependency problems
+## Avoiding gem/dependency problems
 
 **It's important that you always run Guard through Bundler to avoid errors.**
 
@@ -91,6 +85,10 @@ If you're getting sick of typing `bundle exec` all the time, try one of the foll
   project, which means running `bin/guard` (tab completion will save you a key
   stroke or two) will have the exact same result as `bundle exec guard`.
 
+* Or, you can `alias be="bundle exec"` in your `.bashrc` or similar and the execute only `be guard`.
+  **Protip**: It will work for all comands executed in `bundle exec` context!
+
+
 * Or, for RubyGems >= 2.2.0 (at least, though the more recent the better),
   simply set the `RUBYGEMS_GEMDEPS` environment variable to `-` (for autodetecting
   the Gemfile in the current or parent directories) or set it to the path of your Gemfile.
@@ -101,7 +99,7 @@ If you're getting sick of typing `bundle exec` all the time, try one of the foll
 
 * Or, for RubyGems < 2.2.0 check out the [Rubygems Bundler](https://github.com/rvm/rubygems-bundler).
 
-#### Add Guard plugins
+## Add Guard plugins
 
 Guard is now ready to use and you should add some Guard plugins for your specific use. Start exploring the many Guard
 plugins available by browsing the [Guard organization](https://github.com/guard) on GitHub or by searching for `guard-`
@@ -118,8 +116,7 @@ end
 See the init section of the Guard usage below to see how to install the supplied plugin template that you can install and
 to suit your needs.
 
-Usage
------
+## Usage
 
 Guard is run from the command line. Please open your terminal and go to your project work directory.
 
@@ -133,40 +130,54 @@ Just launch Guard inside your Ruby or Rails project with:
 $ bundle exec guard
 ```
 
-Guard will look for a `Guardfile` in your current directory. If it does not find one, it will look in your `$HOME`
-directory for a `.Guardfile`.
+Guard will look for a `Guardfile` or `guardfile.rb` in your current directory. If it does not find one, it will look
+in your `$HOME` directory for a `.Guardfile`.
 
 Please look here to see all the [command line options for Guard](https://github.com/guard/guard/wiki/Command-line-options-for-Guard)
 
-Interactions
-------------
+## Interactions
+
 Please read how to [interact with Guard](https://github.com/guard/guard/wiki/Interacting-with-Guard) on the console and which [signals](https://github.com/guard/guard/wiki/Interacting-with-Guard#guard-signals) Guard accepts
 
 
-Guardfile DSL
--------------
+## Guardfile DSL
+
 For details on extending your `Guardfile` look at [Guardfile examples](https://github.com/guard/guard/wiki/Guardfile-examples) or look at a list of commands [Guardfile-DSL / Configuring-Guard](https://github.com/guard/guard/wiki/Guardfile-DSL---Configuring-Guard)
 
-Issues
-------
+## Issues
 
 Before reporting a problem, please read how to [File an issue](https://github.com/guard/guard/blob/master/CONTRIBUTING.md#file-an-issue).
 
-Development / Contributing
---------------------------
+## Development / Contributing
 
 See the [Contributing Guide](https://github.com/guard/guard/blob/master/CONTRIBUTING.md#development).
 
-#### Author
+## Releasing
+
+### Prerequisites
+
+* You must have commit rights to the GitHub repository.
+* You must have push rights for rubygems.org.
+
+### How to release
+
+1. Determine which would be the correct next version number according to [semver](http://semver.org/).
+1. Update the version in `./lib/guard/version.rb`.
+1. Commit the version in a single commit, the message should be "Bump VERSION to X.Y.Z".
+1. Push and open a pull request.
+1. Once CI is green, merge the pull request.
+1. Pull the changes locally and run `bundle exec rake release:full`; this will tag, push to GitHub, publish to rubygems.org, and publish the [release notes](https://github.com/guard/guard/releases) .
+
+### Author
 
 [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](https://twitter.com/thibaudgg))
 
-#### Core Team
+### Core Team
 
-* R.I.P. :broken_heart: [Michael Kessler](https://github.com/netzpirat) ([flinkfinger.com](http://www.flinkfinger.com)).
+* R.I.P. :broken_heart: [Michael Kessler](https://github.com/netzpirat).
 * [Rémy Coutable](https://github.com/rymai).
-* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](https://twitter.com/thibaudgg), [thibaud.gg](http://thibaud.gg/)).
+* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](https://twitter.com/thibaudgg), [thibaud.gg](https://thibaud.gg/)).
 
-#### Contributors
+### Contributors
 
 [https://github.com/guard/guard/graphs/contributors](https://github.com/guard/guard/graphs/contributors)

data/bin/guard

@@ -41,10 +41,6 @@ class GuardReloader
       Gem.win_platform?
     end
 
-    def default_system_ruby
-      RbConfig.ruby
-    end
-
     def exit_with(code)
       exit(code)
     end
@@ -98,8 +94,8 @@ class GuardReloader
   end
 
   def auto_restart
-    args = [config.guard_core_path] + config.program_arguments
-    args.unshift(config.default_system_ruby) if config.windows?
+    args = [Gem.ruby, config.guard_core_path] + config.program_arguments
+
     loop do
       exitcode = config.wait_ignoring_interrupts(config.spawn_with(*args))
       config.exit_with(exitcode) if exitcode != 2

data/lib/guard/commander.rb

@@ -47,13 +47,14 @@ module Guard
         exitcode = e.status
       end
 
-      stop
       exitcode
+    ensure
+      stop
     end
 
     def stop
-      listener.stop
-      interactor.background
+      listener&.stop
+      interactor&.background
       UI.debug "Guard stops all plugins"
       Runner.new.run(:stop)
       Notifier.disconnect

data/lib/guard/dsl.rb

@@ -37,7 +37,8 @@ module Guard
   #
   # There are two possible locations for the `Guardfile`:
   #
-  # * The `Guardfile` in the current directory where Guard has been started
+  # * The `Guardfile` or `guardfile.rb` in the current directory where Guard
+  #   has been started
   # * The `.Guardfile` in your home directory.
   #
   # In addition, if a user configuration `.guard.rb` in your home directory is
@@ -68,7 +69,7 @@ module Guard
     #   notification :ruby_gntp, host: '192.168.1.5'
     #
     # @param [Symbol, String] notifier the name of the notifier to use
-    # @param [Hash] options the notification library options
+    # @param [Hash] opts the notification library options
     #
     # @see Guard::Notifier for available notifier and its options.
     #
@@ -349,7 +350,7 @@ module Guard
         options[name] = Regexp.new(list.join("|"), Regexp::IGNORECASE)
       end
 
-      UI.options.merge!(options)
+      UI.options = UI.options.merge(options)
     end
 
     # Sets the default scope on startup
@@ -366,7 +367,7 @@ module Guard
     # @example Scope Guard to multiple plugins
     #   scope plugins: [:jasmine, :rspec]
     #
-    # @param [Hash] scopes the scope for the groups and plugins
+    # @param [Hash] scope the scope for the groups and plugins
     #
     def scope(scope = {})
       # TODO: use a Guardfile::Results class

data/lib/guard/guardfile/evaluator.rb

@@ -18,6 +18,12 @@ module Guard
     class Evaluator
       Deprecated::Evaluator.add_deprecated(self) unless Config.new.strict?
 
+      DEFAULT_GUARDFILES = %w(
+        guardfile.rb
+        Guardfile
+        ~/.Guardfile
+      ).freeze
+
       ERROR_NO_GUARDFILE = "No Guardfile found,"\
         " please create one with `guard init`."
 
@@ -60,7 +66,7 @@ module Guard
           @contents = opts[:contents]
         elsif opts[:guardfile]
           @type = :custom
-          @path = Pathname(opts[:guardfile]) # may be updated by _read
+          @path = Pathname.new(opts[:guardfile]) # may be updated by _read
         end
       end
 
@@ -178,19 +184,21 @@ module Guard
       end
 
       def _use_default!
-        @path, @contents = _read("Guardfile")
-        @type = :default
-      rescue Errno::ENOENT
-        begin
-          @path, @contents = _read("~/.Guardfile")
-          @type = :default
-        rescue Errno::ENOENT
-          fail NoGuardfileError, ERROR_NO_GUARDFILE
+        DEFAULT_GUARDFILES.each do |guardfile|
+          begin
+            @path, @contents = _read(guardfile)
+            @type = :default
+            break
+          rescue Errno::ENOENT
+            if guardfile == DEFAULT_GUARDFILES.last
+              fail NoGuardfileError, ERROR_NO_GUARDFILE
+            end
+          end
         end
       end
 
       def _read(path)
-        full_path = Pathname(path).expand_path
+        full_path = Pathname.new(path.to_s).expand_path
         [full_path, full_path.read]
       rescue Errno::ENOENT
         fail
@@ -202,7 +210,7 @@ module Guard
       end
 
       def _guardfile_contents
-        @user_config ||= Pathname("~/.guard.rb").expand_path.read
+        @user_config ||= Pathname.new("~/.guard.rb").expand_path.read
         [@contents, @user_config].compact.join("\n")
       rescue Errno::ENOENT
         @contents || ""

data/lib/guard/guardfile/generator.rb

@@ -32,11 +32,11 @@ module Guard
 
       # The location of user defined templates
       begin
-        HOME_TEMPLATES = Pathname("~/.guard/templates").expand_path
+        HOME_TEMPLATES = Pathname.new("~/.guard/templates").expand_path
       rescue ArgumentError
         # home isn't defined.  Set to the root of the drive.  Trust that there
         # won't be user defined templates there
-        HOME_TEMPLATES = Pathname("/").expand_path
+        HOME_TEMPLATES = Pathname.new("/").expand_path
       end
 
       class Error < RuntimeError
@@ -63,7 +63,7 @@ module Guard
       # @see Guard::CLI#init
       #
       def create_guardfile
-        path = Pathname("Guardfile").expand_path
+        path = Pathname.new("Guardfile").expand_path
         if path.exist?
           _ui(:error, "Guardfile already exists at #{path}")
           abort
@@ -81,7 +81,7 @@ module Guard
       #   initialize
       #
       def initialize_template(plugin_name)
-        guardfile = Pathname("Guardfile")
+        guardfile = Pathname.new("Guardfile")
 
         plugin_util = PluginUtil.new(plugin_name)
         # TODO: change to "valid?" method

data/lib/guard/jobs/pry_wrapper.rb

@@ -276,11 +276,10 @@ module Guard
       #
       def _prompt(ending_char)
         proc do |target_self, nest_level, pry|
-          history = pry.input_array.size
           process = Guard.listener.paused? ? "pause" : "guard"
           level = ":#{ nest_level }" unless nest_level.zero?
 
-          "[#{ history }] #{ _scope_for_prompt }#{ process }"\
+          "[#{ _history(pry) }] #{ _scope_for_prompt }#{ process }"\
             "(#{ _clip_name(target_self) })#{ level }#{ ending_char } "
         end
       end
@@ -288,6 +287,15 @@ module Guard
       def _clip_name(target)
         Pry.view_clip(target)
       end
+
+      def _history(pry)
+        # https://github.com/pry/pry/blob/5bf2585d0a49a4a3666a9eae80ee31153e3ffcf4/CHANGELOG.md#v0120-november-5-2018
+        if Gem::Version.new(Pry::VERSION) < Gem::Version.new("0.12.0")
+          return pry.input_array.size
+        end
+
+        pry.input_ring.size
+      end
     end
   end
 end

data/lib/guard/notifier.rb

@@ -16,7 +16,7 @@ module Guard
     end
 
     def self.disconnect
-      @notifier.disconnect
+      @notifier && @notifier.disconnect
       @notifier = nil
     end
 

data/lib/guard/plugin_util.rb

@@ -55,7 +55,7 @@ module Guard
     def initialize_plugin(options)
       klass = plugin_class
       fail "Could not load class: #{_constant_name.inspect}" unless klass
-      if klass.superclass.to_s == "Guard::Guard"
+      if klass.ancestors.include?(Guard)
         klass.new(options.delete(:watchers), options)
       else
         begin

data/lib/guard/runner.rb

@@ -11,7 +11,7 @@ module Guard
     #
     # @param [Symbol] task the task to run
     #
-    # @param [Hash] scopes either the Guard plugin or the group to run the task
+    # @param [Hash] scope_hash either the Guard plugin or the group to run the task
     # on
     #
     def run(task, scope_hash = {})
@@ -70,7 +70,7 @@ module Guard
     # When the Group has `:halt_on_fail` disabled, we've to catch
     # `:task_has_failed` here in order to avoid an uncaught throw error.
     #
-    # @param [Guard::Plugin] guard the Guard to execute
+    # @param [Guard::Plugin] plugin guard the Guard to execute
     # @param [Symbol] task the task to run
     # @param [Array] args the arguments for the task
     # @raise [:task_has_failed] when task has failed

data/lib/guard/templates/Guardfile

@@ -3,7 +3,7 @@
 
 ## Uncomment and set this to only include directories you want to watch
 # directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+#  .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
 
 ## Note: if you are using the `directories` clause above and you are not
 ## watching the project directory ('.'), then you will want to move

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.14.1"
+  VERSION = "2.16.1"
 end

data/lib/guard/watcher.rb

@@ -26,6 +26,13 @@ module Guard
       @pattern = Pattern.create(pattern)
     end
 
+    # Compare with other watcher
+    # @param other [Guard::Watcher] other watcher for comparing
+    # @return [true, false] equal or not
+    def ==(other)
+      action == other.action && pattern == other.pattern
+    end
+
     # Finds the files that matches a Guard plugin.
     #
     # @param [Guard::Plugin] guard the Guard plugin which watchers are used

data/lib/guard/watcher/pattern/matcher.rb

@@ -2,10 +2,20 @@ module Guard
   class Watcher
     class Pattern
       class Matcher
+        attr_reader :matcher
+
         def initialize(obj)
           @matcher = obj
         end
 
+        # Compare with other matcher
+        # @param other [Guard::Watcher::Pattern::Matcher]
+        #   other matcher for comparing
+        # @return [true, false] equal or not
+        def ==(other)
+          matcher == other.matcher
+        end
+
         def match(string_or_pathname)
           @matcher.match(normalized(string_or_pathname))
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.14.1
+  version: 2.16.1
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2019-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -62,16 +62,22 @@ dependencies:
   name: lumberjack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.12
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.12
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
@@ -228,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications