guard 0.3.4 → 0.4.0.rc

data/README.markdown

@@ -1,4 +1,4 @@
-Guard
+Guard [![Build Status](http://travis-ci.org/guard/guard.png)](http://travis-ci.org/guard/guard)
 =====
 
 Guard is a command line tool that easily handle events on files modifications.
@@ -8,20 +8,23 @@ Features
 
 * [FSEvent](http://en.wikipedia.org/wiki/FSEvents) support on Mac OS X 10.5+ (without RubyCocoa!, [rb-fsevent gem, >= 0.3.5](https://rubygems.org/gems/rb-fsevent) required).
 * [Inotify](http://en.wikipedia.org/wiki/Inotify) support on Linux ([rb-inotify gem, >= 0.5.1](https://rubygems.org/gems/rb-inotify) required).
+* [Directory Change Notification](http://msdn.microsoft.com/en-us/library/aa365261\(VS.85\).aspx) support on Windows ([rb-fchange, >= 0.0.2](https://rubygems.org/gems/rb-fchange) required).
 * Polling on the other operating systems (help us to support more OS).
 * Automatic & Super fast (when polling is not used) files modifications detection (even new files are detected).
 * Growl notifications ([growlnotify](http://growl.info/documentation/growlnotify.php) & [growl gem](https://rubygems.org/gems/growl) required).
 * Libnotify notifications ([libnotify gem](https://rubygems.org/gems/libnotify) required).
-* Tested on Ruby 1.8.6, 1.8.7 & 1.9.2.
+* Tested on Ruby 1.8.7, 1.9.2 && ree.
 
 Install
 -------
 
 Install the gem:
 
-    $ gem install guard
+``` bash
+$ gem install guard
+```
 
-Add it to your Gemfile (inside the <tt>test</tt> group):
+Add it to your Gemfile (inside the `test` group):
 
 ``` ruby
 gem 'guard'
@@ -29,7 +32,11 @@ gem 'guard'
 
 Generate an empty Guardfile with:
 
-    $ guard init
+``` bash
+$ guard init
+```
+
+You may optionally place this Guardfile in your home directory to use it across multiple projects.
 
 Add the guards you need to your Guardfile (see the existing guards below).
 
@@ -37,11 +44,15 @@ Add the guards you need to your Guardfile (see the existing guards below).
 
 Install the rb-fsevent gem for [FSEvent](http://en.wikipedia.org/wiki/FSEvents) support:
 
-    $ gem install rb-fsevent
+``` bash
+$ gem install rb-fsevent
+```
 
 Install the Growl gem if you want notification support:
 
-    $ gem install growl
+``` bash
+$ gem install growl
+```
 
 And add it to you Gemfile:
 
@@ -53,11 +64,15 @@ gem 'growl'
 
 Install the rb-inotify gem for [inotify](http://en.wikipedia.org/wiki/Inotify) support:
 
-    $ gem install rb-inotify
+``` bash
+$ gem install rb-inotify
+```
 
 Install the Libnotify gem if you want notification support:
 
-    $ gem install libnotify
+``` bash
+$ gem install libnotify
+```
 
 And add it to you Gemfile:
 
@@ -65,47 +80,71 @@ And add it to you Gemfile:
 gem 'libnotify'
 ```
 
+### On Windows
+
+Install the rb-fchange gem for [Directory Change Notification](http://msdn.microsoft.com/en-us/library/aa365261\(VS.85\).aspx) support:
+
+``` bash
+$ gem install rb-fchange
+```
+
 Usage
 -----
 
 Just launch Guard inside your Ruby / Rails project with:
 
-    $ guard [start]
+``` bash
+$ guard [start]
+```
 
 or if you use Bundler, to run the Guard executable specific to your bundle:
 
-    $ bundle exec guard
+``` bash
+$ bundle exec guard
+```
+
+Guard will look for a Guardfile in your current directory. If it does not find one, it will look in your home directory for one.
 
 Command line options
 --------------------
 
 Shell can be cleared after each change with:
 
-    $ guard --clear
-    $ guard -c # shortcut
+``` bash
+$ guard --clear
+$ guard -c # shortcut
+```
 
 Notifications (growl/libnotify) can be disabled with:
 
-    $ guard --notify false
-    $ guard -n false # shortcut
+``` bash
+$ guard --notify false
+$ guard -n f # shortcut
+```
+
+Notifications can also be disabled by setting a `GUARD_NOTIFY` environment variable to `false`
 
-The guards to start can be specified by group (see the Guardfile DSL below) specifying the <tt>--group</tt> (or <tt>-g</tt>) option:
+The guards to start can be specified by group (see the Guardfile DSL below) specifying the `--group` (or `-g`) option:
 
-    $ guard --group group_name another_group_name
-    $ guard -g group_name another_group_name # shortcut
+``` bash
+$ guard --group group_name another_group_name
+$ guard -g group_name another_group_name # shortcut
+```
 
 Options list is available with:
 
-    $ guard help [TASK]
+``` bash
+$ guard help [TASK]
+```
 
 Signal handlers
 ---------------
 
 Signal handlers are used to interact with Guard:
 
-* <tt>Ctrl-C</tt> - Calls each guard's <tt>stop</tt> method, in the same order they are declared in the Guardfile, and then quits Guard itself.
-* <tt>Ctrl-\\</tt> - Calls each guard's <tt>run_all</tt> method, in the same order they are declared in the Guardfile.
-* <tt>Ctrl-Z</tt> - Calls each guard's <tt>reload</tt> method, in the same order they are declared in the Guardfile.
+* `Ctrl-C` - Calls each guard's `stop` method, in the same order they are declared in the Guardfile, and then quits Guard itself.
+* `Ctrl-\` - Calls each guard's `run_all` method, in the same order they are declared in the Guardfile.
+* `Ctrl-Z` - Calls each guard's `reload` method, in the same order they are declared in the Guardfile.
 
 Available Guards
 ----------------
@@ -114,7 +153,7 @@ Available Guards
 
 ### Add a guard to your Guardfile
 
-Add it to your Gemfile (inside the <tt>test</tt> group):
+Add it to your Gemfile (inside the `test` group):
 
 ``` ruby
 gem '<guard-name>'
@@ -122,21 +161,25 @@ gem '<guard-name>'
 
 Insert default guard's definition to your Guardfile by running this command:
 
-    $ guard init <guard-name>
+``` bash
+$ guard init <guard-name>
+```
 
 You are good to go!
 
 Guardfile DSL
 -------------
 
-The Guardfile DSL consists of just three simple methods: <tt>guard</tt>, <tt>watch</tt> & <tt>group</tt>.
+The Guardfile DSL consists of just three simple methods: `guard`, `watch` & `group`.
 
 Required:
-* The <tt>guard</tt> method allows you to add a guard with an optional hash of options.
-* The <tt>watch</tt> method allows you to define which files are supervised by this guard. An optional block can be added to overwrite the paths sent to the <tt>run_on_change</tt> guard method or to launch any arbitrary command.
+
+* The `guard` method allows you to add a guard with an optional hash of options.
+* The `watch` method allows you to define which files are supervised by this guard. An optional block can be added to overwrite the paths sent to the `run_on_change` guard method or to launch any arbitrary command.
 
 Optional:
-* The <tt>group</tt> method allows you to group several guards together. Groups to be run can be specified with the Guard DSL option <tt>--group</tt> (or <tt>-g</tt>). This comes in handy especially when you have a huge Guardfile and want to focus your development on a certain part.
+
+* The `group` method allows you to group several guards together. Groups to be run can be specified with the Guard DSL option `--group` (or `-g`). This comes in handy especially when you have a huge Guardfile and want to focus your development on a certain part.
 
 Example:
 
@@ -172,7 +215,7 @@ end
 Create a new guard
 ------------------
 
-Creating a new guard is very easy, just create a new gem (<tt>bundle gem</tt> if you use Bundler) with this basic structure:
+Creating a new guard is very easy, just create a new gem (`bundle gem` if you use Bundler) with this basic structure:
 
     lib/
       guard/
@@ -181,7 +224,7 @@ Creating a new guard is very easy, just create a new gem (<tt>bundle gem</tt> if
             Guardfile (needed for guard init <guard-name>)
         guard-name.rb
 
-<tt>Guard::GuardName</tt> (in <tt>lib/guard/guard-name.rb</tt>) must inherit from <tt>Guard::Guard</tt> and should overwrite at least one of the five basic <tt>Guard::Guard</tt> instance methods. Example:
+`Guard::GuardName` (in `lib/guard/guard-name.rb`) must inherit from `Guard::Guard` and should overwrite at least one of the five basic `Guard::Guard` instance methods. Example:
 
 ``` ruby
 require 'guard'
@@ -219,7 +262,7 @@ module Guard
       true
     end
 
-    # Called on Ctrl-/ signal
+    # Called on Ctrl-\ signal
     # This method should be principally used for long action like running all specs/tests/...
     def run_all
       true
@@ -242,7 +285,7 @@ Alternatively, a new guard can be added inline to a Guardfile with this basic st
 require 'guard/guard'
 
 module ::Guard
-  class Example < ::Guard::Guard
+  class InlineGuard < ::Guard::Guard
     def run_all
       true
     end
@@ -267,3 +310,8 @@ Author
 ------
 
 [Thibaud Guillaume-Gentil](https://github.com/thibaudgg)
+
+Contributors
+------
+
+https://github.com/guard/guard/contributors

data/lib/guard.rb

@@ -1,5 +1,3 @@
-require 'bundler'
-
 module Guard
 
   autoload :UI,         'guard/ui'
@@ -18,7 +16,7 @@ module Guard
       @listener = Listener.select_and_init
       @guards   = []
 
-      Notifier.turn_off unless options[:notify]
+      @options[:notify] && ENV["GUARD_NOTIFY"] != 'false' ? Notifier.turn_on : Notifier.turn_off
 
       self
     end
@@ -62,7 +60,7 @@ module Guard
       guard.send(task_to_supervise, *args)
     rescue Exception
       UI.error("#{guard.class.name} guard failed to achieve its <#{task_to_supervise.to_s}> command: #{$!}")
-      ::Guard.guards.delete guard
+      guards.delete guard
       UI.info("Guard #{guard.class.name} has just been fired")
       return $!
     end
@@ -84,7 +82,7 @@ module Guard
 
     def get_guard_class(name)
       try_to_load_gem name
-      self.const_get(self.constants.find{|klass_name| klass_name.to_s.downcase == name.downcase })
+      self.const_get(self.constants.find{ |klass_name| klass_name.to_s.downcase == name.to_s.downcase.gsub('-', '') })
     rescue TypeError
       UI.error "Could not find load find gem 'guard-#{name}' or find class Guard::#{name}"
     end
@@ -95,7 +93,11 @@ module Guard
     end
 
     def locate_guard(name)
-      Gem.source_index.find_name("guard-#{name}").last.full_gem_path
+      if Gem::Version.create(Gem::VERSION) >= Gem::Version.create('1.8.0')
+        Gem::Specification.find_by_name("guard-#{name}").full_gem_path
+      else
+        Gem.source_index.find_name("guard-#{name}").last.full_gem_path
+      end
     rescue
       UI.error "Could not find 'guard-#{name}' gem path."
     end

data/lib/guard/dsl.rb

@@ -1,30 +1,92 @@
 module Guard
   class Dsl
-
     class << self
+      @@options = nil
+      
       def evaluate_guardfile(options = {})
-        @@options = options
-        
-        if File.exists?(guardfile_path)
-          begin
-            new.instance_eval(File.read(guardfile_path), guardfile_path, 1)
-          rescue
-            UI.error "Invalid Guardfile, original error is:\n#{$!}"
+        options.is_a?(Hash) or raise ArgumentError.new("evaluate_guardfile not passed a Hash!")
+
+        @@options = options.dup
+        instance_eval_guardfile(fetch_guardfile_contents)
+      end
+
+      def instance_eval_guardfile(contents)
+        begin
+          new.instance_eval(contents, @@options[:guardfile_path], 1)
+        rescue
+          UI.error "Invalid Guardfile, original error is:\n#{$!}"
+          exit 1
+        end
+      end
+
+      def guardfile_include?(guard_name)
+        guardfile_contents.match(/^guard\s*\(?\s*['":]#{guard_name}['"]?/)
+      end
+
+      def read_guardfile(guardfile_path)
+        begin
+          @@options[:guardfile_path]     = guardfile_path
+          @@options[:guardfile_contents] = File.read(guardfile_path)
+        rescue
+          UI.error("Error reading file #{guardfile_path}")
+          exit 1
+        end
+      end
+
+      def fetch_guardfile_contents
+        # TODO: do we need .rc file interaction?
+        if @@options.has_key?(:guardfile_contents)
+          UI.info "Using inline Guardfile."
+          @@options[:guardfile_path] = 'Inline Guardfile'
+
+        elsif @@options.has_key?(:guardfile)
+          if File.exist?(@@options[:guardfile])
+            read_guardfile(@@options[:guardfile])
+            UI.info "Using Guardfile at #{@@options[:guardfile]}."
+          else
+            UI.error "No Guardfile exists at #{@@options[:guardfile]}."
             exit 1
           end
+
         else
-          UI.error "No Guardfile in current folder, please create one."
+          if File.exist?(guardfile_default_path)
+            read_guardfile(guardfile_default_path)
+          else
+            UI.error "No Guardfile found, please create one with `guard init`."
+            exit 1
+          end
+        end
+
+        unless guardfile_contents_usable?
+          UI.error "The command file(#{@@options[:guardfile]}) seems to be empty."
           exit 1
         end
+
+        guardfile_contents
       end
 
-      def guardfile_include?(guard_name)
-        File.read(guardfile_path).match(/^guard\s*\(?\s*['":]#{guard_name}['"]?/)
+      def guardfile_contents
+        @@options ? @@options[:guardfile_contents] : ""
       end
-      
-      def guardfile_path
-        File.join(Dir.pwd, 'Guardfile')
+
+      def guardfile_contents_usable?
+        guardfile_contents && guardfile_contents.size >= 'guard :a'.size # smallest guard-definition
       end
+
+      def guardfile_default_path
+        File.exist?(local_guardfile_path) ? local_guardfile_path : home_guardfile_path
+      end
+
+    private
+
+      def local_guardfile_path
+        File.join(Dir.pwd, "Guardfile")
+      end
+
+      def home_guardfile_path
+        File.expand_path(File.join("~", "Guardfile"))
+      end
+
     end
 
     def group(name, &guard_definition)

data/lib/guard/interactor.rb

@@ -1,29 +1,54 @@
 module Guard
   module Interactor
-    
+    extend self
+
+    def run_all
+      ::Guard.run do
+        ::Guard.guards.each { |guard| ::Guard.supervised_task(guard, :run_all) }
+      end
+    end
+
+    def stop
+      UI.info "Bye bye...", :reset => true
+      ::Guard.listener.stop
+      ::Guard.guards.each { |guard| ::Guard.supervised_task(guard, :stop) }
+      abort
+    end
+
+    def reload
+      ::Guard.run do
+        ::Guard.guards.each { |guard| ::Guard.supervised_task(guard, :reload) }
+      end
+    end
+
     def self.init_signal_traps
       # Run all (Ctrl-\)
-      Signal.trap('QUIT') do
-        ::Guard.run do
-          ::Guard.guards.each { |guard| ::Guard.supervised_task(guard, :run_all) }
+      if Signal.list.has_key?('QUIT')
+        Signal.trap('QUIT') do
+          run_all
         end
+      else
+        UI.info "Your system doesn't support QUIT signal, so Ctrl-\\ (Run all) won't work"
       end
-      
+
       # Stop (Ctrl-C)
-      Signal.trap('INT') do
-        UI.info "Bye bye...", :reset => true
-        ::Guard.listener.stop
-        ::Guard.guards.each { |guard| ::Guard.supervised_task(guard, :stop) }
-        abort("\n")
+      if Signal.list.has_key?('INT')
+        Signal.trap('INT') do
+          stop
+        end
+      else
+        UI.info "Your system doesn't support INT signal, so Ctrl-C (stop) won't work"
       end
-      
+
       # Reload (Ctrl-Z)
-      Signal.trap('TSTP') do
-        ::Guard.run do
-          ::Guard.guards.each { |guard| ::Guard.supervised_task(guard, :reload) }
+      if Signal.list.has_key?('TSTP')
+        Signal.trap('TSTP') do
+          reload
         end
+      else
+        UI.info "Your system doesn't support TSTP signal, so Ctrl-Z (Reload) won't work"
       end
+
     end
-    
   end
-end
+end

data/lib/guard/listener.rb

@@ -1,38 +1,88 @@
 require 'rbconfig'
+require 'digest/sha1'
 
 module Guard
 
   autoload :Darwin,  'guard/listeners/darwin'
   autoload :Linux,   'guard/listeners/linux'
+  autoload :Windows, 'guard/listeners/windows'
   autoload :Polling, 'guard/listeners/polling'
 
   class Listener
-    attr_reader :last_event
+    attr_reader :last_event, :sha1_checksums_hash, :directory, :callback
 
-    def self.select_and_init
+    def self.select_and_init(*a)
       if mac? && Darwin.usable?
-        Darwin.new
+        Darwin.new(*a)
       elsif linux? && Linux.usable?
-        Linux.new
+        Linux.new(*a)
+      elsif windows? && Windows.usable?
+        Windows.new(*a)
       else
         UI.info "Using polling (Please help us to support your system better than that.)"
-        Polling.new
+        Polling.new(*a)
       end
     end
 
-    def initialize
+    def initialize(directory=Dir.pwd, options={})
+      @directory = directory.to_s
+      @sha1_checksums_hash = {}
+      @relativate_paths = options.fetch(:relativate_paths, true)
       update_last_event
     end
 
+    def start
+      watch directory
+    end
+
+    def stop
+    end
+
+    def on_change(&callback)
+      @callback = callback
+    end
+
     def update_last_event
       @last_event = Time.now
     end
 
     def modified_files(dirs, options = {})
-      files = potentially_modified_files(dirs, options).select { |path| File.file?(path) && recent_file?(path) }
-      files.map! { |file| file.gsub("#{Dir.pwd}/", '') }
+# <<<<<<< HEAD
+#       files = potentially_modified_files(dirs, options).select { |path| File.file?(path) && file_modified?(path) }
+#       files.map! { |file| file.gsub("#{Dir.pwd}/", '') }
+# =======
+      files = potentially_modified_files(dirs, options).select { |path| File.file?(path) && file_modified?(path) }
+      relativate_paths files
+    end
+
+    def worker
+      raise NotImplementedError, "should respond to #watch"
+    end
+
+    # register a directory to watch. must be implemented by the subclasses
+    def watch(directory)
+      raise NotImplementedError, "do whatever you want here, given the directory as only argument"
+    end
+
+    def all_files
+      potentially_modified_files [directory + '/'], :all => true
+# >>>>>>> b12769d2bf385b3c69973721144cae3d5d8fbed9
+    end
+
+    # scopes all given paths to the current #directory
+    def relativate_paths(paths)
+      return paths unless relativate_paths?
+      paths.map do |path|
+        path.gsub(%r~^#{directory}/~, '')
+      end
     end
 
+    attr_writer :relativate_paths
+    def relativate_paths?
+      !!@relativate_paths
+    end
+
+
   private
 
     def potentially_modified_files(dirs, options = {})
@@ -40,12 +90,36 @@ module Guard
       Dir.glob(dirs.map { |dir| "#{dir}#{match}" })
     end
 
-    def recent_file?(file)
-      File.mtime(file) >= last_event
+    # Depending on the filesystem, mtime is probably only precise to the second, so round
+    # both values down to the second for the comparison.
+    def file_modified?(path)
+      if File.mtime(path).to_i == last_event.to_i
+        file_content_modified?(path, sha1_checksum(path))
+      elsif File.mtime(path).to_i > last_event.to_i
+        set_sha1_checksums_hash(path, sha1_checksum(path))
+        true
+      end
     rescue
       false
     end
 
+    def file_content_modified?(path, sha1_checksum)
+      if sha1_checksums_hash[path] != sha1_checksum
+        set_sha1_checksums_hash(path, sha1_checksum)
+        true
+      else
+        false
+      end
+    end
+
+    def set_sha1_checksums_hash(path, sha1_checksum)
+      @sha1_checksums_hash[path] = sha1_checksum
+    end
+
+    def sha1_checksum(path)
+      Digest::SHA1.file(path).to_s
+    end
+
     def self.mac?
       Config::CONFIG['target_os'] =~ /darwin/i
     end
@@ -54,71 +128,9 @@ module Guard
       Config::CONFIG['target_os'] =~ /linux/i
     end
 
+    def self.windows?
+      Config::CONFIG['target_os'] =~ /mswin|mingw/i
+    end
+
   end
 end
-
-# require 'rbconfig'
-#
-# module Guard
-#
-#   autoload :Darwin,  'guard/listeners/darwin'
-#   autoload :Linux,   'guard/listeners/linux'
-#   autoload :Polling, 'guard/listeners/polling'
-#
-#   class Listener
-#     attr_accessor :last_event, :changed_files
-#
-#     def self.select_and_init
-#       if mac? && Darwin.usable?
-#         Darwin.new
-#       elsif linux? && Linux.usable?
-#         Linux.new
-#       else
-#         UI.info "Using polling (Please help us to support your system better than that.)"
-#         Polling.new
-#       end
-#     end
-#
-#     def initialize
-#       @changed_files = []
-#       update_last_event
-#     end
-#
-#     def get_and_clear_changed_files
-#       files = changed_files.dup
-#       changed_files.clear
-#       files.uniq
-#     end
-#
-#   private
-#
-#     def find_changed_files(dirs, options = {})
-#       files = potentially_changed_files(dirs, options).select { |path| File.file?(path) && changed_file?(path) }
-#       files.map! { |file| file.gsub("#{Dir.pwd}/", '') }
-#     end
-#
-#     def potentially_changed_files(dirs, options = {})
-#       match = options[:all] ? "**/*" : "*"
-#       Dir.glob(dirs.map { |dir| "#{dir}#{match}" })
-#     end
-#
-#     def changed_file?(file)
-#       File.mtime(file) >= last_event
-#     rescue
-#       false
-#     end
-#
-#     def update_last_event
-#       @last_event = Time.now
-#     end
-#
-#     def self.mac?
-#       Config::CONFIG['target_os'] =~ /darwin/i
-#     end
-#
-#     def self.linux?
-#       Config::CONFIG['target_os'] =~ /linux/i
-#     end
-#
-#   end
-# end

data/lib/guard/listeners/darwin.rb

@@ -2,25 +2,23 @@ module Guard
   class Darwin < Listener
     attr_reader :fsevent
 
-    def initialize
+    def initialize(*)
       super
       @fsevent = FSEvent.new
     end
 
-    def on_change(&callback)
-      @fsevent.watch Dir.pwd do |modified_dirs|
-        files = modified_files(modified_dirs)
-        update_last_event
-        callback.call(files)
-      end
+    def worker
+      @fsevent
     end
 
     def start
-      @fsevent.run
+      super
+      fsevent.run
     end
 
     def stop
-      @fsevent.stop
+      super
+      fsevent.stop
     end
 
     def self.usable?
@@ -36,5 +34,15 @@ module Guard
       false
     end
 
+  private
+  
+    def watch(directory)
+      worker.watch directory do |modified_dirs|
+        files = modified_files(modified_dirs)
+        update_last_event
+        callback.call(files)
+      end
+    end
+
   end
 end

data/lib/guard/listeners/linux.rb

@@ -1,8 +1,8 @@
 module Guard
   class Linux < Listener
-    attr_reader :inotify, :files, :latency, :callback
+    attr_reader :inotify, :files, :latency
 
-    def initialize
+    def initialize(*)
       super
 
       @inotify = INotify::Notifier.new
@@ -12,24 +12,16 @@ module Guard
 
     def start
       @stop = false
+      super
       watch_change unless watch_change?
     end
 
     def stop
+      super
       @stop = true
       sleep latency
     end
 
-    def on_change(&callback)
-      @callback = callback
-      inotify.watch(Dir.pwd, :recursive, :modify, :create, :delete, :move) do |event|
-        unless event.name == "" # Event on root directory
-          @files << event.absolute_name
-        end
-      end
-    rescue Interrupt
-    end
-
     def self.usable?
       require 'rb-inotify'
       if !defined?(INotify::VERSION) || Gem::Version.new(INotify::VERSION.join('.')) < Gem::Version.new('0.5.1')
@@ -49,9 +41,22 @@ module Guard
 
   private
 
+    def worker
+      @inotify
+    end
+
+    def watch(directory)
+      worker.watch(directory, :recursive, :modify, :create) do |event|
+        unless event.name == "" # Event on root directory
+          @files << event.absolute_name
+        end
+      end
+    rescue Interrupt
+    end
+
     def watch_change
       @watch_change = true
-      while !@stop
+      until @stop
         if Config::CONFIG['build'] =~ /java/ || IO.select([inotify.to_io], [], [], latency)
           break if @stop
 
@@ -61,8 +66,7 @@ module Guard
 
           unless files.empty?
             files.uniq!
-            files.map! { |file| file.gsub("#{Dir.pwd}/", '') }
-            callback.call(files)
+            callback.call( relativate_paths(files) )
             files.clear
           end
         end

data/lib/guard/listeners/polling.rb

@@ -1,37 +1,39 @@
 module Guard
   class Polling < Listener
-    attr_reader :callback, :latency
+    attr_reader :latency
 
-    def initialize
+    def initialize(*)
       super
       @latency = 1.5
     end
 
-    def on_change(&callback)
-      @callback = callback
-    end
-
     def start
       @stop = false
+      super
       watch_change
     end
 
     def stop
+      super
       @stop = true
     end
 
   private
 
     def watch_change
-      while !@stop
+      until @stop
         start = Time.now.to_f
         files = modified_files([Dir.pwd + '/'], :all => true)
         update_last_event
-        callback.call(files) unless files.empty?
+        callback.call(relativate_paths(files)) unless files.empty?
         nap_time = latency - (Time.now.to_f - start)
         sleep(nap_time) if nap_time > 0
       end
     end
 
+    def watch(directory)
+      @existing = all_files
+    end
+
   end
 end

data/lib/guard/listeners/windows.rb

@@ -0,0 +1,44 @@
+module Guard
+  class Windows < Listener
+    attr_reader :fchange
+
+    def initialize
+      super
+      @fchange = FChange::Notifier.new
+    end
+
+    def start
+      super
+      @fchange.run
+    end
+
+    def stop
+      super
+      @fchange.stop
+    end
+
+    def self.usable?
+      require 'rb-fchange'
+      true
+    rescue LoadError
+      UI.info "Please install rb-fchange gem for Windows file events support"
+      false
+    end
+
+  private
+
+    def worker
+      @fchange
+    end
+
+    def watch(directory)
+      worker.watch(directory, :all_events, :recursive) do |event|
+        paths = [File.expand_path(event.watcher.path) + '/']
+        files = modified_files(paths, {:all => true})
+        update_last_event
+        callback.call(files)
+      end
+    end
+
+  end
+end

data/lib/guard/notifier.rb

@@ -1,30 +1,48 @@
 require 'rbconfig'
 require 'pathname'
+require 'guard/ui'
 
 module Guard
   module Notifier
 
     def self.turn_off
-      @disable = true
+      ENV["GUARD_NOTIFY"] = 'false'
+    end
+
+    def self.turn_on
+      ENV["GUARD_NOTIFY"] = 'true'
+      case Config::CONFIG['target_os']
+      when /darwin/i
+        require_growl
+      when /linux/i
+        require_libnotify
+      when /mswin|mingw/i
+        require_rbnotifu
+      end
     end
 
     def self.notify(message, options = {})
-      unless @disable || ENV["GUARD_ENV"] == "test"
+      if enabled?
         image = options[:image] || :success
         title = options[:title] || "Guard"
         case Config::CONFIG['target_os']
         when /darwin/i
-          if growl_installed?
-            Growl.notify message, :title => title, :icon => image_path(image), :name => "Guard"
-          end
+          require_growl # need for guard-rspec formatter that is called out of guard scope
+          Growl.notify message, :title => title, :icon => image_path(image), :name => "Guard"
         when /linux/i
-          if libnotify_installed?
-            Libnotify.show :body => message, :summary => title, :icon_path => image_path(image)
-          end
+          require_libnotify # need for guard-rspec formatter that is called out of guard scope
+          Libnotify.show :body => message, :summary => title, :icon_path => image_path(image)
+        when /mswin|mingw/i
+          require_rbnotifu
+          Notifu.show :message => message, :title => title, :type => image_level(image), :time => 3
         end
       end
     end
 
+    def self.enabled?
+      ENV["GUARD_NOTIFY"] == 'true'
+    end
+
   private
 
     def self.image_path(image)
@@ -42,25 +60,38 @@ module Guard
       end
     end
 
-    def self.growl_installed?
-      @installed ||= begin
-        require 'growl'
-        true
-      rescue LoadError
-        UI.info "Please install growl gem for Mac OS X notification support and add it to your Gemfile"
-        false
+    def self.image_level(image)
+      case image
+      when :failed
+        :error
+      when :pending
+        :warn
+      when :success
+        :info
+      else
+        :info
       end
     end
+    
+    def self.require_growl
+      require 'growl'
+    rescue LoadError
+      turn_off
+      UI.info "Please install growl gem for Mac OS X notification support and add it to your Gemfile"
+    end
 
-    def self.libnotify_installed?
-      @installed ||= begin
-        require 'libnotify'
-        true
-      rescue LoadError
-        UI.info "Please install libnotify gem for Linux notification support and add it to your Gemfile"
-        false
-      end
+    def self.require_libnotify
+      require 'libnotify'
+    rescue LoadError
+      turn_off
+      UI.info "Please install libnotify gem for Linux notification support and add it to your Gemfile"
     end
 
+    def self.require_rbnotifu
+      require 'rb-notifu'
+    rescue LoadError
+      turn_off
+      UI.info "Please install rb-notifu gem for Windows notification support and add it to your Gemfile"
+    end
   end
-end
+end

data/lib/guard/ui.rb

@@ -24,7 +24,11 @@ module Guard
       end
 
       def reset_line
-        print "\r\e[0m"
+        if color_enabled?
+          print "\r\e[0m"
+        else
+          print "\r\n"
+        end
       end
 
       def clear
@@ -38,7 +42,27 @@ module Guard
       end
 
       def color(text, color_code)
-        "#{color_code}#{text}\e[0m"
+        if color_enabled?
+          return "#{color_code}#{text}\e[0m"
+        else
+          return text
+        end
+      end
+
+      def color_enabled?
+        @color_enabled ||= if Config::CONFIG['target_os'] =~ /mswin|mingw/i
+          unless ENV['ANSICON']
+            begin
+              require 'rubygems' unless ENV['NO_RUBYGEMS']
+              require 'Win32/Console/ANSI'
+            rescue LoadError
+              info "You must 'gem install win32console' to use color on Windows"
+              false
+            end
+          end
+        else
+          true
+        end
       end
 
     end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "0.3.4"
+  VERSION = "0.4.0.rc"
 end

data/lib/guard/watcher.rb

@@ -59,4 +59,4 @@ module Guard
     end
     
   end
-end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: guard
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.4
+  prerelease: 6
+  version: 0.4.0.rc
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 +02:00
-default_executable: 
+date: 2011-05-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -19,9 +18,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.7
+        version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.3.1
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -79,6 +78,7 @@ files:
 - lib/guard/listeners/darwin.rb
 - lib/guard/listeners/linux.rb
 - lib/guard/listeners/polling.rb
+- lib/guard/listeners/windows.rb
 - lib/guard/notifier.rb
 - lib/guard/templates/Guardfile
 - lib/guard/ui.rb
@@ -87,7 +87,6 @@ files:
 - lib/guard.rb
 - LICENSE
 - README.markdown
-has_rdoc: true
 homepage: http://rubygems.org/gems/guard
 licenses: []
 
@@ -111,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guard
-rubygems_version: 1.6.2
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: Guard keep an eye on your files modifications.