guard 1.5.2 → 1.5.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.5.3 - 31 October, 2012
+
+### Bug fix
+
+- [#352][] Guard always reloading twice. ([@netzpirat][])
+- [#354][] Ignore `~/.pryrc` since it breaks Guard when loading the Rails env. ([@netzpirat][])
+
 ## 1.5.2 - 29 October, 2012
 
 ### Bug fix

data/README.md

@@ -55,40 +55,42 @@ $ guard init
 **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).
 
-## OS X
+## Efficient Filesystem Handling
 
-You may want to install the [rb-fsevent](https://github.com/thibaudgg/rb-fsevent) gem to make use of file change events
-and don't rely on polling by adding the gem to your `Gemfile` and install it with Bundler:
+Various operating systems are willing to notify you of changes to files, but the API to
+register/receive updates varies (see [rb-fsevent](https://github.com/thibaudgg/rb-fsevent) for
+OS X, [rb-inotify](https://github.com/nex3/rb-inotify) for Linux, and
+[rb-fchange](https://github.com/stereobooster/rb-fchange) for Windows).  If you do not supply
+one of the supported gems for these methods, Guard will fall back to polling, and give you a
+warning about it doing so.
 
-```ruby
-group :development do
-  gem 'rb-fsevent', :require => false
-end
-```
+A challenge arises when trying to make these dependencies work with [Bundler](http://gembundler.com/).
+If you simply put one of these dependencies into you `Gemfile`, even if it is conditional on a
+platform match, the platform-specific gem will end up in the `Gemfile.lock`, and developers will
+thrash the file back and forth.
 
-## Linux
+There is a good solution. All three gems will successfully, quietly install on all three operating
+systems, and `guard/listen` will only pull in the one you need. This is a more proper `Gemfile`:
 
-You may want to install the [rb-inotify](https://github.com/nex3/rb-inotify) gem to make use of file change events and
-don't rely on polling by adding the gem to your `Gemfile` and install it with Bundler:
-
-```ruby
+```Ruby
 group :development do
   gem 'rb-inotify', :require => false
+  gem 'rb-fsevent', :require => false
+  gem 'rb-fchange', :require => false
 end
 ```
 
-## Windows
+If you're using Windows and at least Ruby 1.9.2, then [Windows Directory Monitor](https://github.com/Maher4Ever/wdm) is
+more efficient than using `rb-fchange`. However WDM cannot be installed on platforms other than Windows, making it
+impossible to add it to the `Gemfile` for projects developed on multiple platforms.
 
-You may want to install the [wdm](https://github.com/Maher4Ever/wdm) gem to make use of file change events and don't
-rely on polling by adding the gem to your `Gemfile` and install it with Bundler:
-
-```ruby
+```Ruby
 group :development do
   gem 'wdm', :require => false
 end
 ```
 
-Please note that you have to use at least on Ruby 1.9.2 for using WDM.
+## Windows Colors
 
 If you want colors in your terminal, you'll have to add the [win32console](https://rubygems.org/gems/win32console) gem
 to your `Gemfile` and install it with Bundler:
@@ -520,9 +522,9 @@ You can also disable the interactions completely by running Guard with the `--no
 ### Customizations
 
 Further Guard specific customizations can be made in `~/.guardrc` that will be evaluated prior the Pry session is
-started. This allows you to make use of the Pry plugin architecture to provide custom commands and extend Guard for
-your own needs and distribute as a gem. Please have a look at the [Pry Wiki](https://github.com/pry/pry/wiki) for more
-information.
+started (`~/.pryrc` is ignored). This allows you to make use of the Pry plugin architecture to provide custom commands
+and extend Guard for your own needs and distribute as a gem. Please have a look at the
+[Pry Wiki](https://github.com/pry/pry/wiki) for more information.
 
 ### Signals
 

data/lib/guard.rb

@@ -63,7 +63,7 @@ module Guard
         ::Guard::UI.options[:level] = :debug
         debug_command_execution
       end
-      
+
       setup_notifier
       setup_interactor
 
@@ -179,6 +179,8 @@ module Guard
     end
 
     # Reload Guardfile and all Guard plugins currently enabled.
+    # If no scope is given, then the Guardfile will be re-evaluated,
+    # which results in a stop/start, which makes the reload obsolete.
     #
     # @param [Hash] scopes hash with a Guard plugin or a group scope
     #
@@ -186,8 +188,12 @@ module Guard
       within_preserved_state do
         ::Guard::UI.clear(:force => true)
         ::Guard::UI.action_with_scopes('Reload', scopes)
-        ::Guard::Dsl.reevaluate_guardfile if scopes.empty?
-        runner.run(:reload, scopes)
+
+        if scopes.empty?
+          ::Guard::Dsl.reevaluate_guardfile
+        else
+          runner.run(:reload, scopes)
+        end
       end
     end
 

data/lib/guard/interactor.rb

@@ -27,6 +27,7 @@ module Guard
     def initialize
       return if ENV['GUARD_ENV'] == 'test'
 
+      Pry.config.should_load_local_rc = false
       Pry.config.history.file = HISTORY_FILE
 
       load_guard_rc

data/lib/guard/version.rb

@@ -1,4 +1,4 @@
 module Guard
   # The current gem version of Guard
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/lib/guard/version.rbc

@@ -0,0 +1,130 @@
+!RBIX
+9595534255132031488
+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
+12
+5
+66
+65
+7
+0
+7
+1
+64
+49
+2
+2
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+7
+VERSION
+s
+5
+1.3.1
+x
+9
+const_set
+p
+3
+I
+2
+I
+3
+I
+c
+x
+52
+/Users/michi/Repositories/guard/lib/guard/version.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1c
+x
+52
+/Users/michi/Repositories/guard/lib/guard/version.rb
+p
+0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -131,7 +131,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/fsevent_watch_guard
 - bin/guard
 - images/failed.png
 - images/guard.png
@@ -166,6 +165,7 @@ files:
 - lib/guard/templates/Guardfile
 - lib/guard/ui.rb
 - lib/guard/version.rb
+- lib/guard/version.rbc
 - lib/guard/watcher.rb
 - lib/guard.rb
 - CHANGELOG.md
@@ -185,6 +185,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1910218198348656087
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,8 +196,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Guard keeps an eye on your file modifications
 test_files: []
+has_rdoc: