Download as
Browse Code »

Commit 2d4c3e4bf35ffee6b90e0d8cca6559bb85a6969d

Authored by Stephen Crosby
1 parent 2f48ecd2
Exists in master and in 1 other branch production

update dependencies

Showing 10 changed files with 151 additions and 144 deletions   Show diff stats
Gemfile.lock
  Diff comments   View file @2d4c3e4
... ... @@ -32,23 +32,23 @@ GEM
32 32 thread_safe (~> 0.1)
33 33 tzinfo (~> 1.1)
34 34 addressable (2.3.8)
35   - airbrake (3.1.14)
  35 + airbrake (4.3.0)
36 36 builder
37   - json
  37 + multi_json
38 38 arel (5.0.1.20140414130214)
39   - bcrypt (3.1.9)
40   - bcrypt (3.1.9-java)
41   - better_errors (1.0.1)
  39 + bcrypt (3.1.10)
  40 + bcrypt (3.1.10-java)
  41 + better_errors (2.1.1)
42 42 coderay (>= 1.0.0)
43 43 erubis (>= 2.6.6)
  44 + rack (>= 0.9.0)
44 45 binding_of_caller (0.7.2)
45 46 debug_inspector (>= 0.0.1)
46   - bson (2.3.0)
47   - bson (2.3.0-java)
  47 + bson (3.1.1)
  48 + bson (3.1.1-java)
48 49 builder (3.2.2)
49   - byebug (2.7.0)
50   - columnize (~> 0.3)
51   - debugger-linecache (~> 1.2)
  50 + byebug (4.0.5)
  51 + columnize (= 0.9.0)
52 52 callsite (0.0.11)
53 53 campy (1.0.0)
54 54 capistrano (3.4.0)
... ... @@ -58,7 +58,7 @@ GEM
58 58 capistrano-bundler (1.1.4)
59 59 capistrano (~> 3.1)
60 60 sshkit (~> 1.2)
61   - capistrano-rails (1.1.2)
  61 + capistrano-rails (1.1.3)
62 62 capistrano (~> 3.1)
63 63 capistrano-bundler (~> 1.1)
64 64 capistrano-rbenv (2.0.3)
... ... @@ -71,30 +71,29 @@ GEM
71 71 rack-test (>= 0.5.4)
72 72 xpath (~> 2.0)
73 73 cliver (0.3.2)
74   - coderay (1.0.9)
  74 + coderay (1.1.0)
75 75 coffee-rails (4.1.0)
76 76 coffee-script (>= 2.2.0)
77 77 railties (>= 4.0.0, < 5.0)
78   - coffee-script (2.3.0)
  78 + coffee-script (2.4.1)
79 79 coffee-script-source
80 80 execjs
81   - coffee-script-source (1.8.0)
82   - colorize (0.7.5)
  81 + coffee-script-source (1.9.1.1)
  82 + colorize (0.7.7)
83 83 columnize (0.9.0)
84   - connection_pool (2.1.1)
85   - coveralls (0.7.0)
86   - multi_json (~> 1.3)
87   - rest-client
88   - simplecov (>= 0.7)
89   - term-ansicolor
90   - thor
91   - css_parser (1.3.5)
  84 + connection_pool (2.2.0)
  85 + coveralls (0.8.2)
  86 + json (~> 1.8)
  87 + rest-client (>= 1.6.8, < 2)
  88 + simplecov (~> 0.10.0)
  89 + term-ansicolor (~> 1.3)
  90 + thor (~> 0.19.1)
  91 + css_parser (1.3.6)
92 92 addressable
93   - database_cleaner (1.2.0)
  93 + database_cleaner (1.4.1)
94 94 debug_inspector (0.0.2)
95   - debugger-linecache (1.2.0)
96 95 decent_exposure (2.3.2)
97   - devise (3.4.1)
  96 + devise (3.5.1)
