Skip to content

Commit

Permalink
Bring Gemfile config from master, adding mongo configs. Also bump mon…
Browse files Browse the repository at this point in the history
…go related and webrat gem versions
  • Loading branch information
carlosantoniodasilva committed Nov 26, 2010
1 parent da3af3f commit 5586067
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
18 changes: 14 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,20 @@ source "http://rubygems.org"
gemspec

gem "rails", "~> 3.0.0"
gem "sqlite3-ruby"
gem "webrat", "0.7.1"
gem "webrat", "0.7.2"
gem "mocha", :require => false

if RUBY_VERSION < '1.9'
gem "ruby-debug", ">= 0.10.3"
platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
end

platforms :ruby do
gem "sqlite3-ruby"
gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'

group :mongoid do
gem "mongo", "1.1.2"
gem "mongoid", "2.0.0.beta.20"
gem "bson_ext", "1.1.2"
end
end
18 changes: 16 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ GEM
activesupport (3.0.3)
arel (2.0.4)
bcrypt-ruby (2.1.2)
bson (1.1.2)
bson_ext (1.1.2)
builder (2.1.2)
columnize (0.3.2)
erubis (2.6.6)
Expand All @@ -51,6 +53,13 @@ GEM
mime-types (1.16)
mocha (0.9.9)
rake
mongo (1.1.2)
bson (>= 1.1.1)
mongoid (2.0.0.beta.20)
activemodel (~> 3.0)
mongo (~> 1.1)
tzinfo (~> 0.3.22)
will_paginate (~> 3.0.pre)
nokogiri (1.4.4)
polyglot (0.3.1)
rack (1.2.1)
Expand Down Expand Up @@ -84,20 +93,25 @@ GEM
tzinfo (0.3.23)
warden (0.10.7)
rack (>= 1.0.0)
webrat (0.7.1)
webrat (0.7.2)
nokogiri (>= 1.2.0)
rack (>= 1.0)
rack-test (>= 0.5.3)
will_paginate (3.0.pre2)

PLATFORMS
ruby

DEPENDENCIES
activerecord-jdbcsqlite3-adapter
bcrypt-ruby (~> 2.1.2)
bson_ext (= 1.1.2)
devise!
mocha
mongo (= 1.1.2)
mongoid (= 2.0.0.beta.20)
rails (~> 3.0.0)
ruby-debug (>= 0.10.3)
sqlite3-ruby
warden (~> 0.10.7)
webrat (= 0.7.1)
webrat (= 0.7.2)

0 comments on commit 5586067

Please sign in to comment.