guard 2.9.2 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2893a48637334eddc679ffc6afeed7867611c0e
-  data.tar.gz: ddc0123c5b7bc8d0a63271ddb996c612b9f4d848
+  metadata.gz: 6996dd69034de1636618026e8606df7f10b2b22b
+  data.tar.gz: c374f6846a61be304447f9518ad72d219ba0b12f
 SHA512:
-  metadata.gz: acf4ff94539a63b66805573b16560b49fc8050b9561efce3a3cd358f14bb6e85f64c35eadc33d98f1cf4de0597cad56da9a0dbf5a6079ef46b341087dcac2b71
-  data.tar.gz: 1c6829ecc0fc789ea4fa6423cb96ed8251b223d0ed9d21421652683672ab72e37f47108c4354f100784b81a115e0b5e900a0b1e1ab57d84fc9462bb46e16e2a0
+  metadata.gz: 2d4cf024a8ce54ad66c2bd9ba03b46a457924da685ec6987e6ae0c4823e2ebc30fd15627b9dae5b01f7c844158cc420f1396d532c525e4b6d4175feb0167aef2
+  data.tar.gz: fc31605dee865f1371c2e6fca5d71c35ef7f4d1ca5255acf364972f9312785ebb897776e985632d966edc88b58b0d9e2d913b6987a9cc9576943041b0e74f304

data/README.md

@@ -198,10 +198,11 @@ $ bundle exec guard --clear
 $ bundle exec guard -c # shortcut
 ```
 
-You can add the following snippet to your `~/.guardrc` to have the clear option always be enabled:
+You may prefer to enable clearing in all projects by addin the `clearing`
+statement (described below) in you `~/.guardrc` instead:
 
-```
-Guard.options[:clear] = true
+```ruby
+clearing :on
 ```
 
 #### `-n`/`--notify` option
