guard 1.3.1 → 1.3.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.2 - 15 August, 2012
+
+### Improvements
+
+- [#316][] Guard clears screen more than once per single watch event. (reported by [@japgolly][], fixed by [@thibaudgg][])
+
 ## 1.3.1 - 14 August, 2012
 
 ### Improvements
@@ -581,6 +587,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [#298]: https://github.com/guard/guard/issues/298
 [#299]: https://github.com/guard/guard/issues/299
 [#315]: https://github.com/guard/guard/issues/315
+[#316]: https://github.com/guard/guard/issues/316
 [#317]: https://github.com/guard/guard/issues/317
 [@Gazer]: https://github.com/Gazer
 [@Maher4Ever]: https://github.com/Maher4Ever
@@ -610,6 +617,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [@hron]: https://github.com/hron
 [@ianwhite]: https://github.com/ianwhite
 [@indirect]: https://github.com/indirect
+[@japgolly]: https://github.com/japgolly
 [@jeffutter]: https://github.com/jeffutter
 [@johnbintz]: https://github.com/johnbintz
 [@jredville]: https://github.com/jredville

data/lib/guard.rb

@@ -46,7 +46,7 @@ module Guard
       @runner     = ::Guard::Runner.new
       @allow_stop = Listen::Turnstile.new
 
-      ::Guard::UI.clear
+      ::Guard::UI.clear(:force => true)
       deprecated_options_warning
 
       setup_groups
@@ -94,7 +94,7 @@ module Guard
         if Signal.list.keys.include?('USR1')
           Signal.trap('USR1') { ::Guard.pause unless @listener.paused? }
         end
-  
+
         if Signal.list.keys.include?('USR2')
           Signal.trap('USR2') { ::Guard.pause if @listener.paused? }
         end
@@ -181,7 +181,7 @@ module Guard
     #
     def reload(scopes = {})
       within_preserved_state do
-        ::Guard::UI.clear
+        ::Guard::UI.clear(:force => true)
         ::Guard::UI.action_with_scopes('Reload', scopes)
         ::Guard::Dsl.reevaluate_guardfile if scopes.empty?
         runner.run(:reload, scopes)
@@ -194,7 +194,7 @@ module Guard
     #
     def run_all(scopes = {})
       within_preserved_state do
-        ::Guard::UI.clear
+        ::Guard::UI.clear(:force => true)
         ::Guard::UI.action_with_scopes('Run', scopes)
         runner.run(:run_all, scopes)
       end

data/lib/guard/runner.rb

@@ -64,6 +64,7 @@ module Guard
     # @param [Array<String>] removed the removed paths.
     #
     def run_on_changes(modified, added, removed)
+      ::Guard::UI.clearable
       scoped_guards do |guard|
         modified_paths = ::Guard::Watcher.match_files(guard, modified)
         added_paths    = ::Guard::Watcher.match_files(guard, added)

data/lib/guard/ui.rb

@@ -78,10 +78,19 @@ module Guard
         STDERR.print(color_enabled? ? "\r\e[0m" : "\r\n")
       end
 
-      # Clear the output.
+      # Clear the output if clearable.
       #
-      def clear
-        system('clear;') if ::Guard.options[:clear]
+      def clear(options = {})
+        if ::Guard.options[:clear] && (@clearable || options[:force])
+          @clearable = false
+          system('clear;')
+        end
+      end
+
+      # Allow the screen to be cleared again.
+      #
+      def clearable
+        @clearable = true
       end
 
       # Show a scoped action message.

data/lib/guard/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -99,6 +99,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/fsevent_watch_guard
 - bin/guard
 - images/failed.png
 - images/pending.png
@@ -129,7 +130,6 @@ 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
@@ -149,9 +149,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2920801038653850427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,4 +162,3 @@ signing_key:
 specification_version: 3
 summary: Guard keeps an eye on your file modifications
 test_files: []
-has_rdoc: 

data/lib/guard/version.rbc

@@ -1,130 +0,0 @@
-!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.0
-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