Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #171 from sanemat/feature/update-datamapper

Update dm-migrations, datamapper, dm-sqlite-adapter, couch_potato for Ruby2.0.0-rc1
  • Loading branch information...
commit 40c4f62cde3658f07fa04c19449897275d5d54c7 2 parents 82df12f + 07aa270
@bmabey bmabey authored
Showing with 66 additions and 65 deletions.
  1. +3 −3 Gemfile
  2. +63 −62 Gemfile.lock
View
6 Gemfile
@@ -12,9 +12,9 @@ group :development do
#ORM's
gem "activerecord"
- gem "datamapper", "1.0.0"
- gem "dm-migrations", "1.0.0"
- gem "dm-sqlite-adapter", "1.0.0"
+ gem "datamapper"
+ gem "dm-migrations"
+ gem "dm-sqlite-adapter"
gem "mongoid"
gem "tzinfo"
gem "mongo_ext"
View
125 Gemfile.lock
@@ -24,73 +24,74 @@ GEM
multi_json (~> 1.0)
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)
- builder (3.0.0)
- couch_potato (0.5.7)
+ builder (3.0.4)
+ couch_potato (0.7.1)
activemodel
couchrest (>= 1.0.1)
- json
- couchrest (1.0.1)
- json (>= 1.4.6)
- mime-types (>= 1.15)
- rest-client (>= 1.5.1)
+ json (~> 1.6)
+ couchrest (1.1.3)
+ mime-types (~> 1.15)
+ multi_json (~> 1.0)
+ rest-client (~> 1.6.1)
cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.11.0)
json (>= 1.4.6)
- data_objects (0.10.8)
+ data_objects (0.10.11)
addressable (~> 2.1)
- datamapper (1.0.0)
- dm-aggregates (= 1.0.0)
- dm-constraints (= 1.0.0)
- dm-core (= 1.0.0)
- dm-core (= 1.0.0)
- dm-migrations (= 1.0.0)
- dm-serializer (= 1.0.0)
- dm-timestamps (= 1.0.0)
- dm-transactions (= 1.0.0)
- dm-types (= 1.0.0)
- dm-validations (= 1.0.0)
+ datamapper (1.2.0)
+ dm-aggregates (~> 1.2.0)
+ dm-constraints (~> 1.2.0)
+ dm-core (~> 1.2.0)
+ dm-migrations (~> 1.2.0)
+ dm-serializer (~> 1.2.0)
+ dm-timestamps (~> 1.2.0)
+ dm-transactions (~> 1.2.0)
+ dm-types (~> 1.2.0)
+ dm-validations (~> 1.2.0)
diff-lcs (1.1.3)
- dm-aggregates (1.0.0)
- dm-core (~> 1.0.0)
- dm-constraints (1.0.0)
- dm-core (~> 1.0.0)
- dm-migrations (~> 1.0.0)
- dm-core (1.0.0)
- addressable (~> 2.1)
- extlib (~> 0.9.15)
- dm-do-adapter (1.0.0)
- data_objects (~> 0.10.1)
- dm-core (~> 1.0.0)
- dm-migrations (1.0.0)
- dm-core (~> 1.0.0)
- dm-serializer (1.0.0)
- dm-core (~> 1.0.0)
- fastercsv (~> 1.5.3)
- json_pure (~> 1.4.3)
- dm-sqlite-adapter (1.0.0)
- dm-do-adapter (~> 1.0.0)
- do_sqlite3 (~> 0.10.2)
- dm-timestamps (1.0.0)
- dm-core (~> 1.0.0)
- dm-transactions (1.0.0)
- dm-core (~> 1.0.0)
- dm-types (1.0.0)
- dm-core (~> 1.0.0)
- fastercsv (~> 1.5.3)
- json_pure (~> 1.4.3)
- stringex (~> 1.1.0)
- uuidtools (~> 2.1.1)
- dm-validations (1.0.0)
- dm-core (~> 1.0.0)
- do_sqlite3 (0.10.8)
- data_objects (= 0.10.8)
+ dm-aggregates (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-constraints (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-core (1.2.0)
+ addressable (~> 2.2.6)
+ dm-do-adapter (1.2.0)
+ data_objects (~> 0.10.6)
+ dm-core (~> 1.2.0)
+ dm-migrations (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-serializer (1.2.2)
+ dm-core (~> 1.2.0)
+ fastercsv (~> 1.5)
+ json (~> 1.6)
+ json_pure (~> 1.6)
+ multi_json (~> 1.0)
+ dm-sqlite-adapter (1.2.0)
+ dm-do-adapter (~> 1.2.0)
+ do_sqlite3 (~> 0.10.6)
+ dm-timestamps (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-transactions (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-types (1.2.2)
+ bcrypt-ruby (~> 3.0)
+ dm-core (~> 1.2.0)
+ fastercsv (~> 1.5)
+ json (~> 1.6)
+ multi_json (~> 1.0)
+ stringex (~> 1.4)
+ uuidtools (~> 2.1)
+ dm-validations (1.2.0)
+ dm-core (~> 1.2.0)
+ do_sqlite3 (0.10.11)
+ data_objects (= 0.10.11)
erubis (2.7.0)
- extlib (0.9.15)
fastercsv (1.5.5)
ffi (1.1.4)
gherkin (2.11.1)
@@ -102,15 +103,15 @@ GEM
guard-rspec (1.2.1)
guard (>= 1.1)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
jeweler (1.8.4)
bundler (~> 1.0)
git (>= 1.2.5)
rake
rdoc
journey (1.0.4)
- json (1.7.3)
- json_pure (1.4.6)
+ json (1.7.6)
+ json_pure (1.7.6)
listen (0.4.7)
rb-fchange (~> 0.0.5)
rb-fsevent (~> 0.9.1)
@@ -129,7 +130,7 @@ GEM
origin (~> 1.0.3)
tzinfo (~> 0.3.22)
moped (1.1.2)
- multi_json (1.3.6)
+ multi_json (1.5.0)
mysql (2.8.1)
mysql2 (0.3.11)
origin (1.0.4)
@@ -181,7 +182,7 @@ GEM
sqlite3 (1.3.6)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
- stringex (1.1.0)
+ stringex (1.5.1)
thor (0.15.4)
tilt (1.3.3)
tzinfo (0.3.33)
@@ -196,9 +197,9 @@ DEPENDENCIES
bundler
couch_potato
cucumber
- datamapper (= 1.0.0)
- dm-migrations (= 1.0.0)
- dm-sqlite-adapter (= 1.0.0)
+ datamapper
+ dm-migrations
+ dm-sqlite-adapter
guard-rspec
jeweler
json_pure
Please sign in to comment.
Something went wrong with that request. Please try again.