guard 0.9.0 → 0.10.0

data/CHANGELOG.md

@@ -1,8 +1,49 @@
-## Dev
+## 0.10.0 - 1 January, 2012
+
+### Improvement
+
+- Improved Readline constraints. ([@netzpirat][])
+- Stop & start all guards on Guardfile reevaluation. ([@thibaudgg][])
 
 ### Bug fix
 
-- [#173](https://github.com/guard/guard/issues/173): Cannot set the watch_all_modifications option. (reported by [@sutherland][], fixed by [@netzpirat][]
+- Terminal keep-alive causing ERROR: Unknown command. ([@waldo][])
+
+## 0.9.4 - December 25, 2011
+
+### Improvement
+
+- Add the ability to load user defined templates. ([@hawx][])
+
+### Bug fix
+
+- Fix guard-rspec notifications by using ENV variable to store Notifier.notifications. ([@thibaudgg][])
+
+## 0.9.3 - December 23, 2011
+
+### Improvement
+
+- Fix terminal status after interrupting the Readline interactor. ([@Maher4Ever][])
+
+## 0.9.2 - December 22, 2011
+
+### Improvements
+
+- Add `interactor` to DSL to allow switching Guard interaction implementation. ([@netzpirat][])
+- Add quit action to the interactor. ([@Maher4Ever][])
+
+## 0.9.1 - December 19, 2011
+
+### Bug fixes
+
+- Fix wrong `--no-vendor` option. ([@netzpirat][])
+- [#195](https://github.com/guard/guard/issues/195): Empty watch directory prohibit Guard from running. (reported by [@madtrick][], fixed by [@netzpirat][])
+
+## 0.9.0 - December 19, 2011
+
+### Bug fixes
+
+- [#173](https://github.com/guard/guard/issues/173): Cannot set the watch_all_modifications option. (reported by [@sutherland][], fixed by [@netzpirat][])
 - Fix `guard init` when a guard name is given. ([@rymai][])
 
 ### Improvements
@@ -346,6 +387,7 @@
 [@fnichol]: https://github.com/fnichol
 [@Gazer]: https://github.com/Gazer
 [@gix]: https://github.com/gix
+[@hawx]: https://github.com/hawx
 [@hron]: https://github.com/hron
 [@hardipe]: https://github.com/hardipe
 [@hashrocketeer]: https://github.com/hashrocketeer
@@ -356,6 +398,8 @@
 [@jrsacks]: https://github.com/jrsacks
 [@koshigoe]: https://github.com/koshigoe
 [@limeyd]: https://github.com/limeyd
+[@madtrick]: https://github.com/madtrick
+[@Maher4Ever]: https://github.com/Maher4Ever
 [@mcmire]: https://github.com/mcmire
 [@mislav]: https://github.com/mislav
 [@monocle]: https://github.com/monocle
@@ -380,6 +424,7 @@
 [@tpope]: https://github.com/tpope
 [@uk-ar]: https://github.com/uk-ar
 [@veged]: https://github.com/veged
+[@waldo]: https://github.com/waldo
 [@wereHamster]: https://github.com/wereHamster
 [@yannlugrin]: https://github.com/yannlugrin
 [@zonque]: https://github.com/zonque

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Thibaud Guillaume-Gentil
+Copyright (c) 2009-2012 Thibaud Guillaume-Gentil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -34,10 +34,6 @@ Add Guard to your `Gemfile`:
 ```ruby
 group :development do
   gem 'guard'
-
-  platforms :ruby do
-    gem 'rb-readline'
-  end
 end
 ```
 
@@ -67,7 +63,8 @@ the time, try the [Rubygems Bundler](https://github.com/mpapis/rubygems-bundler)
 
 ### System notifications
 
-You can configure Guard to make use of the following system notification libraries:
+You can configure Guard to make use of the following system notification libraries, but it's strongly recommended
+to use either Ruby GNTP, Libnotify or Notifu:
 
 #### Ruby GNTP
 
@@ -91,31 +88,6 @@ group :development do
 end
 ```
 
-#### Growl
-
-* Runs on Mac OS X
-* Supports all [Growl](http://growl.info/) versions
-
-The [growl](https://rubygems.org/gems/growl) gem is compatible with all versions of Growl and uses a command line tool
-[growlnotify](http://growl.info/extras.php#growlnotify) that must be separately downloaded and installed. The version of
-the command line tool must match your Growl version. The `growl` gem does **not** support multiple notification
-channels.
-
-You can download an installer for `growlnotify` from the [Growl download section](http://growl.info/downloads) or
-install it with HomeBrew:
-
-```bash
-$ brew install growlnotify
-```
-
-To use `growl` you have to add it to your `Gemfile` and run bundler:
-
-```ruby
-group :development do
-  gem 'growl'
-end
-```
-
 #### Libnotify
 
 * Runs on Linux, FreeBSD, OpenBSD and Solaris
@@ -148,6 +120,26 @@ group :development do
 end
 ```
 
+#### Growl
+
+* Runs on Mac OS X
+* Supports all [Growl](http://growl.info/) versions
+
+The [growl](https://rubygems.org/gems/growl) gem is compatible with all versions of Growl and uses a command line tool
+[growlnotify](http://growl.info/extras.php#growlnotify) that must be separately downloaded and installed. The version of
+the command line tool must match your Growl version. The `growl` gem does **not** support multiple notification
+channels.
+
+You have to download the installer for `growlnotify` from the [Growl download section](http://growl.info/downloads).
+
+To use `growl` you have to add it to your `Gemfile` and run bundler:
+
+```ruby
+group :development do
+  gem 'growl'
+end
+```
+
 #### GrowlNotify
 
 * Runs on Mac OS X
@@ -222,6 +214,13 @@ In addition, the `init` task can be used to append a supplied Guard template fro
 $ guard init <guard-name>
 ```
 
+You can also define your own templates in `~/.guard/templates/` which can be appended in the same way to your existing 
+`Guardfile`:
+
+```bash
+$ guard init <template-name>
+```
+
 ### Start
 
 Just launch Guard inside your Ruby or Rails project with:
@@ -361,11 +360,7 @@ read more about these files in the shared configuration section below.
 Interactions
 ------------
 
-You can interact with Guard and enter commands when Guard has nothing to do. You'll see a command prompt `>` when Guard
-is ready to accept a command. The command line supports history navigation with the `↑` and `↓` arrow keys, and
-command auto-completion with the `⇥` key.
-
-You can execute the following commands:
+You can interact with Guard and enter commands when Guard has nothing to do. Guard understands the following commands:
 
 * `↩`:                 Run all Guards.
 * `h`, `help`:         Show a help of the available interactor commands.
@@ -399,6 +394,23 @@ This will reload only the Ronn Guard. You can also reload all Guards within a gr
 > backend reload
 ```
 
+### Readline support
+
+With Readline enabled, you'll see a command prompt `>` when Guard is ready to accept a command. The command line
+supports history navigation with the `↑` and `↓` arrow keys, and command auto-completion with the `⇥` key.
+
+Unfortunately Readline [does not work on MRI](http://bugs.ruby-lang.org/issues/5539) on Mac OS X by default. You can
+work around the issue by installing a pure Ruby implementation:
+
+```ruby
+platforms :ruby do
+  gem 'rb-readline'
+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.
+
 Guardfile DSL
 -------------
 
@@ -529,6 +541,26 @@ or using the cli switch `-n`:
 notification :off
 ```
 
+### interactor
+
+You can disable the interactor auto detection and for a specific implementation:
+
+```ruby
+interactor :readline
+```
+
+will select Readline interactor. You can also force the simple interactor without Readline support with:
+
+```ruby
+interactor :simple
+```
+
+If you do not need the keyboard interactions with Guard at all, you can turn them off:
+
+```ruby
+interactor :off
+```
+
 ### callback
 
 The `callback` method allows you to execute arbitrary code before or after any of the `start`, `stop`, `reload`,
@@ -810,6 +842,7 @@ Pull requests are very welcome! Please try to follow these simple rules if appli
 
 * Please create a topic branch for every separate change you make.
 * Make sure your patches are well tested. All specs run with `rake spec:portability` must pass.
+  * On OS X you need to compile once rb-fsevent executable with `rake build_mac_exec`.
 * Update the [Yard](http://yardoc.org/) documentation.
 * Update the README.
 * Update the CHANGELOG for noteworthy changes.

data/lib/guard/cli.rb

@@ -72,6 +72,8 @@ module Guard
     #
     def start
       ::Guard.start(options)
+    rescue Interrupt
+      ::Guard.stop
     end
 
     desc 'list', 'Lists guards that can be used with init'

data/lib/guard/dsl.rb

@@ -107,14 +107,24 @@ module Guard
       # Re-evaluate the `Guardfile` to update the current Guard configuration.
       #
       def reevaluate_guardfile
-        ::Guard.guards.clear
-        ::Guard.reset_groups
-        ::Guard::Notifier.notifications.clear
-        @@options.delete(:guardfile_contents)
-        Dsl.evaluate_guardfile(@@options)
-        msg = 'Guardfile has been re-evaluated.'
-        UI.info(msg)
-        Notifier.notify(msg)
+        ::Guard.run do
+          # Stop each old guards
+          ::Guard.run_on_guards do |guard|
+            ::Guard.run_supervised_task(guard, :stop)
+          end
+          ::Guard.guards.clear
+          ::Guard.reset_groups
+          ::Guard::Notifier.clear_notifications
+          @@options.delete(:guardfile_contents)
+          Dsl.evaluate_guardfile(@@options)
+          msg = 'Guardfile has been re-evaluated.'
+          UI.info(msg)
+          Notifier.notify(msg)
+          # Start each new guards
+          ::Guard.run_on_guards do |guard|
+            ::Guard.run_supervised_task(guard, :start)
+          end
+        end
       end
 
       # Evaluate the content of the `Guardfile`.
@@ -276,6 +286,21 @@ module Guard
       ::Guard::Notifier.add_notification(notifier.to_sym, options, false)
     end
 
+    # Sets the interactor to use.
+    #
+    # @example Use the readline interactor
+    #   interactor :readline
+    #
+    # @example Use the gets interactor
+    #   interactor :gets
+    #
+    # @example Turn off interactions
+    #   interactor :off
+    #
+    def interactor(interactor)
+      ::Guard::Interactor.interactor = interactor.to_sym
+    end
+
     # Declares a group of guards to be run with `guard start --group group_name`.
     #
     # @example Declare two groups of Guards

data/lib/guard/interactor.rb

@@ -1,21 +1,20 @@
-require 'readline'
-
 module Guard
 
-  # The interactor reads user input and triggers
-  # specific action upon them unless its locked.
-  #
-  # It used the readline library for history and
-  # completion support.
+  autoload :ReadlineInteractor, 'guard/interactors/readline'
+  autoload :SimpleInteractor,   'guard/interactors/simple'
+
+  # The interactor triggers specific action from input
+  # read by a interactor implementation.
   #
   # Currently the following actions are implemented:
   #
-  # - h, help         => Show help
-  # - e, exit         => Exit Guard
-  # - r, reload       => Reload Guard
-  # - p, pause        => Toggle file modification listener
-  # - n, notification => Toggle notifications
-  # - <enter>         => Run all
+  # - h, help          => Show help
+  # - e, exit,
+  #   q. quit          => Exit Guard
+  # - r, reload        => Reload Guard
+  # - p, pause         => Toggle file modification listener
+  # - n, notification  => Toggle notifications
+  # - <enter>          => Run all
   #
   # It's also possible to scope `reload` and `run all` actions to only a specified group or a guard.
   #
@@ -28,29 +27,62 @@ module Guard
   # @example Run all jasmine specs
   #   jasmine
   #
+  # @abstract
+  #
   class Interactor
 
     HELP_ENTRIES         = %w[help h]
     RELOAD_ENTRIES       = %w[reload r]
-    STOP_ENTRIES         = %w[exit e]
+    STOP_ENTRIES         = %w[exit e quit q]
     PAUSE_ENTRIES        = %w[pause p]
     NOTIFICATION_ENTRIES = %w[notification n]
 
-    COMPLETION_ACTIONS   = %w[help reload exit pause notification]
+    # Set the interactor implementation
+    #
+    # @param [Symbol] interactor the name of the interactor
+    #
+    def self.interactor=(interactor)
+      @interactor = interactor
+    end
 
-    # Initialize the interactor.
+    # Get an instance of the currently configured
+    # interactor implementation.
     #
-    def initialize
-      unless defined?(RbReadline) || defined?(JRUBY_VERSION)
-        ::Guard::UI.info 'Please add rb-readline for proper Readline support.'
+    # @return [Interactor] an interactor implementation
+    #
+    def self.fabricate
+      case @interactor
+      when :readline
+        ReadlineInteractor.new
+      when :simple
+        SimpleInteractor.new
+      when :off
+        nil
+      else
+        auto_detect
       end
-      
-      Readline.completion_proc = proc { |word| auto_complete(word) }
+    end
+
+    # Tries to detect an optimal interactor for the
+    # current environment.
+    #
+    # It returns the Readline implementation when:
+    #
+    # * rb-readline is installed
+    # * The Ruby implementation is JRuby
+    # * The current OS is not Mac OS X
+    #
+    # Otherwise the plain gets interactor is returned.
+    #
+    # @return [Interactor] an interactor implementation
+    #
+    def self.auto_detect
+      require 'readline'
 
-      begin
-        Readline.completion_append_character = ' '
-      rescue NotImplementedError
-        # Ignore, we just don't support it then
+      if defined?(RbReadline) || defined?(JRUBY_VERSION) || RbConfig::CONFIG['target_os'] =~ /linux/i
+        ReadlineInteractor.new
+      else
+        SimpleInteractor.new
       end
     end
 
@@ -69,40 +101,13 @@ module Guard
       end
     end
 
-    # Read a line from stdin with Readline.
+    # Read the user input. This method must be implemented
+    # by each interactor implementation.
     #
-    def read_line
-      while line = Readline.readline(prompt, true)
-        process_input(line)
-      end
-    end
-
-    # Auto complete the given word.
-    #
-    # @param [String] word the partial word
-    # @return [Array<String>] the matching words
-    #
-    def auto_complete(word)
-      completion_list.grep(/^#{ Regexp.escape(word) }/)
-    end
-
-    # Get the auto completion list.
-    #
-    # @return [Array<String>] the list of words
+    # @abstract
     #
-    def completion_list
-      groups = ::Guard.groups.map { |group| group.name.to_s }
-      guards = ::Guard.guards.map { |guard| guard.class.to_s.downcase.sub('guard::', '') }
-
-      COMPLETION_ACTIONS + groups + guards - ['default']
-    end
-
-    # The current interactor prompt
-    #
-    # @return [String] the prompt to show
-    #
-    def prompt
-      ::Guard.listener.paused? ? 'p> ' : '> '
+    def read_line
+      raise NotImplementedError
     end
 
     # Process the input from readline.
@@ -110,10 +115,6 @@ module Guard
     # @param [String] line the input line
     #
     def process_input(line)
-      if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
-        Readline::HISTORY.pop
-      end
-
       scopes, action = extract_scopes_and_action(line)
 
       case action
@@ -159,10 +160,10 @@ module Guard
     #
     def help
       puts ''
-      puts 'e, exit          Exit Guard'
-      puts 'p, pause         Toggle file modification listener'
-      puts 'r, reload        Reload Guard'
-      puts 'n, notification  Toggle notifications'
+      puts '[e]xit, [q]uit   Exit Guard'
+      puts '[p]ause          Toggle file modification listener'
+      puts '[r]eload         Reload Guard'
+      puts '[n]otification   Toggle notifications'
       puts '<enter>          Run all Guards'
       puts ''
       puts 'You can scope the reload action to a specific guard or group:'

data/lib/guard/interactors/readline.rb

@@ -0,0 +1,110 @@
+module Guard
+
+  # Interactor that used readline for getting the user input.
+  # This enables history support and auto-completion, but is
+  # broken on OS X without installing `rb-readline` or using JRuby.
+  #
+  # @see http://bugs.ruby-lang.org/issues/5539
+  #
+  class ReadlineInteractor < Interactor
+
+    COMPLETION_ACTIONS   = %w[help reload exit pause notification]
+
+    # Initialize the interactor.
+    #
+    def initialize
+      require 'readline'
+
+      unless defined?(RbReadline) || defined?(JRUBY_VERSION) || RbConfig::CONFIG['target_os'] =~ /linux/i
+        ::Guard::UI.info 'Please add rb-readline for proper Readline support.'
+      end
+
+      Readline.completion_proc = proc { |word| auto_complete(word) }
+
+      begin
+        Readline.completion_append_character = ' '
+      rescue NotImplementedError
+        # Ignore, we just don't support it then
+      end
+    end
+
+    # Start the interactor.
+    #
+    def start
+      store_terminal_settings if stty_exists?
+      super
+    end
+
+    # Stop the interactor.
+    #
+    def stop
+      super
+      restore_terminal_settings if stty_exists?
+    end
+
+    # Read a line from stdin with Readline.
+    #
+    def read_line
+      while line = Readline.readline(prompt, true)
+        line.gsub!(/^\W*/, '')
+        if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
+          Readline::HISTORY.pop
+        end
+
+        process_input(line)
+      end
+    end
+
+    # Auto complete the given word.
+    #
+    # @param [String] word the partial word
+    # @return [Array<String>] the matching words
+    #
+    def auto_complete(word)
+      completion_list.grep(/^#{ Regexp.escape(word) }/)
+    end
+
+    # Get the auto completion list.
+    #
+    # @return [Array<String>] the list of words
+    #
+    def completion_list
+      groups = ::Guard.groups.map { |group| group.name.to_s }
+      guards = ::Guard.guards.map { |guard| guard.class.to_s.downcase.sub('guard::', '') }
+
+      COMPLETION_ACTIONS + groups + guards - ['default']
+    end
+
+    # The current interactor prompt
+    #
+    # @return [String] the prompt to show
+    #
+    def prompt
+      ::Guard.listener.paused? ? 'p> ' : '> '
+    end
+
+    private
+
+    # Detects whether or not the stty command exists
+    # on the user machine.
+    #
+    # @return [Boolean] the status of stty
+    #
+    def stty_exists?
+      system('hash', 'stty')
+    end
+
+    # Stores the terminal settings so we can resore them
+    # when stopping.
+    #
+    def store_terminal_settings
+      @stty_save = `stty -g`.chomp
+    end
+
+    # Restore terminal settings
+    #
+    def restore_terminal_settings
+      system('stty', @stty_save)
+    end
+  end
+end

data/lib/guard/interactors/simple.rb

@@ -0,0 +1,17 @@
+module Guard
+
+  # Simple interactor that that reads user
+  # input from standard input.
+  #
+  class SimpleInteractor < Interactor
+
+    # Read a line from stdin with Readline.
+    #
+    def read_line
+      while line = $stdin.gets
+        process_input(line.gsub(/^\W*/, '').chomp)
+      end
+    end
+
+  end
+end

data/lib/guard/listener.rb

@@ -28,11 +28,16 @@ module Guard
     # Select the appropriate listener implementation for the
     # current OS and initializes it.
     #
-    # @param [Array] args the arguments for the listener
+    # @param [Hash] options the options for the listener
+    # @option options [String] watchdir the directory to watch
     # @return [Guard::Listener] the chosen listener
     #
-    def self.select_and_init(watchdir = Dir.pwd, options = nil)
-      no_vendor = options && options.key?(:no_vendor) ? options[:no_vendor] : false
+    def self.select_and_init(options = nil)
+      watchdir = options && options[:watchdir] && File.expand_path(options[:watchdir])
+      watchdir = Dir.pwd unless watchdir
+
+      no_vendor = options && options[:no_vendor] ? options[:no_vendor] : false
+
       if mac? && Darwin.usable?(no_vendor)
         Darwin.new(watchdir, options)
       elsif linux? && Linux.usable?(no_vendor)

data/lib/guard/notifier.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 require 'rbconfig'
 require 'pathname'
 require 'guard/ui'
@@ -53,7 +55,7 @@ module Guard
     # @return [Hash] the notifications
     #
     def notifications
-      @notifications ||= []
+      ENV['GUARD_NOTIFICATIONS'] ? YAML::load(ENV['GUARD_NOTIFICATIONS']) : []
     end
 
     # Set the available notifications.
@@ -61,7 +63,13 @@ module Guard
     # @param [Array<Hash>] notifications the notifications
     #
     def notifications=(notifications)
-      @notifications = notifications
+      ENV['GUARD_NOTIFICATIONS'] = YAML::dump(notifications)
+    end
+
+    # Clear available notifications.
+    #
+    def clear_notifications
+      ENV['GUARD_NOTIFICATIONS'] = nil
     end
 
     # Turn notifications on. If no notifications are defined
@@ -107,7 +115,7 @@ module Guard
       return turn_off if name == :off
 
       if NOTIFIERS.has_key?(name) && NOTIFIERS[name].available?(silent)
-        notifications << { :name => name, :options => options }
+        self.notifications = notifications << { :name => name, :options => options }
         true
       else
         false

data/lib/guard/version.rb

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

data/lib/guard.rb

@@ -17,6 +17,8 @@ module Guard
 
   # The Guardfile template for `guard init`
   GUARDFILE_TEMPLATE = File.expand_path('../guard/templates/Guardfile', __FILE__)
+  # The location of user defined templates
+  HOME_TEMPLATES = File.expand_path('~/.guard/templates')
 
   class << self
     attr_accessor :options, :interactor, :listener, :lock
@@ -26,7 +28,7 @@ module Guard
     #
     # @see Guard::Guard.init
     #
-    # @param [String] guard_name the name of the Guard to initialize
+    # @param [String] guard_name the name of the Guard or template to initialize
     #
     def initialize_template(guard_name = nil)
       if !File.exist?('Guardfile')
@@ -38,8 +40,24 @@ module Guard
       end
 
       if guard_name
-        guard_class = ::Guard.get_guard_class(guard_name)
-        guard_class.init(guard_name)
+        guard_class = ::Guard.get_guard_class(guard_name, true)
+        if guard_class
+          guard_class.init(guard_name)
+        elsif File.exist?(File.join(HOME_TEMPLATES, guard_name))
+          content  = File.read('Guardfile')
+          template = File.read(File.join(HOME_TEMPLATES, guard_name))
+          
+          File.open('Guardfile', 'wb') do |f|
+            f.puts(content)
+            f.puts("")
+            f.puts(template)
+          end
+          
+          ::Guard::UI.info "#{ guard_name } template added to Guardfile, feel free to edit it"
+        else
+          const_name  = guard_name.downcase.gsub('-', '')
+          UI.error "Could not load 'guard/#{ guard_name.downcase }' or '~/.guard/templates/#{ guard_name.downcase }' or find class Guard::#{ const_name.capitalize }"
+        end
       end
     end
 
@@ -62,8 +80,7 @@ module Guard
       @options    = options
       @guards     = []
       self.reset_groups
-      @interactor = Interactor.new unless options[:no_interactions]
-      @listener   = Listener.select_and_init(options[:watchdir] && File.expand_path(options[:watchdir]), options)
+      @listener   = Listener.select_and_init(options)
 
       UI.clear if @options[:clear]
       debug_command_execution if @options[:verbose]
@@ -177,7 +194,11 @@ module Guard
         run_supervised_task(guard, :start)
       end
 
-      interactor.start if interactor
+      unless options[:no_interactions]
+        @interactor = Interactor.fabricate
+        @interactor.start if @interactor
+      end
+
       listener.start
     end
 
@@ -190,6 +211,7 @@ module Guard
         run_supervised_task(guard, :stop)
       end
 
+      interactor.stop if interactor
       listener.stop
       abort
     end
@@ -428,9 +450,10 @@ module Guard
     # * `rspec` will find a class `Guard::RSpec`
     #
     # @param [String] name the name of the Guard
+    # @param [Boolean] fail_gracefully whether error messages should not be printed
     # @return [Class, nil] the loaded class
     #
-    def get_guard_class(name)
+    def get_guard_class(name, fail_gracefully=false)
       name        = name.to_s
       try_require = false
       const_name  = name.gsub(/\/(.?)/) { "::#{ $1.upcase }" }.gsub(/(?:^|[_-])(.)/) { $1.upcase }
@@ -445,8 +468,10 @@ module Guard
           UI.error "Could not find class Guard::#{ const_name.capitalize }"
         end
       rescue LoadError => loadError
-        UI.error "Could not load 'guard/#{ name.downcase }' or find class Guard::#{ const_name.capitalize }"
-        UI.error loadError.to_s
+        unless fail_gracefully
+          UI.error "Could not load 'guard/#{ name.downcase }' or find class Guard::#{ const_name.capitalize }"
+          UI.error loadError.to_s
+        end
       end
     end
 

data/man/guard.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GUARD" "1" "October 2011" "" ""
+.TH "GUARD" "1" "December 2011" "" ""
 .
 .SH "NAME"
 \fBguard\fR \- Guard keeps an eye on your file modifications\.
@@ -27,7 +27,7 @@ The following options are available:
 \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 Runs Guard in debug mode\.
+\fB\-v\fR, \fB\-\-verbose\fR Runs Guard in verbose mode\.
 .
 .P
 \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\.
@@ -44,7 +44,7 @@ The following options are available:
 .P
 \fB\-i\fR, \fB\-\-no\-interactions\fR Turn off completely any Guard terminal interactions\.
 .
-.SS "init <a href=\"guard\.html\">GUARD</a>"
+.SS "init [GUARD]"
 If no Guardfile is present in the current directory, creates an empty Guardfile\.
 .
 .P

data/man/guard.1.html

@@ -97,8 +97,8 @@
   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>-d</code>, <code>--debug</code>
-  Runs Guard in debug mode.</p>
+<p><code>-v</code>, <code>--verbose</code>
+  Runs Guard in verbose mode.</p>
 
 <p><code>-g</code>, <code>--group</code> <var>GROUP1</var> <var>GROUP2</var>...
   Runs only the groups specified by GROUP1, GROUP2 etc.
@@ -117,7 +117,7 @@
 <p><code>-i</code>, <code>--no-interactions</code>
   Turn off completely any Guard terminal interactions.</p>
 
-<h3 id="init-GUARD">init <a href="guard.html">GUARD</a></h3>
+<h3 id="init-GUARD-">init [GUARD]</h3>
 
 <p>If no Guardfile is present in the current directory, creates an empty Guardfile.</p>
 
@@ -172,7 +172,7 @@ 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'>October 2011</li>
+    <li class='tc'>December 2011</li>
     <li class='tr'>guard(1)</li>
   </ol>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000Z
+date: 2012-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70141887669800 !ruby/object:Gem::Requirement
+  requirement: &70103690365860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70141887669800
+  version_requirements: *70103690365860
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70141887668820 !ruby/object:Gem::Requirement
+  requirement: &70103690365180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70141887668820
+  version_requirements: *70103690365180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70141887668060 !ruby/object:Gem::Requirement
+  requirement: &70103690358380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141887668060
+  version_requirements: *70103690358380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70141887652680 !ruby/object:Gem::Requirement
+  requirement: &70103690357140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70141887652680
+  version_requirements: *70103690357140
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70141887651580 !ruby/object:Gem::Requirement
+  requirement: &70103690356380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70141887651580
+  version_requirements: *70103690356380
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70141887650780 !ruby/object:Gem::Requirement
+  requirement: &70103690355840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70141887650780
+  version_requirements: *70103690355840
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70141887649460 !ruby/object:Gem::Requirement
+  requirement: &70103690355140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70141887649460
+  version_requirements: *70103690355140
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70141887648300 !ruby/object:Gem::Requirement
+  requirement: &70103690354660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *70141887648300
+  version_requirements: *70103690354660
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me
@@ -119,6 +119,8 @@ files:
 - lib/guard/guard.rb
 - lib/guard/hook.rb
 - lib/guard/interactor.rb
+- lib/guard/interactors/readline.rb
+- lib/guard/interactors/simple.rb
 - lib/guard/listener.rb
 - lib/guard/listeners/darwin.rb
 - lib/guard/listeners/linux.rb
@@ -201,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Guard keeps an eye on your file modifications