guard 2.12.4 → 2.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31304dcf6eb2ea4ad7677f6af161705a083b8702
-  data.tar.gz: 1cafb2eb01a3d796457aadaacaad763fabbc4575
+  metadata.gz: a6cb2b065313fadd1e7938935252c4ba5ff98631
+  data.tar.gz: fbe543cde3dac216174ef74dbc7ef8a7d97c307c
 SHA512:
-  metadata.gz: 2c038d3d9f9a7595800148f250cde17fd234f4026ac0ee8559ed0d8ef82d11184f20d32f707ff30128e013f46b70d63397f096fd3bdc96f994312db351a07804
-  data.tar.gz: 4607e87c1287162050b2bf7a662b6a27021124e4a258379515cece722c319eb7c56276fbc9ed4680b533e727e8621075d327aa80c07fa80a290d1a984b09ce26
+  metadata.gz: 53c56440d62730e2f4b7c31006dc88854042fee6ef6abcd0f9840a7efbc01b7393176383e630078465c356da681c3d864f5747f4f1e0d62f43cb1eaabb5b11b0
+  data.tar.gz: 43d9c9262a46f4a0d7129be5db869db6daecf3994057e89b5f2138e74a66b934a649045ae9c58d70756f53ebec3d768ad323a49042afc997c6f87b7f6cb933f4

data/bin/guard

@@ -22,7 +22,7 @@ def ignore_interrupts(*args)
   rescue Interrupt
     retry
   end
-  return $? == 0
+  $? == 0
 end
 
 guard_core_path = Gem.bin_path("guard", "_guard-core")

data/lib/guard/cli.rb

@@ -20,45 +20,45 @@ module Guard
     desc "start", "Starts Guard"
 
     method_option :clear,
-                  type:    :boolean,
+                  type: :boolean,
                   default: false,
                   aliases: "-c",
-                  banner:  "Auto clear shell before each action"
+                  banner: "Auto clear shell before each action"
 
     method_option :notify,
-                  type:    :boolean,
+                  type: :boolean,
                   default: true,
                   aliases: "-n",
-                  banner:  "Notifications feature"
+                  banner: "Notifications feature"
 
     method_option :debug,
-                  type:    :boolean,
+                  type: :boolean,
                   default: false,
                   aliases: "-d",
-                  banner:  "Show debug information"
+                  banner: "Show debug information"
 
     method_option :group,
-                  type:    :array,
+                  type: :array,
                   default: [],
                   aliases: "-g",
-                  banner:  "Run only the passed groups"
+                  banner: "Run only the passed groups"
 
     method_option :plugin,
-                  type:    :array,
+                  type: :array,
                   default: [],
                   aliases: "-P",
-                  banner:  "Run only the passed plugins"
+                  banner: "Run only the passed plugins"
 
     # TODO: make it plural
     method_option :watchdir,
-                  type:    :array,
+                  type: :array,
                   aliases: "-w",
-                  banner:  "Specify the directories to watch"
+                  banner: "Specify the directories to watch"
 
     method_option :guardfile,
-                  type:    :string,
+                  type: :string,
                   aliases: "-G",
-                  banner:  "Specify a Guardfile"
+                  banner: "Specify a Guardfile"
 
     method_option :no_interactions,
                   type: :boolean,
@@ -74,26 +74,26 @@ module Guard
 
     # Listen options
     method_option :latency,
-                  type:    :numeric,
+                  type: :numeric,
                   aliases: "-l",
-                  banner:  'Overwrite Listen\'s default latency'
+                  banner: 'Overwrite Listen\'s default latency'
 
     method_option :force_polling,
-                  type:    :boolean,
+                  type: :boolean,
                   default: false,
                   aliases: "-p",
-                  banner:  "Force usage of the Listen polling listener"
+                  banner: "Force usage of the Listen polling listener"
 
     method_option :wait_for_delay,
-                  type:    :numeric,
+                  type: :numeric,
                   aliases: "-y",
