From: marios<[email protected]>
Signed-off-by: marios<[email protected]>
---
server/Gemfile | 62 ++-------------
server/Gemfile.lock | 160 ++++++++++++++++++++++------------------
server/deltacloud-core.gemspec | 26 +++++--
3 files changed, 116 insertions(+), 132 deletions(-)
diff --git a/server/Gemfile b/server/Gemfile
index ee5f805..64faef5 100644
--- a/server/Gemfile
+++ b/server/Gemfile
@@ -1,62 +1,18 @@
source "http://rubygems.org";
-gem "haml"
-gem "sinatra"
-gem "rack"
-gem "thin"
-gem "net-ssh"
-gem "json"
-gem "rack-accept"
-gem "rake"
-gem "nokogiri"
+gemspec
-group :azure do
- gem 'waz-blobs'
-end
-
-group :ec2 do
- gem 'aws', ">= 2.5.4"
-
-end
-
-group :gogrid do
-end
-
-group :mock do
-end
-
-group :opennebula do
-end
-
-group :rackspace do
- gem 'cloudservers'
- gem 'cloudfiles'
-end
-
-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
+group :development do
+ gem "linecache", ">= 0.3", "< 0.46"
gem 'ruby-debug', :platforms => :mri_18
gem 'ruby-debug19', :platforms => :mri_19, :require => 'ruby-debug'
- gem "compass"
+ gem "compass", ">= 0.8.17"
gem "vcr"
gem "webmock"
- gem "rack-test"
+ gem "rack-test", ">= 0.5.3"
gem "ci_reporter"
- gem "cucumber"
- gem "rcov"
- gem "rspec", "< 2.0.0"
+ gem "cucumber", ">= 0.6.3"
+ gem "rcov", ">= 0.9.8"
+ gem "rspec", "< 1.3.1"
end
+
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
index f4cec9b..2f93eaf 100644
--- a/server/Gemfile.lock
+++ b/server/Gemfile.lock
@@ -1,71 +1,98 @@
+PATH
+ remote: .
+ specs:
+ deltacloud-core (0.4.0)
+ aws (>= 2.5.4)
+ cloudfiles
+ cloudservers
+ excon
+ fog
+ haml (>= 2.2.17)
+ json (>= 1.1.9)
+ net-ssh (>= 2.0.0)
+ nokogiri (>= 1.4.3,< 1.5.0)
+ rack (>= 1.0.0,< 1.2.1)
+ rack-accept
+ rake (>= 0.8.7)
+ rest-client
+ sinatra (>= 0.9.4)
+ thin (>= 1.2.5)
+ waz-storage (>= 1.1.0)
+
GEM
remote: http://rubygems.org/
specs:
addressable (2.2.6)
archive-tar-minitar (0.5.2)
- aws (2.5.3)
+ aws (2.5.6)
http_connection
uuidtools
xml-simple
- builder (2.1.2)
- ci_reporter (1.6.4)
+ builder (3.0.0)
+ chunky_png (1.2.1)
+ ci_reporter (1.6.5)
builder (>= 2.1.2)
- cloudfiles (1.4.16)
+ cloudfiles (1.4.17)
mime-types (>= 1.16)
cloudservers (0.4.1)
json
- columnize (0.3.1)
- compass (0.10.5)
- haml (>= 3.0.4)
+ columnize (0.3.4)
+ compass (0.11.5)
+ chunky_png (~> 1.2)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
crack (0.1.8)
- cucumber (0.9.2)
- builder (~> 2.1.2)
- diff-lcs (~> 1.1.2)
- gherkin (~> 2.2.5)
- json (~> 1.4.6)
- term-ansicolor (~> 1.0.5)
- daemons (1.1.0)
- diff-lcs (1.1.2)
+ cucumber (1.0.2)
+ builder (>= 2.1.2)
+ diff-lcs (>= 1.1.2)
+ gherkin (~> 2.4.5)
+ json (>= 1.4.6)
+ term-ansicolor (>= 1.0.5)
+ daemons (1.1.4)
+ diff-lcs (1.1.3)
eventmachine (0.12.10)
- excon (0.2.3)
- fog (0.3.7)
+ excon (0.6.5)
+ fog (0.9.0)
builder
- excon (>= 0.2.3)
- formatador (>= 0.0.15)
+ excon (~> 0.6.1)
+ formatador (>= 0.1.3)
json
mime-types
- net-ssh (~> 2.0.23)
- nokogiri (~> 1.4.3.1)
+ net-scp (>= 1.0.4)
+ net-ssh (>= 2.1.4)
+ nokogiri (>= 1.4.4)
ruby-hmac
- formatador (0.0.15)
- gherkin (2.2.8)
- json (~> 1.4.6)
- term-ansicolor (~> 1.0.5)
- haml (3.0.21)
+ formatador (0.2.0)
+ fssm (0.2.7)
+ gherkin (2.4.16)
+ json (>= 1.4.6)
+ haml (3.1.2)
http_connection (1.4.1)
- json (1.4.6)
- linecache (0.43)
- linecache19 (0.5.11)
+ json (1.5.4)
+ linecache (0.45)
+ linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mime-types (1.16)
- net-ssh (2.0.23)
- nokogiri (1.4.3.1)
- rack (1.2.1)
- rack-accept (0.4.3)
+ net-scp (1.0.4)
+ net-ssh (>= 1.99.1)
+ net-ssh (2.2.1)
+ nokogiri (1.4.7)
+ rack (1.2.0)
+ rack-accept (0.4.4)
rack (>= 0.4)
- rack-test (0.5.6)
+ rack-test (0.6.1)
rack (>= 1.0)
- rake (0.8.7)
- rcov (0.9.9)
- rest-client (1.6.1)
+ rake (0.9.2)
+ rcov (0.9.10)
+ rest-client (1.6.7)
mime-types (>= 1.16)
rspec (1.3.0)
- ruby-debug (0.10.3)
+ ruby-debug (0.10.4)
columnize (>= 0.1)
- ruby-debug-base (~> 0.10.3.0)
- ruby-debug-base (0.10.3)
+ ruby-debug-base (~> 0.10.4.0)
+ ruby-debug-base (0.10.4)
linecache (>= 0.3)
- ruby-debug-base19 (0.11.24)
+ ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby_core_source (>= 0.1.4)
@@ -74,52 +101,41 @@ GEM
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
ruby-hmac (0.4.0)
- ruby_core_source (0.1.4)
+ ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
- sinatra (1.0)
- rack (>= 1.0)
- term-ansicolor (1.0.5)
- thin (1.2.7)
+ sass (3.1.7)
+ sinatra (1.2.6)
+ rack (~> 1.1)
+ tilt (>= 1.2.2,< 2.0)
+ term-ansicolor (1.0.6)
+ thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
+ tilt (1.3.3)
uuidtools (2.1.2)
- vcr (1.10.0)
- waz-blobs (0.1.1)
- rest-client (>= 1.0.3)
+ vcr (1.11.3)
+ waz-storage (1.1.0)
+ rest-client
ruby-hmac
- webmock (1.6.4)
+ webmock (1.7.5)
addressable (~> 2.2,> 2.2.5)
crack (>= 0.1.7)
- xml-simple (1.0.15)
+ xml-simple (1.1.0)
PLATFORMS
ruby
DEPENDENCIES
- aws
ci_reporter
- cloudfiles
- cloudservers
- compass
- cucumber
- excon
- fog
- haml
- json
- net-ssh
- nokogiri
- rack
- rack-accept
- rack-test
- rake
- rcov
- rest-client
- rspec (< 2.0.0)
+ compass (>= 0.8.17)
+ cucumber (>= 0.6.3)
+ deltacloud-core!
+ linecache (>= 0.3,< 0.46)
+ rack-test (>= 0.5.3)
+ rcov (>= 0.9.8)
+ rspec (< 1.3.1)
ruby-debug
ruby-debug19
- sinatra
- thin
vcr
- waz-blobs
webmock
diff --git a/server/deltacloud-core.gemspec b/server/deltacloud-core.gemspec
index 293d783..2e9de44 100644
--- a/server/deltacloud-core.gemspec
+++ b/server/deltacloud-core.gemspec
@@ -68,16 +68,28 @@ Gem::Specification.new do |s|
s.add_dependency('rake', '>= 0.8.7')
s.add_dependency('haml', '>= 2.2.17')
s.add_dependency('sinatra', '>= 0.9.4')
- s.add_dependency('rack', '>= 1.0.0')
+ s.add_dependency('rack', '>= 1.0.0', '< 1.2.1')
s.add_dependency('rack-accept')
s.add_dependency('json', '>= 1.1.9')
s.add_dependency('net-ssh', '>= 2.0.0')
s.add_dependency('thin', '>= 1.2.5')
- s.add_dependency('nokogiri', ">= 1.4.3")
- s.add_development_dependency('compass', '>= 0.8.17')
- s.add_development_dependency('nokogiri', '>= 1.4.1')
- s.add_development_dependency('rack-test', '>= 0.5.3')
- s.add_development_dependency('cucumber', '>= 0.6.3')
- s.add_development_dependency('rcov', '>= 0.9.8')
+ s.add_dependency('nokogiri', '>= 1.4.3', '< 1.5.0')
+
+# dependencies for various cloud providers:
+# Amazon EC2 S3
+ s.add_dependency('aws', '>=2.5.4')
+# Microsoft Azure
+ s.add_dependency('waz-storage', '>=1.1.0')
+
+# Rackspace Cloudservers Cloudfiles
+ s.add_dependency('cloudservers')
+ s.add_dependency('cloudfiles')
+
+# Terremark Vcloud Express
+ s.add_dependency('fog')
+ s.add_dependency('excon')
+
+# Rhevm
+ s.add_dependency('rest-client')
end
--
1.7.3.4
