guard 1.5.4 → 1.6.0

data/lib/guard/notifiers/gntp.rb

@@ -57,7 +57,7 @@ module Guard
       # @return [Boolean] the availability status
       #
       def available?(silent = false)
-        if RbConfig::CONFIG['host_os'] =~ /darwin|linux|freebsd|openbsd|sunos|solaris|mswin|mingw/
+        if RbConfig::CONFIG['host_os'] =~ /darwin|linux|freebsd|openbsd|sunos|solaris|mswin|mingw|cygwin/
           require 'ruby_gntp'
           true
 

data/lib/guard/notifiers/tmux.rb

@@ -1,8 +1,6 @@
 module Guard
   module Notifier
 
-    # Default options for Tmux
-
     # Changes the color of the Tmux status bar and optionally
     # shows messages in the status bar.
     #
@@ -18,6 +16,7 @@ module Guard
     module Tmux
       extend self
 
+      # Default options for Tmux
       DEFAULTS = {
         :client                 => 'tmux',
         :tmux_environment       => 'TMUX',
@@ -62,9 +61,10 @@ module Guard
       # @option options [Boolean] display_message whether to display a message or not
       #
       def notify(type, title, message, image, options = { })
-        color = tmux_color type, options
+        color = tmux_color(type, options)
         color_location = options[:color_location] || DEFAULTS[:color_location]
-        system("#{ DEFAULTS[:client] } set -g #{ color_location } #{ color }")
+
+        system("#{ DEFAULTS[:client] } set #{ color_location } #{ color }")
 
         show_message = options[:display_message] || DEFAULTS[:display_message]
         display_message(type, title, message, options) if show_message
@@ -121,6 +121,62 @@ module Guard
           options[:default] || DEFAULTS[:default]
         end
       end
+
+      # Notification starting, save the current Tmux settings
+      # and quiet the Tmux output.
+      #
+      def turn_on(options = { })
+        unless @options_stored
+          reset_options_store
+
+          `#{ DEFAULTS[:client] } show`.each_line do |line|
+            option, _, setting = line.chomp.partition(' ')
+            @options_store[option] = setting
+          end
+
+          @options_stored = true
+        end
+
+        system("#{ DEFAULTS[:client] } set quiet on")
+      end
+
+      # Notification stopping. Restore the previous Tmux state
+      # if available (existing options are restored, new options
+      # are unset) and unquite the Tmux output.
+      #
+      def turn_off(options = { })
+        if @options_stored
+          @options_store.each do |key, value|
+            if value
+              system("#{ DEFAULTS[:client] } set #{ key } #{ value }")
+            else
+              system("#{ DEFAULTS[:client] } set -u #{ key }")
+            end
+          end
+
+          reset_options_store
+        end
+
+        system("#{ DEFAULTS[:client] } set quiet off")
+      end
+
+      private
+
+      # Reset the internal Tmux options store defaults.
+      #
+      def reset_options_store
+        @options_stored = false
+        @options_store = {
+          'status-left-bg'  => nil,
+          'status-right-bg' => nil,
+          'status-left-fg'  => nil,
+          'status-right-fg' => nil,
+          'message-bg'      => nil,
+          'message-fg'      => nil,
+          'display-time'    => nil
+        }
+      end
+
     end
   end
 end

data/lib/guard/runner.rb

@@ -7,7 +7,7 @@ module Guard
     require 'guard'
     require 'guard/ui'
     require 'guard/watcher'
-    
+
     require 'lumberjack'
 
     # Deprecation message for the `run_on_change` method
@@ -153,18 +153,23 @@ module Guard
 
     # Loop through all groups and run the given task for each Guard plugin.
     #
+    # If no scope is supplied, the global Guard scope is taken into account.
+    # If both a plugin and a group scope is given, then only the plugin scope
+    # is used.
+    #
     # Stop the task run for the all Guard plugins within a group if one Guard
     # throws `:task_has_failed`.
     #
-    # @param [Hash] scopes hash with a Guard plugin or a group scope
+    # @param [Hash] scopes hash with plugins or a groups scope
     # @yield the task to run
     #
     def scoped_guards(scopes = {})
-      if guard = scopes[:guard]
-        yield(guard)
+      if guards = current_plugins_scope(scopes)
+        guards.each do |guard|
+          yield(guard)
+        end
       else
-        groups = scopes[:group] ? [scopes[:group]] : ::Guard.groups
-        groups.each do |group|
+        current_groups_scope(scopes).each do |group|
           catch :task_has_failed do
             ::Guard.guards(:group => group.name).each do |guard|
               yield(guard)
@@ -188,5 +193,42 @@ module Guard
       (REMOVAL_TASKS.any? { |task| guard.respond_to?(task) } && !removed_paths.empty?)
     end
 
+    # Returns the current plugins scope.
+    # Local plugins scope wins over global plugins scope.
+    # If no plugins scope is found, then NO plugins are returned.
+    #
+    # @param [Hash] scopes hash with a local plugins or a groups scope
+    # @return [Array<Guard::Guard>] the plugins to scope to
+    #
+    def current_plugins_scope(scopes)
+      if scopes[:plugins] && !scopes[:plugins].empty?
+        scopes[:plugins]
+
+      elsif !::Guard.scope[:plugins].empty?
+        ::Guard.scope[:plugins]
+
+      else
+        nil
+      end
+    end
+
+    # Returns the current groups scope.
+    # Local groups scope wins over global groups scope.
+    # If no groups scope is found, then ALL groups are returned.
+    #
+    # @param [Hash] scopes hash with a local plugins or a groups scope
+    # @return [Array<Guard::Group>] the groups to scope to
+    #
+    def current_groups_scope(scopes)
+      if scopes[:groups] && !scopes[:groups].empty?
+        scopes[:groups]
+
+      elsif !::Guard.scope[:groups].empty?
+        ::Guard.scope[:groups]
+
+      else
+        ::Guard.groups
+      end
+    end
   end
 end

data/lib/guard/ui.rb

@@ -10,7 +10,7 @@ module Guard
   # processing, please just write it to STDOUT with `puts`.
   #
   module UI
-    
+
     class << self
 
       # Get the Guard::UI logger instance
@@ -18,7 +18,7 @@ module Guard
       def logger
         @logger ||= Lumberjack::Logger.new($stderr, self.options)
       end
-      
+
       # Get the logger options
       #
       # @return [Hash] the logger options
@@ -131,27 +131,35 @@ module Guard
       # @param [Hash] scopes hash with a guard or a group scope
       #
       def action_with_scopes(action, scopes)
-        scope_message ||= scopes[:guard]
-        scope_message ||= scopes[:group]
+        plugins = scopes[:plugins] || []
+        groups  = scopes[:groups] || []
+
+        if plugins.empty? && groups.empty?
+          plugins = ::Guard.scope[:plugins] || []
+          groups  = ::Guard.scope[:groups] || []
+        end
+
+        scope_message ||= plugins.join(',') unless plugins.empty?
+        scope_message ||= groups.join(',') unless groups.empty?
         scope_message ||= 'all'
 
-        info "#{action} #{scope_message}"
+        info "#{ action } #{ scope_message }"
       end
 
       private
-     
+
       # Filters log messages depending on either the
       # `:only`` or `:except` option.
       #
       # @param [String] plugin the calling plugin name
       # @yield When the message should be logged
-      # @yieldparam [String] param the calling plugin name 
+      # @yieldparam [String] param the calling plugin name
       #
       def filter(plugin)
         only   = self.options[:only]
         except = self.options[:except]
         plugin = plugin || calling_plugin_name
-        
+
         if (!only && !except) || (only && only.match(plugin)) || (except && !except.match(plugin))
           yield plugin
         end

data/lib/guard/version.rb

@@ -1,4 +1,4 @@
 module Guard
   # The current gem version of Guard
-  VERSION = '1.5.4'
+  VERSION = '1.6.0'
 end

data/man/guard.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GUARD" "1" "July 2012" "" ""
+.TH "GUARD" "1" "December 2012" "" ""
 .
 .SH "NAME"
 \fBguard\fR \- Guard keeps an eye on your file modifications\.
@@ -30,7 +30,10 @@ The following options are available:
 \fB\-d\fR, \fB\-\-debug\fR Runs Guard in debug mode\.
 .
 .P
-\fB\-g\fR, \fB\-\-group\fR \fIGROUP1\fR \fIGROUP2\fR\.\.\. Runs only the groups specified by GROUP1, GROUP2 etc\. Groups name should be separated by spaces\. Guards that don\'t belong to a group are considered global and are always run\.
+\fB\-g\fR, \fB\-\-group\fR \fIGROUP1\fR \fIGROUP2\fR\.\.\. Scopes the Guard actions to the groups specified by GROUP1, GROUP2, etc\. Group names should be separated by spaces\. Plugins that don\'t belong to a group are considered global and are always run\.
+.
+.P
+\fB\-P\fR, \fB\-\-plugin\fR \fIPLUGIN1\fR \fIPLUGIN2\fR\.\.\. Scopes the Guard actions to the plugins specified by PLUGIN1, PLUGIN2, etc\. Plugin names should be separated by spaces\.
 .
 .P
 \fB\-w\fR, \fB\-\-watchdir\fR \fIPATH\fR Tells Guard to watch PATH instead of \fB\./\fR\.

data/man/guard.1.html

@@ -101,9 +101,13 @@
   Runs Guard in debug mode.</p>
 
 <p><code>-g</code>, <code>--group</code> <var>GROUP1</var> <var>GROUP2</var>...
-  Runs only the groups specified by GROUP1, GROUP2 etc.
-  Groups name should be separated by spaces.
-  Guards that don't belong to a group are considered global and are always run.</p>
+  Scopes the Guard actions to the groups specified by GROUP1, GROUP2, etc.
+  Group names should be separated by spaces.
+  Plugins that don't belong to a group are considered global and are always run.</p>
+
+<p><code>-P</code>, <code>--plugin</code> <var>PLUGIN1</var> <var>PLUGIN2</var>...
+  Scopes the Guard actions to the plugins specified by PLUGIN1, PLUGIN2, etc.
+  Plugin names should be separated by spaces.</p>
 
 <p><code>-w</code>, <code>--watchdir</code> <var>PATH</var>
   Tells Guard to watch PATH instead of <code>./</code>.</p>
@@ -181,7 +185,7 @@ https://github.com/guard/guard/blob/master/CHANGELOG.md</p>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>July 2012</li>
+    <li class='tc'>December 2012</li>
     <li class='tr'>guard(1)</li>
   </ol>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me
@@ -142,6 +142,7 @@ files:
 - lib/guard/commands/notification.rb
 - lib/guard/commands/pause.rb
 - lib/guard/commands/reload.rb
+- lib/guard/commands/scope.rb
 - lib/guard/commands/show.rb
 - lib/guard/dsl.rb
 - lib/guard/dsl_describer.rb
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Guard keeps an eye on your file modifications