diff options
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 68 |
2 files changed, 38 insertions, 36 deletions
@@ -153,9 +153,9 @@ end group :development, :test do gem 'coveralls', require: false gem 'rails-dev-tweaks' - gem 'spinach-rails', '0.2.0' - gem "rspec-rails", '2.12.2' - gem "capybara", '2.0.2' + gem 'spinach-rails' + gem "rspec-rails" + gem "capybara" gem "pry" gem "awesome_print" gem "database_cleaner" diff --git a/Gemfile.lock b/Gemfile.lock index d872cd967db..fca92716a95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,7 @@ GEM thor (~> 0.14) code_analyzer (0.3.1) sexp_processor - coderay (1.0.8) + coderay (1.0.9) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) @@ -122,7 +122,7 @@ GEM orm_adapter (~> 0.1) railties (~> 3.1) warden (~> 1.2.1) - diff-lcs (1.1.3) + diff-lcs (1.2.1) draper (1.1.0) actionpack (>= 3.0) activesupport (>= 3.0) @@ -201,12 +201,13 @@ GEM grit_ext (0.8.1) charlock_holmes (~> 0.6.9) growl (1.0.3) - guard (1.5.4) - listen (>= 0.4.2) + guard (1.6.2) + listen (>= 0.6.0) lumberjack (>= 1.0.2) pry (>= 0.9.10) + terminal-table (>= 1.4.3) thor (>= 0.14.6) - guard-rspec (2.1.2) + guard-rspec (2.5.1) guard (>= 1.1) rspec (~> 2.11) guard-spinach (0.0.2) @@ -247,8 +248,8 @@ GEM letter_opener (1.0.0) launchy (>= 2.0.4) libv8 (3.3.10.4) - listen (0.5.3) - lumberjack (1.0.2) + listen (0.7.3) + lumberjack (1.0.3) mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -297,11 +298,10 @@ GEM http_parser.rb (~> 0.5.3) polyglot (0.3.3) posix-spawn (0.3.6) - progressbar (0.12.0) - pry (0.9.10) + pry (0.9.12) coderay (~> 1.0.5) method_source (~> 0.8) - slop (~> 3.3.1) + slop (~> 3.4) pygments.rb (0.4.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) @@ -334,14 +334,14 @@ GEM rails-dev-tweaks (0.6.1) actionpack (~> 3.1) railties (~> 3.1) - rails_best_practices (1.13.2) + rails_best_practices (1.13.4) activesupport awesome_print code_analyzer colored erubis i18n - progressbar + ruby-progressbar railties (3.2.13) actionpack (= 3.2.13) activesupport (= 3.2.13) @@ -350,7 +350,7 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.10.0) - rake (10.0.3) + rake (10.0.4) rb-fsevent (0.9.2) rb-inotify (0.8.8) ffi (>= 0.5.0) @@ -379,27 +379,28 @@ GEM request_store (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) - rspec (2.12.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) - rspec-core (2.12.0) - rspec-expectations (2.12.0) - diff-lcs (~> 1.1.3) - rspec-mocks (2.12.0) - rspec-rails (2.12.2) + rspec (2.13.0) + rspec-core (~> 2.13.0) + rspec-expectations (~> 2.13.0) + rspec-mocks (~> 2.13.0) + rspec-core (2.13.1) + rspec-expectations (2.13.0) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.13.0) + rspec-rails (2.13.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 2.12.0) - rspec-expectations (~> 2.12.0) - rspec-mocks (~> 2.12.0) + rspec-core (~> 2.13.0) + rspec-expectations (~> 2.13.0) + rspec-mocks (~> 2.13.0) + ruby-progressbar (1.0.2) rubyntlm (0.1.1) rubyzip (0.9.9) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - sass (3.2.5) - sass-rails (3.2.5) + sass (3.2.7) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) @@ -418,7 +419,7 @@ GEM rubyzip websocket (~> 1.0.4) settingslogic (2.0.9) - sexp_processor (4.1.3) + sexp_processor (4.2.0) shoulda-matchers (1.3.0) activesupport (>= 3.0.0) sidekiq (2.8.0) @@ -439,7 +440,7 @@ GEM slim (1.3.6) temple (~> 0.5.5) tilt (~> 1.3.3) - slop (3.3.3) + slop (3.4.4) spinach (0.7.0) colorize gherkin-ruby (~> 0.2.0) @@ -457,6 +458,7 @@ GEM state_machine (1.1.2) stringex (1.5.1) temple (0.5.5) + terminal-table (1.4.5) test_after_commit (0.0.1) therubyracer (0.10.2) libv8 (~> 3.3.10) @@ -464,7 +466,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.17.0) + thor (0.18.0) tilt (1.3.6) timers (1.1.0) treetop (1.4.12) @@ -502,7 +504,7 @@ DEPENDENCIES better_errors binding_of_caller bootstrap-sass (= 2.2.1.1) - capybara (= 2.0.2) + capybara carrierwave chosen-rails (= 0.9.8) coffee-rails (~> 3.2.2) @@ -562,7 +564,7 @@ DEPENDENCIES rb-inotify redcarpet (~> 2.2.2) redis-rails - rspec-rails (= 2.12.2) + rspec-rails sass-rails (~> 3.2.5) sdoc seed-fu @@ -574,7 +576,7 @@ DEPENDENCIES sinatra six slim - spinach-rails (= 0.2.0) + spinach-rails spork (~> 1.0rc) stamp state_machine |