98 97 bcrypt (~> 3.0)
99 98 orm_adapter (~> 0.1)
100 99 railties (>= 3.2.6, < 5)
... ... @@ -102,10 +101,14 @@ GEM
102 101 thread_safe (~> 0.1)
103 102 warden (~> 1.2.3)
104 103 diff-lcs (1.2.5)
105   - dotenv (2.0.0)
106   - dotenv-rails (2.0.0)
107   - dotenv (= 2.0.0)
108   - draper (1.4.0)
  104 + docile (1.1.5)
  105 + domain_name (0.5.24)
  106 + unf (>= 0.0.5, < 1.0.0)
  107 + dotenv (2.0.2)
  108 + dotenv-rails (2.0.2)
  109 + dotenv (= 2.0.2)
  110 + railties (~> 4.0)
  111 + draper (2.1.0)
109 112 actionpack (>= 3.0)
110 113 activemodel (>= 3.0)
111 114 activesupport (>= 3.0)
... ... @@ -118,17 +121,17 @@ GEM
118 121 octokit
119 122 errbit_plugin (0.5.0)
120 123 erubis (2.7.0)
121   - execjs (2.0.2)
122   - fabrication (2.9.0)
  124 + execjs (2.5.2)
  125 + fabrication (2.13.2)
123 126 faraday (0.9.1)
124 127 multipart-post (>= 1.2, < 3)
125   - ffi (1.9.6-java)
126   - flowdock (0.3.1)
  128 + ffi (1.9.8-java)
  129 + flowdock (0.6.0)
127 130 httparty (~> 0.7)
128 131 multi_json
129   - haml (4.0.3)
  132 + haml (4.0.6)
130 133 tilt
131   - hashie (2.0.5)
  134 + hashie (3.4.2)
132 135 hipchat (1.5.1)
133 136 httparty
134 137 mimemagic
... ... @@ -139,22 +142,22 @@ GEM
139 142 activesupport
140 143 builder
141 144 htmlentities (4.3.3)
  145 + http-cookie (1.0.2)
  146 + domain_name (~> 0.5)
142 147 httparty (0.13.5)
143 148 json (~> 1.8)
144 149 multi_xml (>= 0.5.2)
145   - httpauth (0.2.0)
146 150 i18n (0.7.0)
147 151 jquery-rails (2.1.4)
148 152 railties (>= 3.0, < 5.0)
149 153 thor (>= 0.14, < 2.0)
150 154 json (1.8.3)
151 155 json (1.8.3-java)
152   - jwt (0.1.8)
153   - multi_json (>= 1.5)
154   - kaminari (0.14.1)
  156 + jwt (1.5.1)
  157 + kaminari (0.16.3)
155 158 actionpack (>= 3.0.0)
156 159 activesupport (>= 3.0.0)
157   - kgio (2.9.2)
  160 + kgio (2.9.3)
158 161 launchy (2.4.3)
159 162 addressable (~> 2.3)
160 163 launchy (2.4.3-java)
... ... @@ -163,12 +166,12 @@ GEM
163 166 libv8 (3.16.14.7)
164 167 mail (2.6.3)
165 168 mime-types (>= 1.16, < 3)
166   - meta_request (0.2.8)
167   - callsite
168   - rack-contrib
169   - railties
  169 + meta_request (0.3.4)
  170 + callsite (~> 0.0, >= 0.0.11)
  171 + rack-contrib (~> 1.1)
  172 + railties (>= 3.0.0, < 5.0.0)
170 173 method_source (0.8.2)
171   - mime-types (1.25.1)
  174 + mime-types (2.6.1)
172 175 mimemagic (0.3.0)
173 176 mini_portile (0.6.2)
174 177 minitest (5.7.0)
... ... @@ -177,7 +180,7 @@ GEM
177 180 moped (~> 2.0.0)
178 181 origin (~> 2.1)
179 182 tzinfo (>= 0.3.37)
180   - mongoid-rspec (2.0.0)
  183 + mongoid-rspec (2.2.0)
181 184 mongoid (~> 4.0.0)
182 185 rake
183 186 rspec (~> 3.1)
... ... @@ -186,8 +189,8 @@ GEM
186 189 bundler (>= 1.0.0)
187 190 rails (>= 3.2.0)
188 191 railties (>= 3.2.0)
189   - moped (2.0.4)
190   - bson (~> 2.2)
  192 + moped (2.0.6)
  193 + bson (~> 3.0)
191 194 connection_pool (~> 2.0)
192 195 optionable (~> 0.2.0)
193 196 multi_json (1.11.1)
... ... @@ -196,62 +199,64 @@ GEM
196 199 net-scp (1.2.1)
197 200 net-ssh (>= 2.6.5)
198 201 net-ssh (2.9.2)
199   - nokogiri (1.6.5)
  202 + netrc (0.10.3)
  203 + nokogiri (1.6.6.2)
200 204 mini_portile (~> 0.6.0)
201   - nokogiri (1.6.5-java)
202   - oauth2 (0.8.1)
203   - faraday (~> 0.8)
204   - httpauth (~> 0.1)
205   - jwt (~> 0.1.4)
206   - multi_json (~> 1.0)
  205 + nokogiri (1.6.6.2-java)
  206 + oauth2 (1.0.0)
  207 + faraday (>= 0.8, < 0.10)
  208 + jwt (~> 1.0)
  209 + multi_json (~> 1.3)
  210 + multi_xml (~> 0.5)
207 211 rack (~> 1.2)
208 212 octokit (3.8.0)
209 213 sawyer (~> 0.6.0, >= 0.5.3)
210   - omniauth (1.1.4)
211   - hashie (>= 1.2, < 3)
212   - rack
213   - omniauth-github (1.1.1)
  214 + omniauth (1.2.2)
  215 + hashie (>= 1.2, < 4)
  216 + rack (~> 1.0)
  217 + omniauth-github (1.1.2)
214 218 omniauth (~> 1.0)
215 219 omniauth-oauth2 (~> 1.1)
216   - omniauth-oauth2 (1.1.1)
217   - oauth2 (~> 0.8.0)
218   - omniauth (~> 1.0)
  220 + omniauth-oauth2 (1.3.1)
  221 + oauth2 (~> 1.0)
  222 + omniauth (~> 1.2)
219 223 optionable (0.2.0)
220 224 origin (2.1.1)
221 225 orm_adapter (0.5.0)
222   - pjax_rails (0.3.4)
  226 + pjax_rails (0.4.0)
223 227 jquery-rails
224   - poltergeist (1.5.1)
  228 + railties (>= 3.2, < 5.0)
  229 + poltergeist (1.6.0)
225 230 capybara (~> 2.1)
226 231 cliver (~> 0.3.1)
227 232 multi_json (~> 1.0)
228 233 websocket-driver (>= 0.2.0)
229   - power_assert (0.2.2)
230   - premailer (1.7.3)
231   - css_parser (>= 1.1.9)
  234 + power_assert (0.2.3)
  235 + premailer (1.8.4)
  236 + css_parser (>= 1.3.6)
232 237 htmlentities (>= 4.0.0)
233   - pry (0.9.12.2)
234   - coderay (~> 1.0.5)
235   - method_source (~> 0.8)
  238 + pry (0.10.1)
  239 + coderay (~> 1.1.0)
  240 + method_source (~> 0.8.1)
236 241 slop (~> 3.4)
237   - pry (0.9.12.2-java)
238   - coderay (~> 1.0.5)
239   - method_source (~> 0.8)
  242 + pry (0.10.1-java)
  243 + coderay (~> 1.1.0)
  244 + method_source (~> 0.8.1)
240 245 slop (~> 3.4)
241 246 spoon (~> 0.0)
242   - pry-byebug (1.3.2)
243   - byebug (~> 2.7)
244   - pry (~> 0.9.12)
245   - pry-rails (0.3.2)
  247 + pry-byebug (3.1.0)
  248 + byebug (~> 4.0)
  249 + pry (~> 0.10)
  250 + pry-rails (0.3.4)
246 251 pry (>= 0.9.10)
247   - quiet_assets (1.0.2)
  252 + quiet_assets (1.1.0)