-                  banner:  'Overwrite Listen\'s default wait_for_delay'
+                  banner: 'Overwrite Listen\'s default wait_for_delay'
 
     method_option :listen_on,
-                  type:    :string,
+                  type: :string,
                   aliases: "-o",
                   default: false,
-                  banner:  "Specify a network address to Listen on for "\
+                  banner: "Specify a network address to Listen on for "\
                   "file change events (e.g. for use in VMs)"
 
     def self.help(shell, subcommand = false)

data/lib/guard/commands/all.rb

@@ -24,7 +24,7 @@ module Guard
             scopes, unknown = Guard.state.session.convert_scope(entries)
 
             unless unknown.empty?
-              output.puts "Unknown scopes: #{ unknown.join(", ") }"
+              output.puts "Unknown scopes: #{ unknown.join(', ') }"
               return
             end
 

data/lib/guard/commands/reload.rb

@@ -23,7 +23,7 @@ module Guard
             scopes, unknown = Guard.state.session.convert_scope(entries)
 
             unless unknown.empty?
-              output.puts "Unknown scopes: #{ unknown.join(", ") }"
+              output.puts "Unknown scopes: #{ unknown.join(', ') }"
               return
             end
 

data/lib/guard/commands/scope.rb

@@ -20,7 +20,7 @@ module Guard
             scope, unknown = Guard.state.session.convert_scope(entries)
 
             unless unknown.empty?
-              output.puts "Unknown scopes: #{unknown.join(",") }"
+              output.puts "Unknown scopes: #{unknown.join(',') }"
               return
             end
 

data/lib/guard/deprecated/dsl.rb

@@ -29,7 +29,7 @@ module Guard
           'Guard::Guardfile::Evaluator.new(options).evaluate_guardfile'
           instead.
 
-          #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods-1"}
+          #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods-1'}
         EOS
 
         def evaluate_guardfile(options = {})

data/lib/guard/deprecated/guard.rb

@@ -30,7 +30,7 @@ module Guard
 
           Please use 'Guard.plugins(filter)' instead.
 
-        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
         EOS
 
         def guards(filter = nil)
@@ -49,7 +49,7 @@ module Guard
 
           Please use 'Guard.add_plugin(name, options = {})' instead.
 
-        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
         EOS
 
         def add_guard(*args)
@@ -71,7 +71,7 @@ module Guard
           Please use 'Guard::PluginUtil.new(name).plugin_class(fail_gracefully:
           fail_gracefully)' instead.
 
-        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
         EOS
 
         def get_guard_class(name, fail_gracefully = false)
@@ -89,7 +89,7 @@ module Guard
 
           Please use 'Guard::PluginUtil.new(name).plugin_location' instead.
 
-        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
         EOS
 
         def locate_guard(name)
@@ -108,7 +108,7 @@ module Guard
 
           Please use 'Guard::PluginUtil.plugin_names' instead.
 
-        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
+        #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
         EOS
 
         def guard_gem_names
@@ -246,7 +246,6 @@ module Guard
                 "Please file an issue if you rely on this option working."
               fail NotImplementedError, format(msg, key)
             end
-
           end.new
         end
 

data/lib/guard/deprecated/guardfile.rb

@@ -27,7 +27,7 @@ module Guard
           Please use 'Guard::Guardfile::Generator.new(options).create_guardfile'
           instead.
 
-          #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods-2"}
+          #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods-2'}
         EOS
 
         def create_guardfile(options = {})
@@ -49,7 +49,7 @@ module Guard
           'Guard::Guardfile::Generator.new.initialize_template(plugin_name)'
           instead.
 
-          #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods-2"}
+          #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods-2'}
         EOS
 
         def initialize_template(plugin_name)
@@ -71,7 +71,7 @@ module Guard
           Please use 'Guard::Guardfile::Generator.new.initialize_all_templates'
           instead.
 
-          #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods-2"}
+          #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods-2'}
         EOS
 
         def initialize_all_templates

data/lib/guard/dsl.rb

