guard 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8af99f10f6df5f4ec30fda1e60627279c331afa
-  data.tar.gz: fab4128ccc9c311302c80270de736dbdaefacae1
+  metadata.gz: 7b5c095e15ffd825f5b44a76fccc7876c3720c17
+  data.tar.gz: 17adc2900e6ba19bd56b266c45d8ab36a11ef9c1
 SHA512:
-  metadata.gz: eea1545a513b80dd36aed19b1f94189a8508bbe01c8e9ff1416807597dbd3a58e3b5df68f4e1c973d264160e861240aa999a87340aed6ca7369a80fddff61c84
-  data.tar.gz: d4d9c887f95c45cc671c7237d5c043eb2dd1b841d5b024f273260fda4164e8f080006a49bf7efe121997e3db9995831fd47360d24939f70a5be75a36ade05d95
+  metadata.gz: 3ebe13bbb141439cec3005cca533ab37c6b4d8352ea680cc432ecc32808796f057039870c7cba7848a2bcbdc8f87713a230cf11f9b91614eaee7ebe92e6a2c89
+  data.tar.gz: fb246be778aadad200aa3ca328c35c542aef5c639cd249a58eef920bd50c0358645c5ff30b97aa64a8cfd7de4ac5b0ec52b39a3f544a246c6c3beed22a7e3341

data/README.md

@@ -478,7 +478,7 @@ group :docs do
 end
 ```
 
-Groups can be nested, reopened and can take muliple names to assign its plugin to multiple groups:
+Groups can be nested, reopened and can take multiple names to assign its plugin to multiple groups:
 
 ```ruby
 group :desktop do

data/lib/guard/dsl.rb

@@ -116,8 +116,9 @@ module Guard
     # @see Guard.add_group
     # @see #guard
     #
-    def group(name, options = {})
-      groups = Array(name)
+    def group(*args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      groups = args
 
       groups.each do |group|
         raise ArgumentError, "'all' is not an allowed group name!" if group.to_sym == :all
@@ -169,8 +170,8 @@ module Guard
 
       yield if block_given?
 
-      groups = @current_groups || [[:default]]
-      groups.last.each do |group|
+      groups = @current_groups && @current_groups.last || [:default]
+      groups.each do |group|
         options.merge!(group: group, watchers: @watchers, callbacks: @callbacks)
         ::Guard.add_plugin(name, options)
       end

data/lib/guard/plugin/hooker.rb

@@ -17,73 +17,6 @@ module Guard
 
       require 'guard/ui'
 
-      # The Hooker module gets included.
-      #
-      # @param [Class] base the class that includes the module
-      #
-      def self.included(base)
-        base.send :include, InstanceMethods
-      end
-
-      # Instance methods that gets included in the base class.
-      #
-      module InstanceMethods
-
-        # When event is a Symbol, {#hook} will generate a hook name
-        # by concatenating the method name from where {#hook} is called
-        # with the given Symbol.
-        #
-        # @example Add a hook with a Symbol
-        #
-        #   def run_all
-        #     hook :foo
-        #   end
-        #
-        # Here, when {Guard::Plugin::Base#run_all} is called, {#hook} will notify
-        # callbacks registered for the "run_all_foo" event.
-        #
-        # When event is a String, {#hook} will directly turn the String
-        # into a Symbol.
-        #
-        # @example Add a hook with a String
-        #
-        #   def run_all
-        #     hook "foo_bar"
-        #   end
-        #
-        # When {Guard::Plugin::Base#run_all} is called, {#hook} will notify
-        # callbacks registered for the "foo_bar" event.
-        #
-        # @param [Symbol, String] event the name of the Guard event
-        # @param [Array] args the parameters are passed as is to the callbacks
-        #   registered for the given event.
-        #
-        def hook(event, *args)
-          hook_name = if event.is_a? Symbol
-                        calling_method = caller[0][/`([^']*)'/, 1]
-                        "#{ calling_method }_#{ event }"
-                      else
-                        event
-                      end
-
-          ::Guard::UI.debug "Hook :#{ hook_name } executed for #{ self.class }"
-
-          Hooker.notify(self, hook_name.to_sym, *args)
-        end
-
-        private
-
-        # Add all the Guard::Plugin's callbacks to the global @callbacks array
-        # that's used by Guard to know which callbacks to notify.
-        #
-        def _register_callbacks
-          callbacks.each do |callback|
-            Hooker.add_callback(callback[:listener], self, callback[:events])
-          end
-        end
-
-      end
-
       # Get all callbacks registered for all Guard plugins present in the
       # Guardfile.
       #
@@ -98,22 +31,11 @@ module Guard
       # @param [Array<Symbol>] events the events to register
       #
       def self.add_callback(listener, guard_plugin, events)
-        _events = events.is_a?(Array) ? events : [events]
-        _events.each do |event|
+        Array(events).each do |event|
           callbacks[[guard_plugin, event]] << listener
         end
       end
 
-      # Checks if a callback has been registered.
-      #
-      # @param [Block] listener the listener to notify
-      # @param [Guard::Plugin] guard_plugin the Guard plugin to add the callback
-      # @param [Symbol] event the event to look for
-      #
-      def self.has_callback?(listener, guard_plugin, event)
-        callbacks[[guard_plugin, event]].include?(listener)
-      end
-
       # Notify a callback.
       #
       # @param [Guard::Plugin] guard_plugin the Guard plugin to add the callback
@@ -132,6 +54,59 @@ module Guard
         @callbacks = nil
       end
 
+      # When event is a Symbol, {#hook} will generate a hook name
+      # by concatenating the method name from where {#hook} is called
+      # with the given Symbol.
+      #
+      # @example Add a hook with a Symbol
+      #
+      #   def run_all
+      #     hook :foo
+      #   end
+      #
+      # Here, when {Guard::Plugin::Base#run_all} is called, {#hook} will notify
+      # callbacks registered for the "run_all_foo" event.
+      #
+      # When event is a String, {#hook} will directly turn the String
+      # into a Symbol.
+      #
+      # @example Add a hook with a String
+      #
+      #   def run_all
+      #     hook "foo_bar"
+      #   end
+      #
+      # When {Guard::Plugin::Base#run_all} is called, {#hook} will notify
+      # callbacks registered for the "foo_bar" event.
+      #
+      # @param [Symbol, String] event the name of the Guard event
+      # @param [Array] args the parameters are passed as is to the callbacks
+      #   registered for the given event.
+      #
+      def hook(event, *args)
+        hook_name = if event.is_a? Symbol
+                      calling_method = caller[0][/`([^']*)'/, 1]
+                      "#{ calling_method }_#{ event }"
+                    else
+                      event
+                    end
+
+        ::Guard::UI.debug "Hook :#{ hook_name } executed for #{ self.class }"
+
+        Hooker.notify(self, hook_name.to_sym, *args)
+      end
+
+      private
+
+      # Add all the Guard::Plugin's callbacks to the global @callbacks array
+      # that's used by Guard to know which callbacks to notify.
+      #
+      def _register_callbacks
+        callbacks.each do |callback|
+          Hooker.add_callback(callback[:listener], self, callback[:events])
+        end
+      end
+
     end
   end
 end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = '2.2.4'
+  VERSION = '2.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications