guard 0.4.2 → 0.5.0

data/CHANGELOG.md

@@ -1,20 +1,47 @@
+## 0.5.0 - July 2, 2011
+
+## New features
+
+- Guard::Ego is now part of Guard, so Guardfile is automagically re-evaluated when modified. ([@thibaudgg][])
+- Pull request [#91](https://github.com/guard/guard/pull/91): Show Guards in Guardfile with the `guard -T`. ([@johnbintz][])
+
+## Improvements
+
+- Issue [#98](https://github.com/guard/guard/issues/98): Multiple calls per watch event on linux with rb-inotify. ([@jeffutter][] & [@netzpirat][])
+- Pull request [#94](https://github.com/guard/guard/pull/94): Show backtrace in terminal when a problem with a watch action occurs. ([@capotej][])
+- Pull request [#88](https://github.com/guard/guard/pull/88): Write exception trace in the terminal when a supervised task fail. ([@mcmire][])
+- Color in red the "ERROR:" flag when using `UI.error`. ([@rymai][])
+- Issue [#79](https://github.com/guard/guard/issues/79) and Pull request [#82](https://github.com/guard/guard/pull/82): Improve INotify support on Linux. ([@Gazer][] & [@yannlugrin][])
+- Issue [#12](https://github.com/guard/guard/issues/12) and Pull request [#86](https://github.com/guard/guard/pull/86): Eventually exits with SystemStackError. ([@stereobooster][])
+- Pull request [#84](https://github.com/guard/guard/pull/84): Use RbConfig instead of obsolete and deprecated Config. ([@etehtsea][])
+- Pull request [#80](https://github.com/guard/guard/pull/80): Watching dotfile (hidden files under unix). (reported by [@chrisberkhout][], fixed by [@yannlugrin][])
+- Clear the terminal on start when the `:clear` option is given. ([@rymai][])
+- Rename home directory Guardfile to `.Guardfile`. ([@tpope][])
+
+## 0.4.2 - June 7, 2011
+
+### Bugs fixes:
+
+- Fixed Guard::Version in ruby 1.8.7 ([@thibaudgg][])
+- Fix ([@mislav][]) link in CHANGELOG (Note: this is a recursive CHANGELOG item). ([@fnichol][])
+
 ## 0.4.1 - June 7, 2011
 
 ### Improvements
 
-- Pull request [#77](https://github.com/guard/guard/pull/77): Refactor `get_guard_class` to first try the constant and fallback to require + various tweaks ([@mislav][])
-- Notifier improvement, don't use system notification library if could not be required ([@yannlugrin][])
+- Pull request [#77](https://github.com/guard/guard/pull/77): Refactor `get_guard_class` to first try the constant and fallback to require + various tweaks. ([@mislav][])
+- Notifier improvement, don't use system notification library if could not be required. ([@yannlugrin][])
 
 ## 0.4.0 - June 5, 2011
 
 ### Bugs fixes:
 
-- In Ruby < 1.9, Symbol#downcase doesn't exist! ([@rymai][])
+- In Ruby < 1.9, `Symbol#downcase` doesn't exist! ([@rymai][])
 
 ### New features:
 
 - Pull request [#73](https://github.com/guard/guard/pull/73): Allow DSL's `group` method to accept a Symbol as group name. ([@johnbintz][])
-- Pull request [#51](https://github.com/guard/guard/pull/51): Allow options (like :priority) to be passed through to the Notifier. ([@indirect][] and [@netzpirat][])
+- Pull request [#51](https://github.com/guard/guard/pull/51): Allow options (like `:priority`) to be passed through to the Notifier. ([@indirect][] & [@netzpirat][])
 
 ### Improvements
 
@@ -24,10 +51,10 @@
 
 ### Bugs fixes:
 
-- Pull request [#69](https://github.com/guard/guard/pull/69): Fixed typo in README: Ctr-/ => Ctr-\\. ([@tinogomes][])
+- Pull request [#69](https://github.com/guard/guard/pull/69): Fixed typo in README: `Ctr-/` => `Ctr-\`. ([@tinogomes][])
 - Pull request [#66](https://github.com/guard/guard/pull/66): Support for dashes in guard names. ([@johnbintz][])
 - Require `guard/ui` because `Guard::Notifier` can be required without full Guard. ([@yannlugrin][])
-- Handled quick file (<1s) modification. Avoid to catch modified files without content modification (sha1 checksum). ([@thibaudgg][] and [@netzpirat][])
+- Handled quick file (<1s) modification. Avoid to catch modified files without content modification (sha1 checksum). ([@thibaudgg][] & [@netzpirat][])
 - Fixed `Guard::Notifier` (when growl/libnotify not present). ([@thibaudgg][])
 - Fixed Rubygems deprecation messages. ([@thibaudgg][])
 
@@ -115,8 +142,8 @@
 
 ### Bugs fixes:
 
-- Pull request [#7](https://github.com/guard/guard/pull/7): Fixes for Linux support. ([@yannlugrin][]))
-- Pull request [#6](https://github.com/guard/guard/pull/6): Locate guard now chomp newline in result path. ([@yannlugrin][]))
+- Pull request [#7](https://github.com/guard/guard/pull/7): Fixes for Linux support. ([@yannlugrin][])
+- Pull request [#6](https://github.com/guard/guard/pull/6): Locate guard now chomp newline in result path. ([@yannlugrin][])
 
 
 ## 0.2.0 - October 21, 2010
@@ -137,12 +164,19 @@
 
 [@anithri]: https://github.com/anithri
 [@brainopia]: https://github.com/brainopia
+[@capotej]: https://github.com/capotej
+[@chrisberkhout]: https://github.com/chrisberkhout
+[@etehtsea]: https://github.com/etehtsea
+[@fnichol]: https://github.com/fnichol
+[@Gazer]: https://github.com/Gazer
 [@gix]: https://github.com/gix
 [@hashrocketeer]: https://github.com/hashrocketeer
 [@indirect]: https://github.com/indirect
+[@jeffutter]: https://github.com/jeffutter
 [@johnbintz]: https://github.com/johnbintz
 [@jrsacks]: https://github.com/jrsacks
 [@koshigoe]: https://github.com/koshigoe
+[@mcmire]: https://github.com/mcmire
 [@mislav]: https://github.com/mislav
 [@netzpirat]: https://github.com/netzpirat
 [@nicksieger]: https://github.com/nicksieger
@@ -155,6 +189,7 @@
 [@thibaudgg]: https://github.com/thibaudgg
 [@thierryhenrio]: https://github.com/thierryhenrio
 [@tinogomes]: https://github.com/tinogomes
+[@tpope]: https://github.com/tpope
 [@veged]: https://github.com/veged
 [@wereHamster]: https://github.com/wereHamster
 [@yannlugrin]: https://github.com/yannlugrin

data/README.md

@@ -3,7 +3,7 @@ Guard [![Build Status](http://travis-ci.org/guard/guard.png)](http://travis-ci.o
 
 Guard is a command line tool that easily handle events on files modifications.
 
-If you have any questions/issues please join us on our [Google group](http://groups.google.com/group/guard-dev) or on `#guard` (irc.freenode.net).
+If you have any questions please join us on our [Google group](http://groups.google.com/group/guard-dev) or on `#guard` (irc.freenode.net).
 
 Features
 --------
@@ -26,7 +26,7 @@ Install the gem:
 $ gem install guard
 ```
 
-Add it to your Gemfile (inside the `test` group):
+Add it to your Gemfile (inside the `development` group):
 
 ``` ruby
 gem 'guard'
@@ -38,7 +38,7 @@ Generate an empty Guardfile with:
 $ guard init
 ```
 
-You may optionally place this Guardfile in your home directory to use it across multiple projects.
+You may optionally place a .Guardfile in your home directory to use it across multiple projects.
 
 Add the guards you need to your Guardfile (see the existing guards below).
 
@@ -117,22 +117,26 @@ $ guard [start]
 or if you use Bundler, to run the Guard executable specific to your bundle:
 
 ``` bash
-$ bundle exec guard
+$ bundle exec guard [start]
 ```
 
-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.
+Guard will look for a Guardfile in your current directory. If it does not find one, it will look in your `$HOME` directory for a .Guardfile.
 
 Command line options
 --------------------
 
-Shell can be cleared after each change with:
+### `--clear` option
+
+Shell can be cleared after each change:
 
 ``` bash
 $ guard --clear
 $ guard -c # shortcut
 ```
 
-Notifications (growl/libnotify) can be disabled with:
+### `--notify` option
+
+Notifications (growl/libnotify) can be disabled:
 
 ``` bash
 $ guard --notify false
@@ -141,14 +145,25 @@ $ guard -n f # shortcut
 
 Notifications can also be disabled globally 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 `--group` (or `-g`) option:
+### `--group` option
+
+Only certain guards groups can be run (see the Guardfile DSL below for creating groups):
 
 ``` bash
 $ guard --group group_name another_group_name
 $ guard -g group_name another_group_name # shortcut
 ```
 
-Options list is available with:
+### `--debug` option
+
+Guard can be run in debug mode:
+
+``` bash
+$ guard --debug
+$ guard -d # shortcut
+```
+
+An exhaustive list of options is available with:
 
 ``` bash
 $ guard help [TASK]
@@ -159,20 +174,20 @@ Signal handlers
 
 Signal handlers are used to interact with Guard:
 
-* `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.
+* `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.
 
-You can read more about [configure the signal keyboard shortcuts](https://github.com/guard/guard/wiki/Configure-keyboard-shortcuts) on the wiki.
+You can read more about [configure the signal keyboard shortcuts](https://github.com/guard/guard/wiki/Configure-keyboard-shortcuts) in the wiki.
 
 Available Guards
 ----------------
 
-[Available Guards list](https://github.com/guard/guard/wiki/List-of-available-Guards) (on the wiki now)
+A list of the available guards is present [in the wiki](https://github.com/guard/guard/wiki/List-of-available-Guards).
 
 ### Add a guard to your Guardfile
 
-Add it to your Gemfile (inside the `test` group):
+Add it to your Gemfile (inside the `development` group):
 
 ``` ruby
 gem '<guard-name>'
@@ -184,21 +199,21 @@ Insert default guard's definition to your Guardfile by running this command:
 $ guard init <guard-name>
 ```
 
-You are good to go!
+You are good to go, or you can modify your guards' definition to suit your needs.
 
 Guardfile DSL
 -------------
 
-The Guardfile DSL consists of just three simple methods: `guard`, `watch` & `group`.
+The Guardfile DSL consists of just three simple methods: `#guard`, `#watch` & `#group`.
 
 Required:
 
-* 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.
+* The `#guard` method allows you to add a guard with an optional hash of options.
 
 Optional:
 
-* 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.
+* 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 guard's `#run_on_change` method or to launch any arbitrary command.
+* 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:
 
@@ -210,10 +225,10 @@ group 'backend' do
 
   guard 'rspec', :cli => '--color --format doc' do
     # Regexp watch patterns are matched with Regexp#match
-    watch(%r{^spec/.+_spec\.rb})
-    watch(%r{^lib/(.+)\.rb})         { |m| "spec/lib/#{m[1]}_spec.rb" }
-    watch(%r{^spec/models/.+\.rb})   { ["spec/models", "spec/acceptance"] }
-    watch(%r{^spec/.+\.rb})          { `say hello` }
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/(.+)\.rb$})         { |m| "spec/lib/#{m[1]}_spec.rb" }
+    watch(%r{^spec/models/.+\.rb$})   { ["spec/models", "spec/acceptance"] }
+    watch(%r{^spec/.+\.rb$})          { `say hello` }
 
     # String watch patterns are matched with simple '=='
     watch('spec/spec_helper.rb') { "spec" }
@@ -222,22 +237,24 @@ end
 
 group 'frontend' do
   guard 'coffeescript', :output => 'public/javascripts/compiled' do
-    watch(%r{^app/coffeescripts/.+\.coffee})
+    watch(%r{^app/coffeescripts/.+\.coffee$})
   end
 
   guard 'livereload' do
-    watch(%r{^app/.+\.(erb|haml)})
+    watch(%r{^app/.+\.(erb|haml)$})
   end
 end
 ```
 
+### Using a Guardfile without the `guard` binary
+
 The Guardfile DSL can also be used in a programmatic fashion by calling directly `Guard::Dsl.evaluate_guardfile`.
 Available options are as follow:
 
 * `:guardfile`          - The path to a valid Guardfile.
 * `:guardfile_contents` - A string representing the content of a valid Guardfile
 
-Without any options given, Guard will look for a Guardfile in your current directory and if it does not find one, it will look in your `$HOME` directory for one.
+Remember, without any options given, Guard will look for a Guardfile in your current directory and if it does not find one, it will look for it in your `$HOME` directory.
 
 For instance, you could use it as follow:
 
@@ -247,28 +264,57 @@ require 'guard'
 
 Guard.setup
 
-Guard::Dsl.evaluate_guardfile(:guardfile => '/Your/Custom/Path/To/A/Valid/Guardfile')
+Guard::Dsl.evaluate_guardfile(:guardfile => '/your/custom/path/to/a/valid/Guardfile')
 # or
 Guard::Dsl.evaluate_guardfile(:guardfile_contents => "
   guard 'rspec' do
-    watch(%r{^spec/.+_spec\.rb})
+    watch(%r{^spec/.+_spec\.rb$})
   end
 ")
 ```
 
+### Listing defined guards/groups for the current project
+
+You can list the defined groups and guards for the current Guardfile from the command line using `guard show` or `guard -T`:
+
+``` bash
+# guard -T
+
+(global):
+  shell
+Group backend:
+  bundler
+  rspec: cli => "--color --format doc'
+Group frontend:
+  coffeescript: output => "public/javascripts/compiled"
+  livereload
+```
+
 Create a new guard
 ------------------
 
 Creating a new guard is very easy, just create a new gem (`bundle gem` if you use Bundler) with this basic structure:
 
-    lib/
-      guard/
-        guard-name/
-          templates/
-            Guardfile (needed for guard init <guard-name>)
-        guard-name.rb
+```
+.travis.yml  # bonus point!
+CHANGELOG.md # bonus point!
+Gemfile
+guard-name.gemspec
+Guardfile
+lib/
+  guard/
+    guard-name/
+      templates/
+        Guardfile # needed for `guard init <guard-name>`
+      version.rb
+    guard-name.rb
+test/ # or spec/
+README.md
+```
+
+`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.
 
-`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:
+Here is an example scaffold for `lib/guard/guard-name.rb`:
 
 ``` ruby
 require 'guard'
@@ -321,7 +367,7 @@ module Guard
 end
 ```
 
-Please take a look at the existing guards' source code (see the list above) for more concrete example.
+Please take a look at the [existing guards' source code](https://github.com/guard/guard/wiki/List-of-available-Guards) for more concrete example and inspiration.
 
 Alternatively, a new guard can be added inline to a Guardfile with this basic structure:
 
@@ -341,14 +387,17 @@ module ::Guard
 end
 ```
 
+Here is a very cool example by [@avdi](https://github.com/avdi) : http://avdi.org/devblog/2011/06/15/a-guardfile-for-redis
+
 Development
 -----------
 
 * Source hosted at [GitHub](https://github.com/guard/guard).
-* Report Issues/Feature requests on [GitHub Issues](https://github.com/guard/guard/issues).
+* Report issues and feature requests to [GitHub Issues](https://github.com/guard/guard/issues).
+
+Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change you make. Please **do not change** the version in your pull-request.
 
-Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
-you make. Please do not change the version in your pull-request.
+For questions please join us on our [Google group](http://groups.google.com/group/guard-dev) or on `#guard` (irc.freenode.net).
 
 Author
 ------

data/lib/guard.rb

@@ -1,11 +1,12 @@
 module Guard
 
-  autoload :UI,         'guard/ui'
-  autoload :Dsl,        'guard/dsl'
-  autoload :Interactor, 'guard/interactor'
-  autoload :Listener,   'guard/listener'
-  autoload :Watcher,    'guard/watcher'
-  autoload :Notifier,   'guard/notifier'
+  autoload :UI,           'guard/ui'
+  autoload :Dsl,          'guard/dsl'
+  autoload :DslDescriber, 'guard/dsl_describer'
+  autoload :Interactor,   'guard/interactor'
+  autoload :Listener,     'guard/listener'
+  autoload :Watcher,      'guard/watcher'
+  autoload :Notifier,     'guard/notifier'
 
   class << self
     attr_accessor :options, :guards, :listener
@@ -22,22 +23,21 @@ module Guard
     end
 
     def start(options = {})
+      UI.clear if options[:clear]
       setup(options)
 
       Interactor.init_signal_traps
       Dsl.evaluate_guardfile(options)
 
-      if guards.empty?
-        UI.error "No guards found in Guardfile, please add at least one."
-      else
-        listener.on_change do |files|
-          run { run_on_change_for_all_guards(files) } if Watcher.match_files?(guards, files)
-        end
+      listener.on_change do |files|
+        Dsl.revaluate_guardfile if Watcher.match_guardfile?(files)
 
-        UI.info "Guard is now watching at '#{Dir.pwd}'"
-        guards.each { |guard| supervised_task(guard, :start) }
-        listener.start
+        run { run_on_change_for_all_guards(files) } if Watcher.match_files?(guards, files)
       end
+
+      UI.info "Guard is now watching at '#{Dir.pwd}'"
+      guards.each { |guard| supervised_task(guard, :start) }
+      listener.start
     end
 
     def run_on_change_for_all_guards(files)
@@ -58,11 +58,12 @@ module Guard
     # fire it if his work leads to a system failure
     def supervised_task(guard, task_to_supervise, *args)
       guard.send(task_to_supervise, *args)
-    rescue Exception
-      UI.error("#{guard.class.name} guard failed to achieve its <#{task_to_supervise.to_s}> command: #{$!}")
+    rescue Exception => ex
+      UI.error("#{guard.class.name} failed to achieve its <#{task_to_supervise.to_s}>, exception was:" +
+      "\n#{ex.class}: #{ex.message}\n#{ex.backtrace.join("\n")}")
       guards.delete guard
-      UI.info("Guard #{guard.class.name} has just been fired")
-      return $!
+      UI.info("\n#{guard.class.name} has just been fired")
+      return ex
     end
 
     def run
@@ -76,8 +77,12 @@ module Guard
     end
 
     def add_guard(name, watchers = [], options = {})
-      guard_class = get_guard_class(name)
-      @guards << guard_class.new(watchers, options)
+      if name.downcase == 'ego'
+        UI.deprecation("Guard::Ego is now part of Guard you can removed it from your Guardfile.")
+      else
+        guard_class = get_guard_class(name)
+        @guards << guard_class.new(watchers, options)
+      end
     end
 
     def get_guard_class(name)

data/lib/guard/cli.rb

@@ -15,13 +15,13 @@ module Guard
       ::Guard.start(options)
     end
 
-    desc "version", "Prints Guard's version information"
+    desc "version", "Prints Guard's version"
     def version
       ::Guard::UI.info "Guard version #{Guard::VERSION}"
     end
     map %w(-v --version) => :version
 
-    desc "init [GUARD]", "Generates a Guardfile into the current working directory, or insert the given GUARD"
+    desc "init [GUARD]", "Generates a Guardfile into the current working directory, or insert the given GUARD in an existing Guardfile"
     def init(guard_name = nil)
       if !File.exist?("Guardfile")
         puts "Writing new Guardfile to #{Dir.pwd}/Guardfile"
@@ -37,5 +37,31 @@ module Guard
       end
     end
 
+    desc "show", "Show all defined Guards and their options"
+    def show
+      ::Guard::DslDescriber.evaluate_guardfile(options)
+
+      ::Guard::DslDescriber.guardfile_structure.each do |group|
+        if !group[:guards].empty?
+          if group[:group]
+            ::Guard::UI.info "Group #{group[:group]}:"
+          else
+            ::Guard::UI.info "(global):"
+          end
+
+          group[:guards].each do |guard|
+            line = "  #{guard[:name]}"
+
+            if !guard[:options].empty?
+              line += ": #{guard[:options].collect { |k, v| "#{k} => #{v.inspect}" }.join(", ")}"
+            end
+            ::Guard::UI.info line
+          end
+        end
+      end
+
+      ::Guard::UI.info ''
+    end
+    map %w(-T) => :show
   end
-end
+end

data/lib/guard/dsl.rb

@@ -2,12 +2,22 @@ module Guard
   class Dsl
     class << self
       @@options = nil
-      
+
       def evaluate_guardfile(options = {})
         options.is_a?(Hash) or raise ArgumentError.new("evaluate_guardfile not passed a Hash!")
 
         @@options = options.dup
         instance_eval_guardfile(fetch_guardfile_contents)
+
+        UI.error "No guards found in Guardfile, please add at least one." if ::Guard.guards.empty?
+      end
+
+      def revaluate_guardfile
+        ::Guard.guards.clear
+        Dsl.evaluate_guardfile(@@options)
+        msg = "Guardfile has been re-evaluated."
+        UI.info(msg)
+        Notifier.notify(msg)
       end
 
       def instance_eval_guardfile(contents)
@@ -69,6 +79,10 @@ module Guard
         @@options ? @@options[:guardfile_contents] : ""
       end
 
+      def guardfile_path
+        @@options ? @@options[:guardfile_path] : ""
+      end
+
       def guardfile_contents_usable?
         guardfile_contents && guardfile_contents.size >= 'guard :a'.size # smallest guard-definition
       end
@@ -84,7 +98,7 @@ module Guard
       end
 
       def home_guardfile_path
-        File.expand_path(File.join("~", "Guardfile"))
+        File.expand_path(File.join("~", ".Guardfile"))
       end
 
     end

data/lib/guard/dsl_describer.rb

@@ -0,0 +1,29 @@
+require 'guard/dsl'
+
+module Guard
+  class DslDescriber < Dsl
+    @@guardfile_structure = [ { :guards => [] } ]
+
+    class << self
+      def guardfile_structure
+        @@guardfile_structure
+      end
+    end
+
+    private
+    def group(name, &guard_definition)
+      @@guardfile_structure << { :group => name.to_sym, :guards => [] }
+
+      @group = true
+      guard_definition.call
+      @group = false
+    end
+
+    def guard(name, options = {}, &watch_definition)
+      node = (@group ? @@guardfile_structure.last : @@guardfile_structure.first)
+
+      node[:guards] << { :name => name, :options => options }
+    end
+  end
+end
+

data/lib/guard/listener.rb

@@ -47,7 +47,7 @@ module Guard
     end
 
     def modified_files(dirs, options = {})
-      files = potentially_modified_files(dirs, options).select { |path| File.file?(path) && file_modified?(path) }
+      files = potentially_modified_files(dirs, options).select { |path| file_modified?(path) }
       relativate_paths files
     end
 
@@ -77,12 +77,11 @@ module Guard
       !!@relativate_paths
     end
 
-
   private
 
     def potentially_modified_files(dirs, options = {})
       match = options[:all] ? "**/*" : "*"
-      Dir.glob(dirs.map { |dir| "#{dir}#{match}" })
+      Dir.glob(dirs.map { |dir| "#{dir}#{match}" }, File::FNM_DOTMATCH).select { |file| File.file?(file) }
     end
 
     # Depending on the filesystem, mtime is probably only precise to the second, so round
@@ -116,15 +115,15 @@ module Guard
     end
 
     def self.mac?
-      Config::CONFIG['target_os'] =~ /darwin/i
+      RbConfig::CONFIG['target_os'] =~ /darwin/i
     end
 
     def self.linux?
-      Config::CONFIG['target_os'] =~ /linux/i
+      RbConfig::CONFIG['target_os'] =~ /linux/i
     end
 
     def self.windows?
-      Config::CONFIG['target_os'] =~ /mswin|mingw/i
+      RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
     end
 
   end

data/lib/guard/listeners/linux.rb

@@ -47,7 +47,8 @@ module Guard
     end
 
     def watch(directory)
-      worker.watch(directory, :recursive, :modify, :create) do |event|
+      # The event selection is based on https://github.com/guard/guard/wiki/Analysis-of-inotify-events-for-different-editors
+      worker.watch(directory, :recursive, :create, :move_self, :close_write) do |event|
         unless event.name == "" # Event on root directory
           @files << event.absolute_name
         end
@@ -58,18 +59,15 @@ module Guard
     def watch_change
       @watch_change = true
       until @stop
-        if Config::CONFIG['build'] =~ /java/ || IO.select([inotify.to_io], [], [], latency)
+        if RbConfig::CONFIG['build'] =~ /java/ || IO.select([inotify.to_io], [], [], latency)
           break if @stop
 
           sleep latency
           inotify.process
-          update_last_event
 
-          unless files.empty?
-            files.uniq!
-            callback.call( relativate_paths(files) )
-            files.clear
-          end
+          modified_files = modified_files(files.shift(files.size).map{|f| File.dirname(f) + '/' }.uniq)
+          update_last_event
+          callback.call(modified_files) unless modified_files.empty?
         end
       end
       @watch_change = false

data/lib/guard/listeners/windows.rb

@@ -2,8 +2,9 @@ module Guard
   class Windows < Listener
     attr_reader :fchange
 
-    def initialize
+    def initialize(*)
       super
+
       @fchange = FChange::Notifier.new
     end
 

data/lib/guard/notifier.rb

@@ -11,7 +11,7 @@ module Guard
 
     def self.turn_on
       ENV["GUARD_NOTIFY"] = 'true'
-      case Config::CONFIG['target_os']
+      case RbConfig::CONFIG['target_os']
       when /darwin/i
         require_growl
       when /linux/i
@@ -26,7 +26,7 @@ module Guard
         image = options.delete(:image) || :success
         title = options.delete(:title) || "Guard"
 
-        case Config::CONFIG['target_os']
+        case RbConfig::CONFIG['target_os']
         when /darwin/i
           notify_mac(title, message, image, options)
         when /linux/i

data/lib/guard/ui.rb

@@ -12,7 +12,14 @@ module Guard
       def error(message, options = {})
         unless ENV["GUARD_ENV"] == "test"
           reset_line if options[:reset]
-          puts "ERROR: #{message}"
+          puts "#{color('ERROR:', ';31')} #{message}"
+        end
+      end
+
+      def deprecation(message, options = {})
+        unless ENV["GUARD_ENV"] == "test"
+          reset_line if options[:reset]
+          puts "#{color('DEPRECATION:', ';31')} #{message}"
         end
       end
 
@@ -24,11 +31,7 @@ module Guard
       end
 
       def reset_line
-        if color_enabled?
-          print "\r\e[0m"
-        else
-          print "\r\n"
-        end
+        print(color_enabled? ? "\r\e[0m" : "\r\n")
       end
 
       def clear
@@ -38,24 +41,21 @@ module Guard
     private
 
       def reset_color(text)
-        color(text, "\e[0m")
+        color(text, "")
       end
 
       def color(text, color_code)
-        if color_enabled?
-          return "#{color_code}#{text}\e[0m"
-        else
-          return text
-        end
+        color_enabled? ? "\e[0#{color_code}m#{text}\e[0m" : text
       end
 
       def color_enabled?
-        @color_enabled ||= if Config::CONFIG['target_os'] =~ /mswin|mingw/i
+        @color_enabled ||= if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
           unless ENV['ANSICON']
             begin
               require 'rubygems' unless ENV['NO_RUBYGEMS']
               require 'Win32/Console/ANSI'
             rescue LoadError
+              @color_enabled = false
               info "You must 'gem install win32console' to use color on Windows"
               false
             end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "0.4.2" unless defined? Guard::VERSION
+  VERSION = "0.5.0" unless defined? Guard::VERSION
 end

data/lib/guard/watcher.rb

@@ -1,11 +1,11 @@
 module Guard
   class Watcher
     attr_accessor :pattern, :action
-    
+
     def initialize(pattern, action = nil)
       @pattern, @action = pattern, action
       @@warning_printed ||= false
-      
+
       # deprecation warning
       if @pattern.is_a?(String) && @pattern =~ /(^(\^))|(>?(\\\.)|(\.\*))|(\(.*\))|(\[.*\])|(\$$)/
         unless @@warning_printed
@@ -17,7 +17,7 @@ module Guard
         @pattern = Regexp.new(@pattern)
       end
     end
-    
+
     def self.match_files(guard, files)
       guard.watchers.inject([]) do |paths, watcher|
         files.each do |file|
@@ -33,7 +33,7 @@ module Guard
         paths.flatten.map { |p| p.to_s }
       end
     end
-    
+
     def self.match_files?(guards, files)
       guards.any? do |guard|
         guard.watchers.any? do |watcher|
@@ -41,7 +41,7 @@ module Guard
         end
       end
     end
-    
+
     def match_file?(file)
       if @pattern.is_a?(Regexp)
         file.match(@pattern)
@@ -49,14 +49,18 @@ module Guard
         file == @pattern ? [file] : nil
       end
     end
-    
+
+    def self.match_guardfile?(files)
+      files.any? { |file| "#{Dir.pwd}/#{file}" == Dsl.guardfile_path }
+    end
+
     def call_action(matches)
       begin
         @action.arity > 0 ? @action.call(matches) : @action.call
-      rescue
-        UI.error "Problem with watch action!"
+      rescue Exception => e
+        UI.error "Problem with watch action!\n#{e.message}\n\n#{e.backtrace.join("\n")}"
       end
     end
-    
+
   end
 end

data/man/guard.1

@@ -0,0 +1,70 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "GUARD" "1" "June 2011" "" ""
+.
+.SH "NAME"
+\fBguard\fR \- Guard keeps an eye on your file modifications\.
+.
+.SH "SYNOPSIS"
+guard \fIcommand\fR \fIoptions\fR
+.
+.SH "DESCRIPTION"
+Guard is a command line tool that easily handle events on files modifications\.
+.
+.SH "HOMEPAGE"
+https://github\.com/guard/guard
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-c\fR, \fB\-\-clear\fR
+Clears the Shell after each change\.
+.
+.TP
+\fB\-n\fR \fIflag\fR, \fB\-\-notify\fR \fIflag\fR
+Disable notifications (Growl or Libnotify depending on your system)\. Note that notifications can also be disabled globally by setting a GUARD_NOTIFY environment variable to false\. The \fIflag\fR part can be passed to guard using true/false or t/f\.
+.
+.TP
+\fB\-g\fR \fIgroup\fR \.\.\., \fB\-\-group\fR \fIgroup\fR \.\.\.
+Runs only the groups specified\.
+.
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+Runs Guard in debug mode\.
+.
+.TP
+\fB\-h\fR
+List all of Guard\'s available commands\.
+.
+.SH "COMMANDS"
+.
+.TP
+\fBstart\fR
+Starts Guard\. This is the default command if none is provided\.
+.
+.TP
+\fBinit\fR [guard]
+Add the requested guard\'s default Guardfile configuration to the current Guardfile\.
+.
+.TP
+\fBshow\fR, \fB\-T\fR
+List defined groups and guards for the current Guardfile\.
+.
+.SH "EXAMPLES"
+\fB[bundle exec] guard \-\-clear \-\-group backend frontend \-\-notify false \-\-debug\fR
+.
+.P
+or in a more concise way:
+.
+.P
+\fB[bundle exec] guard \-c \-g backend frontend \-n f \-d\fR
+.
+.SH "AUTHORS / CONTRIBUTORS"
+Thibaud Guillaume\-Gentil is the main author\.
+.
+.P
+A list of contributors based on all commits can be found here: https://github\.com/guard/guard/contributors
+.
+.P
+For an exhaustive list of all the contributors, please see the CHANGELOG: https://github\.com/guard/guard/blob/master/CHANGELOG\.md

data/man/guard.1.html

@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' value='text/html;charset=utf8'>
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>guard(1) - Guard keeps an eye on your file modifications.</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#HOMEPAGE">HOMEPAGE</a>
+    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#COMMANDS">COMMANDS</a>
+    <a href="#EXAMPLES">EXAMPLES</a>
+    <a href="#AUTHORS-CONTRIBUTORS">AUTHORS / CONTRIBUTORS</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>guard(1)</li>
+    <li class='tc'></li>
+    <li class='tr'>guard(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>guard</code> - <span class="man-whatis">Guard keeps an eye on your file modifications.</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+
+<p>guard <var>command</var> <var>options</var></p>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>Guard is a command line tool that easily handle events on files modifications.</p>
+
+<h2 id="HOMEPAGE">HOMEPAGE</h2>
+
+<p>https://github.com/guard/guard</p>
+
+<h2 id="OPTIONS">OPTIONS</h2>
+
+<dl>
+<dt><code>-c</code>, <code>--clear</code></dt><dd><p>Clears the Shell after each change.</p></dd>
+<dt><code>-n</code> <var>flag</var>, <code>--notify</code> <var>flag</var></dt><dd><p>Disable notifications (Growl or Libnotify depending on your system).
+Note that notifications can also be disabled globally by setting a GUARD_NOTIFY environment variable to false.
+The <var>flag</var> part can be passed to guard using true/false or t/f.</p></dd>
+<dt><code>-g</code> <var>group</var> ..., <code>--group</code> <var>group</var> ...</dt><dd><p>Runs only the groups specified.</p></dd>
+<dt><code>-d</code>, <code>--debug</code></dt><dd><p>Runs Guard in debug mode.</p></dd>
+<dt class="flush"><code>-h</code></dt><dd><p>List all of Guard's available commands.</p></dd>
+</dl>
+
+
+<h2 id="COMMANDS">COMMANDS</h2>
+
+<dl>
+<dt class="flush"><code>start</code></dt><dd><p>Starts Guard. This is the default command if none is provided.</p></dd>
+<dt><code>init</code> [guard]</dt><dd><p>Add the requested guard's default Guardfile configuration to the current Guardfile.</p></dd>
+<dt><code>show</code>, <code>-T</code></dt><dd><p>List defined groups and guards for the current Guardfile.</p></dd>
+</dl>
+
+
+<h2 id="EXAMPLES">EXAMPLES</h2>
+
+<p><code>[bundle exec] guard --clear --group backend frontend --notify false --debug</code></p>
+
+<p>or in a more concise way:</p>
+
+<p><code>[bundle exec] guard -c -g backend frontend -n f -d</code></p>
+
+<h2 id="AUTHORS-CONTRIBUTORS">AUTHORS / CONTRIBUTORS</h2>
+
+<p>Thibaud Guillaume-Gentil is the main author.</p>
+
+<p>A list of contributors based on all commits can be found here:
+https://github.com/guard/guard/contributors</p>
+
+<p>For an exhaustive list of all the contributors, please see the CHANGELOG:
+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'>June 2011</li>
+    <li class='tr'>guard(1)</li>
+  </ol>
+
+  </div>
+</body>
+</html>

metadata

@@ -1,101 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: guard
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
 platform: ruby
-authors: 
+authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-08 00:00:00 +02:00
+date: 2011-07-02 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164408000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164408000
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2164407200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2164407200
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &2164406640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2164406640
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &2164406140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 14
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2164406140
 description: Guard is a command line tool to easily handle events on file system modifications.
-email: 
+email:
 - thibaud@thibaud.me
-executables: 
+executables:
 - guard
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/guard
 - images/failed.png
 - images/pending.png
 - images/success.png
 - lib/guard/cli.rb
 - lib/guard/dsl.rb
+- lib/guard/dsl_describer.rb
 - lib/guard/guard.rb
 - lib/guard/interactor.rb
 - lib/guard/listener.rb
@@ -109,44 +84,34 @@ files:
 - lib/guard/version.rb
 - lib/guard/watcher.rb
 - lib/guard.rb
+- CHANGELOG.md
 - LICENSE
+- man/guard.1
+- man/guard.1.html
 - README.md
-- CHANGELOG.md
 has_rdoc: true
 homepage: https://github.com/guard/guard
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: guard
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Guard keeps an eye on your file modifications
 test_files: []
-