[PATCHv2 4/5] Fix up the dependencies for bundler.

[Chris Lalancette <cl...@redhat.com>]

Signed-off-by: Chris Lalancette <cl...@redhat.com>
---
 server/Gemfile      |   42 ++++++++++++++++++++++++------------------
 server/Gemfile.lock |   51 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/server/Gemfile b/server/Gemfile
index f72f0b5..3ab3d5c 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -1,32 +1,30 @@
 source "http://rubygems.org"
 
-gem "rake"
-gem "eventmachine"
 gem "haml"
 gem "sinatra"
 gem "rack"
-gem "rack-accept"
 gem "thin"
-gem "rerun"
-gem "json"
 gem "net-ssh"
+gem "json"
+gem "rack-accept"
+gem "rake"
+gem "nokogiri"
 
-group :linode do
-  gem 'linode'
+group :azure do
+  gem 'waz-blobs'
 end
 
-group :amazon do
-  gem 'activesupport'
+group :ec2 do
   gem 'aws'
 end
 
-group 'terremark' do
-  gem 'fog'
-  gem 'excon'
+group :gogrid do
 end
 
-group :azure do
-  gem 'waz-blobs'
+group :mock do
+end
+
+group :opennebula do
 end
 
 group :rackspace do
@@ -38,18 +36,26 @@ group :rhevm do
   gem 'rest-client'
 end
 
+group :rimuhosting do
+end
+
+group :sbc do
+end
+
+group 'terremark' do
+  gem 'fog'
+  gem 'excon'
+end
+
 group :test do
   gem 'ruby-debug', :platforms => :mri_18
   gem 'ruby-debug19', :platforms => :mri_19, :require => 'ruby-debug'
   gem "compass"
   gem "vcr"
   gem "webmock"
-  gem "nokogiri"
   gem "rack-test"
   gem "ci_reporter"
   gem "cucumber"
   gem "rcov"
-  gem "rspec", "< 2.0.0" 
-  # This gem is needed by activesupport (aws)
-  gem "i18n"
+  gem "rspec", "< 2.0.0"
 end
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index 0d48011..f4cec9b 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -1,10 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    amazon-ec2 (0.9.15)
-      xml-simple (>= 1.0.12)
+    addressable (2.2.6)
     archive-tar-minitar (0.5.2)
+    aws (2.5.3)
+      http_connection
+      uuidtools
+      xml-simple
     builder (2.1.2)
+    ci_reporter (1.6.4)
+      builder (>= 2.1.2)
+    cloudfiles (1.4.16)
+      mime-types (>= 1.16)
+    cloudservers (0.4.1)
+      json
     columnize (0.3.1)
     compass (0.10.5)
       haml (>= 3.0.4)
@@ -33,14 +42,11 @@ GEM
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     haml (3.0.21)
-    httparty (0.6.1)
-      crack (= 0.1.8)
+    http_connection (1.4.1)
     json (1.4.6)
     linecache (0.43)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
-    linode (0.6.2)
-      httparty (>= 0.4.4)
     mime-types (1.16)
     net-ssh (2.0.23)
     nokogiri (1.4.3.1)
@@ -51,10 +57,8 @@ GEM
       rack (>= 1.0)
     rake (0.8.7)
     rcov (0.9.9)
-    rerun (0.5.2)
-    right_aws (2.0.0)
-      right_http_connection (>= 1.2.1)
-    right_http_connection (1.2.4)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
     rspec (1.3.0)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
@@ -79,30 +83,43 @@ GEM
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    xml-simple (1.0.12)
+    uuidtools (2.1.2)
+    vcr (1.10.0)
+    waz-blobs (0.1.1)
+      rest-client (>= 1.0.3)
+      ruby-hmac
+    webmock (1.6.4)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
+    xml-simple (1.0.15)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  amazon-ec2
+  aws
+  ci_reporter
+  cloudfiles
+  cloudservers
   compass
   cucumber
-  eventmachine
+  excon
   fog
   haml
   json
-  linode
+  net-ssh
   nokogiri
   rack
   rack-accept
   rack-test
   rake
   rcov
-  rerun
-  right_aws
-  rspec
+  rest-client
+  rspec (< 2.0.0)
   ruby-debug
   ruby-debug19
   sinatra
   thin
+  vcr
+  waz-blobs
+  webmock
-- 
1.7.4.4