ztk 1.18.5 → 1.19.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.ruby-version +1 -1
  3. data/lib/ztk/parallel.rb +11 -6
  4. data/lib/ztk/version.rb +1 -1
  5. data/spec/ztk/parallel_spec.rb +14 -0
  6. metadata +44 -44
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 15870a2fb96bcf1aa8f0e0e5cdc5c2707fdc9b5e
4
- data.tar.gz: 33c3a98ce4e7a4d939a359ffe3bbb8ee693d2bb4
3
+ metadata.gz: 76e0918d938f223daea9adadd3d177ebbe9c34e8
4
+ data.tar.gz: d3234190f977e215bcc52471c3dcff70b05e9dfa
5
5
  SHA512:
6
- metadata.gz: f2e7a2a41ac1fec4c9b1481893d3d78dcf1719c6716da9a3062ae65e3480b40d1f236c1d2c73e7a6b152a91c87222dc99126915c30807cc04df077f50c1f2abc
7
- data.tar.gz: bb0a67cf931f0314042d12e68cd28996cf843b4d76e50edeef3882c9928d7167dffb344151fedd9f8809d98789821459a0091d745fbf32a2750f9501ed02c3f3
6
+ metadata.gz: 360875cd23b791272785f3d9cea938b5660600b269d113402b1f2f7087b1185c41fdfe56252eb79da8fb1cd1e59267e3641aea6bc8cb171f6a3cb23cd646c0e2
7
+ data.tar.gz: 55a14980a5ec1b04bab832b00c87652b17650575eac73684cb467bd63366e9f4703bd5fbadac366e56fbc107c5c1fbee54073134f14c2e73ddd5a62e121224fb
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- ruby-2.1.0
1
+ ruby-2.0.0
data/lib/ztk/parallel.rb CHANGED
@@ -135,7 +135,8 @@ module ZTK
135
135
  # @option config [Proc] :after_fork (nil) Proc to call after forking.
136
136
  def initialize(configuration={})
137
137
  super({
138
- :max_forks => MAX_FORKS
138
+ :max_forks => MAX_FORKS,
139
+ :raise_exceptions => true
139
140
  }, configuration)
140
141
 
141
142
  (config.max_forks < 1) and log_and_raise(ParallelError, "max_forks must be equal to or greater than one!")
@@ -225,7 +226,7 @@ module ZTK
225
226
  data = (Marshal.load(Base64.decode64(fork[:reader].read.to_s)) rescue nil)
226
227
  config.ui.logger.debug { "read(#{data.inspect})" }
227
228
 
228
- process_exception_data(data)
229
+ data = process_data(data)
229
230
  !data.nil? and @results.push(data)
230
231
 
231
232
  fork[:reader].close
@@ -284,13 +285,17 @@ module ZTK
284
285
 
285
286
  private
286
287
 
287
- def process_exception_data(data)
288
- return if !(ZTK::Parallel::ExceptionWrapper === data)
288
+ def process_data(data)
289
+ return data if !(ZTK::Parallel::ExceptionWrapper === data)
289
290
 
290
291
  config.ui.logger.fatal { "exception(#{data.exception.inspect})" }
291
292
 
292
- signal_all
293
- raise data.exception
293
+ if (config.raise_exceptions == true)
294
+ signal_all
295
+ raise data.exception
296
+ end
297
+
298
+ return data.exception
294
299
  end
295
300
 
296
301
  end
data/lib/ztk/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module ZTK
2
2
 
3
3
  # ZTK Version String
4
- VERSION = "1.18.5"
4
+ VERSION = "1.19.0"
5
5
 
6
6
  end
data/spec/ztk/parallel_spec.rb CHANGED
@@ -82,6 +82,20 @@ describe ZTK::Parallel do
82
82
  }.should raise_error
83
83
  end
84
84
 
85
+ it "should allow us to ignore exceptions" do
86
+ subject = ZTK::Parallel.new(:raise_exceptions => false)
87
+
88
+ lambda {
89
+ 3.times do |x|
90
+ subject.process do
91
+ raise "SomeException"
92
+ end
93
+ end
94
+
95
+ subject.waitall
96
+ }.should_not raise_error
97
+ end
98
+
85
99
  end
86
100
 
87
101
  describe "#wait" do
metadata CHANGED
@@ -1,251 +1,251 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ztk
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.18.5
4
+ version: 1.19.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Zachary Patten
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-13 00:00:00.000000000 Z
11
+ date: 2014-03-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
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'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: erubis
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
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: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: net-ssh
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
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'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: net-ssh-gateway
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '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: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: net-sftp
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
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'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: net-scp
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: :runtime
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: pry
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
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: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: rake
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rspec
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: yard
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - '>='
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - '>='
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: redcarpet
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - '>='
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: coveralls
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - '>='
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: yarjuf
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - '>='
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: simplecov-rcov
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ">="
199
+ - - '>='
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ">="
206
+ - - '>='
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: travis
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ">="
213
+ - - '>='
214
214
  - !ruby/object:Gem::Version
215
215
  version: '0'
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ">="
220
+ - - '>='
221
221
  - !ruby/object:Gem::Version
222
222
  version: '0'
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: typhoeus
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - "~>"
227
+ - - ~>
228
228
  - !ruby/object:Gem::Version
229
229
  version: 0.6.7
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - "~>"
234
+ - - ~>
235
235
  - !ruby/object:Gem::Version
236
236
  version: 0.6.7
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: websocket-native
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - ">="
241
+ - - '>='
242
242
  - !ruby/object:Gem::Version
243
243
  version: '0'
244
244
  type: :development
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
- - - ">="
248
+ - - '>='
249
249
  - !ruby/object:Gem::Version
250
250
  version: '0'
251
251
  description: Zachary's Tool Kit contains a collection of reusable classes meant to
@@ -262,12 +262,12 @@ executables:
262
262
  extensions: []
263
263
  extra_rdoc_files: []
264
264
  files:
265
- - ".gitignore"
266
- - ".rspec"
267
- - ".ruby-gemset"
268
- - ".ruby-version"
269
- - ".travis.yml"
270
- - ".yardopts"
265
+ - .gitignore
266
+ - .rspec
267
+ - .ruby-gemset
268
+ - .ruby-version
269
+ - .travis.yml
270
+ - .yardopts
271
271
  - Gemfile
272
272
  - LICENSE
273
273
  - README.md
@@ -354,12 +354,12 @@ require_paths:
354
354
  - lib
355
355
  required_ruby_version: !ruby/object:Gem::Requirement
356
356
  requirements:
357
- - - ">="
357
+ - - '>='
358
358
  - !ruby/object:Gem::Version
359
359
  version: '0'
360
360
  required_rubygems_version: !ruby/object:Gem::Requirement
361
361
  requirements:
362
- - - ">="
362
+ - - '>='
363
363
  - !ruby/object:Gem::Version
364
364
  version: '0'
365
365
  requirements: []