248 253 railties (>= 3.1, < 5.0)
249   - rack (1.5.4)
250   - rack-contrib (1.1.0)
  254 + rack (1.5.5)
  255 + rack-contrib (1.2.0)
251 256 rack (>= 0.9.1)
252   - rack-ssl (1.4.0)
  257 + rack-ssl (1.4.1)
253 258 rack
254   - rack-ssl-enforcer (0.2.6)
  259 + rack-ssl-enforcer (0.2.8)
255 260 rack-test (0.6.3)
256 261 rack (>= 1.0)
257 262 rails (4.1.11)
... ... @@ -278,47 +283,47 @@ GEM
278 283 thor (>= 0.18.1, < 2.0)
279 284 raindrops (0.13.0)
280 285 rake (10.4.2)
281   - rdoc (4.1.2)
282   - json (~> 1.4)
283 286 ref (1.0.5)
284 287 request_store (1.1.0)
285 288 responders (1.1.2)
286 289 railties (>= 3.2, < 4.2)
287   - rest-client (1.6.8)
288   - mime-types (~> 1.16)
289   - rdoc (>= 2.4.2)
  290 + rest-client (1.8.0)
  291 + http-cookie (>= 1.0.2, < 2.0)
  292 + mime-types (>= 1.16, < 3.0)
  293 + netrc (~> 0.7)
290 294 ri_cal (0.8.8)
291   - rspec (3.1.0)
292   - rspec-core (~> 3.1.0)
293   - rspec-expectations (~> 3.1.0)
294   - rspec-mocks (~> 3.1.0)
  295 + rspec (3.3.0)
  296 + rspec-core (~> 3.3.0)
  297 + rspec-expectations (~> 3.3.0)
  298 + rspec-mocks (~> 3.3.0)
295 299 rspec-activemodel-mocks (1.0.1)
296 300 activemodel (>= 3.0)
297 301 activesupport (>= 3.0)
298 302 rspec-mocks (>= 2.99, < 4.0)
299   - rspec-core (3.1.7)
300   - rspec-support (~> 3.1.0)
301   - rspec-expectations (3.1.2)
  303 + rspec-core (3.3.1)
  304 + rspec-support (~> 3.3.0)
  305 + rspec-expectations (3.3.0)
302 306 diff-lcs (>= 1.2.0, < 2.0)
303   - rspec-support (~> 3.1.0)
304   - rspec-its (1.1.0)
  307 + rspec-support (~> 3.3.0)
  308 + rspec-its (1.2.0)
305 309 rspec-core (>= 3.0.0)
306 310 rspec-expectations (>= 3.0.0)
307   - rspec-mocks (3.1.3)
308   - rspec-support (~> 3.1.0)
309   - rspec-rails (3.1.0)
310   - actionpack (>= 3.0)
311   - activesupport (>= 3.0)
312   - railties (>= 3.0)
313   - rspec-core (~> 3.1.0)
314   - rspec-expectations (~> 3.1.0)
315   - rspec-mocks (~> 3.1.0)
316   - rspec-support (~> 3.1.0)
317   - rspec-support (3.1.2)
  311 + rspec-mocks (3.3.1)
  312 + diff-lcs (>= 1.2.0, < 2.0)
  313 + rspec-support (~> 3.3.0)
  314 + rspec-rails (3.3.2)
  315 + actionpack (>= 3.0, < 4.3)
  316 + activesupport (>= 3.0, < 4.3)
  317 + railties (>= 3.0, < 4.3)
  318 + rspec-core (~> 3.3.0)
  319 + rspec-expectations (~> 3.3.0)
  320 + rspec-mocks (~> 3.3.0)
  321 + rspec-support (~> 3.3.0)
  322 + rspec-support (3.3.0)
318 323 rushover (0.3.0)
319 324 json
320 325 rest-client
321   - sass (3.4.14)
  326 + sass (3.4.15)
322 327 sass-rails (5.0.3)
323 328 railties (>= 4.0.0, < 5.0)
324 329 sass (~> 3.1)
... ... @@ -328,16 +333,17 @@ GEM
328 333 sawyer (0.6.0)
329 334 addressable (~> 2.3.5)
330 335 faraday (~> 0.8, < 0.10)
331   - simplecov (0.7.1)
332   - multi_json (~> 1.0)
333   - simplecov-html (~> 0.7.1)
334   - simplecov-html (0.7.1)
335   - slop (3.4.6)
  336 + simplecov (0.10.0)
  337 + docile (~> 1.1.0)
  338 + json (~> 1.8)
  339 + simplecov-html (~> 0.10.0)
  340 + simplecov-html (0.10.0)
  341 + slop (3.6.0)
336 342 spoon (0.0.4)
337 343 ffi
338 344 sprockets (3.2.0)
339 345 rack (~> 1.0)
340   - sprockets-rails (2.3.1)
  346 + sprockets-rails (2.3.2)
341 347 actionpack (>= 3.0)
342 348 activesupport (>= 3.0)
343 349 sprockets (>= 2.8, < 4.0)
... ... @@ -345,9 +351,9 @@ GEM
345 351 colorize (>= 0.7.0)
346 352 net-scp (>= 1.1.2)
347 353 net-ssh (>= 2.8.0)
348   - term-ansicolor (1.2.2)
349   - tins (~> 0.8)
350   - test-unit (3.0.8)
  354 + term-ansicolor (1.3.2)
  355 + tins (~> 1.0)
  356 + test-unit (3.1.2)
351 357 power_assert
352 358 therubyracer (0.12.2)
353 359 libv8 (~> 3.16.14.0)
... ... @@ -356,30 +362,34 @@ GEM
356 362 thread_safe (0.3.5)
357 363 thread_safe (0.3.5-java)
358 364 tilt (1.4.1)
359   - timecop (0.6.3)
360   - tins (0.12.0)
  365 + timecop (0.7.4)
  366 + tins (1.5.4)
361 367 tzinfo (1.2.2)
362 368 thread_safe (~> 0.1)
363   - uglifier (2.2.1)
  369 + uglifier (2.7.1)
364 370 execjs (>= 0.3.0)
365 371 json (>= 1.8.0)
366   - underscore-rails (1.5.2)
367   - unicorn (4.8.3)
  372 + underscore-rails (1.8.3)
  373 + unf (0.1.4)
  374 + unf_ext
  375 + unf (0.1.4-java)
  376 + unf_ext (0.0.7.1)
  377 + unicorn (4.9.0)
368 378 kgio (~> 2.6)
369 379 rack
370 380 raindrops (~> 0.7)
371   - useragent (0.9.0)
  381 + useragent (0.14.0)
372 382 warden (1.2.3)
373 383 rack (>= 1.0)
374   - websocket-driver (0.5.1)
  384 + websocket-driver (0.5.4)
375 385 websocket-extensions (>= 0.1.0)
376   - websocket-driver (0.5.1-java)
  386 + websocket-driver (0.5.4-java)
377 387 websocket-extensions (>= 0.1.0)
378   - websocket-extensions (0.1.1)
379   - xmpp4r (0.5.5)
  388 + websocket-extensions (0.1.2)
  389 + xmpp4r (0.5.6)
380 390 xpath (2.0.0)
381 391 nokogiri (~> 1.3)
382   - yajl-ruby (1.1.0)
  392 + yajl-ruby (1.2.1)
383 393  
384 394 PLATFORMS
385 395 java
... ... @@ -452,6 +462,3 @@ DEPENDENCIES
452 462 useragent
453 463 xmpp4r
454 464 yajl-ruby
455   -
456   -BUNDLED WITH
457   - 1.10.3
... ...
spec/fabricators/notification_service_fabricator.rb
  Diff comments   View file @2d4c3e4
... ... @@ -6,20 +6,20 @@ Fabricator :notification_service do
6 6 notify_at_notices { sequence { |a| [0]} }
7 7 end
8 8  
9   -Fabricator :gtalk_notification_service, :from => :notification_service, :class_name => "NotificationService::GtalkService" do
  9 +Fabricator :gtalk_notification_service, :from => :notification_service, :class_name => "NotificationServices::GtalkService" do
10 10 user_id { sequence :word }
11 11 service_url { sequence :word }
12 12 service { sequence :word }
13 13 end
14 14  
15   -Fabricator :slack_notification_service, :from => :notification_service, :class_name => "NotificationService::SlackService" do
  15 +Fabricator :slack_notification_service, :from => :notification_service, :class_name => "NotificationServices::SlackService" do
16 16 service_url { sequence :word }
17 17 end
18 18  
19   -Fabricator :hipchat_notification_service, :from => :notification_service, :class_name => "NotificationService::HipchatService" do
  19 +Fabricator :hipchat_notification_service, :from => :notification_service, :class_name => "NotificationServices::HipchatService" do
20 20 service { 'v2' }
21 21 end
22 22  
23 23 %w(campfire flowdock hoiio hubot pushover webhook).each do |t|
24   - Fabricator "#{t}_notification_service".to_sym, :from => :notification_service, :class_name => "NotificationService::#{t.camelcase}Service"
  24 + Fabricator "#{t}_notification_service".to_sym, :from => :notification_service, :class_name => "NotificationServices::#{t.camelcase}Service"
25 25 end
... ...
spec/models/notification_service/campfire_service_spec.rb
  Diff comments   View file @2d4c3e4
1   -describe NotificationService::CampfireService, type: 'model' do
  1 +describe NotificationServices::CampfireService, type: 'model' do
2 2 it "it should send a notification to campfire" do
3 3 # setup
4 4 notice = Fabricate :notice
... ...
spec/models/notification_service/gtalk_service_spec.rb
  Diff comments   View file @2d4c3e4
1   -describe NotificationService::GtalkService, type: 'model' do
  1 +describe NotificationServices::GtalkService, type: 'model' do
2 2 it "it should send a notification to gtalk" do
3 3 # setup
4 4 notice = Fabricate :notice
... ...
spec/models/notification_service/hoiio_service_spec.rb
  Diff comments   View file @2d4c3e4
1   -describe NotificationService::HoiioService, type: 'model' do
  1 +describe NotificationServices::HoiioService, type: 'model' do
2 2 it "it should send a notification to hoiio" do
3 3 # setup
4 4 notice = Fabricate :notice
... ...
spec/models/notification_service/hubot_service_spec.rb
  Diff comments   View file @2d4c3e4
1   -describe NotificationService::HubotService, type: 'model' do
  1 +describe NotificationServices::HubotService, type: 'model' do
2 2 it "it should send a notification to Hubot" do
3 3 # setup
4 4 notice = Fabricate :notice
... ...
spec/models/notification_service/notification_service_spec.rb
  Diff comments   View file @2d4c3e4
1   -describe NotificationService, type: 'model' do
  1 +describe NotificationServices, type: 'model' do
2 2  
3 3 let(:notice) { Fabricate :notice }
4 4 let(:notification_service) { Fabricate :notification_service, :app => notice.app }
... ...
spec/models/notification_service/pushover_service_spec.rb
  Diff comments   View file @2d4c3e4
1   -describe NotificationService::PushoverService, type: 'model' do
  1 +describe NotificationServices::PushoverService, type: 'model' do
2 2 it "it should send a notification to Pushover" do
3 3 # setup
4 4 notice = Fabricate :notice
... ...
spec/models/notification_service/slack_service_spec.rb
  Diff comments   View file @2d4c3e4
1   -describe NotificationService::SlackService, type: 'model' do
  1 +describe NotificationServices::SlackService, type: 'model' do
2 2 it "it should send a notification to Slack with hook url" do
3 3 # setup
4 4 notice = Fabricate :notice
... ...
spec/models/notification_service/webhook_service_spec.rb
  Diff comments   View file @2d4c3e4
1   -describe NotificationService::WebhookService, type: 'model' do
  1 +describe NotificationServices::WebhookService, type: 'model' do
2 2 it "it should send a notification to a user-specified URL" do
3 3 notice = Fabricate :notice
4 4 notification_service = Fabricate :webhook_notification_service, :app => notice.app
... ...