guard 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,11 +1,28 @@
-## Master
+## 1.0.2 - 30 April, 2012
+
+### Improvements
+
+- [#274 & #275](https://github.com/guard/guard/issues/274) Make the Bundler warning less scary and more friendly. ([@mcmire][])
+- [#270](https://github.com/guard/guard/issues/270) Make urgency configurable for libnotify/notifysend. ([@viking][])
+- [#254](https://github.com/guard/guard/issues/254) Add the possibility to pause/unpause by sending OS signal. ([@steakknife][])
+- [#261](https://github.com/guard/guard/issues/261) Clarify the usage of the term `guard-name` in the README. ([@spadin][])
+- Add a `--no-bundler-warning` option to Guard start. ([@netzpirat][])
+- Update vendor/darwin. ([@thibaudgg][])
+
+### Bug fixes
+
+- [#260](https://github.com/guard/guard/issues/260) Don't show Bundler warning when no Gemfile present. ([@netzpirat][])
+- [#259](https://github.com/guard/guard/issues/259) Fix `guard show` on Ruby 1.8.7. ([@netzpirat][] and [@rymai][])
 
 ## 1.0.1 - 7 March, 2012
 
 ### Improvements
 
-- [#236](https://github.com/guard/guard/pull/236) Add support for `notifysend`. ([@alandipert][])
+- [#236](https://github.com/guard/guard/issues/236) Add support for `notifysend`. ([@alandipert][])
 - Update vendor/darwin to rb-fsevent 0.9.0. ([@thibaudgg][])
+
+### Bug fixes
+
 - [#249 & #250](https://github.com/guard/guard/issues/250) Fix programmatic examples that didn't work. ([@oreoshake][])
 - [#238](https://github.com/guard/guard/issues/238) Don't try to load the FSEvents listener on older versions of OSX. ([@philomory][])
 - [#233](https://github.com/guard/guard/issues/233) Guard::Listener.select_and_init requires hash. (reported by [@sunaku][], fixed by [@thibaudgg][])
@@ -449,6 +466,8 @@
 [@rymai]: https://github.com/rymai
 [@scottdavis]: https://github.com/scottdavis
 [@semperos]: https://github.com/semperos
+[@spadin]: https://github.com/spadin
+[@steakknife]: https://github.com/steakknife
 [@stereobooster]: https://github.com/stereobooster
 [@stouset]: https://github.com/stouset
 [@sunaku]: https://github.com/sunaku
@@ -459,6 +478,7 @@
 [@tpope]: https://github.com/tpope
 [@uk-ar]: https://github.com/uk-ar
 [@veged]: https://github.com/veged
+[@viking]: https://github.com/viking
 [@waldo]: https://github.com/waldo
 [@wereHamster]: https://github.com/wereHamster
 [@yannlugrin]: https://github.com/yannlugrin

data/README.md

@@ -3,9 +3,47 @@ Guard [![Build Status](https://secure.travis-ci.org/guard/guard.png?branch=maste
 
 Guard is a command line tool to easily handle events on file system modifications.
 
-If you have any questions please join us in our [Google group](http://groups.google.com/group/guard-dev) or on
-`#guard` (irc.freenode.net).
+This document contains a lot of information, please take your time and read these instructions carefully. If you have
+any questions, ask them in our [Google group](http://groups.google.com/group/guard-dev) or on `#guard`
+(irc.freenode.net).
+
+Before you file an issue, make sure you have read the [file an issue](#file-an-issue) section that contains some
+important information.
+
+Contents
+--------
 
+* [Features](#features)
+* [Screencast](#screencast)
+* [Installation](#installation)
+  * [System notifications](#installation-system-notifications)
+* [Add more Guards](#add-more-guards)
+* [Usage](#usage)
+  * [Help](#usage-help)
+  * [Init](#usage-init)
+  * [Start](#usage-start)
+  * [List](#usage-list)
+  * [Show](#usage-show)
+* [Interactions](#interactions)
+  * [Readline support](#interactions-readline-support)
+  * [Signals](#interactions-signal)
+* [Guardfile DSL](#guardfile-dsl)
+  * [guard](#guardfile-dsl-guard)
+  * [watch](#guardfile-dsl-watch)
+  * [group](#guardfile-dsl-group)
+  * [notification](#guardfile-dsl-notification)
+  * [interactor](#guardfile-dsl-interactor)
+  * [callback](#guardfile-dsl-callback)
+  * [ignore_paths](#guardfile-dsl-ignore-paths)
+  * [Example](#guardfile-dsl-example)
+* [Shared configurations](#shared-configurations)
+* [Advanced Linux system configuration](#advanced-linux-system-configuration)
+* [Create a Guard](#create-a-guard)
+* [Programmatic use of Guard](#programmatic-use-of-guard)
+* [File an issue](#file-an-issue)
+* [Development](#development)
+
+<a name="features" />
 Features
 --------
 
@@ -18,12 +56,14 @@ Features
 * Support for visual system notifications.
 * Tested against Ruby 1.8.7, 1.9.2, 1.9.3, REE and the latest versions of JRuby & Rubinius.
 
+<a name="screencast" />
 Screencast
 ----------
 
 Ryan Bates made an excellent [RailsCast about Guard](http://railscasts.com/episodes/264-guard) and you should definitely
 watch it for a nice introduction to Guard.
 
+<a name="installation" />
 Installation
 ------------
 
@@ -61,6 +101,7 @@ end
 **It's important that you always run Guard through Bundler to avoid errors.** If you're getting sick of typing `bundle exec` all
 the time, try the [Rubygems Bundler](https://github.com/mpapis/rubygems-bundler).
 
+<a name="installation-system-notifications" />
 ### System notifications
 
 You can configure Guard to make use of the following system notification libraries, but it's strongly recommended
@@ -168,6 +209,7 @@ group :development do
 end
 ```
 
+<a name="add-more-guards" />
 Add more Guards
 ---------------
 
@@ -186,11 +228,13 @@ end
 See the init section of the Guard usage below to see how to install the supplied Guard template that you can install and
 to suit your needs.
 
+<a name="usage" />
 Usage
 -----
 
 Guard is run from the command line. Please open your terminal and go to your project work directory.
 
+<a name="usage-help" />
 ### Help
 
 You can always get help on the available tasks with the `help` task:
@@ -206,6 +250,7 @@ For example, to get help for the `start` task, simply run:
 $ guard help start
 ```
 
+<a name="usage-init" />
 ### Init
 
 You can generate a Guardfile and have all installed guards be automatically added into
@@ -243,6 +288,7 @@ $ guard init --bare
 $ guard init -b # shortcut
 ```
 
+<a name="usage-start" />
 ### Start
 
 Just launch Guard inside your Ruby or Rails project with:
@@ -330,7 +376,7 @@ $ guard start -i
 $ guard start --no-interactions
 ```
 
-### `-I`/`--no-vendor` option
+#### `-I`/`--no-vendor` option
 
 Ignore the use of vendored gems with:
 
@@ -339,6 +385,16 @@ $ guard start -I
 $ guard start --no-vendor
 ```
 
+#### `-B`/`--no-bundler-warning` option
+
+Skip Bundler warning when a Gemfile exists in the project directory but Guard is not run with Bundler.
+
+```bash
+$ guard start -B
+$ guard start --no-bundler-warning
+```
+
+<a name="usage-list" />
 ### List
 
 You can list the available Guards with the `list` task:
@@ -359,6 +415,7 @@ See also https://github.com/guard/guard/wiki/List-of-available-Guards
 * denotes ones already in your Guardfile
 ```
 
+<a name="usage-show" />
 ### Show
 
 You can show the structure of the groups and their Guards with the `show` task:
@@ -379,6 +436,7 @@ Group frontend:
 This shows the internal structure of the evaluated `Guardfile` or `.Guardfile`, with the `.guard.rb` file. You can
 read more about these files in the shared configuration section below.
 
+<a name="interactions" />
 Interactions
 ------------
 
@@ -389,7 +447,7 @@ You can interact with Guard and enter commands when Guard has nothing to do. Gua
 * `r`, `reload`:       Reload all Guards.
 * `n`, `notification`: Toggle system notifications on and off.
 * `p`, `pause`:        Toggles the file modification listener. The prompt will change to `p>` when paused.
-                       This is useful when switching Git branches.
+                       This is useful when switching Git branches, rebase Git or change whitespace.
 * `e`, `exit`:         Stop all Guards and quit Guard.
 
 Instead of running all Guards with the `↩` key, you can also run a single Guard by entering its name:
@@ -416,6 +474,7 @@ This will reload only the Ronn Guard. You can also reload all Guards within a gr
 > backend reload
 ```
 
+<a name="interactions-readline-support" />
 ### Readline support
 
 With Readline enabled, you'll see a command prompt `>` when Guard is ready to accept a command. The command line
@@ -433,12 +492,31 @@ end
 Guard will automatically enable Readline support if your environment supports it, but you can disable Readline with the
 `interactor` DSL method or turn off completely with the `--no-interactions` option.
 
+<a name="interactions-signal" />
+### Signals
+
+You can also interact with Guard by sending POSIX signals to the Guard process (all but Windows).
+
+#### Pause watching
+
+```bash
+$ kill -USR1 <guard_pid>
+```
+
+#### Continue watching
+
+```bash
+$ kill -USR2 <guard_pid>
+```
+
+<a name="guardfile-dsl" />
 Guardfile DSL
 -------------
 
 The Guardfile DSL is evaluated as plain Ruby, so you can use normal Ruby code in your `Guardfile`.
 Guard itself provides the following DSL methods that can be used for configuration:
 
+<a name="guardfile-dsl-guard" />
 ### guard
 
 The `guard` method allows you to add a Guard to your toolchain and configure it by passing the
@@ -455,6 +533,7 @@ guard :coffeescript, :input => 'coffeescripts', :output => 'javascripts'
 guard :coffeescript, :input => 'specs', :output => 'specs'
 ```
 
+<a name="guardfile-dsl-watch" />
 ### watch
 
 The `watch` method allows you to define which files are watched by a Guard:
@@ -500,6 +579,7 @@ guard :shell do
 end
 ```
 
+<a name="guardfile-dsl-group" />
 ### group
 
 The `group` method allows you to group several Guards together. This comes in handy especially when you
@@ -527,6 +607,7 @@ $ guard -g specs
 
 Guards that don't belong to a group are considered global and are always run.
 
+<a name="guardfile-dsl-notification" />
 ### notification
 
 If you don't specify any notification configuration in your `Guardfile`, Guard goes through the list of available
@@ -549,7 +630,7 @@ Each notifier has a slightly different set of supported options:
 notification :growl, :sticky => true, :host => '192.168.1.5', :password => 'secret'
 notification :gntp, :sticky => true, :host => '192.168.1.5', :password => 'secret'
 notification :growl_notify, :sticky => true, :priority => 0
-notification :libnotify, :timeout => 5, :transient => true, :append => false
+notification :libnotify, :timeout => 5, :transient => true, :append => false, :urgency => :critical
 notification :notifu, :time => 5, :nosound => true, :xp => true
 ```
 
@@ -563,6 +644,7 @@ or using the cli switch `-n`:
 notification :off
 ```
 
+<a name="guardfile-dsl-interactor" />
 ### interactor
 
 You can disable the interactor auto detection and for a specific implementation:
@@ -583,6 +665,7 @@ If you do not need the keyboard interactions with Guard at all, you can turn the
 interactor :off
 ```
 
+<a name="guardfile-dsl-callback" />
 ### callback
 
 The `callback` method allows you to execute arbitrary code before or after any of the `start`, `stop`, `reload`,
@@ -599,6 +682,7 @@ end
 Please see the [hooks and callbacks](https://github.com/guard/guard/wiki/Hooks-and-callbacks) page in the Guard wiki for
 more details.
 
+<a name="guardfile-dsl-ignore-paths" />
 ### ignore_paths
 
 The `ignore_paths` method allows you to ignore top level directories altogether. This comes is handy when you have large
@@ -609,6 +693,7 @@ Currently it is only possible to ignore the immediate descendants of the watched
 ignore_paths 'public'
 ```
 
+<a name="guardfile-dsl-example" />
 ### Example
 
 ```ruby
@@ -642,6 +727,7 @@ group :frontend do
 end
 ```
 
+<a name="shared-configurations" />
 Shared configurations
 ---------------------
 
@@ -659,6 +745,7 @@ guard :shell do
 end
 ```
 
+<a name="advanced-linux-system-configuration" />
 Advanced Linux system configuration
 -----------------------------------
 
@@ -687,16 +774,16 @@ sudo sysctl -p
 
 You may also need to pay attention to the values of `max_queued_events` and `max_user_instances`.
 
+<a name="create-a-guard" />
 Create a Guard
 --------------
 
-Creating a new Guard is very easy, just create a new gem by running `bundle gem guard-name`, where `name` is
-the name of your Guard. Please make your Guard start with `guard-`, so that it can easily be found on RubyGems.
+Creating a new Guard is very easy. For example, to create a Guard named `yoyo` just create a new gem by running `bundle gem guard-yoyo`. Please make your Guard start with `guard-`, so that it can easily be found on RubyGems.
 
 ```bash
-$ mkdir guard-name
-$ cd guard-name
-$ bundle gem guard-name
+$ mkdir guard-yoyo
+$ cd guard-yoyo
+$ bundle gem guard-yoyo
 ```
 
 Now extend the project structure to have an initial Guard:
@@ -705,31 +792,31 @@ Now extend the project structure to have an initial Guard:
 .travis.yml  # bonus point!
 CHANGELOG.md # bonus point!
 Gemfile
-guard-name.gemspec
+guard-yoyo.gemspec
 Guardfile
 lib/
   guard/
-    guard-name/
+    yoyo/
       templates/
         Guardfile # needed for `guard init <guard-name>`
       version.rb
-    guard-name.rb
+    yoyo.rb
 test/ # or spec/
 README.md
 ```
 
-Your Guard main class `Guard::GuardName` in `lib/guard/guard-name.rb` must inherit from
+Your Guard main class `Guard::Yoyo` in `lib/guard/guard-yoyo.rb` must inherit from
 [Guard::Guard](http://rubydoc.info/github/guard/guard/master/Guard/Guard) and should overwrite at least the
 `#run_on_change` task methods.
 
-Here is an example scaffold for `lib/guard/guard-name.rb`:
+Here is an example scaffold for `lib/guard/yoyo.rb`:
 
 ```ruby
 require 'guard'
 require 'guard/guard'
 
 module Guard
-  class GuardName < Guard
+  class Yoyo < Guard
 
     # Initialize a Guard.
     # @param [Array<Guard::Watcher>] watchers the Guard file watchers
@@ -798,6 +885,7 @@ end
 [@avdi](https://github.com/avdi) has a very cool inline Guard example in his blog post
 [A Guardfile for Redis](http://avdi.org/devblog/2011/06/15/a-guardfile-for-redis).
 
+<a name="programmatic-use-of-guard" />
 Programmatic use of Guard
 -------------------------
 
@@ -837,21 +925,28 @@ EOF
 Guard.start(:guardfile_contents => guardfile)
 ```
 
-Issues
-------
+<a name="file-an-issue" />
+File an issue
+-------------
 
-You can report issues and feature requests to [GitHub Issues](https://github.com/guard/guard/issues). Try to figure out
-where the issue belongs to: Is it an issue with Guard itself or with a Guard implementation you're using? Please don't
-ask question in the issue tracker, instead join us in our [Google group](http://groups.google.com/group/guard-dev) or on
-`#guard` (irc.freenode.net).
+You can report bugs and feature requests to [GitHub Issues](https://github.com/guard/guard/issues).
 
-When you file an issue, please try to follow to these simple rules if applicable:
+**Please don't ask question in the issue tracker**, instead ask them in our
+[Google group](http://groups.google.com/group/guard-dev) or on `#guard` (irc.freenode.net).
+
+Try to figure out where the issue belongs to: Is it an issue with Guard itself or with a Guard implementation you're
+using?
+
+When you file a bug, please try to follow these simple rules if applicable:
 
 * Make sure you run Guard with `bundle exec` first.
 * Add verbose information to the issue by running Guard with the `--verbose` option.
 * Add your `Guardfile` and `Gemfile` to the issue.
 * Make sure that the issue is reproducible with your description.
 
+**It's most likely that your bug gets resolved faster if you provide as much information as possible!**
+
+<a name="development" />
 Development [![Dependency Status](https://gemnasium.com/guard/guard.png?branch=master)](https://gemnasium.com/guard/guard)
 -----------
 
@@ -871,19 +966,17 @@ Pull requests are very welcome! Please try to follow these simple rules if appli
 For questions please join us in our [Google group](http://groups.google.com/group/guard-dev) or on
 `#guard` (irc.freenode.net).
 
-Core Team
----------
+### Author
 
-* [Michael Kessler](https://github.com/netzpirat) ([@netzpirat](http://twitter.com/netzpirat)), sponsored by [mksoft.ch](https://mksoft.ch)
-* [Rémy Coutable](https://github.com/rymai) ([@rymai](http://twitter.com/rymai))
-* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg))
+[Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg))
 
-Author
-------
+### Core Team
 
-[Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg))
+* [Maher Sallam](https://github.com/Maher4Ever) ([@mahersalam](http://twitter.com/mahersalam))
+* [Michael Kessler](https://github.com/netzpirat) ([@netzpirat](http://twitter.com/netzpirat), [mksoft.ch](https://mksoft.ch))
+* [Rémy Coutable](https://github.com/rymai) ([@rymai](http://twitter.com/rymai), [rymai.me](http://rymai.me/))
+* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg), [thibaud.me](http://thibaud.me/))
 
-Contributors
-------------
+### Contributors
 
 [https://github.com/guard/guard/contributors](https://github.com/guard/guard/contributors)

data/lib/guard.rb

@@ -100,6 +100,14 @@ module Guard
       self.reset_groups
       @listener   = Listener.select_and_init(options)
 
+      if Signal.list.keys.include?('USR1')
+        Signal.trap('USR1') { ::Guard.pause unless @listener.paused? }
+      end
+
+      if Signal.list.keys.include?('USR2')
+        Signal.trap('USR2') { ::Guard.pause if @listener.paused? }
+      end
+
       UI.clear if @options[:clear]
       debug_command_execution if @options[:verbose]
 

data/lib/guard/cli.rb

@@ -65,13 +65,19 @@ module Guard
                   :aliases => '-i',
                   :banner => 'Turn off completely any guard terminal interactions'
 
+    method_option :no_bundler_warning,
+                  :type => :boolean,
+                  :default => false,
+                  :aliases => '-B',
+                  :banner => 'Turn off warning when Bundler is not present'
+
     # Start Guard by initialize the defined Guards and watch the file system.
     # This is the default task, so calling `guard` is the same as calling `guard start`.
     #
     # @see Guard.start
     #
     def start
-      verify_bundler_presence
+      verify_bundler_presence unless options[:no_bundler_warning]
       ::Guard.start(options)
     rescue Interrupt
       ::Guard.stop
@@ -152,7 +158,16 @@ module Guard
     # shows a hint to do so if not.
     #
     def verify_bundler_presence
-      ::Guard::UI.warning "You are using Guard outside of Bundler, this is dangerous and may not work. Using `bundle exec guard` is safer." unless ENV['BUNDLE_GEMFILE']
+      if File.exists?('Gemfile') && !ENV['BUNDLE_GEMFILE']
+        ::Guard::UI.info <<EOF
+
+Guard here! It looks like your project has a Gemfile, yet you are running
+`guard` outside of Bundler. If this is your intent, feel free to ignore this
+message. Otherwise, consider using `bundle exec guard` to ensure your
+dependencies are loaded correctly.
+(You can run `guard` with --no-bundler-warning to get rid of this message.)
+EOF
+      end
     end
 
   end

data/lib/guard/dsl_describer.rb

@@ -91,7 +91,7 @@ module Guard
               line = "  #{ guard[:name] }"
 
               unless guard[:options].empty?
-                line += ": #{ guard[:options].sort.collect { |k, v| "#{ k } => #{ v.inspect }" }.join(', ') }"
+                line += ": #{ guard[:options].inject({}) { |options, (k, v)| options[k.to_s] = v; options }.sort.collect { |k, v| "#{ k } => #{ v.inspect }" }.join(', ') }"
               end
 
               UI.info line

data/lib/guard/listener.rb

@@ -76,24 +76,6 @@ module Guard
       start_reactor
     end
 
-    # Start the listener thread.
-    #
-    def start_reactor
-      return if ENV["GUARD_ENV"] == 'test'
-
-      Thread.new do
-        loop do
-          if @changed_files != [] && !@paused
-            changed_files = @changed_files.dup
-            clear_changed_files
-            ::Guard.run_on_change(changed_files)
-          else
-            sleep 0.1
-          end
-        end
-      end
-    end
-
     # Start watching the root directory.
     #
     def start
@@ -240,6 +222,24 @@ module Guard
 
     private
 
+    # Start the listener thread.
+    #
+    def start_reactor
+      return if ENV["GUARD_ENV"] == 'test'
+
+      Thread.new do
+        loop do
+          if @changed_files != [] && !@paused
+            changed_files = @changed_files.dup
+            clear_changed_files
+            ::Guard.run_on_change(changed_files)
+          else
+            sleep 0.1
+          end
+        end
+      end
+    end
+
     # Gets a list of files that are in the modified directories.
     #
     # @param [Array<String>] dirs the list of directories

data/lib/guard/notifiers/libnotify.rb

@@ -17,7 +17,7 @@ module Guard
     #   notification :libnotify
     #
     # @example Add the `:libnotify` notifier with configuration options to your `Guardfile`
-    #   notification :libnotify, :timeout => 5, :transient => true, :append => false
+    #   notification :libnotify, :timeout => 5, :transient => true, :append => false, :urgency => :critical
     #
     module Libnotify
       extend self
@@ -64,12 +64,13 @@ module Guard
       def notify(type, title, message, image, options = { })
         require 'libnotify'
 
-        ::Libnotify.show(DEFAULTS.merge(options).merge({
-          :urgency   => libnotify_urgency(type),
+        options = DEFAULTS.merge(options).merge({
           :summary   => title,
           :body      => message,
           :icon_path => image
-        }))
+        })
+        options[:urgency] ||= libnotify_urgency(type)
+        ::Libnotify.show(options)
       end
 
       private
@@ -83,8 +84,6 @@ module Guard
       def libnotify_urgency(type)
         case type
         when 'failed'
-          :critical
-        when 'pending'
           :normal
         else
           :low

data/lib/guard/notifiers/notifysend.rb

@@ -14,7 +14,7 @@ module Guard
 
       # Default options for the notify-send program
       DEFAULTS = {
-        :t   => 3000 # Default timeout is 3000ms
+        :t => 3000 # Default timeout is 3000ms
       }
 
       # Full list of options supported by notify-send
@@ -46,10 +46,11 @@ module Guard
       #
       def notify(type, title, message, image, options = { })
         command = "notify-send '#{title}' '#{message}'"
-        system(to_command_string(command, SUPPORTED, DEFAULTS.merge(options).merge({
-          :u => notifysend_urgency(type),
+        options = DEFAULTS.merge(options).merge({
           :i => image
-        })))
+        })
+        options[:u] ||= notifysend_urgency(type)
+        system(to_command_string(command, SUPPORTED, options))
       end
 
       private
@@ -61,7 +62,7 @@ module Guard
       # @return [String] the notify-send urgency
       #
       def notifysend_urgency(type)
-        {'failed' => 'critical', 'pending' => 'normal'}.fetch(type, 'low')
+        { 'failed' => 'normal', 'pending' => 'low' }.fetch(type, 'low')
       end
 
       # Build a shell command out of a command string and option hash.

data/lib/guard/version.rb

@@ -1,6 +1,6 @@
 module Guard
   unless defined? Guard::VERSION
     # The current gem version of Guard
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/lib/vendor/darwin/lib/rb-fsevent/fsevent.rb

@@ -14,6 +14,10 @@ class FSEvent
 
   attr_reader :paths, :callback
 
+  def initialize args = nil, &block
+    watch(args, &block) unless args.nil?
+  end
+
   def watch(watch_paths, options=nil, &block)
     @paths      = watch_paths.kind_of?(Array) ? watch_paths : [watch_paths]
     @callback   = block
@@ -28,12 +32,14 @@ class FSEvent
   end
 
   def run
+    @pipe    = open_pipe
     @running = true
+
     # please note the use of IO::select() here, as it is used specifically to
     # preserve correct signal handling behavior in ruby 1.8.
-    while @running && IO::select([pipe], nil, nil, nil)
-      if line = pipe.readline
-        modified_dir_paths = line.split(":").select { |dir| dir != "\n" }
+    while @running && IO::select([@pipe], nil, nil, nil)
+      if line = @pipe.readline
+        modified_dir_paths = line.split(':').select { |dir| dir != "\n" }
         callback.call(modified_dir_paths)
       end
     end
@@ -43,18 +49,18 @@ class FSEvent
   end
 
   def stop
-    if pipe
-      Process.kill("KILL", pipe.pid)
-      pipe.close
+    unless @pipe.nil?
+      Process.kill('KILL', @pipe.pid)
+      @pipe.close
     end
   rescue IOError
   ensure
-    @pipe = @running = nil
+    @running = false
   end
 
   if RUBY_VERSION < '1.9'
-    def pipe
-      @pipe ||= IO.popen("#{self.class.watcher_path} #{options_string} #{shellescaped_paths}")
+    def open_pipe
+      IO.popen("#{self.class.watcher_path} #{options_string} #{shellescaped_paths}")
     end
 
     private
@@ -85,8 +91,8 @@ class FSEvent
       return str
     end
   else
-    def pipe
-      @pipe ||= IO.popen([self.class.watcher_path] + @options + @paths)
+    def open_pipe
+      IO.popen([self.class.watcher_path] + @options + @paths)
     end
   end
 

data/lib/vendor/darwin/lib/rb-fsevent/version.rb

@@ -1,3 +1,3 @@
 class FSEvent
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/vendor/darwin/rb-fsevent.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "rb-fsevent"
 
-  s.add_development_dependency  'bundler',     '~> 1.0.10'
+  s.add_development_dependency  'bundler',     '~> 1.0'
   s.add_development_dependency  'rspec',       '~> 2.5.0'
   s.add_development_dependency  'guard-rspec', '~> 0.1.9'
 

data/lib/vendor/darwin/spec/rb-fsevent/fsevent_spec.rb

@@ -10,6 +10,19 @@ describe FSEvent do
     end
   end
 
+  it "shouldn't pass anything to watch when instantiated without a path" do
+    fsevent = FSEvent.new
+    fsevent.paths.should be_nil
+    fsevent.callback.should be_nil
+  end
+
+  it "should pass path and block to watch when instantiated with them" do
+    blk = proc { }
+    fsevent = FSEvent.new(@fixture_path, &blk)
+    fsevent.paths.should == [@fixture_path]
+    fsevent.callback.should == blk
+  end
+
   it "should have a watcher_path that resolves to an executable file" do
     File.exists?(FSEvent.watcher_path).should be_true
     File.executable?(FSEvent.watcher_path).should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70307690665580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70307690665580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70307690665040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70307690665040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70307690664440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307690664440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70307690663480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70307690663480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70307690662360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70307690662360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70307690661980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307690661980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70307690661460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307690661460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70307690660580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307690660580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me
@@ -137,7 +177,6 @@ files:
 - lib/guard/templates/Guardfile
 - lib/guard/ui.rb
 - lib/guard/version.rb
-- lib/guard/version.rbc
 - lib/guard/watcher.rb
 - lib/guard.rb
 - lib/vendor/darwin/bin/fsevent_watch
@@ -214,6 +253,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3612619536525068345
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,8 +264,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Guard keeps an eye on your file modifications
 test_files: []
+has_rdoc: 

data/lib/guard/version.rbc

@@ -1,180 +0,0 @@
-!RBIX
-16846133056282117387
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-28
-99
-7
-0
-65
-49
-1
-2
-13
-99
-12
-7
-2
-12
-7
-3
-12
-65
-12
-49
-4
-4
-15
-49
-2
-0
-15
-2
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-5
-x
-5
-Guard
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-5
-Guard
-i
-48
-5
-66
-26
-93
-0
-15
-29
-21
-0
-45
-0
-1
-7
-2
-3
-98
-3
-3
-30
-8
-27
-25
-92
-0
-27
-8
-32
-15
-7
-4
-8
-33
-1
-9
-38
-1
-8
-47
-65
-7
-2
-7
-5
-64
-49
-6
-2
-11
-I
-4
-I
-0
-I
-0
-I
-0
-n
-p
-7
-x
-5
-Guard
-n
-x
-7
-VERSION
-x
-22
-vm_const_defined_under
-s
-8
-constant
-s
-5
-0.6.3
-x
-9
-const_set
-p
-5
-I
-2
-I
-2
-I
-2f
-I
-0
-I
-30
-x
-66
-/Users/remy/Development/Ruby/Gems/guard/guard/lib/guard/version.rb
-p
-0
-x
-13
-attach_method
-p
-3
-I
-0
-I
-1
-I
-1c
-x
-66
-/Users/remy/Development/Ruby/Gems/guard/guard/lib/guard/version.rb
-p
-0