guard 2.1.1 → 2.2.0

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 53af35fa31798f99a8230636673520c16f4c7e72
4
- data.tar.gz: 210eae70340553a7bcbd008ae728c936739e2cad
3
+ metadata.gz: 24dadb9bdcb23445a1551ae1d5717e76f567c757
4
+ data.tar.gz: 4166e22e0d9637b5044bab05b9fa067c7677f928
5
5
  SHA512:
6
- metadata.gz: 47b4e5af3573d6a44f428dcd6cfcec942548ff69dcd702ad1f5a752f2b7e921ffddc10a85944912b75907c692f9d130b2ef3d102e12a13f8a670d0880eb3f2b6
7
- data.tar.gz: d610139610407063ca8f4533335ccf009d950c40328017cb0f545149955a4659cc529ca9a6f5bbc37d778610cb2da584c8a81892d9052577a44c1b3de8d63f47
6
+ metadata.gz: bfe00b908e251e96da33060b4dd4754e83a5bc00d2ef42ba6fdbef00f0b24338d43a151858b3c79c908e3333e5c663921cd8b15aa832e39876fc23701f6f030e
7
+ data.tar.gz: 0619e035846ea334c5a03b2e09c92d4031296f5364bd80340d0a66fd3586265a7ecda601d732b0b1beb49edf58519d427694f9e51ede313ebf319a9bea269816
@@ -29,6 +29,8 @@ module Guard
29
29
  display_message: false,
30
30
  default_message_format: '%s - %s',
31
31
  default_message_color: 'white',
32
+ display_title: false,
33
+ default_title_format: '%s - %s',
32
34
  line_separator: ' - ',
33
35
  change_color: true,
34
36
  color_location: 'status-left-bg'
@@ -97,15 +99,44 @@ module Guard
97
99
  color = tmux_color(opts[:type], opts)
98
100
 
99
101
  color_locations.each do |color_location|
100
- _run_client "set #{ color_location } #{ color }"
102
+ _run_client "set -q #{ color_location } #{ color }"
101
103
  end
102
104
  end
103
105
 
106
+ type = opts.delete(:type).to_s
107
+ title = opts.delete(:title)
108
+
109
+ if opts.fetch(:display_title, DEFAULTS[:display_title])
110
+ display_title(type, title, message, opts)
111
+ end
112
+
104
113
  if opts.fetch(:display_message, DEFAULTS[:display_message])
105
- display_message(opts.delete(:type).to_s, opts.delete(:title), message, opts)
114
+ display_message(type, title, message, opts)
106
115
  end
107
116
  end
108
117
 
118
+ # Displays a message in the title bar of the terminal.
119
+ #
120
+ # @param [String] title the notification title
121
+ # @param [String] message the notification message body
122
+ # @param [Hash] options additional notification library options
123
+ # @option options [String] success_message_format a string to use as
124
+ # formatter for the success message.
125
+ # @option options [String] failed_message_format a string to use as
126
+ # formatter for the failed message.
127
+ # @option options [String] pending_message_format a string to use as
128
+ # formatter for the pending message.
129
+ # @option options [String] default_message_format a string to use as
130
+ # formatter when no format per type is defined.
131
+ #
132
+ def display_title(type, title, message, opts = {})
133
+ title_format = opts.fetch("#{ type }_title_format".to_sym, opts.fetch(:default_title_format, DEFAULTS[:default_title_format]))
134
+ teaser_message = message.split("\n").first
135
+ display_title = title_format % [title, teaser_message]
136
+
137
+ _run_client "set-option -q set-titles-string '#{ display_title }'"
138
+ end
139
+
109
140
  # Displays a message in the status bar of tmux.
110
141
  #
111
142
  # @param [String] type the notification type. Either 'success',
@@ -144,9 +175,9 @@ module Guard
144
175
  formatted_message = message.split("\n").join(separator)
145
176
  display_message = message_format % [title, formatted_message]
146
177
 
147
- _run_client "set display-time #{ display_time * 1000 }"
148
- _run_client "set message-fg #{ message_color }"
149
- _run_client "set message-bg #{ color }"
178
+ _run_client "set -q display-time #{ display_time * 1000 }"
179
+ _run_client "set -q message-fg #{ message_color }"
180
+ _run_client "set -q message-bg #{ color }"
150
181
  _run_client "display-message '#{ display_message }'"
151
182
  end
152
183
 
@@ -176,8 +207,6 @@ module Guard
176
207
 
177
208
  @options_stored = true
178
209
  end
179
-
180
- _run_client 'set quiet on'
181
210
  end
182
211
 
183
212
  # Notification stopping. Restore the previous Tmux state
@@ -188,15 +217,13 @@ module Guard
188
217
  if @options_stored
189
218
  @options_store.each do |key, value|
190
219
  if value
191
- _run_client "set #{ key } #{ value }"
220
+ _run_client "set -q #{ key } #{ value }"
192
221
  else
193
- _run_client "set -u #{ key }"
222
+ _run_client "set -q -u #{ key }"
194
223
  end
195
224
  end
196
225
  _reset_options_store
197
226
  end
198
-
199
- _run_client 'set quiet off'
200
227
  end
201
228
 
202
229
  def options_store
data/lib/guard/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Guard
2
- VERSION = '2.1.1'
2
+ VERSION = '2.2.0'
3
3
  end
metadata CHANGED
@@ -1,111 +1,111 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: guard
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.1
4
+ version: 2.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thibaud Guillaume-Gentil
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-10-18 00:00:00.000000000 Z
11
+ date: 2013-10-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.18.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.18.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: listen
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: '2.1'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '2.1'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: pry
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: 0.9.12
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: 0.9.12
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: lumberjack
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '1.0'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '1.0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: formatador
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: 0.2.4
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: 0.2.4
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bundler
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '>='
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rspec
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ~>
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
103
  version: '2.14'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ~>
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: '2.14'
111
111
  description: Guard is a command line tool to easily handle events on file system modifications.
@@ -116,7 +116,6 @@ executables:
116
116
  extensions: []
117
117
  extra_rdoc_files: []
118
118
  files:
119
- - bin/fsevent_watch_guard
120
119
  - bin/guard
121
120
  - images/failed.png
122
121
  - images/guard.png
@@ -183,18 +182,19 @@ require_paths:
183
182
  - lib
184
183
  required_ruby_version: !ruby/object:Gem::Requirement
185
184
  requirements:
186
- - - '>='
185
+ - - ">="
187
186
  - !ruby/object:Gem::Version
188
187
  version: 1.9.2
189
188
  required_rubygems_version: !ruby/object:Gem::Requirement
190
189
  requirements:
191
- - - '>='
190
+ - - ">="
192
191
  - !ruby/object:Gem::Version
193
192
  version: '0'
194
193
  requirements: []
195
194
  rubyforge_project:
196
- rubygems_version: 2.1.8
195
+ rubygems_version: 2.1.9
197
196
  signing_key:
198
197
  specification_version: 4
199
198
  summary: Guard keeps an eye on your file modifications
200
199
  test_files: []
200
+ has_rdoc:
Binary file