guard 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c86565038c0d17ebb30f6cc008bd4daa3ec3146
-  data.tar.gz: 7de5a07cdad205ab62306ecab6f044222406dd1e
+  metadata.gz: 8a56573a032fe19caaec716bce14a5e8c31c861b
+  data.tar.gz: bd96b08fbe6d1df7dc92147104de03a8fdf9fc66
 SHA512:
-  metadata.gz: 72ae5a7b063bb4fa07fcfe0dc7b7673dd97a1d3099d4dcf846b7cf3c62040f9a4850a32168df6545eb80a7e62bfdc0f20bc1967239c376a6559a96e95050ebc2
-  data.tar.gz: 0e182edbd7934d9524c6261c2db55b1d3cd9b4c9ed8aea9dd66ece1cffd9534f6226abd9b3e705caaea1543891bd36f2e783714435a3577a94824023f6617808
+  metadata.gz: 14b5197e11d01da9c1313fb06801df0533144f08cdfebd292d7f9c69db7b64ddc7deabfb638735f651d0f64a4c062de436e2c7bc2b301085e16d650fec570e6c
+  data.tar.gz: 58cfe1bd2aa5e666cf42c0ee118f02d9d288706d5713ef122fb0ebc43a1f03f81434d9df3e23f2050175fe719f59db7aa63e992305425fcfcbe39b836fb14393

data/lib/guard/dsl_describer.rb

@@ -35,11 +35,13 @@ module Guard
     # @see CLI#list
     #
     def list
+      _evaluate_guardfile
       names = ::Guard::PluginUtil.plugin_names.sort.uniq
       final_rows = names.inject([]) do |rows, name|
+        used = ::Guard.plugins(name).any?
         rows << {
           Plugin: name.capitalize,
-          Guardfile: ::Guard.plugins(name) ? "✔" : "✘"
+          Guardfile: used ? "✔" : "✘"
         }
       end
 

data/lib/guard/dsl_describer.rb.orig

@@ -0,0 +1,180 @@
+# encoding: utf-8
+require "formatador"
+
+require "guard/guardfile/evaluator"
+require "guard/ui"
+
+module Guard
+  # The DslDescriber evaluates the Guardfile and creates an internal structure
+  # of it that is used in some inspection utility methods like the CLI commands
+  # `show` and `list`.
+  #
+  # @see Guard::Dsl
+  # @see Guard::CLI
+  #
+  class DslDescriber
+    # Initializes a new DslDescriber object.
+    #
+    # @option options [String] guardfile the path to a valid Guardfile
+    #
+    # @option options [String] guardfile_contents a string representing the
+    # content of a valid Guardfile
+    #
+    # @see Guard::Guardfile::Evaluator#initialize
+    #
+    def initialize(options = {})
+      ::Guard.reset_groups
+      ::Guard.reset_plugins
+      ::Guard.reset_scope
+      ::Guard.reset_options(options)
+    end
+
+    # List the Guard plugins that are available for use in your system and marks
+    # those that are currently used in your `Guardfile`.
+    #
+    # @see CLI#list
+    #
+    def list
+      names = ::Guard::PluginUtil.plugin_names.sort.uniq
+      final_rows = names.inject([]) do |rows, name|
+        rows << {
+          Plugin: name.capitalize,
+          Guardfile: ::Guard.plugins(name) ? "✔" : "✘"
+        }
+      end
+
+      Formatador.display_compact_table(final_rows, [:Plugin, :Guardfile])
+    end
+
+    # Shows all Guard plugins and their options that are defined in
+    # the `Guardfile`.
+    #
+    # @see CLI#show
+    #
+    def show
+      _evaluate_guardfile
+      groups = ::Guard.groups
+
+      final_rows = groups.each_with_object([]) do |group, rows|
+
+        plugins = Array(::Guard.plugins(group: group.name))
+
+        plugins.each do |plugin|
+          options = plugin.options.inject({}) do |o, (k, v)|
+            o.tap { |option| option[k.to_s] = v }
+          end.sort
+
+          if options.empty?
+            rows << :split
+            rows << {
+              Group: group.title,
+              Plugin: plugin.title,
+              Option: "",
+              Value: ""
+            }
+          else
+            options.each_with_index do |(option, value), index|
+              if index == 0
+                rows << :split
+                rows << {
+                  Group: group.title,
+                  Plugin: plugin.title,
+                  Option: option.to_s,
+                  Value: value.inspect
+                }
+              else
+                rows << {
+                  Group: "",
+                  Plugin: "",
+                  Option: option.to_s,
+                  Value: value.inspect
+                }
+              end
+            end
+          end
+        end
+
+        rows
+      end
+
+      Formatador.display_compact_table(
+        final_rows.drop(1),
+        [:Group, :Plugin, :Option, :Value]
+      )
+    end
+
+    # Shows all notifiers and their options that are defined in
+    # the `Guardfile`.
+    #
+    # @see CLI#show
+    #
+    def notifiers
+      _evaluate_guardfile
+
+      merged_notifiers = ::Guard::Notifier::NOTIFIERS.inject(:merge)
+      final_rows = merged_notifiers.each_with_object([]) do |definition, rows|
+
+        name      = definition[0]
+        clazz     = definition[1]
+        available = clazz.available?(silent: true) ? "✔" : "✘"
+        notifier  = ::Guard::Notifier.notifiers.detect { |n| n[:name] == name }
+        used      = notifier ? "✔" : "✘"
+
+        options = _merge_options(clazz, notifier)
+        options.delete(:silent)
+
+        if options.empty?
+          rows << :split
+          _add_row(rows, name, available, used, "", "")
+        else
+          options.each_with_index do |(option, value), index|
+            if index == 0
+              rows << :split
+              _add_row(rows, name, available, used, option.to_s, value.inspect)
+            else
+              _add_row(rows, "", "", "", option.to_s, value.inspect)
+            end
+          end
+        end
+
+        rows
+      end
+
+      Formatador.display_compact_table(
+        final_rows.drop(1),
+        [:Name, :Available, :Used, :Option, :Value]
+      )
+    end
+
+    private
+
+    # Evaluates the `Guardfile` by delegating to
+    #   {Guard::Guardfile::Evaluator#evaluate_guardfile}.
+    #
+    def _evaluate_guardfile
+      ::Guard.save_scope
+      ::Guard::Guardfile::Evaluator.new(::Guard.options).evaluate_guardfile
+      ::Guard.restore_scope
+    end
+
+    def _merge_options(klass, notifier)
+      notify_options = notifier ? notifier[:options] : {}
+
+      if klass.const_defined?(:DEFAULTS)
+        klass.const_get(:DEFAULTS).merge(notify_options)
+      else
+        notify_options
+      end
+    end
+
+    def _add_row(rows, name, available, used, option, value)
+      rows << {
+        Name: name,
+        Available: available,
+        Used: used,
+        Option: option,
+        Value: value
+      }
+    end
+  end
+end

