guard 2.0.0.pre → 2.0.0.pre.2

data/README.md

@@ -23,7 +23,7 @@ Before you file an issue, make sure you have read the _[known issues](#issues)_
 * File system changes handled by our awesome [Listen](https://github.com/guard/listen) gem.
 * Support for visual system notifications.
 * Huge eco-system with [more than 220](https://rubygems.org/search?query=guard-) Guard plugins.
-* Tested against Ruby 1.9.2, 1.9.3, 2.0.0, JRuby (1.9 mode) & Rubinius (1.9 mode).
+* Tested against Ruby 1.9.3, 2.0.0, JRuby (1.9 mode) & Rubinius (1.9 mode).
 
 #### Screencast
 
@@ -603,11 +603,10 @@ used the `watch` method to monitor a directory, but you are not interested in ch
 the ignore method to exclude them.
 
 This comes in handy when you have large amounts of non-source data in you project. By default
-[`.rbx`, `.bundle`, `.git`, `.svn`, `log`, `tmp`, `vendor`](https://github.com/guard/listen/blob/master/lib/listen/directory_record.rb#L14)
+[`.rbx`, `.bundle`, `.DS_Store`, `.git`, `.hg` ,`.svn`, `bundle`, `log`, `tmp`, `vendor/bundle`](https://github.com/guard/listen/blob/master/lib/listen/silencer.rb#L5-L9)
 are ignored.
 
-Please note that method only accept regexps. More on the
-[Listen README](https://github.com/guard/listen#note-on-the-patterns-for-ignoring-and-filtering-paths).
+Please note that method only accept regexps. See [Listen README](https://github.com/guard/listen#ignore--ignore).
 
 To append to the default ignored files and directories, use the `ignore` method:
 
@@ -615,7 +614,7 @@ To append to the default ignored files and directories, use the `ignore` method:
 ignore %r{^ignored/path/}, /public/
 ```
 
-To _replace_ to default ignored files and directories, use the `ignore!` method:
+To _replace_ any existing ignored files and directories, use the `ignore!` method:
 
 ```ruby
 ignore! /data/
@@ -623,22 +622,7 @@ ignore! /data/
 
 ### filter
 
-The `filter` method allows you to focus by filtering files and directories without having to specify them by hand in the
-`watch` method. E.g. if you are watching multiple directories but only interested in changes to the Ruby files, then use
-the `filter` method.
-
-Please note that method only accept regexps. More on the
-[Listen README](https://github.com/guard/listen#note-on-the-patterns-for-ignoring-and-filtering-paths).
-
-```ruby
-filter /\.txt$/, /.*\.zip/
-```
-
-To _replace_ any existing filter, use the `filter!` method:
-
-```ruby
-filter! /\.js$/
-```
+Alias of the [ignore](https://github.com/guard/guard#ignore) method.
 
 ### logger
 

data/lib/guard.rb

@@ -119,6 +119,8 @@ module Guard
     # @return [Array<Group>] the filtered group(s)
     #
     def groups(filter = nil)
+      @groups ||= []
+
       return @groups if filter.nil?
 
       filtered_groups = case filter

data/lib/guard/dsl.rb

@@ -223,8 +223,9 @@ module Guard
     # @param [Regexp] regexps a pattern (or list of patterns) for ignoring paths
     #
     def ignore(*regexps)
-      ::Guard.listener = ::Guard.listener.ignore(*regexps) if ::Guard.listener
+      ::Guard.listener.ignore(*regexps) if ::Guard.listener
     end
+    alias filter ignore
 
     # Replaces ignored paths globally
     #
@@ -234,32 +235,11 @@ module Guard
     # @param [Regexp] regexps a pattern (or list of patterns) for ignoring paths
     #
     def ignore!(*regexps)
-      ::Guard.listener = ::Guard.listener.ignore!(*regexps) if ::Guard.listener
-    end
-
-    # Filters certain paths globally.
-    #
-    # @example Filter some files
-    #   filter /\.txt$/, /.*\.zip/
-    #
-    # @param [Regexp] regexps a pattern (or list of patterns) for filtering
-    #   paths
-    #
-    def filter(*regexps)
-      ::Guard.listener = ::Guard.listener.filter(*regexps) if ::Guard.listener
-    end
-
-    # Replaces filtered paths globally.
-    #
-    # @example Filter only these files
-    #   filter! /\.txt$/, /.*\.zip/
-    #
-    # @param [Regexp] regexps a pattern (or list of patterns) for filtering
-    #   paths
-    #
-    def filter!(*regexps)
-      ::Guard.listener = ::Guard.listener.filter!(*regexps) if ::Guard.listener
+      @ignore_regexps ||= []
+      @ignore_regexps << regexps
+      ::Guard.listener.ignore!(@ignore_regexps) if ::Guard.listener
     end
+    alias filter! ignore!
 
     # Configures the Guard logger.
     #

data/lib/guard/interactor.rb

@@ -159,21 +159,35 @@ module Guard
     # * Restore prompt after each evaluation.
     #
     def _add_hooks
+      _add_load_guard_rc_hook
+      _add_load_project_guard_rc_hook
+      _add_restore_visibility_hook if _stty_exists?
+    end
+
+    # Add a `when_started` hook that loads a global .guardrc if it exists.
+    #
+    def _add_load_guard_rc_hook
       Pry.config.hooks.add_hook :when_started, :load_guard_rc do
         (self.class.options[:guard_rc] || GUARD_RC).tap do |p|
           load p if File.exist?(File.expand_path(p))
         end
       end
+    end
 
+    # Add a `when_started` hook that loads a project .guardrc if it exists.
+    #
+    def _add_load_project_guard_rc_hook
       Pry.config.hooks.add_hook :when_started, :load_project_guard_rc do
         project_guard_rc = Dir.pwd + '/.guardrc'
         load project_guard_rc if File.exist?(project_guard_rc)
       end
+    end
 
-      if _stty_exists?
-        Pry.config.hooks.add_hook :after_eval, :restore_visibility do
-          system("stty echo 2>#{ DEV_NULL }")
-        end
+    # Add a `after_eval` hook that restores visibility after a command is eval.
+    #
+    def _add_restore_visibility_hook
+      Pry.config.hooks.add_hook :after_eval, :restore_visibility do
+        system("stty echo 2>#{ DEV_NULL }")
       end
     end
 
@@ -243,13 +257,30 @@ module Guard
       end
     end
 
-    # Configure the pry prompt to see `guard` instead of
+    # Configures the pry prompt to see `guard` instead of
     # `pry`.
     #
     def _configure_prompt
       Pry.config.prompt = [_prompt('>'), _prompt('*')]
     end
 
+    # Returns the plugins scope, or the groups scope ready for display in the
+    # prompt.
+    #
+    def _scope_for_prompt
+      [:plugins, :groups].each do |scope_name|
+        return _join_scope(scope_name) unless ::Guard.scope[scope_name].empty?
+      end
+
+      ''
+    end
+
+    # Joins the scope corresponding to the given scope name with commas.
+    #
+    def _join_scope_for_prompt(scope_name)
+      ::Guard.scope[scope_name].map(&:title).join(',')
+    end
+
     # Returns a proc that will return itself a string ending with the given
     # `ending_char` when called.
     #
@@ -258,16 +289,9 @@ module Guard
         history = pry.input_array.size
         process = ::Guard.listener.paused? ? 'pause' : 'guard'
         clip    = Pry.view_clip(target_self)
-        level = ":#{ nest_level }" unless nest_level.zero?
-        scope = if !::Guard.scope[:plugins].empty?
-                  "{#{ ::Guard.scope[:plugins].map(&:title).join(',') }} "
-                elsif !::Guard.scope[:groups].empty?
-                  "{#{ ::Guard.scope[:groups].map(&:title).join(',') }} "
-                else
-                  ''
-                end
-
-        "[#{ history }] #{ scope }#{ process }(#{ clip })#{ level }#{ending_char} "
+        level   = ":#{ nest_level }" unless nest_level.zero?
+
+        "[#{ history }] #{ _scope_for_prompt }#{ process }(#{ clip })#{ level }#{ ending_char } "
       end
     end
 

data/lib/guard/setuper.rb

@@ -177,7 +177,7 @@ module Guard
       end
 
       listen_args = @watchdirs + [listener_options]
-      @listener = Listen.to(*listen_args).change(&listener_callback)
+      @listener = Listen.to(*listen_args, &listener_callback)
     end
 
     # Sets up traps to catch signals used to control Guard.

data/lib/guard/ui.rb

@@ -51,10 +51,7 @@ module Guard
       # @option options [String] plugin manually define the calling plugin
       #
       def info(message, options = {})
-        filter(options[:plugin]) do |plugin|
-          reset_line if options[:reset]
-          logger.info(message, plugin)
-        end
+        _filtered_logger_message(message, :info, nil, options)
       end
 
       # Show a yellow warning message that is prefixed with WARNING.
@@ -64,10 +61,7 @@ module Guard
       # @option options [String] plugin manually define the calling plugin
       #
       def warning(message, options = {})
-        filter(options[:plugin]) do |plugin|
-          reset_line if options[:reset]
-          logger.warn(color(message, :yellow), plugin)
-        end
+        _filtered_logger_message(message, :warn, :yellow, options)
       end
 
       # Show a red error message that is prefixed with ERROR.
@@ -77,10 +71,7 @@ module Guard
       # @option options [String] plugin manually define the calling plugin
       #
       def error(message, options = {})
-        filter(options[:plugin]) do |plugin|
-          reset_line if options[:reset]
-          logger.error(color(message, :red), plugin)
-        end
+        _filtered_logger_message(message, :error, :red, options)
       end
 
       # Show a red deprecation message that is prefixed with DEPRECATION.
@@ -91,12 +82,7 @@ module Guard
       # @option options [String] plugin manually define the calling plugin
       #
       def deprecation(message, options = {})
-        return unless ::Guard.options.show_deprecations
-
-        filter(options[:plugin]) do |plugin|
-          reset_line if options[:reset]
-          logger.warn(color(message, :yellow), plugin)
-        end
+        warning(message, options) if ::Guard.options.show_deprecations
       end
 
       # Show a debug message that is prefixed with DEBUG and a timestamp.
@@ -106,10 +92,7 @@ module Guard
       # @option options [String] plugin manually define the calling plugin
       #
       def debug(message, options = {})
-        filter(options[:plugin]) do |plugin|
-          reset_line if options[:reset]
-          logger.debug(color(message, :yellow), plugin)
-        end
+        _filtered_logger_message(message, :debug, :yellow, options)
       end
 
       # Reset a line.
@@ -138,24 +121,27 @@ module Guard
       # @param [String] action the action to show
       # @param [Hash] scopes hash with a guard or a group scope
       #
-      def action_with_scopes(action, scopes)
-        plugins = scopes[:plugins] || []
-        groups  = scopes[:groups] || []
-
-        if plugins.empty? && groups.empty?
-          plugins = ::Guard.scope[:plugins] || []
-          groups  = ::Guard.scope[:groups] || []
-        end
-
-        scope_message ||= plugins.map(&:title).join(', ') unless plugins.empty?
-        scope_message ||= groups.map(&:title).join(', ') unless groups.empty?
-        scope_message ||= 'all'
+      def action_with_scopes(action, scope)
+        first_non_blank_scope = _first_non_blank_scope(scope)
+        scope_message = first_non_blank_scope.map(&:title).join(', ') unless first_non_blank_scope.nil?
 
-        info "#{ action } #{ scope_message }"
+        info "#{ action } #{ scope_message || 'all' }"
       end
 
       private
 
+      # Returns the first non-blank scope by searching in the given `scope`
+      # hash and in Guard.scope. Returns nil if no non-blank scope is found.
+      #
+      def _first_non_blank_scope(scope)
+        [:plugins, :groups].each do |scope_name|
+          s = scope[scope_name] || ::Guard.scope[scope_name]
+          return s if !s.nil? && !s.empty?
+        end
+
+        nil
+      end
+
       # Filters log messages depending on either the
       # `:only`` or `:except` option.
       #
@@ -163,7 +149,7 @@ module Guard
       # @yield When the message should be logged
       # @yieldparam [String] param the calling plugin name
       #
-      def filter(plugin)
+      def _filter(plugin)
         only   = options.only
         except = options.except
         plugin = plugin || calling_plugin_name
@@ -173,6 +159,22 @@ module Guard
         end
       end
 
+      # Display a message of the type `method` and with the color `color_name`
+      # (no color by default) conditionnaly given a `plugin_name`.
+      #
+      # @param [String] plugin_name the calling plugin name
+      # @option options [Boolean] reset whether to clean the output before
+      # @option options [String] plugin manually define the calling plugin
+      #
+      def _filtered_logger_message(message, method, color_name, options = {})
+        message = color(message, color_name) if color_name
+
+        _filter(options[:plugin]) do |plugin|
+          reset_line if options[:reset]
+          logger.send(method, message, plugin)
+        end
+      end
+
       # Tries to extract the calling Guard plugin name
       # from the call stack.
       #

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = '2.0.0.pre'
+  VERSION = '2.0.0.pre.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0.pre.2
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0.beta.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement