guard 0.4.0 → 0.5.0

data/CHANGELOG.md

@@ -0,0 +1,195 @@
+## 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][])
+
+## 0.4.0 - June 5, 2011
+
+### Bugs fixes:
+
+- 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][] & [@netzpirat][])
+
+### Improvements
+
+- Pull request [#74](https://github.com/guard/guard/pull/74): Added link definitions to make the CHANGELOG more DRY! That's for sure now, we have the cleanest CHANGELOG ever! (even the link definitions are sorted alphabetically!) ([@pcreux][])
+
+## 0.4.0.rc - May 28, 2011
+
+### Bugs fixes:
+
+- 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][] & [@netzpirat][])
+- Fixed `Guard::Notifier` (when growl/libnotify not present). ([@thibaudgg][])
+- Fixed Rubygems deprecation messages. ([@thibaudgg][])
+
+### New features:
+
+- Pull request [#67](https://github.com/guard/guard/pull/67): Allow Guardfile in `$HOME` folder. ([@hashrocketeer][])
+- Pull request [#64](https://github.com/guard/guard/pull/64): Windows notifications support. ([@stereobooster][])
+- Pull request [#63](https://github.com/guard/guard/pull/63): Refactor listeners to work as a library. ([@niklas][])
+- Use `ENV["GUARD_NOTIFY"]` to disable notifications. ([@thibaudgg][])
+- Cleaning up all specs. ([@netzpirat][])
+- Pull request [#60](https://github.com/guard/guard/pull/60): Added Windows support. ([@stereobooster][])
+- Pull request [#58](https://github.com/guard/guard/pull/58): Extract code from signal handlers into methods. ([@nicksieger][])
+- Pull request [#55](https://github.com/guard/guard/pull/55): It is now possible to pass `:guardfile` (a Guardfile path) or `:guardfile_contents` (the content of a Guardfile) to `Guard::Dsl.evaluate_guardfile`. Hence this allows the use of `Guard::Dsl.evaluate_guardfile` in a programmatic manner. ([@anithri][], improved by [@rymai][])
+
+
+## 0.3.4 - April 24, 2011
+
+### Bugs fixes:
+
+- Issue [#41](https://github.com/guard/guard/issues/41): Removed useless Bundler requirement. ([@thibaudgg][])
+
+### New features:
+
+- Changed CHANGELOG from RDOC to Markdown and cleaned it! Let's celebrate! ([@rymai][])
+- Changed README from RDOC to Markdown! Let's celebrate! ([@thibaudgg][])
+- Issue [#48](https://github.com/guard/guard/issues/48): Adding support for inline Guard classes rather than requiring a gem. ([@jrsacks][])
+
+
+## 0.3.3 - April 18, 2011
+
+### Bugs fixes:
+
+- Fixed `new_modified_files` rerun conditions on `Guard.run_on_change_for_all_guards`. ([@thibaudgg][])
+
+
+## 0.3.2 - April 17, 2011
+
+### Bugs fixes:
+
+- Pull request [#43](https://github.com/guard/guard/pull/43): Fixed `guard init` command. ([@brainopia][])
+
+
+## 0.3.1 - April 14, 2011
+
+### Bugs fixes:
+
+- Return unique filenames from Linux listener. (Marian Schubert)
+- `Guard.get_guard_class` return wrong class when loaded nested class. ([@koshigoe][])
+- Issue [#35](https://github.com/guard/guard/issues/35): Fixed open-gem/gem_open dependency problem by using `gem which` to locate guards gem path. (reported by [@thierryhenrio][], fixed by [@thibaudgg][])
+- Issue [#38](https://github.com/guard/guard/issues/38) & Pull request [#39](https://github.com/guard/guard/issues/39): Fixed an invalid ANSI escape code in `Guard::UI.reset_line`. ([@gix][])
+
+### New features:
+
+- Issue [#28](https://github.com/guard/guard/issues/28): New `-n` command line option to disable notifications (Growl / Libnotify). ([@thibaudgg][])
+
+
+## 0.3.0 - January 19, 2011
+
+### Bugs fixes:
+
+- Avoid launching `run_on_change` guards method when no files matched. `--clear` guard argument is now usable. ([@thibaudgg][])
+
+### New features:
+
+- The whole directory is now watched during `run_on_change` to detect new files modifications. ([@thibaudgg][])
+- Pull request [#26](https://github.com/guard/guard/pull/26): New DSL method: `group` allows you to group several guards. New CLI option: `--group group_name` to specify certain groups of guards to start. ([@netzpirat][])
+- `watch` patterns are now more strict: strings are matched with `String#==`, `Regexp` are matched with `Regexp#match`. ([@rymai][])
+- A deprecation warning is displayed if your `Guardfile` contains `String` that look like `Regexp` (bad!). ([@rymai][])
+- It's now possible to return an `Enumerable` in the `watch` optional blocks in the `Guardfile`. ([@rymai][])
+
+### New specs:
+
+- `Guard::Watcher`. ([@rymai][])
+- Pull request [#13](https://github.com/guard/guard/pull/13): `Guard::Dsl`. ([@oliamb][])
+
+
+## 0.2.2 - October 25, 2010
+
+### Bugs fixes:
+
+- Issue [#5](https://github.com/guard/guard/issues/5): avoid creating new copy of `fsevent_watch` every time a file is changed. (reported by [@stouset][], fixed by [@thibaudgg][])
+
+
+## 0.2.1 - October 24, 2010
+
+### 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][])
+
+
+## 0.2.0 - October 21, 2010
+
+### Bugs fixes:
+
+- Issue [#3](https://github.com/guard/guard/issues/3): `guard init <guard-name>` no more need `Gemfile` but `open_gem` is required now. (reported by [@wereHamster][], fixed by [@thibaudgg][])
+- Issue [#2](https://github.com/guard/guard/issues/2): 1.8.6 compatibility. (reported by [@veged][], fixed by [@thibaudgg][])
+- Removes Growl & Libnotify dependencies. ([@thibaudgg][])
+
+
+## 0.2.0.beta.1 - October 17, 2010
+
+### New features:
+
+- Improved listeners support (`rb-fsevent` & `rb-inotify`). ([@thibaudgg][])
+- Added polling listening fallback. ([@thibaudgg][])
+
+[@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
+[@niklas]: https://github.com/niklas
+[@oliamb]: https://github.com/oliamb
+[@pcreux]: https://github.com/pcreux
+[@rymai]: https://github.com/rymai
+[@stereobooster]: https://github.com/stereobooster
+[@stouset]: https://github.com/stouset
+[@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).
 
@@ -56,9 +56,10 @@ Install the Growl gem if you want notification support:
 $ gem install growl
 ```
 
-And add it to you Gemfile:
+And add them to your Gemfile:
 
 ``` ruby
+gem 'rb-fsevent'
 gem 'growl'
 ```
 
@@ -76,9 +77,10 @@ Install the Libnotify gem if you want notification support:
 $ gem install libnotify
 ```
 
-And add it to you Gemfile:
+And add them to your Gemfile:
 
 ``` ruby
+gem 'rb-inotify'
 gem 'libnotify'
 ```
 
@@ -90,6 +92,19 @@ Install the rb-fchange gem for [Directory Change Notification](http://msdn.micro
 $ gem install rb-fchange
 ```
 
+Install the Notifu gem if you want notification support:
+
+``` bash
+$ gem install rb-notifu
+```
+
+And add them to your Gemfile:
+
+``` ruby
+gem 'rb-fchange'
+gem 'rb-notifu'
+```
+
 Usage
 -----
 
@@ -102,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
@@ -126,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]
@@ -144,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>'
@@ -169,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:
 
@@ -195,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" }
@@ -207,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:
 
@@ -232,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'
@@ -306,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:
 
@@ -326,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/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