Download as
Browse Code »

Commit 2b2d43ed2a91b9a82608d26a6ece70929009b5ed

Authored by Dmitriy Zaporozhets
1 parent ed7a2136
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update develoment dependencies

Showing 2 changed files with 38 additions and 36 deletions   Show diff stats
@@ -153,9 +153,9 @@ end @@ -153,9 +153,9 @@ end
153 group :development, :test do 153 group :development, :test do
154 gem 'coveralls', require: false 154 gem 'coveralls', require: false
155 gem 'rails-dev-tweaks' 155 gem 'rails-dev-tweaks'
156 - gem 'spinach-rails', '0.2.0'  
157 - gem "rspec-rails", '2.12.2'  
158 - gem "capybara", '2.0.2' 156 + gem 'spinach-rails'
  157 + gem "rspec-rails"
  158 + gem "capybara"
159 gem "pry" 159 gem "pry"
160 gem "awesome_print" 160 gem "awesome_print"
161 gem "database_cleaner" 161 gem "database_cleaner"
@@ -95,7 +95,7 @@ GEM @@ -95,7 +95,7 @@ GEM
95 thor (~> 0.14) 95 thor (~> 0.14)
96 code_analyzer (0.3.1) 96 code_analyzer (0.3.1)
97 sexp_processor 97 sexp_processor
98 - coderay (1.0.8) 98 + coderay (1.0.9)
99 coffee-rails (3.2.2) 99 coffee-rails (3.2.2)
100 coffee-script (>= 2.2.0) 100 coffee-script (>= 2.2.0)
101 railties (~> 3.2.0) 101 railties (~> 3.2.0)
@@ -122,7 +122,7 @@ GEM @@ -122,7 +122,7 @@ GEM
122 orm_adapter (~> 0.1) 122 orm_adapter (~> 0.1)
123 railties (~> 3.1) 123 railties (~> 3.1)
124 warden (~> 1.2.1) 124 warden (~> 1.2.1)
125 - diff-lcs (1.1.3) 125 + diff-lcs (1.2.1)
126 draper (1.1.0) 126 draper (1.1.0)
127 actionpack (>= 3.0) 127 actionpack (>= 3.0)
128 activesupport (>= 3.0) 128 activesupport (>= 3.0)
@@ -201,12 +201,13 @@ GEM @@ -201,12 +201,13 @@ GEM
201 grit_ext (0.8.1) 201 grit_ext (0.8.1)
202 charlock_holmes (~> 0.6.9) 202 charlock_holmes (~> 0.6.9)
203 growl (1.0.3) 203 growl (1.0.3)
204 - guard (1.5.4)  
205 - listen (>= 0.4.2) 204 + guard (1.6.2)
  205 + listen (>= 0.6.0)
206 lumberjack (>= 1.0.2) 206 lumberjack (>= 1.0.2)
207 pry (>= 0.9.10) 207 pry (>= 0.9.10)
  208 + terminal-table (>= 1.4.3)
208 thor (>= 0.14.6) 209 thor (>= 0.14.6)
209 - guard-rspec (2.1.2) 210 + guard-rspec (2.5.1)
210 guard (>= 1.1) 211 guard (>= 1.1)
211 rspec (~> 2.11) 212 rspec (~> 2.11)
212 guard-spinach (0.0.2) 213 guard-spinach (0.0.2)
@@ -247,8 +248,8 @@ GEM @@ -247,8 +248,8 @@ GEM
247 letter_opener (1.0.0) 248 letter_opener (1.0.0)
248 launchy (>= 2.0.4) 249 launchy (>= 2.0.4)
249 libv8 (3.3.10.4) 250 libv8 (3.3.10.4)
250 - listen (0.5.3)  
251 - lumberjack (1.0.2) 251 + listen (0.7.3)
  252 + lumberjack (1.0.3)
252 mail (2.5.3) 253 mail (2.5.3)
253 i18n (>= 0.4.0) 254 i18n (>= 0.4.0)
254 mime-types (~> 1.16) 255 mime-types (~> 1.16)
@@ -297,11 +298,10 @@ GEM @@ -297,11 +298,10 @@ GEM
297 http_parser.rb (~> 0.5.3) 298 http_parser.rb (~> 0.5.3)
298 polyglot (0.3.3) 299 polyglot (0.3.3)
299 posix-spawn (0.3.6) 300 posix-spawn (0.3.6)
300 - progressbar (0.12.0)  
301 - pry (0.9.10) 301 + pry (0.9.12)
302 coderay (~> 1.0.5) 302 coderay (~> 1.0.5)
303 method_source (~> 0.8) 303 method_source (~> 0.8)
304 - slop (~> 3.3.1) 304 + slop (~> 3.4)
305 pygments.rb (0.4.2) 305 pygments.rb (0.4.2)
306 posix-spawn (~> 0.3.6) 306 posix-spawn (~> 0.3.6)
307 yajl-ruby (~> 1.1.0) 307 yajl-ruby (~> 1.1.0)
@@ -334,14 +334,14 @@ GEM @@ -334,14 +334,14 @@ GEM
334 rails-dev-tweaks (0.6.1) 334 rails-dev-tweaks (0.6.1)
335 actionpack (~> 3.1) 335 actionpack (~> 3.1)
336 railties (~> 3.1) 336 railties (~> 3.1)
337 - rails_best_practices (1.13.2) 337 + rails_best_practices (1.13.4)
338 activesupport 338 activesupport
339 awesome_print 339 awesome_print
340 code_analyzer 340 code_analyzer
341 colored 341 colored
342 erubis 342 erubis
343 i18n 343 i18n
344 - progressbar 344 + ruby-progressbar
345 railties (3.2.13) 345 railties (3.2.13)
346 actionpack (= 3.2.13) 346 actionpack (= 3.2.13)
347 activesupport (= 3.2.13) 347 activesupport (= 3.2.13)
@@ -350,7 +350,7 @@ GEM @@ -350,7 +350,7 @@ GEM
350 rdoc (~> 3.4) 350 rdoc (~> 3.4)
351 thor (>= 0.14.6, < 2.0) 351 thor (>= 0.14.6, < 2.0)
352 raindrops (0.10.0) 352 raindrops (0.10.0)
353 - rake (10.0.3) 353 + rake (10.0.4)
354 rb-fsevent (0.9.2) 354 rb-fsevent (0.9.2)
355 rb-inotify (0.8.8) 355 rb-inotify (0.8.8)
356 ffi (>= 0.5.0) 356 ffi (>= 0.5.0)
@@ -379,27 +379,28 @@ GEM @@ -379,27 +379,28 @@ GEM
379 request_store (1.0.5) 379 request_store (1.0.5)
380 rest-client (1.6.7) 380 rest-client (1.6.7)
381 mime-types (>= 1.16) 381 mime-types (>= 1.16)
382 - rspec (2.12.0)  
383 - rspec-core (~> 2.12.0)  
384 - rspec-expectations (~> 2.12.0)  
385 - rspec-mocks (~> 2.12.0)  
386 - rspec-core (2.12.0)  
387 - rspec-expectations (2.12.0)  
388 - diff-lcs (~> 1.1.3)  
389 - rspec-mocks (2.12.0)  
390 - rspec-rails (2.12.2) 382 + rspec (2.13.0)
  383 + rspec-core (~> 2.13.0)
  384 + rspec-expectations (~> 2.13.0)
  385 + rspec-mocks (~> 2.13.0)
  386 + rspec-core (2.13.1)
  387 + rspec-expectations (2.13.0)
  388 + diff-lcs (>= 1.1.3, < 2.0)
  389 + rspec-mocks (2.13.0)
  390 + rspec-rails (2.13.0)
391 actionpack (>= 3.0) 391 actionpack (>= 3.0)
392 activesupport (>= 3.0) 392 activesupport (>= 3.0)
393 railties (>= 3.0) 393 railties (>= 3.0)
394 - rspec-core (~> 2.12.0)  
395 - rspec-expectations (~> 2.12.0)  
396 - rspec-mocks (~> 2.12.0) 394 + rspec-core (~> 2.13.0)
  395 + rspec-expectations (~> 2.13.0)
  396 + rspec-mocks (~> 2.13.0)
  397 + ruby-progressbar (1.0.2)
397 rubyntlm (0.1.1) 398 rubyntlm (0.1.1)
398 rubyzip (0.9.9) 399 rubyzip (0.9.9)
399 sanitize (2.0.3) 400 sanitize (2.0.3)
400 nokogiri (>= 1.4.4, < 1.6) 401 nokogiri (>= 1.4.4, < 1.6)
401 - sass (3.2.5)  
402 - sass-rails (3.2.5) 402 + sass (3.2.7)
  403 + sass-rails (3.2.6)
