diff --git a/Gemfile b/Gemfile index 25912f1..efec955 100755 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ group :development do gem "json_pure" #ORM's - gem "activerecord" + gem "activerecord", "3.2.6" gem "datamapper" gem "dm-migrations" gem "dm-sqlite-adapter" diff --git a/Gemfile.lock b/Gemfile.lock index 4b59dd5..93cda31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,10 +25,11 @@ GEM addressable (2.2.8) arel (3.0.2) bcrypt-ruby (3.0.1) - bson (1.6.4) - bson_ext (1.6.4) - bson (~> 1.6.4) + bson (1.8.1) + bson_ext (1.8.1) + bson (~> 1.8.1) builder (3.0.4) + coderay (1.0.8) couch_potato (0.7.1) activemodel couchrest (>= 1.0.1) @@ -93,15 +94,17 @@ GEM data_objects (= 0.10.11) erubis (2.7.0) fastercsv (1.5.5) - ffi (1.1.4) - gherkin (2.11.1) + gherkin (2.11.5) json (>= 1.4.6) git (1.2.5) - guard (1.3.0) - listen (>= 0.4.2) + guard (1.6.1) + listen (>= 0.6.0) + lumberjack (>= 1.0.2) + pry (>= 0.9.10) thor (>= 0.14.6) - guard-rspec (1.2.1) + guard-rspec (2.3.3) guard (>= 1.1) + rspec (~> 2.11) hike (1.2.1) i18n (0.6.1) jeweler (1.8.4) @@ -112,37 +115,40 @@ GEM journey (1.0.4) json (1.7.6) json_pure (1.7.6) - listen (0.4.7) - rb-fchange (~> 0.0.5) - rb-fsevent (~> 0.9.1) - rb-inotify (~> 0.8.8) + listen (0.7.1) + lumberjack (1.0.2) + method_source (0.8.1) mime-types (1.19) - mongo (1.6.4) - bson (~> 1.6.4) + mongo (1.8.1) + bson (~> 1.8.1) mongo_ext (0.19.3) - mongo_mapper (0.11.1) + mongo_mapper (0.12.0) activemodel (~> 3.0) activesupport (~> 3.0) - plucky (~> 0.4.0) - mongoid (3.0.1) + plucky (~> 0.5.2) + mongoid (3.0.16) activemodel (~> 3.1) - moped (~> 1.1.1) - origin (~> 1.0.3) + moped (~> 1.1) + origin (~> 1.0) tzinfo (~> 0.3.22) - moped (1.1.2) + moped (1.3.2) multi_json (1.5.0) mysql (2.8.1) mysql2 (0.3.11) - origin (1.0.4) - pg (0.14.0) - plucky (0.4.4) + origin (1.0.11) + pg (0.14.1) + plucky (0.5.2) mongo (~> 1.5) - rack (1.4.1) + pry (0.9.10) + coderay (~> 1.0.5) + method_source (~> 0.8) + slop (~> 3.3.1) + rack (1.4.3) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) railties (3.2.6) actionpack (= 3.2.6) @@ -151,30 +157,28 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rb-fchange (0.0.5) - ffi - rb-fsevent (0.9.1) - rb-inotify (0.8.8) - ffi (>= 0.5.0) + rake (10.0.3) rdoc (3.12) json (~> 1.4) rest-client (1.6.7) mime-types (>= 1.16) - rspec (2.11.0) - rspec-core (~> 2.11.0) - rspec-expectations (~> 2.11.0) - rspec-mocks (~> 2.11.0) - rspec-core (2.11.1) - rspec-expectations (2.11.1) + rspec (2.12.0) + rspec-core (~> 2.12.0) + rspec-expectations (~> 2.12.0) + rspec-mocks (~> 2.12.0) + rspec-core (2.12.2) + rspec-expectations (2.12.1) diff-lcs (~> 1.1.3) - rspec-mocks (2.11.1) - rspec-rails (2.11.0) + rspec-mocks (2.12.1) + rspec-rails (2.12.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.11.0) + rspec-core (~> 2.12.0) + rspec-expectations (~> 2.12.0) + rspec-mocks (~> 2.12.0) sequel (3.21.0) + slop (3.3.3) sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) @@ -183,16 +187,16 @@ GEM sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) stringex (1.5.1) - thor (0.15.4) + thor (0.16.0) tilt (1.3.3) - tzinfo (0.3.33) + tzinfo (0.3.35) uuidtools (2.1.3) PLATFORMS ruby DEPENDENCIES - activerecord + activerecord (= 3.2.6) bson_ext bundler couch_potato @@ -206,7 +210,7 @@ DEPENDENCIES mongo_ext mongo_mapper mongoid - mysql + mysql (~> 2.8.1) mysql2 pg rake