guard 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c6b3428b071bd5e34a0b9a05235d5814f7fe190
-  data.tar.gz: 19dae3ff061b4d697789e01dcfd3a4558047672e
+  metadata.gz: ee12e6183bd7f80c82c6c173e73da077423efd8b
+  data.tar.gz: 658e7a0eaf51b6d4ba16cf8126f1cebe9ef75e10
 SHA512:
-  metadata.gz: f539620c78fa10c40df9b8fb11bab2519772b6f2ad1c3839c964f1e2efda97e0ab10397baa591dc036552b30c77ef91e05e1901912db83a55527a01798070eb9
-  data.tar.gz: f234c272662f566f641a3fb684d010291c809630e5b4fc6ee6fc7bb8b0a0e1c2a859e64c5d6b892b8ed1d447287bc71fe3488d1846f3874bd498599ab6a6ea59
+  metadata.gz: 7d40ddd8ef223df2e0bbf59791583eeaf4b460eac7a32a674e3b2d16c51ca9f8158b71b1458c605c0a3e9b078d724362443ea1f7dd73a3a85e419ff6fbc28fa8
+  data.tar.gz: 5fb257cf77358225a124a6b659812e78f9aea514c66578993f1b8d2dd874b7f0a174e68d3d8fda209dc515674897b72e32775f6c0d8186db36dfdfedd29e7f17

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2014 Thibaud Guillaume-Gentil
+Copyright (c) 2009-2016 Thibaud Guillaume-Gentil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,14 +1,15 @@
-:exclamation::exclamation: Guard is [currently accepting more maintainers/contributors](https://groups.google.com/forum/#!topic/guard-dev/2Td0QTvTIsE). :exclamation::exclamation: 
+## 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.2 before installing Guard!
 
+### (To install for older versions, update Bundler to a prerelease version: `gem install bundler --pre` and Bundler should correctly resolve to an earlier gems for your given Ruby version).
 
-:exclamation::exclamation: Please [contact me](mailto:thibaud@thibaud.gg) or [Cezary Baginski](mailto:cezary@chronomantic.net) if you're interested in joining the team. :exclamation::exclamation:
+: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.png)](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)
 
-<img src="http://cl.ly/image/1k3o1r2Z3a0J/guard-Icon.png" alt="Guard Icon" align="right" />
+<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.
 
 It's frequently used by software developers, web designers, writers and other specialists to avoid mundane, repetitive actions and commands such as "relaunching" tools after changing source files or configurations.
