guard 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.6.1 - August 15, 2011
+
+### Bugs fixes:
+
+- Pull request [#120](https://github.com/guard/guard/pull/120): remove guardfile_contents when re-evaluating so that the Guardfile gets reloaded correctly. ([@mordaroso][])
+- Pull request [#119](https://github.com/guard/guard/pull/119): Dsl.evaluate_guardfile uses all groups if none specified. ([@ches][])
+
 ## 0.6.0 - August 13, 2011
 
 ### Bugs fixes:
@@ -194,8 +201,10 @@
 [@brainopia]: https://github.com/brainopia
 [@bronson]: https://github.com/bronson
 [@capotej]: https://github.com/capotej
+[@ches]: https://github.com/ches
 [@chrisberkhout]: https://github.com/chrisberkhout
 [@dnagir]: https://github.com/dnagir
+[@docwhat]: https://github.com/docwhat
 [@etehtsea]: https://github.com/etehtsea
 [@fnichol]: https://github.com/fnichol
 [@Gazer]: https://github.com/Gazer
@@ -208,6 +217,7 @@
 [@koshigoe]: https://github.com/koshigoe
 [@mcmire]: https://github.com/mcmire
 [@mislav]: https://github.com/mislav
+[@mordaroso]: https://github.com/mordaroso
 [@nestegg]: https://github.com/nestegg
 [@netzpirat]: https://github.com/netzpirat
 [@nicksieger]: https://github.com/nicksieger

data/README.md

@@ -15,7 +15,12 @@ Features
 * 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.7, 1.9.2 && ree.
+* Tested against Ruby 1.8.7, 1.9.2 and REE.
+
+Screencast
+----------
+
+Ryan Bates made a screencast on Guard, you can view it here: http://railscasts.com/episodes/264-guard
 
 Install
 -------
@@ -243,7 +248,7 @@ Required:
 Optional:
 
 * 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.
+* 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. Guards that don't belong to a group are considered global and are always run.
 
 Example:
 

data/lib/guard/dsl.rb

@@ -14,6 +14,7 @@ module Guard
 
       def reevaluate_guardfile
         ::Guard.guards.clear
+        @@options.delete(:guardfile_contents)
         Dsl.evaluate_guardfile(@@options)
         msg = "Guardfile has been re-evaluated."
         UI.info(msg)
@@ -104,7 +105,8 @@ module Guard
     end
 
     def group(name, &guard_definition)
-      guard_definition.call if guard_definition && (@@options[:group].empty? || @@options[:group].include?(name.to_s))
+      @groups = @@options[:group] || []
+      guard_definition.call if guard_definition && (@groups.empty? || @groups.include?(name.to_s))
     end
 
     def guard(name, options = {}, &watch_definition)

data/lib/guard/version.rb

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

data/man/guard.1

@@ -10,7 +10,7 @@
 Guard is a command line tool that easily handle events on files modifications\.
 .
 .SH "SYNOPSIS"
-guard \fIcommand\fR \fIoptions\fR
+\fBguard <COMMAND> <OPTIONS>\fR
 .
 .SH "COMMANDS"
 .
@@ -21,103 +21,54 @@ Starts Guard\. This is the default command if none is provided\.
 The following options are available:
 .
 .P
-\fB\-c\fR/\fB\-\-clear\fR
-.
-.IP "" 4
-.
-.nf
-
-    Clears the Shell after each change\.
-.
-.fi
-.
-.IP "" 0
+\fB\-c\fR, \fB\-\-clear\fR Clears the Shell after each change\.
 .
 .P
-\fB\-n\fR/\fB\-\-notify\fR \fIflag\fR
-.
-.IP "" 4
-.
-.nf
-
-    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 <flag> part can be passed to guard using true/false or t/f\.
-.
-.fi
-.
-.IP "" 0
+\fB\-n\fR, \fB\-\-notify\fR \fIFLAG\fR Disable notifications (Growl or Libnotify depending on your system)\. Notifications can be disabled globally by setting a GUARD_NOTIFY environment variable to false\. FLAG can be \fBtrue\fR/\fBfalse\fR or \fBt\fR/\fBf\fR\.
 .
 .P
-\fB\-d\fR/\fB\-\-debug\fR
-.
-.IP "" 4
-.
-.nf
-
-    Runs Guard in debug mode\.
-.
-.fi
-.
-.IP "" 0
+\fB\-d\fR, \fB\-\-debug\fR Runs Guard in debug mode\.
 .
 .P
-\fB\-g\fR/\fB\-\-group\fR \fIgroup\fR \.\.\.
-.
-.IP "" 4
-.
-.nf
-
-    Runs only the groups specified\.
-.
-.fi
-.
-.IP "" 0
+\fB\-g\fR, \fB\-\-group\fR \fIGROUP1\fR \fIGROUP2\fR\.\.\. Runs only the groups specified by GROUP1, GROUP2 etc\. Groups name should be separated by spaces\. Guards that don\'t belong to a group are considered global and are always run\.
 .
 .P
-\fB\-w\fR/\fB\-\-watchdir\fR \fIfolder\fR
-.
-.IP "" 4
-.
-.nf
-
-    Specify the directory to watch\.
-.
-.fi
-.
-.IP "" 0
+\fB\-w\fR, \fB\-\-watchdir\fR \fIPATH\fR
 .
 .P
-\fB\-G\fR/\fB\-\-guardfile\fR \fIfile\fR
-.
-.IP "" 4
+Tells Guard to watch PATH instead of \fB\./\fR\.
 .
-.nf
-
-    Specify a Guardfile by giving its path\.
-.
-.fi
+.P
+\fB\-G\fR, \fB\-\-guardfile\fR \fIFILE\fR Tells Guard to use FILE as its Guardfile instead of \fB\./Guardfile\fR or \fB~/\.Guardfile\fR\.
 .
-.IP "" 0
+.SS "init [GUARD]"
+If no Guardfile is present in the current directory, creates an empty Guardfile\.
 .
-.SS "init [guard]"
-Add the requested guard\'s default Guardfile configuration to the current Guardfile\.
+.P
+If \fIGUARD\fR is present, add its default Guardfile configuration to the current Guardfile\. Note that \fIGUARD\fR is the guard\'s name without the \fBguard\-\fR prefix\. For instance to initialize guard\-rspec, run \fBguard init rspec\fR\.
 .
 .SS "list"
 Lists guards that can be used with the \fBinit\fR command\.
 .
-.SS "\-T/show"
+.SS "\-T, show"
 List defined groups and guards for the current Guardfile\.
 .
-.SH "OPTIONS"
-.
-.TP
-\fB\-h\fR
+.SS "\-h, help [COMMAND]"
 List all of Guard\'s available commands\.
 .
-.SS "start"
+.P
+If \fICOMMAND\fR is given, displays a specific help for \fITASK\fR\.
 .
 .SH "EXAMPLES"
+Initialize Guard and a specific guard at the same time:
+.
+.P
+\fB[bundle exec] guard init [rspec]\fR
+.
+.P
+Run Guard:
+.
+.P
 \fB[bundle exec] guard [start] \-\-watchdir ~/dev \-\-guardfile ~/env/Guardfile \-\-clear \-\-group backend frontend \-\-notify false \-\-debug\fR
 .
 .P

data/man/guard.1.html

@@ -57,7 +57,6 @@
     <a href="#DESCRIPTION">DESCRIPTION</a>
     <a href="#SYNOPSIS">SYNOPSIS</a>
     <a href="#COMMANDS">COMMANDS</a>
-    <a href="#OPTIONS">OPTIONS</a>
     <a href="#EXAMPLES">EXAMPLES</a>
     <a href="#AUTHORS-CONTRIBUTORS">AUTHORS / CONTRIBUTORS</a>
     <a href="#WWW">WWW</a>
@@ -80,70 +79,68 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p>guard <var>command</var> <var>options</var></p>
+<p><code>guard &lt;COMMAND> &lt;OPTIONS></code></p>
 
 <h2 id="COMMANDS">COMMANDS</h2>
 
 <h3 id="start">start</h3>
 
-<p>  Starts Guard. This is the default command if none is provided.</p>
+<p>Starts Guard. This is the default command if none is provided.</p>
 
 <p>The following options are available:</p>
 
-<p>  <code>-c</code>/<code>--clear</code></p>
+<p><code>-c</code>, <code>--clear</code>
+  Clears the Shell after each change.</p>
 
-<pre><code>    Clears the Shell after each change.
-</code></pre>
+<p><code>-n</code>, <code>--notify</code> <var>FLAG</var>
+  Disable notifications (Growl or Libnotify depending on your system).
+  Notifications can be disabled globally by setting a GUARD_NOTIFY environment variable to false.
+  FLAG can be <code>true</code>/<code>false</code> or <code>t</code>/<code>f</code>.</p>
 
-<p>  <code>-n</code>/<code>--notify</code> <var>flag</var></p>
+<p><code>-d</code>, <code>--debug</code>
+  Runs Guard in debug mode.</p>
 
-<pre><code>    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 &lt;flag> part can be passed to guard using true/false or t/f.
-</code></pre>
+<p><code>-g</code>, <code>--group</code> <var>GROUP1</var> <var>GROUP2</var>...
+  Runs only the groups specified by GROUP1, GROUP2 etc.
+  Groups name should be separated by spaces.
+  Guards that don't belong to a group are considered global and are always run.</p>
 
-<p>  <code>-d</code>/<code>--debug</code></p>
+<p><code>-w</code>, <code>--watchdir</code> <var>PATH</var></p>
 
-<pre><code>    Runs Guard in debug mode.
-</code></pre>
+<p>Tells Guard to watch PATH instead of <code>./</code>.</p>
 
-<p>  <code>-g</code>/<code>--group</code> <var>group</var> ...</p>
+<p><code>-G</code>, <code>--guardfile</code> <var>FILE</var>
+  Tells Guard to use FILE as its Guardfile instead of <code>./Guardfile</code> or <code>~/.Guardfile</code>.</p>
 
-<pre><code>    Runs only the groups specified.
-</code></pre>
+<h3 id="init-GUARD-">init [GUARD]</h3>
 
-<p>  <code>-w</code>/<code>--watchdir</code> <var>folder</var></p>
+<p>If no Guardfile is present in the current directory, creates an empty Guardfile.</p>
 
-<pre><code>    Specify the directory to watch.
-</code></pre>
+<p>If <var>GUARD</var> is present, add its default Guardfile configuration to the current Guardfile.
+Note that <var>GUARD</var> is the guard's name without the <code>guard-</code> prefix.
+For instance to initialize guard-rspec, run <code>guard init rspec</code>.</p>
 
-<p>  <code>-G</code>/<code>--guardfile</code> <var>file</var></p>
-
-<pre><code>    Specify a Guardfile by giving its path.
-</code></pre>
-
-<h3 id="init-guard-">init [guard]</h3>
+<h3 id="list">list</h3>
 
-<p>  Add the requested guard's default Guardfile configuration to the current Guardfile.</p>
+<p>Lists guards that can be used with the <code>init</code> command.</p>
 
-<h3 id="list">list</h3>
+<h3 id="-T-show">-T, show</h3>
 
-<p>  Lists guards that can be used with the <code>init</code> command.</p>
+<p>List defined groups and guards for the current Guardfile.</p>
 
-<h3 id="-T-show">-T/show</h3>
+<h3 id="-h-help-COMMAND-">-h, help [COMMAND]</h3>
 
-<p>  List defined groups and guards for the current Guardfile.</p>
+<p>List all of Guard's available commands.</p>
 
-<h2 id="OPTIONS">OPTIONS</h2>
+<p>If <var>COMMAND</var> is given, displays a specific help for <var>TASK</var>.</p>
 
-<dl>
-<dt class="flush"><code>-h</code></dt><dd>List all of Guard's available commands.</dd>
-</dl>
+<h2 id="EXAMPLES">EXAMPLES</h2>
 
+<p>Initialize Guard and a specific guard at the same time:</p>
 
-<h3 id="start">start</h3>
+<p><code>[bundle exec] guard init [rspec]</code></p>
 
-<h2 id="EXAMPLES">EXAMPLES</h2>
+<p>Run Guard:</p>
 
 <p><code>[bundle exec] guard [start] --watchdir ~/dev --guardfile ~/env/Guardfile --clear --group backend frontend --notify false --debug</code></p>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-13 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-08-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2151817180 !ruby/object:Gem::Requirement
+  requirement: &70208916582320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151817180
+  version_requirements: *70208916582320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151815560 !ruby/object:Gem::Requirement
+  requirement: &70208916581740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2151815560
+  version_requirements: *70208916581740
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2151813940 !ruby/object:Gem::Requirement
+  requirement: &70208916581220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *2151813940
+  version_requirements: *70208916581220
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2151811280 !ruby/object:Gem::Requirement
+  requirement: &70208916580720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +54,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2151811280
+  version_requirements: *70208916580720
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me
@@ -89,7 +88,6 @@ files:
 - man/guard.1
 - man/guard.1.html
 - README.md
-has_rdoc: true
 homepage: https://github.com/guard/guard
 licenses: []
 post_install_message: 
@@ -110,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Guard keeps an eye on your file modifications