data/lib/guard/plugin_util.rb

@@ -74,7 +74,11 @@ module Guard
       if klass.superclass.to_s == "Guard::Guard"
         klass.new(options.delete(:watchers), options)
       else
-        klass.new(options)
+        begin
+          klass.new(options)
+        rescue ArgumentError => e
+          fail "Failed to call #{klass}.new(options): #{e}"
+        end
       end
     end
 

data/lib/guard/reevaluator.rb

@@ -7,6 +7,14 @@ module Guard
       return unless ::Guard::Watcher.match_guardfile?(files)
       ::Guard.save_scope
       ::Guard.evaluator.reevaluate_guardfile
+    rescue ScriptError, StandardError => e
+      ::Guard::UI.warning("Failed to reevaluate file: #{e}")
+
+      options = { watchers: [::Guard::Watcher.new("Guardfile")] }
+      ::Guard.add_plugin(:reevaluator, options)
+
+      throw :task_has_failed
+    ensure
       ::Guard.restore_scope
     end
   end

data/lib/guard/runner.rb

@@ -55,6 +55,7 @@ module Guard
 
           next unless (task = tasks.detect { |meth| plugin.respond_to?(meth) })
           _supervise(plugin, task, match_result)
+          ::Guard::UI.clearable
         end
       end
     end

data/lib/guard/setuper.rb

@@ -21,7 +21,7 @@ module Guard
       wait_for_delay: nil,
       listen_on: nil
     }
-    DEFAULT_GROUPS = [:default, :common]
+    DEFAULT_GROUPS = [:common, :default]
 
     # Initializes the Guard singleton:
     #
@@ -217,6 +217,7 @@ module Guard
       end
 
       _run_actions(actions)
+      return if changes.values.all?(&:empty?)
       runner.run_on_changes(*changes.values)
     end
 

data/lib/guard/ui.rb

@@ -118,9 +118,12 @@ module Guard
 
       # Clear the output if clearable.
       #
