guard 0.9.4 → 0.10.0

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.10.0 - 1 January, 2012
+
+### Improvement
+
+- Improved Readline constraints. ([@netzpirat][])
+- Stop & start all guards on Guardfile reevaluation. ([@thibaudgg][])
+
+### Bug fix
+
+- Terminal keep-alive causing ERROR: Unknown command. ([@waldo][])
+
 ## 0.9.4 - December 25, 2011
 
 ### Improvement
@@ -413,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

@@ -63,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
 
@@ -87,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
@@ -144,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

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.clear_notifications
-        @@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`.

data/lib/guard/interactor.rb

@@ -79,7 +79,7 @@ module Guard
     def self.auto_detect
       require 'readline'
 
-      if defined?(RbReadline) || defined?(JRUBY_VERSION) || !RbConfig::CONFIG['target_os'] =~ /darwin/i
+      if defined?(RbReadline) || defined?(JRUBY_VERSION) || RbConfig::CONFIG['target_os'] =~ /linux/i
         ReadlineInteractor.new
       else
         SimpleInteractor.new

data/lib/guard/interactors/readline.rb

@@ -15,7 +15,7 @@ module Guard
     def initialize
       require 'readline'
 
-      unless defined?(RbReadline) || defined?(JRUBY_VERSION)
+      unless defined?(RbReadline) || defined?(JRUBY_VERSION) || RbConfig::CONFIG['target_os'] =~ /linux/i
         ::Guard::UI.info 'Please add rb-readline for proper Readline support.'
       end
 
@@ -31,7 +31,7 @@ module Guard
     # Start the interactor.
     #
     def start
-      store_terminal_settings
+      store_terminal_settings if stty_exists?
       super
     end
 
@@ -39,13 +39,14 @@ module Guard
     #
     def stop
       super
-      restore_terminal_settings
+      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
@@ -84,6 +85,15 @@ module Guard
 
     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.
     #

data/lib/guard/interactors/simple.rb

@@ -9,7 +9,7 @@ module Guard
     #
     def read_line
       while line = $stdin.gets
-        process_input(line.chomp)
+        process_input(line.gsub(/^\W*/, '').chomp)
       end
     end
 

data/lib/guard/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-25 00:00:00.000000000 Z
+date: 2012-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70180932216960 !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: *70180932216960
+  version_requirements: *70103690365860
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70180932216500 !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: *70180932216500
+  version_requirements: *70103690365180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70180932209560 !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: *70180932209560
+  version_requirements: *70103690358380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70180932208780 !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: *70180932208780
+  version_requirements: *70103690357140
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70180932207640 !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: *70180932207640
+  version_requirements: *70103690356380
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70180932206640 !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: *70180932206640
+  version_requirements: *70103690355840
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70180932206180 !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: *70180932206180
+  version_requirements: *70103690355140
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70180932205720 !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: *70180932205720
+  version_requirements: *70103690354660
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me