guard 2.14.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee12e6183bd7f80c82c6c173e73da077423efd8b
-  data.tar.gz: 658e7a0eaf51b6d4ba16cf8126f1cebe9ef75e10
+  metadata.gz: 333a3157cb9d7213ed91accef45785924fd9db23
+  data.tar.gz: 8b434fd66fdc4b04d024b2acf965208ed7513ca0
 SHA512:
-  metadata.gz: 7d40ddd8ef223df2e0bbf59791583eeaf4b460eac7a32a674e3b2d16c51ca9f8158b71b1458c605c0a3e9b078d724362443ea1f7dd73a3a85e419ff6fbc28fa8
-  data.tar.gz: 5fb257cf77358225a124a6b659812e78f9aea514c66578993f1b8d2dd874b7f0a174e68d3d8fda209dc515674897b72e32775f6c0d8186db36dfdfedd29e7f17
+  metadata.gz: 0cda152be7d6ae11a64ff0e66c7177812ee2da867a14c591720678c03d19cd006153bfa29abed4cd2e85eb444ad55f50d274ff9bec7eaf1f938968e64284ba6e
+  data.tar.gz: 6194bb82b25b8b4b78cb9c14a919acee55422436a153a903e87b457d085257f442ce27b757abcef73c45a6f7f34b310d8999c9833c3b426f94c60a18ea5cba70

data/README.md

@@ -1,13 +1,13 @@
-## 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!
+## 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!
 