@@ -143,7 +143,7 @@ module Guard
         @current_groups.pop
       else
         UI.error \
-          "No Guard plugins found in the group '#{ groups.join(", ") }',"\
+          "No Guard plugins found in the group '#{ groups.join(', ') }',"\
           " please add at least one."
       end
     end

data/lib/guard/dsl_describer.rb

@@ -117,8 +117,8 @@ module Guard
       final_rows = supported.each_with_object([]) do |(name, _), rows|
         available = detected_names.include?(name) ? "✔" : "✘"
 
-        notifier  = detected.detect { |n| n[:name] == name }
-        used      = notifier ? "✔" : "✘"
+        notifier = detected.detect { |n| n[:name] == name }
+        used = notifier ? "✔" : "✘"
 
         options = notifier ? notifier[:options] : {}
 

data/lib/guard/dsl_reader.rb

@@ -0,0 +1,51 @@
+require "guard/dsl"
+
+module Guard
+  # TODO: this should probably be a base class for Dsl instead (in Guard 3.x)
+  class DslReader < Dsl
+    attr_reader :plugin_names
+
+    def initialize
+      super
+      @plugin_names = []
+    end
+
+    def guard(name, _options = {})
+      @plugin_names << name
+    end
+
+    # Stub everything else
+    def notification
+    end
+
+    def interactor(_options)
+    end
+
+    def group(*_args)
+    end
+
+    def watch(_pattern, &_action)
+    end
+
+    def callback(*_args, &_block)
+    end
+
+    def ignore(*_regexps)
+    end
+
+    def ignore!(*_regexps)
+    end
+
+    def logger(_options)
+    end
+
+    def scope(_scope = {})
+    end
+
+    def directories(_directories)
+    end
+
+    def clearing(_on)
+    end
+  end
+end

data/lib/guard/group.rb

@@ -33,7 +33,7 @@ module Guard
     #   throws `:task_has_failed`
     #
     def initialize(name, options = {})
-      @name    = name.to_sym
+      @name = name.to_sym
       @options = options
     end
 

data/lib/guard/guardfile/evaluator.rb

@@ -5,6 +5,7 @@ require "guard/options"
 require "guard/plugin"
 
 require "guard/dsl"
+require "guard/dsl_reader"
 
 module Guard
   module Guardfile
@@ -105,7 +106,9 @@ module Guard
       # @return [Boolean] whether the Guard plugin has been declared
       #
       def guardfile_include?(plugin_name)