403 railties (~> 3.2.0) 404 railties (~> 3.2.0)
404 sass (>= 3.1.10) 405 sass (>= 3.1.10)
405 tilt (~> 1.3) 406 tilt (~> 1.3)
@@ -418,7 +419,7 @@ GEM @@ -418,7 +419,7 @@ GEM
418 rubyzip 419 rubyzip
419 websocket (~> 1.0.4) 420 websocket (~> 1.0.4)
420 settingslogic (2.0.9) 421 settingslogic (2.0.9)
421 - sexp_processor (4.1.3) 422 + sexp_processor (4.2.0)
422 shoulda-matchers (1.3.0) 423 shoulda-matchers (1.3.0)
423 activesupport (>= 3.0.0) 424 activesupport (>= 3.0.0)
424 sidekiq (2.8.0) 425 sidekiq (2.8.0)
@@ -439,7 +440,7 @@ GEM @@ -439,7 +440,7 @@ GEM
439 slim (1.3.6) 440 slim (1.3.6)
440 temple (~> 0.5.5) 441 temple (~> 0.5.5)
441 tilt (~> 1.3.3) 442 tilt (~> 1.3.3)
442 - slop (3.3.3) 443 + slop (3.4.4)
443 spinach (0.7.0) 444 spinach (0.7.0)
444 colorize 445 colorize
445 gherkin-ruby (~> 0.2.0) 446 gherkin-ruby (~> 0.2.0)
@@ -457,6 +458,7 @@ GEM @@ -457,6 +458,7 @@ GEM
457 state_machine (1.1.2) 458 state_machine (1.1.2)
458 stringex (1.5.1) 459 stringex (1.5.1)
459 temple (0.5.5) 460 temple (0.5.5)
  461 + terminal-table (1.4.5)
460 test_after_commit (0.0.1) 462 test_after_commit (0.0.1)
461 therubyracer (0.10.2) 463 therubyracer (0.10.2)
462 libv8 (~> 3.3.10) 464 libv8 (~> 3.3.10)
@@ -464,7 +466,7 @@ GEM @@ -464,7 +466,7 @@ GEM
464 daemons (>= 1.0.9) 466 daemons (>= 1.0.9)
465 eventmachine (>= 0.12.6) 467 eventmachine (>= 0.12.6)
466 rack (>= 1.0.0) 468 rack (>= 1.0.0)
467 - thor (0.17.0) 469 + thor (0.18.0)
468 tilt (1.3.6) 470 tilt (1.3.6)
469 timers (1.1.0) 471 timers (1.1.0)
470 treetop (1.4.12) 472 treetop (1.4.12)
@@ -502,7 +504,7 @@ DEPENDENCIES @@ -502,7 +504,7 @@ DEPENDENCIES
502 better_errors 504 better_errors
503 binding_of_caller 505 binding_of_caller
504 bootstrap-sass (= 2.2.1.1) 506 bootstrap-sass (= 2.2.1.1)
505 - capybara (= 2.0.2) 507 + capybara
506 carrierwave 508 carrierwave
507 chosen-rails (= 0.9.8) 509 chosen-rails (= 0.9.8)
508 coffee-rails (~> 3.2.2) 510 coffee-rails (~> 3.2.2)
@@ -562,7 +564,7 @@ DEPENDENCIES @@ -562,7 +564,7 @@ DEPENDENCIES
562 rb-inotify 564 rb-inotify
563 redcarpet (~> 2.2.2) 565 redcarpet (~> 2.2.2)
564 redis-rails 566 redis-rails
565 - rspec-rails (= 2.12.2) 567 + rspec-rails
566 sass-rails (~> 3.2.5) 568 sass-rails (~> 3.2.5)
567 sdoc 569 sdoc
568 seed-fu 570 seed-fu
@@ -574,7 +576,7 @@ DEPENDENCIES @@ -574,7 +576,7 @@ DEPENDENCIES
574 sinatra 576 sinatra
575 six 577 six
576 slim 578 slim
577 - spinach-rails (= 0.2.0) 579 + spinach-rails
578 spork (~> 1.0rc) 580 spork (~> 1.0rc)
579 stamp 581 stamp
580 state_machine 582 state_machine