guard 0.9.2 → 0.9.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.9.3 - December 23, 2011
+
+### Improvements
+
+- Fix terminal status after interrupting the Readline interactor. ([@Maher4Ever][])
+
 ## 0.9.2 - December 22, 2011
 
 ### Improvements
@@ -10,13 +16,13 @@
 ### Bug fix
 
 - 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][]
+- [#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 fix
 
-- [#173](https://github.com/guard/guard/issues/173): Cannot set the watch_all_modifications option. (reported by [@sutherland][], fixed by [@netzpirat][]
+- [#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

data/lib/guard.rb

@@ -193,6 +193,7 @@ module Guard
         run_supervised_task(guard, :stop)
       end
 
+      interactor.stop if interactor
       listener.stop
       abort
     end

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/interactors/readline.rb

@@ -28,6 +28,20 @@ module Guard
       end
     end
 
+    # Start the interactor.
+    #
+    def start
+      store_terminal_settings
+      super
+    end
+
+    # Stop the interactor.
+    #
+    def stop
+      super
+      restore_terminal_settings
+    end
+
     # Read a line from stdin with Readline.
     #
     def read_line
@@ -68,5 +82,19 @@ module Guard
       ::Guard.listener.paused? ? 'p> ' : '> '
     end
 
+    private
+
+    # 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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
+date: 2011-12-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70324163239920 !ruby/object:Gem::Requirement
+  requirement: &70333332552280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70324163239920
+  version_requirements: *70333332552280
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70324163237020 !ruby/object:Gem::Requirement
+  requirement: &70333332551660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70324163237020
+  version_requirements: *70333332551660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70324163234420 !ruby/object:Gem::Requirement
+  requirement: &70333332550980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324163234420
+  version_requirements: *70333332550980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70324163232220 !ruby/object:Gem::Requirement
+  requirement: &70333332550060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70324163232220
+  version_requirements: *70333332550060
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70324163230380 !ruby/object:Gem::Requirement
+  requirement: &70333332549420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70324163230380
+  version_requirements: *70333332549420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70324163229000 !ruby/object:Gem::Requirement
+  requirement: &70333332548120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70324163229000
+  version_requirements: *70333332548120
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70324163221540 !ruby/object:Gem::Requirement
+  requirement: &70333332546500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70324163221540
+  version_requirements: *70333332546500
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70324163213600 !ruby/object:Gem::Requirement
+  requirement: &70333332545160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *70324163213600
+  version_requirements: *70333332545160
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me