-      def clear(options = {})
+      def clear(opts = {})
+        return unless ::Guard.options[:clear]
+
         fail "UI not set up!" if @clearable.nil?
-        return unless ::Guard.options[:clear] && (@clearable || options[:force])
+        return unless @clearable || opts[:force]
+
         @clearable = false
         ::Guard::Terminal.clear
       rescue Errno::ENOENT => e

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
 end

data/lib/guard/version.rb.orig

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -91,14 +91,12 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- bin/fsevent_watch_guard
 - bin/guard
 - images/failed.png
 - images/guard.png
 - images/pending.png
 - images/success.png
 - lib/guard.rb
-- lib/guard.rb.orig
 - lib/guard/aruba_adapter.rb
 - lib/guard/cli.rb
 - lib/guard/commander.rb
@@ -113,21 +111,19 @@ files:
 - lib/guard/deprecator.rb
 - lib/guard/dsl.rb
 - lib/guard/dsl_describer.rb
+- lib/guard/dsl_describer.rb.orig
 - lib/guard/group.rb
 - lib/guard/guard.rb
 - lib/guard/guardfile.rb
 - lib/guard/guardfile/evaluator.rb
 - lib/guard/guardfile/generator.rb
 - lib/guard/interactor.rb
-- lib/guard/interactor.rb.orig
 - lib/guard/jobs/base.rb
 - lib/guard/jobs/pry_wrapper.rb
 - lib/guard/jobs/sleep.rb
-- lib/guard/jobs/stdin.rb.orig
 - lib/guard/notifier.rb
 - lib/guard/notifiers/base.rb
 - lib/guard/notifiers/emacs.rb
-- lib/guard/notifiers/emacs.rb.orig
 - lib/guard/notifiers/file_notifier.rb
 - lib/guard/notifiers/gntp.rb
 - lib/guard/notifiers/growl.rb
@@ -146,20 +142,14 @@ files:
 - lib/guard/reevaluator.rb
 - lib/guard/runner.rb
 - lib/guard/setuper.rb
-- lib/guard/setuper.rb.orig
 - lib/guard/sheller.rb
-- lib/guard/sheller.rb.orig
-- lib/guard/tags
 - lib/guard/templates/Guardfile
 - lib/guard/terminal.rb
-- lib/guard/terminal.rb.orig
 - lib/guard/ui.rb
-- lib/guard/ui.rb.orig
 - lib/guard/ui/colors.rb
 - lib/guard/version.rb
 - lib/guard/version.rb.orig
 - lib/guard/watcher.rb
-- lib/guard/watcher.rb.orig
 - man/guard.1
 - man/guard.1.html
 homepage: http://guardgem.org

data/lib/guard.rb.orig

