guard 1.5.3 → 1.5.4

data/CHANGELOG.md

@@ -1,9 +1,19 @@
+## 1.5.4 - 9 November, 2012
+
+### Improvements
+
+- Thread handling improved and added thread debug mode. ([@netzpirat][])
+
+## Bug fix
+
+- [#358][] Ignore `~/.pryrc` since it breaks Guard when loading the Rails env. ([@netzpirat][])
+
 ## 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][])
+- [#354][] Ignore `./.pryrc` since it breaks Guard when loading the Rails env. ([@netzpirat][])
 
 ## 1.5.2 - 29 October, 2012
 
@@ -643,7 +653,10 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [#345]: https://github.com/guard/guard/issues/345
 [#348]: https://github.com/guard/guard/issues/348
 [#351]: https://github.com/guard/guard/issues/351
+[#352]: https://github.com/guard/guard/issues/352
 [#353]: https://github.com/guard/guard/issues/353
+[#354]: https://github.com/guard/guard/issues/354
+[#358]: https://github.com/guard/guard/issues/358
 [@Gazer]: https://github.com/Gazer
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@alandipert]: https://github.com/alandipert

data/README.md

@@ -1,4 +1,4 @@
-Guard [![Build Status](https://secure.travis-ci.org/guard/guard.png?branch=master)](http://travis-ci.org/guard/guard) [![Dependency Status](https://gemnasium.com/guard/guard.png)](https://gemnasium.com/guard/guard)
+Guard [![Build Status](https://secure.travis-ci.org/guard/guard.png?branch=master)](http://travis-ci.org/guard/guard) [![Dependency Status](https://gemnasium.com/guard/guard.png)](https://gemnasium.com/guard/guard) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/guard/guard)
 =====
 
 Guard is a command line tool to easily handle events on file system modifications.
@@ -52,25 +52,25 @@ Generate an empty `Guardfile` with:
 $ 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).
+**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).
+
+If you are on Mac OS X and have problems with either Guard not reacting to file changes or Pry behaving strange, then
+you should [add proper Readline support to Ruby on Mac OS X](https://github.com/guard/guard/wiki/Add-proper-Readline-support-to-Ruby-on-Mac-OS-X).
 
 ## Efficient Filesystem Handling
 
-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.
+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.
 
-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.
+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.
 
-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`:
+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`:
 
 ```Ruby
 group :development do
@@ -816,14 +816,18 @@ using?
 
 When you file a bug, please try to follow these simple rules if applicable:
 
+* Make sure you've read the README carefully.
 * Make sure you run Guard with `bundle exec` first.
 * Add debug information to the issue by running Guard with the `--debug` option.
 * Add your `Guardfile` and `Gemfile` to the issue.
+* Provide information about your environment:
+  * Your current versions of your OS, Ruby, Rubygems and Bundler.
+  * Shared project folder with services like Dropbox, NFS, etc.
 * 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!**
 
-Development [![Dependency Status](https://gemnasium.com/guard/guard.png?branch=master)](https://gemnasium.com/guard/guard) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/guard/guard)
+Development
 -----------
 
 * Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/guard/master/frames).

data/lib/guard.rb

@@ -44,7 +44,12 @@ module Guard
       @options    = options.dup
       @watchdir   = (options[:watchdir] && File.expand_path(options[:watchdir])) || Dir.pwd
       @runner     = ::Guard::Runner.new
-      @allow_stop = Listen::Turnstile.new
+
+      if @options[:debug]
+        Thread.abort_on_exception = true
+        ::Guard::UI.options[:level] = :debug
+        debug_command_execution
+      end
 
       ::Guard::UI.clear(:force => true)
       deprecated_options_warning
@@ -59,11 +64,6 @@ module Guard
 
       runner.deprecation_warning if @options[:show_deprecations]
 
-      if @options[:debug]
-        ::Guard::UI.options[:level] = :debug
-        debug_command_execution
-      end
-
       setup_notifier
       setup_interactor
 
@@ -162,20 +162,20 @@ module Guard
         runner.run(:start)
       end
 
-      listener.start(false)
-
-      @allow_stop.wait if @allow_stop
+      # Blocks main thread
+      listener.start
     end
 
     # Stop Guard listening to file changes
     #
     def stop
-      listener.stop
-      interactor.stop if interactor
-      runner.run(:stop)
-      ::Guard::UI.info 'Bye bye...', :reset => true
+      within_preserved_state(false) do
+        runner.run(:stop)
+        ::Guard::UI.info 'Bye bye...', :reset => true
 
-      @allow_stop.signal if @allow_stop
+        # Unblocks main thread
+        listener.stop
+      end
     end
 
     # Reload Guardfile and all Guard plugins currently enabled.
@@ -324,9 +324,10 @@ module Guard
     # blocked and execution is synchronized
     # to avoid state inconsistency.
     #
+    # @param [Boolean] restart_interactor whether to restart the interactor or not
     # @yield the block to run
     #
-    def within_preserved_state
+    def within_preserved_state(restart_interactor = true)
       lock.synchronize do
         begin
           interactor.stop if interactor
@@ -334,8 +335,9 @@ module Guard
         rescue Interrupt
         end
 
-        interactor.start if interactor
+        interactor.start if interactor && restart_interactor
       end
+
       @result
     end
 

data/lib/guard/interactor.rb

@@ -27,6 +27,7 @@ module Guard
     def initialize
       return if ENV['GUARD_ENV'] == 'test'
 
+      Pry.config.should_load_rc = false
       Pry.config.should_load_local_rc = false
       Pry.config.history.file = HISTORY_FILE
 
@@ -145,6 +146,7 @@ module Guard
       return if !@thread || ENV['GUARD_ENV'] == 'test'
 
       unless Thread.current == @thread
+        ::Guard::UI.reset_line
         ::Guard::UI.debug 'Stop interactor'
         @thread.kill
       end

data/lib/guard/notifier.rb

@@ -194,6 +194,7 @@ module Guard
     #
     def auto_detect_notification
       available = nil
+      self.notifications = []
 
       NOTIFIERS.each do |group|
         added = group.map { |n| n.first }.find { |notifier| add_notification(notifier, { }, true) }

data/lib/guard/notifiers/terminal_title.rb

@@ -23,11 +23,7 @@ module Guard
       #
       def notify(type, title, message, image, options = { })
         first_line = message.sub(/^\n/, '').sub(/\n.*/m, '')
-        set_terminal_title("[#{title}] #{first_line}")
-      end
-
-      def set_terminal_title(text)
-        puts "\e]2;#{text}\a"
+        puts("\e]2;[#{ title }] #{ first_line }\a")
       end
     end
   end

data/lib/guard/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -185,9 +185,6 @@ 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:
@@ -196,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Guard keeps an eye on your file modifications