diff --git a/Gemfile b/Gemfile index 45eb8ca82..e37eda291 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,11 @@ source 'http://rubygems.org' -gem 'rails', '3.0.5' +gem 'rails', '3.1' -# Bundle edge Rails instead: +# To bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'sqlite3' +gem 'sqlite3', '~> 1.3.3' gem 'haml' group :test, :development do diff --git a/Gemfile.lock b/Gemfile.lock index 08beff7aa..bd2f71c14 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,126 +1,144 @@ GEM remote: http://rubygems.org/ specs: - abstract (1.0.0) - actionmailer (3.0.5) - actionpack (= 3.0.5) - mail (~> 2.2.15) - actionpack (3.0.5) - activemodel (= 3.0.5) - activesupport (= 3.0.5) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.4) - rack (~> 1.2.1) - rack-mount (~> 0.6.13) - rack-test (~> 0.5.7) - tzinfo (~> 0.3.23) - activemodel (3.0.5) - activesupport (= 3.0.5) - builder (~> 2.1.2) - i18n (~> 0.4) - activerecord (3.0.5) - activemodel (= 3.0.5) - activesupport (= 3.0.5) - arel (~> 2.0.2) - tzinfo (~> 0.3.23) - activeresource (3.0.5) - activemodel (= 3.0.5) - activesupport (= 3.0.5) - activesupport (3.0.5) - arel (2.0.9) - builder (2.1.2) - capybara (0.4.1.2) - celerity (>= 0.7.9) - culerity (>= 0.2.4) + actionmailer (3.1.0) + actionpack (= 3.1.0) + mail (~> 2.3.0) + actionpack (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + builder (~> 3.0.0) + erubis (~> 2.7.0) + i18n (~> 0.6) + rack (~> 1.3.2) + rack-cache (~> 1.0.3) + rack-mount (~> 0.8.2) + rack-test (~> 0.6.1) + sprockets (~> 2.0.0) + activemodel (3.1.0) + activesupport (= 3.1.0) + bcrypt-ruby (~> 3.0.0) + builder (~> 3.0.0) + i18n (~> 0.6) + activerecord (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + arel (~> 2.2.1) + tzinfo (~> 0.3.29) + activeresource (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + activesupport (3.1.0) + multi_json (~> 1.0) + arel (2.2.1) + bcrypt-ruby (3.0.0) + builder (3.0.0) + capybara (1.1.1) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - selenium-webdriver (>= 0.0.27) - xpath (~> 0.1.3) - celerity (0.8.8) - childprocess (0.1.8) + selenium-webdriver (~> 2.0) + xpath (~> 0.1.4) + childprocess (0.2.2) ffi (~> 1.0.6) - columnize (0.3.2) - cucumber (0.10.0) + columnize (0.3.4) + cucumber (1.0.4) builder (>= 2.1.2) - diff-lcs (~> 1.1.2) - gherkin (~> 2.3.2) - json (~> 1.4.6) - term-ansicolor (~> 1.0.5) - cucumber-rails (0.3.2) - cucumber (>= 0.8.0) - culerity (0.2.15) - diff-lcs (1.1.2) - erubis (2.6.6) - abstract (>= 1.0.0) - ffi (1.0.7) - rake (>= 0.8.7) - gherkin (2.3.3) - json (~> 1.4.6) - haml (3.0.25) - i18n (0.5.0) - json (1.4.6) - json_pure (1.5.1) - linecache (0.43) - mail (2.2.15) - activesupport (>= 2.3.6) + diff-lcs (>= 1.1.2) + gherkin (~> 2.4.18) + json (>= 1.4.6) + term-ansicolor (>= 1.0.6) + cucumber-rails (1.0.3) + capybara (>= 1.1.1) + cucumber (~> 1.0.4) + nokogiri (>= 1.5.0) + diff-lcs (1.1.3) + erubis (2.7.0) + ffi (1.0.9) + gherkin (2.4.18) + json (>= 1.4.6) + haml (3.1.3) + hike (1.2.1) + i18n (0.6.0) + json (1.5.4) + json_pure (1.5.4) + spruz (~> 0.2.8) + linecache (0.46) + rbx-require-relative (> 0.0.4) + mail (2.3.0) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.16) - nokogiri (1.4.4) - polyglot (0.3.1) - rack (1.2.2) - rack-mount (0.6.14) + multi_json (1.0.3) + nokogiri (1.5.0) + polyglot (0.3.2) + rack (1.3.2) + rack-cache (1.0.3) + rack (>= 0.4) + rack-mount (0.8.3) rack (>= 1.0.0) - rack-test (0.5.7) + rack-ssl (1.3.2) + rack + rack-test (0.6.1) rack (>= 1.0) - rails (3.0.5) - actionmailer (= 3.0.5) - actionpack (= 3.0.5) - activerecord (= 3.0.5) - activeresource (= 3.0.5) - activesupport (= 3.0.5) + rails (3.1.0) + actionmailer (= 3.1.0) + actionpack (= 3.1.0) + activerecord (= 3.1.0) + activeresource (= 3.1.0) + activesupport (= 3.1.0) bundler (~> 1.0) - railties (= 3.0.5) - railties (3.0.5) - actionpack (= 3.0.5) - activesupport (= 3.0.5) + railties (= 3.1.0) + railties (3.1.0) + actionpack (= 3.1.0) + activesupport (= 3.1.0) + rack-ssl (~> 1.3.2) rake (>= 0.8.7) - thor (~> 0.14.4) - rake (0.8.7) - rspec (2.0.0) - rspec-core (= 2.0.0) - rspec-expectations (= 2.0.0) - rspec-mocks (= 2.0.0) - rspec-core (2.0.0) - rspec-expectations (2.0.0) - diff-lcs (>= 1.1.2) - rspec-mocks (2.0.0) - rspec-core (= 2.0.0) - rspec-expectations (= 2.0.0) - rspec-rails (2.0.0) - rspec (= 2.0.0) + rdoc (~> 3.4) + thor (~> 0.14.6) + rake (0.9.2) + rbx-require-relative (0.0.5) + rdoc (3.9.4) + rspec (2.6.0) + rspec-core (~> 2.6.0) + rspec-expectations (~> 2.6.0) + rspec-mocks (~> 2.6.0) + rspec-core (2.6.4) + rspec-expectations (2.6.0) + diff-lcs (~> 1.1.2) + rspec-mocks (2.6.0) + rspec-rails (2.6.1) + actionpack (~> 3.0) + activesupport (~> 3.0) + railties (~> 3.0) + rspec (~> 2.6.0) ruby-debug (0.10.4) columnize (>= 0.1) ruby-debug-base (~> 0.10.4.0) ruby-debug-base (0.10.4) linecache (>= 0.3) rubyzip (0.9.4) - selenium-webdriver (0.1.4) - childprocess (>= 0.1.7) + selenium-webdriver (2.5.0) + childprocess (>= 0.2.1) ffi (>= 1.0.7) json_pure rubyzip - sqlite3 (1.3.3) - term-ansicolor (1.0.5) + sprockets (2.0.0) + hike (~> 1.2) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + spruz (0.2.13) + sqlite3 (1.3.4) + term-ansicolor (1.0.6) thor (0.14.6) - treetop (1.4.9) + tilt (1.3.3) + treetop (1.4.10) + polyglot polyglot (>= 0.3.1) - tzinfo (0.3.25) - xpath (0.1.3) + tzinfo (0.3.29) + xpath (0.1.4) nokogiri (~> 1.3) PLATFORMS @@ -130,7 +148,7 @@ DEPENDENCIES capybara cucumber-rails haml - rails (= 3.0.5) + rails (= 3.1) rspec-rails ruby-debug - sqlite3 + sqlite3 (~> 1.3.3)