@@ -1,210 +0,0 @@
-require "rbconfig"
-
-require "guard/commander"
-require "guard/deprecated_methods"
-require "guard/deprecator"
-require "guard/dsl"
-require "guard/group"
-require "guard/guardfile"
-require "guard/interactor"
-require "guard/notifier"
-require "guard/plugin_util"
-require "guard/runner"
-require "guard/setuper"
-require "guard/sheller"
-require "guard/ui"
-require "guard/watcher"
-require "guard/reevaluator"
-
-# Guard is the main module for all Guard related modules and classes.
-# Also Guard plugins should use this namespace.
-#
-module Guard
-  DEV_NULL = Gem.win_platform? ? "NUL" : "/dev/null"
-
-  extend Commander
-  extend DeprecatedMethods
-  extend Setuper
-
-  class << self
-    # Called by Pry scope command
-
-    def scope=(new_scope)
-      @scope = new_scope
-      @scope.dup.freeze
-    end
-
-    def scope
-      fail "::Guard.setup() not called" if @scope.nil?
-      @scope.dup.freeze
-    end
-    attr_reader :runner, :listener
-
-    # Smart accessor for retrieving specific plugins at once.
-    #
-    # @see Guard.plugin
-    # @see Guard.group
-    # @see Guard.groups
-    #
-    # @example Filter plugins by String or Symbol
-    #   Guard.plugins('rspec')
-    #   Guard.plugins(:rspec)
-    #
-    # @example Filter plugins by Regexp
-    #   Guard.plugins(/rsp.+/)
-    #
-    # @example Filter plugins by Hash
-    #   Guard.plugins(name: 'rspec', group: 'backend')
-    #
-    # @param [String, Symbol, Regexp, Hash] filter the filter to apply to the
-    # plugins
-    # @return [Plugin, Array<Plugin>] the filtered plugin(s)
-    #
-    def plugins(filter = nil)
-      @plugins ||= []
-
-      return @plugins if filter.nil?
-
-      filtered_plugins = case filter
-                         when String, Symbol
-                           @plugins.select do |plugin|
-                             plugin.name == filter.to_s.downcase.gsub("-", "")
-                           end
-                         when Regexp
-                           @plugins.select do |plugin|
-                             plugin.name =~ filter
-                           end
-                         when Hash
-                           @plugins.select do |plugin|
-                             filter.all? do |k, v|
-                               case k
-                               when :name
-                                 plugin.name == v.to_s.downcase.gsub("-", "")
-                               when :group
-                                 plugin.group.name == v.to_sym
-                               end
-                             end
-                           end
-                         end
-
-      filtered_plugins
-    end
-
-    # Smart accessor for retrieving a specific plugin.
-    #
-    # @see Guard.plugins
-    # @see Guard.group
-    # @see Guard.groups
-    #
-    # @example Find a plugin by String or Symbol
-    #   Guard.plugin('rspec')
-    #   Guard.plugin(:rspec)
-    #
-    # @example Find a plugin by Regexp
-    #   Guard.plugin(/rsp.+/)
-    #
-    # @example Find a plugin by Hash
-    #   Guard.plugin(name: 'rspec', group: 'backend')
-    #
-    # @param [String, Symbol, Regexp, Hash] filter the filter for finding the
-    #   plugin the Guard plugin
-    # @return [Plugin, nil] the plugin found, nil otherwise
-    #
-    def plugin(filter)
-      plugins(filter).first
-    end
-
-    # Smart accessor for retrieving specific groups at once.
-    #
-    # @see Guard.plugin
-    # @see Guard.plugins
-    # @see Guard.group
-    #
-    # @example Filter groups by String or Symbol
-    #   Guard.groups('backend')
-    #   Guard.groups(:backend)
-    #
-    # @example Filter groups by Regexp
-    #   Guard.groups(/(back|front)end/)
-    #
-    # @param [String, Symbol, Regexp] filter the filter to apply to the Groups
-    # @return [Array<Group>] the filtered group(s)
-    #
-    def groups(filter = nil)
-      @groups ||= []
-
-      return @groups if filter.nil?
-
-      case filter
-      when String, Symbol
-        @groups.select { |group| group.name == filter.to_sym }
-      when Regexp
-        @groups.select { |group| group.name.to_s =~ filter }
-      else
-        fail "Invalid filter: #{filter.inspect}"
-      end
-    end
-
-    # Smart accessor for retrieving a specific group.
-    #
-    # @see Guard.plugin
-    # @see Guard.plugins
-    # @see Guard.groups
-    #
-    # @example Find a group by String or Symbol
-    #   Guard.group('backend')
-    #   Guard.group(:backend)
-    #
-    # @example Find a group by Regexp
-    #   Guard.group(/(back|front)end/)
-    #
-    # @param [String, Symbol, Regexp] filter the filter for finding the group
-    # @return [Group] the group found, nil otherwise
-    #
-    def group(filter)
-      groups(filter).first
-    end
-
-    # Add a Guard plugin to use.
-    #
-    # @param [String] name the Guard name
-    # @param [Hash] options the plugin options (see Plugin documentation)
-    # @option options [String] group the group to which the plugin belongs
-    # @option options [Array<Watcher>] watchers the list of declared watchers
-    # @option options [Array<Hash>] callbacks the list of callbacks
-    # @return [Plugin] the added Guard plugin
-    # @see Plugin
-    #
-    def add_plugin(name, options = {})
-      instance = ::Guard::PluginUtil.new(name).initialize_plugin(options)
-      @plugins << instance
-      instance
-    end
-
-    # Used by runner to remove a failed plugin
-    def remove_plugin(plugin)
-      # TODO: coverage/aruba
-      @plugins.delete(plugin)
-    end
-
-    # Add a Guard plugin group.
-    #
-    # @param [String] name the group name
-    # @option options [Boolean] halt_on_fail if a task execution
-    #   should be halted for all Guard plugins in this group if
-    #   one Guard throws `:task_has_failed`
-    # @return [Group] the group added (or retrieved from the `@groups`
-    #   variable if already present)
-    #
-    # @see Group
-    #
-    def add_group(name, options = {})
-      unless (group = group(name))
-        group = ::Guard::Group.new(name, options)
-        @groups << group
-      end
-
-      group
-    end
-  end
-end