@@ -262,6 +263,9 @@ directory - by selecting which ones to actually track.*
 If your watched directories are outside the current one, or if `--watchdirs` isn't working
 as you expect, be sure to read: [Correctly using watchdirs](https://github.com/guard/guard/wiki/Correctly-using-the---watchdir-option)
 
+You may find it more convenient to use the `directories` statement (described
+below) in your Guardfile
+
 
 #### `-G`/`--guardfile` option
 
@@ -641,6 +645,40 @@ plural and the singular option, the plural has precedence.
 
 **Please be sure to call the `scope` method after you've declared your Guard plugins!**
 
+### directories
+
+This option limits the directories watch to those given, which can improve
+responsiveness, performance and help reduce resource usage (CPU, memory) on
+larger projects.
+
+```ruby
+directories %w(app config lib spec features)
+```
+
+Note: The `--watchdir` option overrides this. (see `--watchdir` above for extra
+info).
+
+Note: Since recursion cannot be diabled on OSX, all other backends were made
+recursive - so if you want to watch selected directories AND files in the root
+directory of your project, move them to another directory and create symlinks
+back, e.g.
+
+```
+mkdir config
+mv Gemfile config
+ln -s config/Gemfile Gemfile
+```
+
+### clearing
+
+Guard can clear the screen before every action (which some people prefer).
+
+The this clearing behavior can be set to `:on` or `:off`:
+
+```ruby
+clearing :on
+```
+
 ### notification
 
 If you don't specify any notification configuration in your `Guardfile`, Guard goes through the list of available

data/lib/guard.rb

@@ -57,8 +57,6 @@ module Guard
 
       @queue = Internals::Queue.new(Guard)
 
-      UI.reset_and_clear
-
       _evaluate(state.session.evaluator_options)
 
       # NOTE: this should be *after* evaluate so :directories can work
@@ -146,6 +144,12 @@ module Guard
     def _evaluate(options)
       evaluator = Guardfile::Evaluator.new(options)
       evaluator.evaluate
+
+      # TODO: remove this workaround when options are removed
+      state.session.clearing(state.session.options[:clear])
+
+      UI.reset_and_clear
+
       msg = "No plugins found in Guardfile, please add at least one."
       UI.error msg if _pluginless_guardfile?
 

data/lib/guard/deprecated/guard.rb

@@ -172,6 +172,18 @@ module Guard
           msg = "No plugins found in Guardfile, please add at least one."
           ::Guard::UI.error msg if _pluginless_guardfile?
         end
+
+        OPTIONS = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.9.0 Guard.options is deprecated and ideally you
+          should be able to set specific options through an API or a DSL
+          method. Feel free to add feature requests if there's something
+          missing.
+        EOS
+
+        def options
+          UI.deprecation(OPTIONS)
+          ::Guard.state.session.options
+        end
       end
     end
   end

data/lib/guard/deprecated/guard.rb.orig

@@ -0,0 +1,178 @@
+require "guard/config"
+fail "Deprecations disabled (strict mode)" if Guard::Config.new.strict?
+
+require "guard/ui"
+require "guard/plugin_util"
+require "guard/guardfile/evaluator"
+
+module Guard
+  # @deprecated Every method in this module is deprecated
+  module Deprecated
+    module Guard
+      def self.add_deprecated(klass)
+        klass.send(:extend, ClassMethods)
+      end
+
+      module ClassMethods
+        MORE_INFO_ON_UPGRADING_TO_GUARD_2 = <<-EOS.gsub(/^\s*/, "")
+          For more information on how to upgrade for Guard 2.0, please head
+          over to: https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0%s
+        EOS
+
+        # @deprecated Use `Guard.plugins(filter)` instead.
+        #
+        # @see https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0 How to
+        #   upgrade for Guard 2.0
+        #
+        GUARDS = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.0 'Guard.guards(filter)' is deprecated.
+
+          Please use 'Guard.plugins(filter)' instead.
+
+            #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        EOS
+
+        def guards(filter = nil)
+          ::Guard::UI.deprecation(GUARDS)
+          plugins(filter)
+        end
+
+        # @deprecated Use `Guard.add_plugin(name, options = {})` instead.
+        #
+        # @see https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0 How to
+        #   upgrade for Guard 2.0
+        #
+        ADD_GUARD = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.0 'Guard.add_guard(name, options = {})' is
+          deprecated.
+
+          Please use 'Guard.add_plugin(name, options = {})' instead.
+
+        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        EOS
+
+        def add_guard(*args)
+          ::Guard::UI.deprecation(ADD_GUARD)
+          add_plugin(*args)
+        end
+
+        # @deprecated Use
+        #   `Guard::PluginUtil.new(name).plugin_class(fail_gracefully:
+        #   fail_gracefully)` instead.
+        #
+        # @see https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0 How to
+        #   upgrade for Guard 2.0
+        #
+        GET_GUARD_CLASS = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.0 'Guard.get_guard_class(name, fail_gracefully
+          = false)' is deprecated and is now always on.
+
+          Please use 'Guard::PluginUtil.new(name).plugin_class(fail_gracefully:
+          fail_gracefully)' instead.
+
+        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        EOS
+
+        def get_guard_class(name, fail_gracefully = false)
+          UI.deprecation(GET_GUARD_CLASS)
+          PluginUtil.new(name).plugin_class(fail_gracefully: fail_gracefully)
+        end
+
+        # @deprecated Use `Guard::PluginUtil.new(name).plugin_location` instead.
+        #
+        # @see https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0 How to
+        #   upgrade for Guard 2.0
+        #
+        LOCATE_GUARD = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.0 'Guard.locate_guard(name)' is deprecated.
+
+          Please use 'Guard::PluginUtil.new(name).plugin_location' instead.
+
+        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        EOS
+
+        def locate_guard(name)
+          UI.deprecation(LOCATE_GUARD)
+          PluginUtil.new(name).plugin_location
+        end
+
+        # @deprecated Use `Guard::PluginUtil.plugin_names` instead.
+        #
+        # @see https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0 How to
+        #   upgrade for Guard 2.0
+        #
+        # Deprecator message for the `Guard.guard_gem_names` method
+        GUARD_GEM_NAMES = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.0 'Guard.guard_gem_names' is deprecated.
+
+          Please use 'Guard::PluginUtil.plugin_names' instead.
+
+        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        EOS
+
+        def guard_gem_names
+          UI.deprecation(GUARD_GEM_NAMES)
+          PluginUtil.plugin_names
+        end
+
+        RUNNING = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.7.1 it was discovered that Guard.running was
+          never initialized or used internally.
+        EOS
+
+        def running
+          UI.deprecation(RUNNING)
+          nil
+        end
+
+        LOCK = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.7.1 it was discovered that this accessor was
+          never initialized or used internally.
+        EOS
+        def lock
+          UI.deprecation(LOCK)
+        end
+
+        EVALUATOR = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.8.2 this method shouldn't be used
+        EOS
+
+        def evaluator
+          UI.deprecation(EVALUATOR)
+          options = ::Guard.state.session.evaluator_options
+          ::Guard::Guardfile::Evaluator.new(options)
+        end
+
+        RESET_EVALUATOR = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.8.2 this method shouldn't be used
+        EOS
+
+        def reset_evaluator(_options)
+          UI.deprecation(RESET_EVALUATOR)
+        end
+
+        RUNNER = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.8.2 this method shouldn't be used
+        EOS
+
+        def runner
+          UI.deprecation(RUNNER)
+          ::Guard::Runner.new
+        end
+
+        EVALUATE_GUARDFILE = <<-EOS.gsub(/^\s*/, "")
+          Starting with Guard 2.8.2 this method shouldn't be used
+        EOS
+
+        def evaluate_guardfile
+          UI.deprecation(EVALUATE_GUARDFILE)
+          options = ::Guard.state.session.evaluator_options
+          evaluator = ::Guard::Guardfile::Evaluator.new(options)
+          evaluator.evaluate
+          msg = "No plugins found in Guardfile, please add at least one."
+          ::Guard::UI.error msg if _pluginless_guardfile?
+        end
+      end
+    end
+  end
+end

