From 7a709870528810a136349693c5f998af4bc37995 Mon Sep 17 00:00:00 2001 From: Marcin Ciunelis Date: Thu, 9 Aug 2012 12:37:19 +0200 Subject: [PATCH] gems updated --- Gemfile | 9 +++++---- Gemfile.lock | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- 2 files changed, 63 insertions(+), 56 deletions(-) diff --git a/Gemfile b/Gemfile index 245522e..31c7061 100644 --- a/Gemfile +++ b/Gemfile @@ -32,9 +32,9 @@ gem 'fabrication', "~> 1.3.0" # Both for tests, and loading demo data gem 'rails_autolink', '~> 1.0.9' platform :ruby do - gem 'mongo', '= 1.3.1' - gem 'bson', '= 1.3.1' - gem 'bson_ext', '= 1.3.1' + gem 'mongo', '~> 1.6.4' + gem 'bson', '~> 1.6.4' + gem 'bson_ext', '~> 1.6.4' end gem 'ri_cal' @@ -47,7 +47,8 @@ group :development, :test do gem 'ruby-debug', :platform => :mri_18 gem 'debugger', :platform => :mri_19 end - # gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update" + # gem 'rpm_contrib' + # gem 'newrelic_rpm' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index ee859b2..e343e1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,11 +33,12 @@ GEM activesupport (3.2.6) i18n (~> 0.6) multi_json (~> 1.0) - addressable (2.2.8) + addressable (2.3.2) arel (3.0.2) bcrypt-ruby (3.0.1) - bson (1.3.1) - bson_ext (1.3.1) + bson (1.6.4) + bson_ext (1.6.4) + bson (~> 1.6.4) builder (3.0.0) capybara (1.1.2) mime-types (>= 1.16) @@ -46,8 +47,8 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.3.2) - ffi (~> 1.0.6) + childprocess (0.3.5) + ffi (~> 1.0, >= 1.0.6) columnize (0.3.6) crack (0.3.1) css_parser (1.2.6) @@ -55,13 +56,13 @@ GEM rdoc daemons (1.1.8) database_cleaner (0.6.7) - debugger (1.1.3) + debugger (1.2.0) columnize (>= 0.3.1) debugger-linecache (~> 1.1.1) - debugger-ruby_core_source (~> 1.1.2) - debugger-linecache (1.1.1) + debugger-ruby_core_source (~> 1.1.3) + debugger-linecache (1.1.2) debugger-ruby_core_source (>= 1.1.1) - debugger-ruby_core_source (1.1.2) + debugger-ruby_core_source (1.1.3) devise (1.5.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) @@ -77,10 +78,10 @@ GEM fabrication (1.3.2) faraday (0.8.1) multipart-post (~> 1.1) - faraday_middleware (0.8.7) + faraday_middleware (0.8.8) faraday (>= 0.7.4, < 0.9) - ffi (1.0.11) - haml (3.1.5) + ffi (1.1.4) + haml (3.1.6) happymapper (0.4.0) libxml-ruby (~> 2.0) has_scope (0.5.1) @@ -90,23 +91,26 @@ GEM activesupport builder htmlentities (4.3.1) + httpauth (0.1) i18n (0.6.0) inherited_resources (1.3.1) has_scope (~> 0.5.0) responders (~> 0.6) journey (1.0.4) - json (1.7.3) + json (1.7.4) + jwt (0.1.5) + multi_json (>= 1.0) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) railties (>= 3.0.0) kgio (2.7.4) - launchy (2.1.0) - addressable (~> 2.2.6) + launchy (2.1.2) + addressable (~> 2.3) libv8 (3.3.10.4) - libwebsocket (0.1.3) + libwebsocket (0.1.5) addressable - libxml-ruby (2.3.2) + libxml-ruby (2.3.3) lighthouse-api (2.0) activeresource (>= 3.0.0) activesupport (>= 3.0.0) @@ -116,9 +120,9 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.18) - mongo (1.3.1) - bson (>= 1.3.1) + mime-types (1.19) + mongo (1.6.4) + bson (~> 1.6.4) mongoid (2.4.10) activemodel (~> 3.1) mongo (~> 1.3) @@ -130,25 +134,28 @@ GEM railties (>= 3.0.0) multi_json (1.3.6) multipart-post (1.1.5) - nokogiri (1.5.0) + nokogiri (1.5.5) oa-core (0.3.2) - oauth2 (0.5.2) - faraday (~> 0.7) + oauth2 (0.8.0) + faraday (~> 0.8) + httpauth (~> 0.1) + jwt (~> 0.1.4) multi_json (~> 1.0) + rack (~> 1.2) octokit (1.0.7) addressable (~> 2.2) faraday (~> 0.8) faraday_middleware (~> 0.8) hashie (~> 1.2) multi_json (~> 1.3) - omniauth (1.0.3) + omniauth (1.1.0) hashie (~> 1.2) rack - omniauth-github (1.0.1) + omniauth-github (1.0.2) omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-oauth2 (1.0.0) - oauth2 (~> 0.5.0) + omniauth-oauth2 (~> 1.1) + omniauth-oauth2 (1.1.0) + oauth2 (~> 0.8.0) omniauth (~> 1.0) orm_adapter (0.0.7) oruen_redmine_client (0.0.1) @@ -191,29 +198,29 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - raindrops (0.8.0) + raindrops (0.10.0) rake (0.9.2.2) rbx-require-relative (0.0.9) rdoc (3.12) json (~> 1.4) - responders (0.9.1) + responders (0.9.2) railties (~> 3.1) rest-client (1.6.7) mime-types (>= 1.16) ri_cal (0.8.8) - rspec (2.10.0) - rspec-core (~> 2.10.0) - rspec-expectations (~> 2.10.0) - rspec-mocks (~> 2.10.0) - rspec-core (2.10.0) - rspec-expectations (2.10.0) + 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.2) diff-lcs (~> 1.1.3) - rspec-mocks (2.10.1) - rspec-rails (2.10.1) + rspec-mocks (2.11.1) + rspec-rails (2.11.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.10.0) + rspec (~> 2.11.0) ruby-debug (0.10.4) columnize (>= 0.1) ruby-debug-base (~> 0.10.4.0) @@ -221,10 +228,9 @@ GEM linecache (>= 0.3) ruby-fogbugz (0.1.1) crack - rubyzip (0.9.8) - selenium-webdriver (2.21.2) + rubyzip (0.9.9) + selenium-webdriver (2.25.0) childprocess (>= 0.2.5) - ffi (~> 1.0) libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip @@ -232,29 +238,29 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - therubyracer (0.10.1) + therubyracer (0.10.2) libv8 (~> 3.3.10) - thin (1.3.1) + thin (1.4.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.15.2) + thor (0.15.4) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) tzinfo (0.3.33) - uglifier (1.2.4) + uglifier (1.2.7) execjs (>= 0.3.0) - multi_json (>= 1.0.2) + multi_json (~> 1.3) unicorn (4.3.1) kgio (~> 2.6) rack raindrops (~> 0.7) useragent (0.3.2) - warden (1.2.0) + warden (1.2.1) rack (>= 1.0) - webmock (1.8.6) + webmock (1.8.7) addressable (>= 2.2.7) crack (>= 0.1.7) xpath (0.1.4) @@ -267,8 +273,8 @@ PLATFORMS DEPENDENCIES SystemTimer actionmailer_inline_css (~> 1.3.0) - bson (= 1.3.1) - bson_ext (= 1.3.1) + bson (~> 1.6.4) + bson_ext (~> 1.6.4) capybara database_cleaner (~> 0.6.0) debugger @@ -283,7 +289,7 @@ DEPENDENCIES kaminari launchy lighthouse-api - mongo (= 1.3.1) + mongo (~> 1.6.4) mongoid (~> 2.4.10) mongoid_rails_migrations nokogiri -- libgit2 0.21.2