Permalink
Browse files

Updated Gemfile to bundle ok with 1.9.3

  • Loading branch information...
cjheath committed Sep 9, 2012
1 parent 12795b9 commit 43e2e3807ef1a8289621f7bbddd4fec172c422e9
Showing with 67 additions and 68 deletions.
  1. +2 −2 Gemfile
  2. +65 −66 Gemfile.lock
View
@@ -14,8 +14,8 @@ gem 'haml', '>=3.1.1'
group :development do
gem 'bundler', '>= 1.0.0'
gem 'jeweler', '~> 1.6.2'
- gem 'rcov', '>= 0'
+ gem 'rcov', '~>0.9.11', :platforms => [:jruby, :mri_18], :require => false
+ gem 'simplecov', '~>0.6.4', :platforms => :mri_19, :require => false
gem 'rdoc', '>= 2.4.0'
- gem 'ruby-debug'
gem 'dm-sqlite-adapter'
end
View
@@ -2,8 +2,7 @@ GEM
remote: http://rubygems.org/
specs:
addressable (2.2.4)
- columnize (0.3.4)
- data_objects (0.10.6)
+ data_objects (0.10.8)
addressable (~> 2.1)
dm-core (1.1.0)
addressable (~> 2.2.4)
@@ -18,94 +17,94 @@ GEM
dm-sqlite-adapter (1.1.0)
dm-do-adapter (~> 1.1.0)
do_sqlite3 (~> 0.10.2)
- do_postgres (0.10.6)
- data_objects (= 0.10.6)
- do_sqlite3 (0.10.6)
- data_objects (= 0.10.6)
+ do_postgres (0.10.8)
+ data_objects (= 0.10.8)
+ do_sqlite3 (0.10.8)
+ data_objects (= 0.10.8)
faraday (0.6.1)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
git (1.2.5)
- haml (3.1.2)
+ haml (3.1.7)
jeweler (1.6.4)
bundler (~> 1.0)
git (>= 1.2.5)
rake
- linecache (0.46)
- rbx-require-relative (> 0.0.4)
- mime-types (1.16)
- multi_json (0.0.5)
- multipart-post (1.1.3)
- net-ldap (0.1.1)
+ json (1.7.5)
+ mime-types (1.19)
+ multi_json (1.0.4)
+ multi_xml (0.2.2)
+ multipart-post (1.1.5)
+ net-ldap (0.2.2)
nokogiri (1.4.7)
- oa-basic (0.2.2)
- multi_json (~> 0.0.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.2)
+ oa-basic (0.2.6)
+ oa-core (= 0.2.6)
rest-client (~> 1.6.0)
- oa-core (0.2.2)
- rack (~> 1.1)
- oa-enterprise (0.2.2)
- net-ldap (~> 0.1.1)
+ oa-core (0.2.6)
+ oa-enterprise (0.2.6)
+ addressable (= 2.2.4)
+ net-ldap (~> 0.2.2)
nokogiri (~> 1.4.2)
- oa-core (= 0.2.2)
+ oa-core (= 0.2.6)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
- oa-more (0.2.2)
- multi_json (~> 0.0.2)
- oa-core (= 0.2.2)
+ oa-more (0.2.6)
+ multi_json (~> 1.0.0)
+ oa-core (= 0.2.6)
rest-client (~> 1.6.0)
- oa-oauth (0.2.2)
+ oa-oauth (0.2.6)
faraday (~> 0.6.1)
- multi_json (~> 0.0.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.2)
+ multi_json (~> 1.0.0)
+ multi_xml (~> 0.2.2)
+ oa-core (= 0.2.6)
oauth (~> 0.4.0)
- oauth2 (~> 0.3.0)
- oa-openid (0.2.2)
- oa-core (= 0.2.2)
- rack-openid (~> 1.2.0)
- ruby-openid-apps-discovery
- oauth (0.4.5)
- oauth2 (0.3.0)
- faraday (~> 0.6.0)
- multi_json (~> 0.0.4)
- omniauth (0.2.2)
- oa-basic (= 0.2.2)
- oa-core (= 0.2.2)
- oa-enterprise (= 0.2.2)
- oa-more (= 0.2.2)
- oa-oauth (= 0.2.2)
- oa-openid (= 0.2.2)
+ oauth2 (~> 0.4.1)
+ oa-openid (0.2.6)
+ oa-core (= 0.2.6)
+ rack-openid (~> 1.3.1)
+ ruby-openid-apps-discovery (~> 1.2.0)
+ oauth (0.4.7)
+ oauth2 (0.4.1)
+ faraday (~> 0.6.1)
+ multi_json (>= 0.0.5)
+ omniauth (0.2.6)
+ oa-basic (= 0.2.6)
+ oa-core (= 0.2.6)
+ oa-enterprise (= 0.2.6)
+ oa-more (= 0.2.6)
+ oa-oauth (= 0.2.6)
+ oa-openid (= 0.2.6)
pyu-ruby-sasl (0.0.3.3)
- rack (1.3.2)
+ rack (1.4.1)
rack-flash (0.1.2)
rack
- rack-openid (1.2.0)
+ rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
- rake (0.9.2)
- rbx-require-relative (0.0.5)
- rcov (0.9.10)
- rdoc (3.9.1)
- rest-client (1.6.3)
+ rack-protection (1.2.0)
+ rack
+ rake (0.9.2.2)
+ rcov (0.9.11)
+ rdoc (3.12)
+ json (~> 1.4)
+ rest-client (1.6.7)
mime-types (>= 1.16)
- ruby-debug (0.10.4)
- columnize (>= 0.1)
- ruby-debug-base (~> 0.10.4.0)
- ruby-debug-base (0.10.4)
- linecache (>= 0.3)
- ruby-openid (2.1.8)
+ ruby-openid (2.2.0)
ruby-openid-apps-discovery (1.2.0)
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
- sinatra (1.2.6)
- rack (~> 1.1)
- tilt (< 2.0, >= 1.2.2)
- sqlite3 (1.3.4)
- tilt (1.3.2)
- uuidtools (2.1.2)
+ simplecov (0.6.4)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.5.3)
+ simplecov-html (0.5.3)
+ sinatra (1.3.3)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
+ sqlite3 (1.3.6)
+ tilt (1.3.3)
+ uuidtools (2.1.3)
PLATFORMS
ruby
@@ -120,9 +119,9 @@ DEPENDENCIES
jeweler (~> 1.6.2)
omniauth (~> 0.2.2)
rack-flash
- rcov
+ rcov (~> 0.9.11)
rdoc (>= 2.4.0)
- ruby-debug
+ simplecov (~> 0.6.4)
sinatra
sqlite3
uuidtools

0 comments on commit 43e2e38

Please sign in to comment.