data/lib/guard/dsl.rb

@@ -379,6 +379,31 @@ module Guard
       raise Error, format(msg, e, backtrace)
     end
 
+    # Sets the directories to pass to Listen
+    #
+    # @example watch only given directories
+    #   directories %w(lib specs)
+    #
+    # @param [Array] directories directories for Listen to watch
+    #
+    def directories(directories)
+      directories.each do |dir|
+        fail "Directory #{dir.inspect} does not exist!" unless Dir.exist?(dir)
+      end
+      Guard.state.session.watchdirs = directories
+    end
+
+    # Sets Guard to clear the screen before every task is run
+    #
+    # @example switching clearing the screen on
+    #   clearing(:on)
+    #
+    # @param [Symbol] on ':on' to turn on, ':off' (default) to turn off
+    #
+    def clearing(on)
+      Guard.state.session.clearing(on == :on)
+    end
+
     private
 
     def _cleanup_backtrace(backtrace)
@@ -404,19 +429,5 @@ module Guard
         end
       end
     end
-
-    # Sets the directories to pass to Listen
-    #
-    # @example watch only given directories
-    #   directories %w(lib specs)
-    #
-    # @param [Array] directories directories for Listen to watch
-    #
-    def directories(directories)
-      directories.each do |dir|
-        fail "Directory #{dir.inspect} does not exist!" unless Dir.exist?(dir)
-      end
-      Guard.state.session.watchdirs = directories
-    end
   end
 end

data/lib/guard/internals/session.rb

@@ -81,11 +81,16 @@ module Guard
       attr_reader :guardfile_group_scope
       attr_reader :guardfile_plugin_scope
 
-      # TODO: not tested
-      def clear?
+      def clearing(on)
+        @clear = on
+      end
+
+      def clearing?
         @clear
       end
 
+      alias :clear? :clearing?
+
       def debug?
         @debug
       end

data/lib/guard/internals/session.rb.orig