-        /^\s*guard\s*\(?\s*['":]#{plugin_name}['"]?/.match(@contents)
+        reader = DslReader.new
+        reader.evaluate(@contents, @path || "", 1)
+        reader.plugin_names.include?(plugin_name)
       end
 
       attr_reader :path
@@ -160,7 +163,7 @@ module Guard
 
         return false unless (source_from_option) || inline
 
-        @source   = :inline
+        @source = :inline
         @guardfile_contents = options[:guardfile_contents]
 
         UI.info "Using inline Guardfile."

data/lib/guard/guardfile/generator.rb

@@ -66,8 +66,18 @@ module Guard
 
         plugin_util = PluginUtil.new(plugin_name)
         # TODO: change to "valid?" method
-        if plugin_util.plugin_class(fail_gracefully: true)
-          plugin_util.add_to_guardfile
+        plugin_class = plugin_util.plugin_class(fail_gracefully: true)
+        if plugin_class
+          begin
+            plugin_util.add_to_guardfile
+          rescue Errno::ENOENT => error
+            # TODO: refactor
+            template = plugin_class.template(plugin_util.plugin_location)
+            _ui(:error, "Found class #{plugin_class} but loading it's template"\
+              "failed: '#{template}'")
+            _ui(:error, "Error is: #{error}")
+            return
+          end
           return
         end
 

data/lib/guard/internals/debugging.rb

@@ -43,7 +43,7 @@ module Guard
         private
 
         def _notify(*args)
-          UI.debug "Command execution: #{args.join(" ")}"
+          UI.debug "Command execution: #{args.join(' ')}"
         end
 
         # reset singleton - called by tests

data/lib/guard/internals/session.rb

@@ -162,7 +162,7 @@ module Guard
 
       # TODO: call this from within action, not within interactor command
       def convert_scope(entries)
-        scopes  = { plugins: [], groups: [] }
+        scopes = { plugins: [], groups: [] }
         unknown = []
 
         entries.each do |entry|

data/lib/guard/jobs/pry_wrapper.rb

@@ -48,16 +48,16 @@ module Guard
 
       # List of shortcuts for each interactor command
       SHORTCUTS = {
-        help:         "h",
-        all:          "a",
-        reload:       "r",
-        change:       "c",
-        show:         "s",
-        scope:        "o",
+        help: "h",
+        all: "a",
+        reload: "r",
+        change: "c",
+        show: "s",
+        scope: "o",
         notification: "n",
-        pause:        "p",
-        exit:         "e",
-        quit:         "q"
+        pause: "p",
+        exit: "e",
+        quit: "q"
       }
 
       def initialize(options)
@@ -246,7 +246,7 @@ module Guard
           next if group.name == :default
 
           cmd = "Run all #{ group.title }"
-          Pry.commands.create_command group.name.to_s, cmd  do
+          Pry.commands.create_command group.name.to_s, cmd do
             group "Guard"
 
             def process
@@ -278,7 +278,7 @@ module Guard
         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?
+          level = ":#{ nest_level }" unless nest_level.zero?
 
           "[#{ history }] #{ _scope_for_prompt }#{ process }"\
             "(#{ _clip_name(target_self) })#{ level }#{ ending_char } "

data/lib/guard/notifier.rb

@@ -20,8 +20,9 @@ module Guard
       @notifier = nil
     end
 
-    DEPRECATED_IMPLICIT_CONNECT = "Calling Notiffany::Notifier.notify()" +
-      " without a prior Notifier.connect() is deprecated"
+    DEPRECATED_IMPLICIT_CONNECT = "Calling Notiffany::Notifier.notify()"\
+                                  " without a prior Notifier.connect() is"\
+                                  " deprecated"
 
     def self.notify(message, options = {})
       unless @notifier

data/lib/guard/plugin.rb

@@ -287,7 +287,7 @@ module Guard
       @group = Guard.state.session.groups.add(group_name)
       @watchers = options.delete(:watchers) { [] }
       @callbacks = options.delete(:callbacks) { [] }
-      @options  = options
+      @options = options
       _register_callbacks
     end
 

data/lib/guard/plugin_util.rb

@@ -109,11 +109,13 @@ module Guard
       rescue TypeError => error
         UI.error "Could not find class Guard::#{ _constant_name }"
         UI.error error.backtrace.join("\n")
+        # 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")
+          # TODO: return value or move exception higher
         end
       end
     end
@@ -164,7 +166,7 @@ module Guard
     #
     def _constant_name
       @_constant_name ||= name.gsub(/\/(.?)/) { "::#{ $1.upcase }" }.
-        gsub(/(?:^|[_-])(.)/) { $1.upcase }
+                          gsub(/(?:^|[_-])(.)/) { $1.upcase }
     end
 
     def self._gem_valid?(gem)

data/lib/guard/rake_task.rb

@@ -32,12 +32,10 @@ module Guard
       task name => ["#{name}:start"]
 
       namespace(name) do
-
         desc "Starts Guard with options: '#{options}'"
         task(:start) do
           ::Guard::CLI.start(options.split)
         end
-
       end
     end
   end

data/lib/guard/runner.rb

@@ -31,8 +31,8 @@ module Guard
       :run_on_modifications, :run_on_changes, :run_on_change
     ]
 
-    ADDITION_TASKS     = [:run_on_additions, :run_on_changes, :run_on_change]
-    REMOVAL_TASKS      = [:run_on_removals, :run_on_changes, :run_on_deletion]
+    ADDITION_TASKS = [:run_on_additions, :run_on_changes, :run_on_change]
+    REMOVAL_TASKS = [:run_on_removals, :run_on_changes, :run_on_deletion]
 
     # Runs the appropriate tasks on all registered plugins
     # based on the passed changes.

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" : "clear;"
         exit_code, _, stderr = Shellany::Sheller.system(cmd)
         fail Errno::ENOENT, stderr unless exit_code == 0
       end

data/lib/guard/ui.rb

@@ -161,7 +161,7 @@ module Guard
       #
       def action_with_scopes(action, scope)
         titles = Guard.state.scope.titles(scope)
-        info "#{action} #{titles.join(", ")}"
+        info "#{action} #{titles.join(', ')}"
       end
 
       private
@@ -174,7 +174,7 @@ module Guard
       # @yieldparam [String] param the calling plugin name
       #
       def _filter(plugin)
-        only   = options[:only]
+        only = options[:only]
         except = options[:except]
         plugin ||= calling_plugin_name
 

data/lib/guard/ui/colors.rb

@@ -2,55 +2,55 @@ module Guard
   module UI
     module Colors
       # Brighten the color
-      ANSI_ESCAPE_BRIGHT    = "1"
+      ANSI_ESCAPE_BRIGHT = "1"
 
       # Black foreground color
-      ANSI_ESCAPE_BLACK     = "30"
+      ANSI_ESCAPE_BLACK = "30"
 
       # Red foreground color
-      ANSI_ESCAPE_RED       = "31"
+      ANSI_ESCAPE_RED = "31"
 
       # Green foreground color
-      ANSI_ESCAPE_GREEN     = "32"
+      ANSI_ESCAPE_GREEN = "32"
 
       # Yellow foreground color
-      ANSI_ESCAPE_YELLOW    = "33"
+      ANSI_ESCAPE_YELLOW = "33"
 
       # Blue foreground color
-      ANSI_ESCAPE_BLUE      = "34"
+      ANSI_ESCAPE_BLUE = "34"
 
       # Magenta foreground color
-      ANSI_ESCAPE_MAGENTA   = "35"
+      ANSI_ESCAPE_MAGENTA = "35"
 
       # Cyan foreground color
-      ANSI_ESCAPE_CYAN      = "36"
+      ANSI_ESCAPE_CYAN = "36"
 
       # White foreground color
-      ANSI_ESCAPE_WHITE     = "37"
+      ANSI_ESCAPE_WHITE = "37"
 
       # Black background color
-      ANSI_ESCAPE_BGBLACK   = "40"
+      ANSI_ESCAPE_BGBLACK = "40"
 
       # Red background color
-      ANSI_ESCAPE_BGRED     = "41"
+      ANSI_ESCAPE_BGRED = "41"
 
       # Green background color
-      ANSI_ESCAPE_BGGREEN   = "42"
+      ANSI_ESCAPE_BGGREEN = "42"
 
       # Yellow background color
-      ANSI_ESCAPE_BGYELLOW  = "43"
+      ANSI_ESCAPE_BGYELLOW = "43"
 
       # Blue background color
-      ANSI_ESCAPE_BGBLUE    = "44"
+      ANSI_ESCAPE_BGBLUE = "44"
 
       # Magenta background color
       ANSI_ESCAPE_BGMAGENTA = "45"
 
       # Cyan background color
-      ANSI_ESCAPE_BGCYAN    = "46"
+      ANSI_ESCAPE_BGCYAN = "46"
 
       # White background color
-      ANSI_ESCAPE_BGWHITE   = "47"
+      ANSI_ESCAPE_BGWHITE = "47"
     end
   end
 end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.12.4"
+  VERSION = "2.12.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.12.4
+  version: 2.12.5
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -162,6 +162,7 @@ files:
 - lib/guard/deprecated/watcher.rb
 - lib/guard/dsl.rb
 - lib/guard/dsl_describer.rb
+- lib/guard/dsl_reader.rb
 - lib/guard/group.rb
 - lib/guard/guardfile.rb
 - lib/guard/guardfile/evaluator.rb