-### (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).
+### (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.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)
+[![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)
 
 <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.
@@ -35,7 +35,7 @@ Before you file an issue, make sure you have read the _[known issues](#issues)_
 * 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 1.9.3, 2.0.0, 2.1.0, JRuby & Rubinius.
+* Tested against Ruby 2.2.6, 2.3.3, 2.4.0, JRuby & Rubinius.
 
 #### Screencast
 

data/lib/guard/cli.rb

@@ -92,7 +92,7 @@ module Guard
     method_option :listen_on,
                   type: :string,
                   aliases: "-o",
-                  default: false,
+                  default: nil,
                   banner: "Specify a network address to Listen on for "\
                   "file change events (e.g. for use in VMs)"
 

data/lib/guard/options.rb

@@ -13,5 +13,10 @@ module Guard
     def initialize(opts = {}, default_opts = {})
       super(default_opts.merge(opts || {}))
     end
+
+    # workaround for: https://github.com/erikhuda/thor/issues/504
+    def fetch(name)
+      super(name.to_s)
+    end
   end
 end

data/lib/guard/plugin_util.rb

@@ -126,7 +126,7 @@ module Guard
     def add_to_guardfile
       klass = plugin_class # call here to avoid failing later
 
-      require "guard/guardfile/evaluator"
+      require_relative "guardfile/evaluator"
       # TODO: move this to Generator?
       options = Guard.state.session.evaluator_options
       evaluator = Guardfile::Evaluator.new(options)

data/lib/guard/runner.rb

@@ -78,10 +78,12 @@ module Guard
     def _supervise(plugin, task, *args)
       catch self.class.stopping_symbol_for(plugin) do
         plugin.hook("#{ task }_begin", *args)
-        begin
-          result = plugin.send(task, *args)
-        rescue Interrupt
-          throw(:task_has_failed)
+        result = UI.options.with_progname(plugin.class.name) do
+          begin
+            plugin.send(task, *args)
+          rescue Interrupt
+            throw(:task_has_failed)
+          end
         end
         plugin.hook("#{ task }_end", result)
         result

data/lib/guard/terminal.rb

@@ -4,7 +4,7 @@ module Guard
   class Terminal
     class << self
       def clear
-        cmd = Gem.win_platform? ? "cls" : "clear;"
+        cmd = Gem.win_platform? ? "cls" : "printf '\33c\e[3J';"
         exit_code, _, stderr = Shellany::Sheller.system(cmd)
         fail Errno::ENOENT, stderr unless exit_code == 0
       end

data/lib/guard/ui.rb

@@ -1,12 +1,13 @@
 require "guard/ui/colors"
+require "guard/ui/config"
 
 require "guard/terminal"
-require "guard/options"
 require "forwardable"
 
 # TODO: rework this class from the bottom-up
 #  - remove dependency on Session and Scope
 #  - extract into a separate gem
+# - change UI to class
 
 module Guard
   # The UI class helps to format messages for the user. Everything that is
@@ -23,13 +24,11 @@ module Guard
       # Get the Guard::UI logger instance
       #
       def logger
-        @logger ||= begin
-                      require "lumberjack"
-                      Lumberjack::Logger.new(
-                        options.fetch(:device) { $stderr },
-                        options
-                      )
-                    end
+        @logger ||=
+          begin
+            require "lumberjack"
+            Lumberjack::Logger.new(options.device, options.logger_config)
+          end
       end
 
       # Since logger is global, for Aruba in-process to properly
@@ -45,11 +44,7 @@ module Guard
       # @return [Hash] the logger options
       #
       def options
-        @options ||= Options.new(
-          level: :info,
-          template: ":time - :severity - :message",
-          time_format: "%H:%M:%S"
-        )
+        @options ||= Config.new
       end
 
       # Set the logger options
@@ -61,12 +56,14 @@ module Guard
       #
       # TODO: deprecate?
       def options=(options)
-        @options = Options.new(options)
+        @options = Config.new(options)
       end
 
       # Assigns a log level
-      extend Forwardable
-      def_delegator :logger, :level=
+      def level=(new_level)
+        options.logger_config.level = new_level
+        @logger.level = new_level if @logger
+      end
 
       # Show an info message.
       #
@@ -176,9 +173,9 @@ module Guard
       # @yieldparam [String] param the calling plugin name
       #
       def _filter(plugin)
-        only = options[:only]
-        except = options[:except]
-        plugin ||= calling_plugin_name
+        only = options.only
+        except = options.except
+        plugin ||= _calling_plugin_name
 
         match = !(only || except)
         match ||= (only && only.match(plugin))
@@ -191,9 +188,9 @@ module Guard
       def _filtered_logger_message(message, method, color_name, options = {})
         message = color(message, color_name) if color_name
 
-        _filter(options[:plugin]) do |plugin|
+        _filter(options[:plugin]) do
           reset_line if options[:reset]
-          logger.send(method, message, plugin)
+          logger.send(method, message)
         end
       end
 
@@ -203,9 +200,11 @@ module Guard
       # @param [Integer] depth the stack depth
       # @return [String] the Guard plugin name
       #
-      def calling_plugin_name(depth = 2)
-        name = %r{(guard\/[a-z_]*)(/[a-z_]*)?.rb:}i.match(caller[depth])
-        return "Guard" unless name
+      def _calling_plugin_name
+        name = caller.lazy.map do |line|
+          %r{(?<!guard\/lib)\/(guard\/[a-z_]*)(/[a-z_]*)?.rb:}i.match(line)
+        end.reject(&:nil?).take(1).force.first
+        return "Guard" unless name || (name && name[1] == "guard/lib")
         name[1].split("/").map do |part|
           part.split(/[^a-z0-9]/i).map(&:capitalize).join
         end.join("::")

data/lib/guard/ui/config.rb

@@ -0,0 +1,70 @@
+require "guard/options"
+require "guard/ui/logger"
+
+module Guard
+  module UI
+    class Config < Guard::Options
+      DEFAULTS = {
+        only: nil,
+        except: nil,
+
+        # nil (will be whatever $stderr is later) or LumberJack device, e.g.
+        # $stderr or 'foo.log'
+        device: nil,
+      }.freeze
+
+      DEPRECATED_OPTS = %w(template time_format level progname).freeze
+
+      attr_reader :logger_config
+
+      def initialize(options = {})
+        opts = Guard::Options.new(options, DEFAULTS)
+
+        # migrate old options stored in UI config directly
+        deprecated_logger_opts = {}
+        DEPRECATED_OPTS.each do |option|
+          if opts.key?(option)
+            deprecated_logger_opts[option.to_sym] = opts.delete(option)
+          end
+        end
+
+        @logger_config = Logger::Config.new(deprecated_logger_opts)
+        super(opts.to_hash)
+      end
+
+      def device
+        # Use strings to work around Thor's indifferent Hash's bug
+        fetch("device") || $stderr
+      end
+
+      def only
+        fetch("only")
+      end
+
+      def except
+        fetch("except")
+      end
+
+      def [](name)
+        name = name.to_s
+
+        # TODO: remove in Guard 3.x
+        return logger_config[name] if DEPRECATED_OPTS.include?(name)
+        return device if name == "device"
+
+        # let Thor's Hash handle anything else
+        super(name.to_s)
+      end
+
+      def with_progname(name)
+        if Guard::UI.logger.respond_to?(:set_progname)
+          Guard::UI.logger.set_progname(name) do
+            yield if block_given?
+          end
+        elsif block_given?
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/guard/ui/logger.rb

@@ -0,0 +1,30 @@
+require "guard/options"
+
+module Guard
+  module UI
+    class Logger
+      class Config < Guard::Options
+        DEFAULTS = {
+          progname: "Guard",
+          level: :info,
+          template: ":time - :severity - :message",
+          time_format: "%H:%M:%S",
+          flush_seconds: 0,
+
+          # Other LumberJack device-specific options
+          # max_size: "5M",
+          # buffer_size: 0,
+          # additional_lines: nil,
+        }.freeze
+
+        def initialize(options = {})
+          super(options, DEFAULTS)
+        end
+
+        def level=(value)
+          self["level"] = value
+        end
+      end
+    end
+  end
+end

data/lib/guard/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -196,6 +196,8 @@ files:
 - lib/guard/terminal.rb
 - lib/guard/ui.rb
 - lib/guard/ui/colors.rb
+- lib/guard/ui/config.rb
+- lib/guard/ui/logger.rb
 - lib/guard/version.rb
 - lib/guard/watcher.rb
 - lib/guard/watcher/pattern.rb
@@ -227,9 +229,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications
 test_files: []
-has_rdoc: