From d9fc07149237991f07b7f02d414cfab19278797b Mon Sep 17 00:00:00 2001
From: Darren Pearce <limeyd@gmail.com>
Date: Mon, 26 Sep 2011 11:37:54 -0600
Subject: [PATCH] fixed typo and updated relativize_paths regex

---
 lib/guard.rb          |  4 ++--
 lib/guard/listener.rb | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/guard.rb b/lib/guard.rb
index 6c06844..740c115 100644
--- a/lib/guard.rb
+++ b/lib/guard.rb
@@ -24,13 +24,13 @@ module Guard
     # @option options [Array<String>] group the list of groups to start
     # @option options [String] watchdir the director to watch
     # @option options [String] guardfile the path to the Guardfile
-    # @optuin options [Boolean] watch_all_modifications watches all file modifications if true
+    # @option options [Boolean] watch_all_modifications watches all file modifications if true
     def setup(options = {})
       @options    = options
       @guards     = []
       @groups     = [:default]
       @interactor = Interactor.new
-      @listener   = Listener.select_and_init(@options[:watchdir] ? File.expand_path(@options[:watchdir]) : Dir.pwd,options)
+      @listener   = Listener.select_and_init(@options[:watchdir] ? File.expand_path(@options[:watchdir]) : Dir.pwd, options)
 
       @watch_all_modifications = options[:watch_all_modifications]
       @options[:notify] && ENV['GUARD_NOTIFY'] != 'false' ? Notifier.turn_on : Notifier.turn_off
diff --git a/lib/guard/listener.rb b/lib/guard/listener.rb
index 6212e52..83561e7 100644
--- a/lib/guard/listener.rb
+++ b/lib/guard/listener.rb
@@ -126,8 +126,12 @@ module Guard
 
     # Get the modified files.
     #
+    # If watch_all_modifications is true then moved and deleted files are also appended
+    # to the returned array prefixed so !/home/user/dir/file.rb
+    #
     # @param [Array<String>] dirs the watched directories
     # @param [Hash] options the listener options
+    # @return [Array<String>] paths of files that have been modified
     #
     def modified_files(dirs, options = {})
       last_event = @last_event
@@ -172,8 +176,7 @@ module Guard
     def relativize_paths(paths)
       return paths unless relativize_paths?
       paths.map do |path|
-        path.gsub(%r{#{@directory}/}, '')
-        #path.gsub(%r{^#{ @directory }/}, '')
+      path.gsub(%r{^(!)?#{ @directory }/},'\1')
       end
     end
 
@@ -274,6 +277,11 @@ module Guard
       end
     end
 
+    # Set save a files current timestamp
+    #
+    # @param [String] path the file path
+    # @param [Int] file_timestamp the files modified timestamp
+    #
     def set_file_timestamp_hash(path, file_timestamp)
         @file_timestamp_hash[path] = file_timestamp
     end
@@ -287,6 +295,11 @@ module Guard
       @sha1_checksums_hash[path] = sha1_checksum
     end
 
+    # Gets a files modified timestamp
+    #
+    # @path [String] path the file path
+    # @return [Int] file modified timestamp
+    #
     def file_timestamp(path)
       File.mtime(path).to_i
     end