@@ -0,0 +1,135 @@
+require "guard/internals/plugins"
+require "guard/internals/groups"
+
+require "guard/options"
+
+module Guard
+  # @private api
+  module Internals
+    # TODO: split into a commandline class and session (plugins, groups)
+    # TODO: swap session and metadata
+    # This class contains variables set during
+    # evaluation of the guardfile (and are reset
+    # before reevaluation)
+    class Session
+      attr_reader :options
+      attr_reader :plugins
+      attr_reader :groups
+
+      DEFAULT_OPTIONS = {
+        clear: false,
+        debug: false,
+        no_bundler_warning: false,
+
+        # User defined scopes
+        group: [],
+        plugin: [],
+
+        # Notifier
+        notify: true,
+
+        # Interactor
+        no_interactions: false,
+
+        # Guardfile options:
+        # guardfile_contents
+        guardfile: nil,
+
+        # Listener options
+        # TODO: rename to watchdirs?
+        watchdir: Dir.pwd,
+        latency: nil,
+        force_polling: false,
+        wait_for_delay: nil,
+        listen_on: nil
+      }
+
+      def cmdline_groups
+        @cmdline_groups.dup.freeze
+      end
+
+      def cmdline_plugins
+        @cmdline_plugins.dup.freeze
+      end
+
+      def initialize(new_options)
+        @options = Options.new(new_options, DEFAULT_OPTIONS)
+
+        @plugins = Internals::Plugins.new
+        @groups = Internals::Groups.new
+
+        @cmdline_groups = @options[:group]
+        @cmdline_plugins = @options[:plugin]
+
+        @clear = @options[:clear]
+        @debug = @options[:debug]
+        @watchdirs = Array(@options[:watchdir])
+        @notify = @options[:notify]
+        @interactor_name = @options[:no_interactions] ? :sleep : :pry_wrapper
+
+        @guardfile_plugin_scope = []
+        @guardfile_group_scope = []
+      end
+
+      def guardfile_scope(scope)
+        opts = scope.dup
+        @guardfile_plugin_scope = Array(opts.delete(:plugins))
+        @guardfile_group_scope = Array(opts.delete(:groups))
+        fail "Unknown options: #{opts.inspect}" unless opts.empty?
+      end
+
+      attr_reader :guardfile_group_scope
+      attr_reader :guardfile_plugin_scope
+
+      # TODO: not tested
+      def clear?
+        @clear
+      end
+
+      def debug?
+        @debug
+      end
+
+      def watchdirs
+        @watchdirs_from_guardfile ||= nil
+        @watchdirs_from_guardfile || @watchdirs
+      end
+
+      # set by Dsl with :directories() command
+      def watchdirs=(dirs)
+        dirs = [Dir.pwd] if dirs.empty?
+        @watchdirs_from_guardfile = dirs.map { |dir| File.expand_path dir }
+      end
+
+      def listener_args
+        if options[:listen_on]
+          [:on, options[:listen_on]]
+        else
+          listener_options = {}
+          [:latency, :force_polling, :wait_for_delay].each do |option|
+            listener_options[option] = options[option] if options[option]
+          end
+          expanded_watchdirs = watchdirs.map { |dir| File.expand_path dir }
+          [:to, *expanded_watchdirs, listener_options]
+        end
+      end
+
+      def evaluator_options
+        opts = { guardfile: options[:guardfile] }
+        # TODO: deprecate :guardfile_contents
+        if options[:guardfile_contents]
+          opts[:contents] = options[:guardfile_contents]
+        end
+        opts
+      end
+
+      def notify_options
+        { notify: @options[:notify] }
+      end
+
+      def interactor_name
+        @interactor_name
+      end
+    end
+  end
+end

data/lib/guard/templates/Guardfile

@@ -1,6 +1,8 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-# Uncomment and set this to only include directories you want to watch
-#
+## Uncomment and set this to only include directories you want to watch
 # directories %(app lib config test spec feature)
+
+## Uncomment to clear the screen before every task
+# clearing :on

data/lib/guard/ui.rb.orig