@@ -22,7 +23,7 @@ any questions about Guard or want to share some information with the Guard commu
 the following places:
 
 * [Guard Wiki](https://github.com/guard/guard/wiki)
-* [Google+ community](https://plus.google.com/u/1/communities/110022199336250745477).
+* [Google+ community](https://plus.google.com/communities/110022199336250745477).
 * [Google group](http://groups.google.com/group/guard-dev).
 * [StackOverflow](http://stackoverflow.com/questions/tagged/guard).
 * IRC channel `#guard` (irc.freenode.net) for chatting.
@@ -46,7 +47,7 @@ Two nice screencasts are available to help you get started:
 Installation
 ------------
 
-The simplest way to install Guard is to use [Bundler](http://gembundler.com/).
+The simplest way to install Guard is to use [Bundler](http://bundler.io).
 
 Add Guard (and any other dependencies) to a `Gemfile` in your project’s root:
 
@@ -98,7 +99,7 @@ If you're getting sick of typing `bundle exec` all the time, try one of the foll
 
 *NOTE: this Rubygems feature is still under development still lacks many features of bundler*
 
-* Or, for RubyGems < 2.2.0 check out the [Rubygems Bundler](https://github.com/mpapis/rubygems-bundler).
+* Or, for RubyGems < 2.2.0 check out the [Rubygems Bundler](https://github.com/rvm/rubygems-bundler).
 
 #### Add Guard plugins
 
@@ -156,26 +157,15 @@ Development / Contributing
 
 See the [Contributing Guide](https://github.com/guard/guard/blob/master/CONTRIBUTING.md#development).
 
-
-#### Open Commit Bit
-
-Guard has an open commit bit policy: Anyone with an accepted pull request gets added as a repository collaborator.
-Please try to follow these simple rules:
-
-* Commit directly onto the master branch only for typos, improvements to the readme and documentation (please add
-  `[ci skip]` to the commit message).
-* Create a feature branch and open a pull-request early for any new features to get feedback.
-* Make sure you adhere to the general pull request rules above.
-
 #### Author
 
-[Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg))
+[Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](https://twitter.com/thibaudgg))
 
 #### Core Team
 
-* R.I.P. :broken_heart: [Michael Kessler](https://github.com/netzpirat) ([@netzpirat](http://twitter.com/netzpirat), [flinkfinger.com](http://www.flinkfinger.com)).
+* R.I.P. :broken_heart: [Michael Kessler](https://github.com/netzpirat) ([flinkfinger.com](http://www.flinkfinger.com)).
 * [Rémy Coutable](https://github.com/rymai).
-* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg), [thibaud.gg](http://thibaud.gg/)).
+* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](https://twitter.com/thibaudgg), [thibaud.gg](http://thibaud.gg/)).
 
 #### Contributors
 

data/lib/guard.rb

@@ -151,7 +151,8 @@ module Guard
     # TODO: not tested because collides with ongoing refactoring
     def _guardfile_deprecated_check(modified)
       modified.map!(&:to_s)
-      guardfiles = modified.select { |path| /^(?:.+\/)?Guardfile$/.match(path) }
+      regexp = %r{^(?:.+/)?Guardfile$}
+      guardfiles = modified.select { |path| regexp.match(path) }
       return if guardfiles.empty?
 
       guardfile = Pathname("Guardfile").realpath
@@ -159,14 +160,10 @@ module Guard
         /^Guardfile$/.match(path) || Pathname(path).expand_path == guardfile
       end
 
-      if real_guardfiles
-        UI.warning "Guardfile changed -- _guard-core will exit.\n"
-        exit 2 # nonzero to break any while loop
-      else # e.g. templates/Guardfile
-        msg = "Config changed: %s - Guard will exit so it can be restarted."
-        UI.info format(msg, guardfiles.inspect)
-        exit 0 # 0 so any shell while loop can continue
-      end
+      return unless real_guardfiles
+
+      UI.warning "Guardfile changed -- _guard-core will exit.\n"
+      exit 2 # nonzero to break any while loop
     end
   end
 end

data/lib/guard/cli/environments/valid.rb

@@ -46,13 +46,19 @@ module Guard
           rescue Guard::Guardfile::Evaluator::NoPluginsError
           end
 
-          if plugin_names.empty?
-            generator.initialize_all_templates
-          else
-            plugin_names.each do |plugin_name|
-              generator.initialize_template(plugin_name)
+          begin
+            if plugin_names.empty?
+              generator.initialize_all_templates
+            else
+              plugin_names.each do |plugin_name|
+                generator.initialize_template(plugin_name)
+              end
             end
+          rescue Guardfile::Generator::Error => e
+            UI.error(e.message)
+            return 1
           end
+
           # TODO: capture exceptions to show msg and return exit code on
           # failures
           0 # exit code

data/lib/guard/commander.rb

@@ -92,7 +92,7 @@ module Guard
       return if pause == paused
 
       listener.public_send(pause ? :pause : :start)
-      UI.info "File modification listening is now #{pause.to_s.upcase}"
+      UI.info "File event handling has been #{pause ? 'paused' : 'resumed'}"
     end
 
     def show

data/lib/guard/deprecated/evaluator.rb

@@ -29,7 +29,7 @@ module Guard
       end
 
       def reevaluate_guardfile
-        # require guard only when needed, becuase
+        # require guard only when needed, because
         # guard's deprecations require us
         require "guard"
         UI.deprecation(REEVALUATE_GUARDFILE)

data/lib/guard/deprecated/guard.rb

@@ -1,6 +1,8 @@
 require "guard/config"
 fail "Deprecations disabled (strict mode)" if Guard::Config.new.strict?
 
+require "forwardable"
+
 require "guard/ui"
 require "guard/internals/session"
 require "guard/internals/state"
@@ -209,9 +211,9 @@ module Guard
               }
             end
 
-            def to_a
-              to_hash.to_a
-            end
+            extend Forwardable
+            delegate [:to_a, :keys] => :to_hash
+            delegate [:include?] => :keys
 
             def fetch(key, *args)
               hash = to_hash
@@ -230,14 +232,6 @@ module Guard
               end
             end
 
-            def keys
-              to_hash.keys
-            end
-
-            def include?(value)
-              keys.include? value
-            end
-
             private
 
             def verify_key!(hash, key)

data/lib/guard/deprecated/watcher.rb

@@ -4,8 +4,8 @@ fail "Deprecations disabled (strict mode)" if Guard::Config.new.strict?
 module Guard
   module Deprecated
     module Watcher
-      def self.add_deprecated(dsl_klass)
-        dsl_klass.send(:extend, ClassMethods)
+      def self.add_deprecated(klass)
+        klass.send(:extend, ClassMethods)
       end
 
       module ClassMethods

data/lib/guard/dsl.rb

@@ -326,7 +326,7 @@ module Guard
         options[:level] = options[:level].to_sym
 
         unless [:debug, :info, :warn, :error].include? options[:level]
-          UI.warning WARN_INVALID_LOG_LEVEL % [options[:level]]
+          UI.warning(format(WARN_INVALID_LOG_LEVEL, options[:level]))
           options.delete :level
         end
       end

data/lib/guard/guardfile/evaluator.rb

@@ -58,11 +58,9 @@ module Guard
         if opts[:contents]
           @type = :inline
           @contents = opts[:contents]
-        else
-          if opts[:guardfile]
-            @type = :custom
-            @path = Pathname(opts[:guardfile]) # may be updated by _read
-          end
+        elsif opts[:guardfile]
+          @type = :custom
+          @path = Pathname(opts[:guardfile]) # may be updated by _read
         end
       end
 
@@ -162,7 +160,7 @@ module Guard
         source_from_option = @source.nil? && options[:guardfile_contents]
         inline = @source == :inline
 
-        return false unless (source_from_option) || inline
+        return false unless source_from_option || inline
 
         @source = :inline
         @guardfile_contents = options[:guardfile_contents]

data/lib/guard/guardfile/generator.rb

@@ -27,7 +27,8 @@ module Guard
       # The Guardfile template for `guard init`
       GUARDFILE_TEMPLATE = File.expand_path(
         "../../../guard/templates/Guardfile",
-        __FILE__)
+        __FILE__
+      )
 
       # The location of user defined templates
       begin
@@ -38,6 +39,24 @@ module Guard
         HOME_TEMPLATES = Pathname("/").expand_path
       end
 
+      class Error < RuntimeError
+      end
+
+      class NoSuchPlugin < Error
+        attr_reader :plugin_name, :class_name
+
+        def initialize(plugin_name)
+          @plugin_name = plugin_name
+          @class_name = plugin_name.delete("-").capitalize
+        end
+
+        def message
+          "Could not load 'guard/#{plugin_name}'"\
+          " or '~/.guard/templates/#{plugin_name}'"\
+          " or find class Guard::#{class_name}\n"
+        end
+      end
+
       # Creates the initial Guardfile template when it does not
       # already exist.
       #
@@ -86,14 +105,8 @@ module Guard
 
         _ui(:info, format(INFO_TEMPLATE_ADDED, plugin_name))
 
-      rescue Errno::ENOENT => error
-
-        name = plugin_name.downcase
-        class_name = name.gsub("-", "").capitalize
-        _ui(:error, "Could not load 'guard/#{name}'"\
-            " or '~/.guard/templates/#{name}'"\
-            " or find class Guard::#{class_name}")
-        _ui(:error, "Error is: #{error}")
+      rescue Errno::ENOENT
+        fail NoSuchPlugin, plugin_name.downcase
       end
 
       # Adds the templates of all installed Guard implementations to an

data/lib/guard/interactor.rb

@@ -1,3 +1,5 @@
+require "forwardable"
+
 module Guard
   class Interactor
     # Initializes the interactor. This configures
@@ -19,19 +21,8 @@ module Guard
       @interactive
     end
 
-    # Run in foreground and wait until interrupted or closed
-    def foreground
-      idle_job.foreground
-    end
-
-    # Remove interactor so other tasks can run in foreground
-    def background
-      idle_job.background
-    end
-
-    def handle_interrupt
-      idle_job.handle_interrupt
-    end
+    extend Forwardable
+    delegate [:foreground, :background, :handle_interrupt] => :idle_job
 
     # TODO: everything below is just so the DSL can set options
     # before setup() is called, which makes it useless for when

data/lib/guard/internals/debugging.rb

@@ -13,6 +13,7 @@ module Guard
       class << self
         TRACES = [
           [Kernel, :system],
+          [Kernel, :spawn],
           [Kernel, :`],
           [Open3, :popen3]
         ]

data/lib/guard/internals/groups.rb

@@ -28,9 +28,9 @@ module Guard
       def matcher_for(filter)
         case filter
         when String, Symbol
-          lambda { |group| group.name == filter.to_sym }
+          ->(group) { group.name == filter.to_sym }
         when Regexp
-          lambda { |group| group.name.to_s =~ filter }
+          ->(group) { group.name.to_s =~ filter }
         else
           fail "Invalid filter: #{filter.inspect}"
         end

data/lib/guard/internals/plugins.rb

@@ -31,16 +31,16 @@ module Guard
       def matcher_for(filter)
         case filter
         when String, Symbol
-          shortname = filter.to_s.downcase.gsub("-", "")
-          lambda { |plugin| plugin.name == shortname }
+          shortname = filter.to_s.downcase.delete("-")
+          ->(plugin) { plugin.name == shortname }
         when Regexp
-          lambda { |plugin| plugin.name =~ filter }
+          ->(plugin) { plugin.name =~ filter }
         when Hash
           lambda do |plugin|
             filter.all? do |k, v|
               case k
               when :name
-                plugin.name == v.to_s.downcase.gsub("-", "")
+                plugin.name == v.to_s.downcase.delete("-")
               when :group
                 plugin.group.name == v.to_sym
               end

data/lib/guard/internals/queue.rb

@@ -8,7 +8,8 @@ module Guard
 
       # Process the change queue, running tasks within the main Guard thread
       def process
-        actions, changes = [], { modified: [], added: [], removed: [] }
+        actions = []
+        changes = { modified: [], added: [], removed: [] }
 
         while pending?
           if (item = @queue.pop).first.is_a?(Symbol)
@@ -24,7 +25,7 @@ module Guard
       end
 
       def pending?
-        ! @queue.empty?
+        !@queue.empty?
       end
 
       def <<(changes)

data/lib/guard/internals/session.rb

@@ -156,9 +156,7 @@ module Guard
         @guardfile_notifier_options.merge!(config)
       end
 
-      def interactor_name
-        @interactor_name
-      end
+      attr_reader :interactor_name
 
       # TODO: call this from within action, not within interactor command
       def convert_scope(entries)

data/lib/guard/plugin.rb

@@ -160,7 +160,7 @@ module Guard
     # @param [String] plugin_location the plugin location
     #
     def self.template(plugin_location)
-      File.read TEMPLATE_FORMAT % [plugin_location, non_namespaced_name]
+      File.read(format(TEMPLATE_FORMAT, plugin_location, non_namespaced_name))
     end
 
     # Called once when Guard starts. Please override initialize method to

data/lib/guard/plugin_util.rb

@@ -112,9 +112,10 @@ module Guard
         # TODO: return value or move exception higher
       rescue LoadError => error
         unless options[:fail_gracefully]
-          UI.error ERROR_NO_GUARD_OR_CLASS % [name.downcase, _constant_name]
-          UI.error "Error is: #{error}"
-          UI.error error.backtrace.join("\n")
+          msg = format(ERROR_NO_GUARD_OR_CLASS, name.downcase, _constant_name)
+          UI.error(msg)
+          UI.error("Error is: #{error}")
+          UI.error(error.backtrace.join("\n"))
           # TODO: return value or move exception higher
         end
       end
@@ -158,7 +159,7 @@ module Guard
     #
     def _plugin_constant
       @_plugin_constant ||= Guard.constants.detect do |c|
-        c.to_s.downcase == _constant_name.downcase
+        c.to_s.casecmp(_constant_name.downcase).zero?
       end
     end
 
@@ -169,20 +170,22 @@ module Guard
     #   => "Rspec"
     #
     def _constant_name
-      @_constant_name ||= name.gsub(/\/(.?)/) { "::#{ $1.upcase }" }.
+      @_constant_name ||= name.gsub(%r{/(.?)}) { "::#{ $1.upcase }" }.
                           gsub(/(?:^|[_-])(.)/) { $1.upcase }
     end
 
-    def self._gem_valid?(gem)
-      return false if gem.name == "guard-compat"
-      return true if gem.name =~ /^guard-/
-      full_path = gem.full_gem_path
-      file = File.join(full_path, "lib", "guard", "#{gem.name}.rb")
-      File.exist?(file)
-    end
-
     def _full_gem_path(name)
       Gem::Specification.find_by_name(name).full_gem_path
     end
+
+    class << self
+      def _gem_valid?(gem)
+        return false if gem.name == "guard-compat"
+        return true if gem.name =~ /^guard-/
+        full_path = gem.full_gem_path
+        file = File.join(full_path, "lib", "guard", "#{gem.name}.rb")
+        File.exist?(file)
+      end
+    end
   end
 end

data/lib/guard/ui.rb

@@ -2,6 +2,7 @@ require "guard/ui/colors"
 
 require "guard/terminal"
 require "guard/options"
+require "forwardable"
 
 # TODO: rework this class from the bottom-up
 #  - remove dependency on Session and Scope
@@ -26,7 +27,8 @@ module Guard
                       require "lumberjack"
                       Lumberjack::Logger.new(
                         options.fetch(:device) { $stderr },
-                        options)
+                        options
+                      )
                     end
       end
 
@@ -46,7 +48,8 @@ module Guard
         @options ||= Options.new(
           level: :info,
           template: ":time - :severity - :message",
-          time_format: "%H:%M:%S")
+          time_format: "%H:%M:%S"
+        )
       end
 
       # Set the logger options
@@ -62,9 +65,8 @@ module Guard
       end
 
       # Assigns a log level
-      def level=(new_level)
-        logger.level = new_level
-      end
+      extend Forwardable
+      def_delegator :logger, :level=
 
       # Show an info message.
       #
@@ -202,7 +204,7 @@ module Guard
       # @return [String] the Guard plugin name
       #
       def calling_plugin_name(depth = 2)
-        name = /(guard\/[a-z_]*)(\/[a-z_]*)?.rb:/i.match(caller[depth])
+        name = %r{(guard\/[a-z_]*)(/[a-z_]*)?.rb:}i.match(caller[depth])
         return "Guard" unless name
         name[1].split("/").map do |part|
           part.split(/[^a-z0-9]/i).map(&:capitalize).join
@@ -217,26 +219,19 @@ module Guard
         @color_enabled_initialized ||= false
         @color_enabled = nil unless @color_enabled_initialized
         @color_enabled_initialized = true
-        if @color_enabled.nil?
-          if Gem.win_platform?
-            if ENV["ANSICON"]
-              @color_enabled = true
-            else
-              begin
-                require "rubygems" unless ENV["NO_RUBYGEMS"]
-                require "Win32/Console/ANSI"
-                @color_enabled = true
-              rescue LoadError
-                @color_enabled = false
-                info "Run 'gem install win32console' to use color on Windows"
-              end
-            end
-          else
-            @color_enabled = true
-          end
-        end
+        return @color_enabled unless @color_enabled.nil?
+        return (@color_enabled = true) unless Gem.win_platform?
+        return (@color_enabled = true) if ENV["ANSICON"]
 
-        @color_enabled
+        @color_enabled =
+          begin
+            require "rubygems" unless ENV["NO_RUBYGEMS"]
+            require "Win32/Console/ANSI"
+            true
+          rescue LoadError
+            info "Run 'gem install win32console' to use color on Windows"
+            false
+          end
       end
 
       # Colorizes a text message. See the constant in the UI class for possible

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.13.0"
+  VERSION = "2.14.0"
 end

data/lib/guard/watcher.rb

@@ -2,6 +2,7 @@ require "guard/config"
 require "guard/deprecated/watcher" unless Guard::Config.new.strict?
 
 require "guard/ui"
+require "guard/watcher/pattern"
 
 module Guard
   # The watcher defines a RegExp that will be matched against file system
@@ -21,30 +22,8 @@ module Guard
     #   the Guard plugin
     #
     def initialize(pattern, action = nil)
-      @pattern, @action = pattern, action
-      @@warning_printed ||= false
-
-      # deprecation warning
-      regexp = /(^(\^))|(>?(\\\.)|(\.\*))|(\(.*\))|(\[.*\])|(\$$)/
-      return unless @pattern.is_a?(String) && @pattern =~ regexp
-
-      unless @@warning_printed
-        UI.info "*" * 20 + "\nDEPRECATION WARNING!\n" + "*" * 20
-        UI.info <<-MSG
-            You have a string in your Guardfile watch patterns that seem to
-            represent a Regexp.
-
-            Guard matches String with == and Regexp with Regexp#match.
-
-            You should either use plain String (without Regexp special
-            characters) or real Regexp.
-        MSG
-        @@warning_printed = true
-      end
-
-      new_regexp = Regexp.new(@pattern).inspect
-      UI.info "\"#{@pattern}\" has been converted to #{ new_regexp }\n"
-      @pattern = Regexp.new(@pattern)
+      @action = action
+      @pattern = Pattern.create(pattern)
     end
 
     # Finds the files that matches a Guard plugin.
@@ -59,7 +38,7 @@ module Guard
       files.inject([]) do |paths, file|
         guard.watchers.each do |watcher|
           matches = watcher.match(file)
-          next unless matches
+          next(paths) unless matches
 
           if watcher.action
             result = watcher.call_action(matches)
@@ -68,7 +47,7 @@ module Guard
             elsif result.respond_to?(:empty?) && !result.empty?
               paths << Array(result)
             else
-              next
+              next(paths)
             end
           else
             paths << matches[0]
@@ -81,20 +60,9 @@ module Guard
       end
     end
 
-    # Test the watchers pattern against a file.
-    #
-    # @param [String] file the file to test
-    # @return [Array<String>] an array of matches (or containing a single path
-    #   if the pattern is a string)
-    #
     def match(string_or_pathname)
-      # TODO: use only match() - and show fnmatch example
-      file = string_or_pathname.to_s
-      return (file == @pattern ? [file] : nil) unless @pattern.is_a?(Regexp)
-      return unless (m = @pattern.match(file))
-      m = m.to_a
-      m[0] = file
-      m
+      m = pattern.match(string_or_pathname)
+      m.nil? ? nil : Pattern::MatchResult.new(m, string_or_pathname)
     end
 
     # Executes a watcher action.
@@ -106,7 +74,7 @@ module Guard
     def call_action(matches)
       @action.arity > 0 ? @action.call(matches) : @action.call
     rescue => ex
-      UI.error "Problem with watch action!\n#{ ex.message }"
+      UI.error "Problem with watch action!\n#{ex.message}"
       UI.error ex.backtrace.join("\n")
     end
   end

data/lib/guard/watcher/pattern.rb

@@ -0,0 +1,24 @@
+require "guard/ui"
+
+require_relative "pattern/match_result"
+require_relative "pattern/matcher"
+require_relative "pattern/deprecated_regexp"
+require_relative "pattern/simple_path"
+require_relative "pattern/pathname_path"
+
+module Guard
+  class Watcher
+    class Pattern
+      def self.create(pattern)
+        if DeprecatedRegexp.new(pattern).deprecated?
+          DeprecatedRegexp.show_deprecation(pattern)
+          return DeprecatedRegexp.convert(pattern)
+        end
+
+        return PathnamePath.new(pattern) if pattern.is_a?(Pathname)
+        return SimplePath.new(pattern) if pattern.is_a?(String)
+        Matcher.new(pattern)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+require_relative "matcher"
+
+module Guard
+  class Watcher
+    class Pattern
+      # TODO: remove before Guard 3.x
+      class DeprecatedRegexp
+        def initialize(pattern)
+          @original_pattern = pattern
+        end
+
+        def self.convert(pattern)
+          Matcher.new(Regexp.new(pattern))
+        end
+
+        def deprecated?
+          regexp = /(^(\^))|(>?(\\\.)|(\.\*))|(\(.*\))|(\[.*\])|(\$$)/
+          @original_pattern.is_a?(String) && regexp.match(@original_pattern)
+        end
+
+        def self.show_deprecation(pattern)
+          @warning_printed ||= false
+
+          unless @warning_printed
+            msg = "*" * 20 + "\nDEPRECATION WARNING!\n" + "*" * 20
+            msg += <<-MSG
+            You have a string in your Guardfile watch patterns that seem to
+            represent a Regexp.
+
+            Guard matches String with == and Regexp with Regexp#match.
+
+            You should either use plain String (without Regexp special
+            characters) or real Regexp.
+            MSG
+            UI.deprecation(msg)
+            @warning_printed = true
+          end
+
+          new_regexp = Regexp.new(pattern).inspect
+          UI.info "\"#{pattern}\" will be converted to #{new_regexp}\n"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Guard
+  class Watcher
+    class Pattern
+      class MatchResult
+        def initialize(match_result, original_value)
+          @match_result = match_result
+          @original_value = original_value
+        end
+
+        def [](index)
+          return @match_result[index] if index.is_a?(Symbol)
+          return @original_value if index.zero?
+          @match_result.to_a[index]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Guard
+  class Watcher
+    class Pattern
+      class Matcher
+        def initialize(obj)
+          @matcher = obj
+        end
+
+        def match(string_or_pathname)
+          @matcher.match(normalized(string_or_pathname))
+        end
+
+        private
+
+        def normalized(string_or_pathname)
+          path = Pathname.new(string_or_pathname).cleanpath
+          return path.to_s if @matcher.is_a?(Regexp)
+          path
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+require_relative "simple_path"
+
+module Guard
+  class Watcher
+    class Pattern
+      class PathnamePath < SimplePath
+        protected
+
+        def normalize(string_or_pathname)
+          Pathname.new(string_or_pathname).cleanpath
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Guard
+  class Watcher
+    class Pattern
+      class SimplePath
+        def initialize(string_or_pathname)
+          @path = normalize(string_or_pathname)
+        end
+
+        def match(string_or_pathname)
+          cleaned = normalize(string_or_pathname)
+          return nil unless @path == cleaned
+          [cleaned]
+        end
+
+        protected
+
+        def normalize(string_or_pathname)
+          Pathname.new(string_or_pathname).cleanpath.to_s
+        end
+      end
+    end
+  end
+end

data/lib/tasks/releaser.rb

@@ -0,0 +1,116 @@
+# TODO: extract to gem?
+
+class Releaser
+  def initialize(options = {})
+    @project_name = options.delete(:project_name) do
+      fail "project_name is needed!"
+    end
+
+    @gem_name = options.delete(:gem_name) do
+      fail "gem_name is needed!"
+    end
+
+    @github_repo = options.delete(:github_repo) do
+      fail "github_repo is needed!"
+    end
+
+    @version = options.delete(:version) do
+      fail "version is needed!"
+    end
+  end
+
+  def full
+    rubygems
+    github
+  end
+
+  def rubygems
+    input = nil
+    loop do
+      STDOUT.puts "Release #{@project_name} #{@version} to RubyGems? (y/n)"
+      input = STDIN.gets.chomp.downcase
+      break if %w(y n).include?(input)
+    end
+
+    exit if input == "n"
+
+    Rake::Task["release"].invoke
+  end
+
+  def github
+    tag_name = "v#{@version}"
+
+    require "gems"
+
+    _verify_released
+    _verify_tag_pushed
+
+    require "octokit"
+    gh_client = Octokit::Client.new(netrc: true)
+
+    gh_release = _detect_gh_release(gh_client, tag_name, true)
+    return unless gh_release
+
+    STDOUT.puts "Draft release for #{tag_name}:\n"
+    STDOUT.puts gh_release.body
+    STDOUT.puts "\n-------------------------\n\n"
+
+    _confirm_publish
+
+    return unless _update_release(gh_client, gh_release, tag_name)
+
+    gh_release = _detect_gh_release(gh_client, tag_name, false)
+
+    _success_summary(gh_release, tag_name)
+  end
+
+  private
+
+  def _verify_released
+    if @version != Gems.info(@gem_name)["version"]
+      STDOUT.puts "#{@project_name} #{@version} is not yet released."
+      STDOUT.puts "Please release it first with: rake release:gem"
+      exit
+    end
+  end
+
+  def _verify_tag_pushed
+    tags = `git ls-remote --tags origin`.split("\n")
+    return if tags.detect { |tag| tag =~ /v#{@version}$/ }
+
+    STDOUT.puts "The tag v#{@version} has not yet been pushed."
+    STDOUT.puts "Please push it first with: rake release:gem"
+    exit
+  end
+
+  def _success_summary(gh_release, tag_name)
+    href = gh_release.rels[:html].href
+    STDOUT.puts "GitHub release #{tag_name} has been published!"
+    STDOUT.puts "\nPlease enjoy and spread the word!"
+    STDOUT.puts "Lack of inspiration? Here's a tweet you could improve:\n\n"
+    STDOUT.puts "Just released #{@project_name} #{@version}! #{href}"
+  end
+
+  def _detect_gh_release(gh_client, tag_name, draft)
+    gh_releases = gh_client.releases(@github_repo)
+    gh_releases.detect { |r| r.tag_name == tag_name && r.draft == draft }
+  end
+
+  def _confirm_publish
+    input = nil
+    loop do
+      STDOUT.puts "Would you like to publish this GitHub release now? (y/n)"
+      input = STDIN.gets.chomp.downcase
+      break if %w(y n).include?(input)
+    end
+
+    exit if input == "n"
+  end
+
+  def _update_release(gh_client, gh_release, tag_name)
+    result = gh_client.update_release(gh_release.rels[:self].href, draft: false)
+    return true if result
+    STDOUT.puts "GitHub release #{tag_name} couldn't be published!"
+    false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -31,7 +31,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
@@ -41,7 +41,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -198,6 +198,13 @@ files:
 - lib/guard/ui/colors.rb
 - lib/guard/version.rb
 - lib/guard/watcher.rb
+- lib/guard/watcher/pattern.rb
+- lib/guard/watcher/pattern/deprecated_regexp.rb
+- lib/guard/watcher/pattern/match_result.rb
+- lib/guard/watcher/pattern/matcher.rb
+- lib/guard/watcher/pattern/pathname_path.rb
+- lib/guard/watcher/pattern/simple_path.rb
+- lib/tasks/releaser.rb
 - man/guard.1
 - man/guard.1.html
 homepage: http://guardgem.org
@@ -220,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications