guard 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb89fd8c33c9157806648b93f82adc1756ae93d3
-  data.tar.gz: 39596d5b723687f2e0aab7e31aeca974ee952af2
+  metadata.gz: a8af99f10f6df5f4ec30fda1e60627279c331afa
+  data.tar.gz: fab4128ccc9c311302c80270de736dbdaefacae1
 SHA512:
-  metadata.gz: 33195a00ad0b4dfce3e70ab175254aba5a485e2eb8e5cf72ba601b34b31e948f5eb13c6f88a5bdfc6c200bf1b5d7c08d1c0a26f3658faf04c10d5fe54dea8f52
-  data.tar.gz: 74db8ad59ac2ecda8d0c3cdd2aa2fcf9967ed3ef809ee0e0e5de1b523e6374b5f03d24c3feafa3b59519ac0eaa0dac8f9b6abb20f7c169497fed1aae8851b53f
+  metadata.gz: eea1545a513b80dd36aed19b1f94189a8508bbe01c8e9ff1416807597dbd3a58e3b5df68f4e1c973d264160e861240aa999a87340aed6ca7369a80fddff61c84
+  data.tar.gz: d4d9c887f95c45cc671c7237d5c043eb2dd1b841d5b024f273260fda4164e8f080006a49bf7efe121997e3db9995831fd47360d24939f70a5be75a36ade05d95

data/README.md

@@ -478,13 +478,35 @@ group :docs do
 end
 ```
 
+Groups can be nested, reopened and can take muliple names to assign its plugin to multiple groups:
+
+```ruby
+group :desktop do
+  guard 'livereload' do
+    watch(%r{desktop/.+\.html})
+  end
+
+  group :mobile do
+    guard 'livereload' do
+      watch(%r{mobile/.+\.html})
+    end
+  end
+end
+
+group :mobile, :desktop do
+  guard 'livereload' do
+    watch(%r{both/.+\.html})
+  end
+end
+```
+
 Groups to be run can be specified with the Guard DSL option `--group` (or `-g`):
 
 ```bash
 $ bundle exec guard -g specs
 ```
 
-Guard plugins that don't belong to a group are considered global and are always run.
+Plugins that don't belong to a group are part of the `default` group.
 
 Another neat use of groups is to group dependant plugins and stop processing if one fails. In order
 to make this work, the group needs to have the `halt_on_fail` option enabled and the Guard plugin

data/lib/guard/dsl.rb

@@ -108,7 +108,7 @@ module Guard
     #     guard :livereload
     #   end
     #
-    # @param [Symbol, String] name the group name called from the CLI
+    # @param [Symbol, String, Array<Symbol, String>] name the group name called from the CLI
     # @param [Hash] options the options accepted by the group
     # @yield a block where you can declare several Guard plugins
     #
@@ -117,17 +117,25 @@ module Guard
     # @see #guard
     #
     def group(name, options = {})
-      raise ArgumentError, "'all' is not an allowed group name!" if name.to_sym == :all
+      groups = Array(name)
+
+      groups.each do |group|
+        raise ArgumentError, "'all' is not an allowed group name!" if group.to_sym == :all
+      end
 
       if block_given?
-        ::Guard.add_group(name, options)
-        @current_group = name
+        groups.each do |group|
+          ::Guard.add_group(group, options)
+        end
+
+        @current_groups ||= []
+        @current_groups.push(groups)
 
         yield
 
-        @current_group = nil
+        @current_groups.pop
       else
-        ::Guard::UI.error "No Guard plugins found in the group '#{ name }', please add at least one."
+        ::Guard::UI.error "No Guard plugins found in the group '#{ groups.join(', ') }', please add at least one."
       end
     end
 
@@ -158,12 +166,14 @@ module Guard
     def guard(name, options = {})
       @watchers  = []
       @callbacks = []
-      @current_group ||= :default
 
       yield if block_given?
 
-      options.merge!(group: @current_group, watchers: @watchers, callbacks: @callbacks)
-      ::Guard.add_plugin(name, options)
+      groups = @current_groups || [[:default]]
+      groups.last.each do |group|
+        options.merge!(group: group, watchers: @watchers, callbacks: @callbacks)
+        ::Guard.add_plugin(name, options)
+      end
     end
 
     # Defines a pattern to be watched in order to run actions on file modification.

data/lib/guard/notifiers/emacs.rb

@@ -86,7 +86,8 @@ module Guard
       private
 
       def _run_cmd(*args)
-        p = IO.popen(args).readlines
+        p = IO.popen(args)
+        p.readlines
         p.close
       end
 

data/lib/guard/plugin/hooker.rb

@@ -17,6 +17,73 @@ 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.
       #
@@ -65,59 +132,6 @@ 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|
-          self.class.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.3'
+  VERSION = '2.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor