guard 1.3.1 → 1.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## 1.3.2 - 15 August, 2012
2
+
3
+ ### Improvements
4
+
5
+ - [#316][] Guard clears screen more than once per single watch event. (reported by [@japgolly][], fixed by [@thibaudgg][])
6
+
1
7
  ## 1.3.1 - 14 August, 2012
2
8
 
3
9
  ### Improvements
@@ -581,6 +587,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
581
587
  [#298]: https://github.com/guard/guard/issues/298
582
588
  [#299]: https://github.com/guard/guard/issues/299
583
589
  [#315]: https://github.com/guard/guard/issues/315
590
+ [#316]: https://github.com/guard/guard/issues/316
584
591
  [#317]: https://github.com/guard/guard/issues/317
585
592
  [@Gazer]: https://github.com/Gazer
586
593
  [@Maher4Ever]: https://github.com/Maher4Ever
@@ -610,6 +617,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
610
617
  [@hron]: https://github.com/hron
611
618
  [@ianwhite]: https://github.com/ianwhite
612
619
  [@indirect]: https://github.com/indirect
620
+ [@japgolly]: https://github.com/japgolly
613
621
  [@jeffutter]: https://github.com/jeffutter
614
622
  [@johnbintz]: https://github.com/johnbintz
615
623
  [@jredville]: https://github.com/jredville
Binary file
data/lib/guard.rb CHANGED
@@ -46,7 +46,7 @@ module Guard
46
46
  @runner = ::Guard::Runner.new
47
47
  @allow_stop = Listen::Turnstile.new
48
48
 
49
- ::Guard::UI.clear
49
+ ::Guard::UI.clear(:force => true)
50
50
  deprecated_options_warning
51
51
 
52
52
  setup_groups
@@ -94,7 +94,7 @@ module Guard
94
94
  if Signal.list.keys.include?('USR1')
95
95
  Signal.trap('USR1') { ::Guard.pause unless @listener.paused? }
96
96
  end
97
-
97
+
98
98
  if Signal.list.keys.include?('USR2')
99
99
  Signal.trap('USR2') { ::Guard.pause if @listener.paused? }
100
100
  end
@@ -181,7 +181,7 @@ module Guard
181
181
  #
182
182
  def reload(scopes = {})
183
183
  within_preserved_state do
184
- ::Guard::UI.clear
184
+ ::Guard::UI.clear(:force => true)
185
185
  ::Guard::UI.action_with_scopes('Reload', scopes)
186
186
  ::Guard::Dsl.reevaluate_guardfile if scopes.empty?
187
187
  runner.run(:reload, scopes)
@@ -194,7 +194,7 @@ module Guard
194
194
  #
195
195
  def run_all(scopes = {})
196
196
  within_preserved_state do
197
- ::Guard::UI.clear
197
+ ::Guard::UI.clear(:force => true)
198
198
  ::Guard::UI.action_with_scopes('Run', scopes)
199
199
  runner.run(:run_all, scopes)
200
200
  end
data/lib/guard/runner.rb CHANGED
@@ -64,6 +64,7 @@ module Guard
64
64
  # @param [Array<String>] removed the removed paths.
65
65
  #
66
66
  def run_on_changes(modified, added, removed)
67
+ ::Guard::UI.clearable
67
68
  scoped_guards do |guard|
68
69
  modified_paths = ::Guard::Watcher.match_files(guard, modified)
69
70
  added_paths = ::Guard::Watcher.match_files(guard, added)
data/lib/guard/ui.rb CHANGED
@@ -78,10 +78,19 @@ module Guard
78
78
  STDERR.print(color_enabled? ? "\r\e[0m" : "\r\n")
79
79
  end
80
80
 
81
- # Clear the output.
81
+ # Clear the output if clearable.
82
82
  #
83
- def clear
84
- system('clear;') if ::Guard.options[:clear]
83
+ def clear(options = {})
84
+ if ::Guard.options[:clear] && (@clearable || options[:force])
85
+ @clearable = false
86
+ system('clear;')
87
+ end
88
+ end
89
+
90
+ # Allow the screen to be cleared again.
91
+ #
92
+ def clearable
93
+ @clearable = true
85
94
  end
86
95
 
87
96
  # Show a scoped action message.
data/lib/guard/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Guard
2
2
  # The current gem version of Guard
3
- VERSION = '1.3.1'
3
+ VERSION = '1.3.2'
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: guard
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ version: 1.3.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-14 00:00:00.000000000 Z
12
+ date: 2012-08-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: thor
@@ -99,6 +99,7 @@ executables:
99
99
  extensions: []
100
100
  extra_rdoc_files: []
101
101
  files:
102
+ - bin/fsevent_watch_guard
102
103
  - bin/guard
103
104
  - images/failed.png
104
105
  - images/pending.png
@@ -129,7 +130,6 @@ files:
129
130
  - lib/guard/templates/Guardfile
130
131
  - lib/guard/ui.rb
131
132
  - lib/guard/version.rb
132
- - lib/guard/version.rbc
133
133
  - lib/guard/watcher.rb
134
134
  - lib/guard.rb
135
135
  - CHANGELOG.md
@@ -149,9 +149,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
149
149
  - - ! '>='
150
150
  - !ruby/object:Gem::Version
151
151
  version: '0'
152
- segments:
153
- - 0
154
- hash: 2920801038653850427
155
152
  required_rubygems_version: !ruby/object:Gem::Requirement
156
153
  none: false
157
154
  requirements:
@@ -165,4 +162,3 @@ signing_key:
165
162
  specification_version: 3
166
163
  summary: Guard keeps an eye on your file modifications
167
164
  test_files: []
168
- has_rdoc:
@@ -1,130 +0,0 @@
1
- !RBIX
2
- 9595534255132031488
3
- x
4
- M
5
- 1
6
- n
7
- n
8
- x
9
- 10
10
- __script__
11
- i
12
- 28
13
- 99
14
- 7
15
- 0
16
- 65
17
- 49
18
- 1
19
- 2
20
- 13
21
- 99
22
- 12
23
- 7
24
- 2
25
- 12
26
- 7
27
- 3
28
- 12
29
- 65
30
- 12
31
- 49
32
- 4
33
- 4
34
- 15
35
- 49
36
- 2
37
- 0
38
- 15
39
- 2
40
- 11
41
- I
42
- 6
43
- I
44
- 0
45
- I
46
- 0
47
- I
48
- 0
49
- n
50
- p
51
- 5
52
- x
53
- 5
54
- Guard
55
- x
56
- 11
57
- open_module
58
- x
59
- 15
60
- __module_init__
61
- M
62
- 1
63
- n
64
- n
65
- x
66
- 5
67
- Guard
68
- i
69
- 12
70
- 5
71
- 66
72
- 65
73
- 7
74
- 0
75
- 7
76
- 1
77
- 64
78
- 49
79
- 2
80
- 2
81
- 11
82
- I
83
- 3
84
- I
85
- 0
86
- I
87
- 0
88
- I
89
- 0
90
- n
91
- p
92
- 3
93
- x
94
- 7
95
- VERSION
96
- s
97
- 5
98
- 1.3.0
99
- x
100
- 9
101
- const_set
102
- p
103
- 3
104
- I
105
- 2
106
- I
107
- 3
108
- I
109
- c
110
- x
111
- 52
112
- /Users/michi/Repositories/guard/lib/guard/version.rb
113
- p
114
- 0
115
- x
116
- 13
117
- attach_method
118
- p
119
- 3
120
- I
121
- 0
122
- I
123
- 1
124
- I
125
- 1c
126
- x
127
- 52
128
- /Users/michi/Repositories/guard/lib/guard/version.rb
129
- p
130
- 0