@@ -0,0 +1,274 @@
+require "lumberjack"
+
+require "guard/internals/state"
+
+require "guard/options"
+
+require "guard/ui/colors"
+
+require "guard/terminal"
+
+module Guard
+  # The UI class helps to format messages for the user. Everything that is
+  # logged through this class is considered either as an error message or a
+  # diagnostic message and is written to standard error ($stderr).
+  #
+  # If your Guard plugin does some output that is piped into another process
+  # for further processing, please just write it to STDOUT with `puts`.
+  #
+  module UI
+    include Colors
+
+    class << self
+      # Get the Guard::UI logger instance
+      #
+      def logger
+        @logger ||= begin
+                      Lumberjack::Logger.new(
+                        options.fetch(:device) { $stderr },
+                        options)
+                    end
+      end
+
+      # Since logger is global, for Aruba in-process to properly
+      # separate output between calls, we need to reset
+      #
+      # We don't use logger=() since it's expected to be a Lumberjack instance
+      def reset_logger
+        @logger = nil
+      end
+
+      # Get the logger options
+      #
+      # @return [Hash] the logger options
+      #
+      def options
+        @options ||= ::Guard::Options.new(
+          level: :info,
+          template: ":time - :severity - :message",
+          time_format: "%H:%M:%S")
+      end
+
+      # Set the logger options
+      #
+      # @param [Hash] options the logger options
+      # @option options [Symbol] level the log level
+      # @option options [String] template the logger template
+      # @option options [String] time_format the time format
+      #
+      # TODO: deprecate?
+      def options=(options)
+        @options = ::Guard::Options.new(options)
+      end
+
+      # Assigns a log level
+      def level=(new_level)
+        logger.level = new_level
+      end
+
+      # Show an info message.
+      #
+      # @param [String] message the message to show
+      # @option options [Boolean] reset whether to clean the output before
+      # @option options [String] plugin manually define the calling plugin
+      #
+      def info(message, options = {})
+        _filtered_logger_message(message, :info, nil, options)
+      end
+
+      # Show a yellow warning message that is prefixed with WARNING.
+      #
+      # @param [String] message the message to show
+      # @option options [Boolean] reset whether to clean the output before
+      # @option options [String] plugin manually define the calling plugin
+      #
+      def warning(message, options = {})
+        _filtered_logger_message(message, :warn, :yellow, options)
+      end
+
+      # Show a red error message that is prefixed with ERROR.
+      #
+      # @param [String] message the message to show
+      # @option options [Boolean] reset whether to clean the output before
+      # @option options [String] plugin manually define the calling plugin
+      #
+      def error(message, options = {})
+        _filtered_logger_message(message, :error, :red, options)
+      end
+
+      # Show a red deprecation message that is prefixed with DEPRECATION.
+      # It has a log level of `warn`.
+      #
+      # @param [String] message the message to show
+      # @option options [Boolean] reset whether to clean the output before
+      # @option options [String] plugin manually define the calling plugin
+      #
+      def deprecation(message, options = {})
+        unless ENV["GUARD_GEM_SILENCE_DEPRECATIONS"] == "1"
+          backtrace = Thread.current.backtrace[1..5].join("\n\t >")
+          msg = format("%s\nDeprecation backtrace: %s", message, backtrace)
+          warning(msg, options)
+        end
+      end
+
+      # Show a debug message that is prefixed with DEBUG and a timestamp.
+      #
+      # @param [String] message the message to show
+      # @option options [Boolean] reset whether to clean the output before
+      # @option options [String] plugin manually define the calling plugin
+      #
+      def debug(message, options = {})
+        _filtered_logger_message(message, :debug, :yellow, options)
+      end
+
+      # Reset a line.
+      #
+      def reset_line
+        $stderr.print(color_enabled? ? "\r\e[0m" : "\r\n")
+      end
+
+      # Clear the output if clearable.
+      #
+      def clear(opts = {})
+        return unless Guard.state.session.clear?
+
+        fail "UI not set up!" if @clearable.nil?
+        return unless @clearable || opts[:force]
+
+        @clearable = false
+        Terminal.clear
+      rescue Errno::ENOENT => e
+        warning("Failed to clear the screen: #{e.inspect}")
+      end
+
+      # TODO: arguments: UI uses Guard::options anyway
+      # @private api
+      def reset_and_clear
+        @clearable = false
+        clear(force: true)
+      end
+
+      # Allow the screen to be cleared again.
+      #
+      def clearable
+        @clearable = true
+      end
+
+      # Show a scoped action message.
+      #
+      # @param [String] action the action to show
+      # @param [Hash] scope hash with a guard or a group scope
+      #
+      def action_with_scopes(action, scope)
+        titles = Guard.state.scope.titles(scope)
+        info "#{action} #{titles.join(", ")}"
+      end
+
+      private
+
+      # Filters log messages depending on either the
+      # `:only`` or `:except` option.
+      #
+      # @param [String] plugin the calling plugin name
+      # @yield When the message should be logged
+      # @yieldparam [String] param the calling plugin name
+      #
+      def _filter(plugin)
+        only   = options[:only]
+        except = options[:except]
+        plugin ||= calling_plugin_name
+
+        match = !(only || except)
+        match ||= (only && only.match(plugin))
+        match ||= (except && !except.match(plugin))
+        return unless match
+        yield plugin
+      end
+
+      # Display a message of the type `method` and with the color `color_name`
+      # (no color by default) conditionnaly given a `plugin_name`.
+      #
+      # @param [String] plugin_name the calling plugin name
+      # @option options [Boolean] reset whether to clean the output before
+      # @option options [String] plugin manually define the calling plugin
+      #
+      def _filtered_logger_message(message, method, color_name, options = {})
+        message = color(message, color_name) if color_name
+
+        _filter(options[:plugin]) do |plugin|
+          reset_line if options[:reset]
+          logger.send(method, message, plugin)
+        end
+      end
+
+      # Tries to extract the calling Guard plugin name
+      # from the call stack.
+      #
+      # @param [Integer] depth the stack depth
+      # @return [String] the Guard plugin name
+      #
+      def calling_plugin_name(depth = 2)
+        name = /(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
+        end.join("::")
+      end
+
+      # Checks if color output can be enabled.
+      #
+      # @return [Boolean] whether color is enabled or not
+      #
+      def color_enabled?
+        @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
+
+        @color_enabled
+      end
+
+      # Colorizes a text message. See the constant in the UI class for possible
+      # color_options parameters. You can pass optionally :bright, a foreground
+      # color and a background color.
+      #
+      # @example
+      #
+      #   color('Hello World', :red, :bright)
+      #
+      # @param [String] text the text to colorize
+      # @param [Array] color_options the color options
+      #
+      def color(text, *color_options)
+        color_code = ""
+        color_options.each do |color_option|
+          color_option = color_option.to_s
+          next if color_option == ""
+
+          unless color_option =~ /\d+/
+            color_option = const_get("ANSI_ESCAPE_#{ color_option.upcase }")
+          end
+          color_code += ";" + color_option
+        end
+        color_enabled? ? "\e[0#{ color_code }m#{ text }\e[0m" : text
+      end
+    end
+  end
+end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.9.2"
+  VERSION = "2.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.10.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
@@ -113,6 +113,7 @@ files:
 - lib/guard/deprecated/dsl.rb
 - lib/guard/deprecated/evaluator.rb
 - lib/guard/deprecated/guard.rb
+- lib/guard/deprecated/guard.rb.orig
 - lib/guard/deprecated/guardfile.rb
 - lib/guard/deprecated/watcher.rb
 - lib/guard/dsl.rb
@@ -132,6 +133,7 @@ files:
 - lib/guard/internals/queue.rb
 - lib/guard/internals/scope.rb
 - lib/guard/internals/session.rb
+- lib/guard/internals/session.rb.orig
 - lib/guard/internals/state.rb
 - lib/guard/internals/tracing.rb
 - lib/guard/internals/traps.rb
@@ -166,6 +168,7 @@ files:
 - lib/guard/templates/Guardfile.orig
 - lib/guard/terminal.rb
 - lib/guard/ui.rb
+- lib/guard/ui.rb.orig
 - lib/guard/ui/colors.rb
 - lib/guard/version.rb
 - lib/guard/version.rb.orig