Merge "[staging] Do not assume Sinatra and Rails support"

cloudfoundry-attic · Feb 29, 2012 · 75977e6 · 75977e6
2 parents 9d1775e + 99c8252
commit 75977e6
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/cloud_controller/Gemfile.lock b/cloud_controller/Gemfile.lock
@@ -140,7 +140,7 @@ GEM
       yajl-ruby (~> 0.8.3)
     vcap_logging (0.1.3)
     vcap_stager (0.1.11)
-    vcap_staging (0.1.41)
+    vcap_staging (0.1.42)
       nokogiri (>= 1.4.4)
       rake
       rspec

diff --git a/...ller/vendor/cache/vcap_staging-0.1.41.gem → ...ller/vendor/cache/vcap_staging-0.1.42.gem b/...ller/vendor/cache/vcap_staging-0.1.41.gem → ...ller/vendor/cache/vcap_staging-0.1.42.gem
diff --git a/stager/Gemfile.lock b/stager/Gemfile.lock
@@ -43,7 +43,7 @@ GEM
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
     vcap_logging (0.1.3)
-    vcap_staging (0.1.41)
+    vcap_staging (0.1.42)
       nokogiri (>= 1.4.4)
       rake
       rspec

diff --git a/stager/vendor/cache/vcap_staging-0.1.41.gem → stager/vendor/cache/vcap_staging-0.1.42.gem b/stager/vendor/cache/vcap_staging-0.1.41.gem → stager/vendor/cache/vcap_staging-0.1.42.gem
diff --git a/staging/Gemfile.lock b/staging/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcap_staging (0.1.41)
+    vcap_staging (0.1.42)
       nokogiri (>= 1.4.4)
       rake
       rspec

diff --git a/staging/lib/vcap/staging/plugin/common.rb b/staging/lib/vcap/staging/plugin/common.rb
@@ -90,7 +90,7 @@ def self.camelize(word)
   # Checks the existence and version of the Ruby runtimes specified
   # by the sinatra and rails staging manifests.
   def self.check_ruby_runtimes
-    %w[sinatra rails3].each do |framework|
+    (%w[sinatra rails3] & manifests.keys).each do |framework|
       manifests[framework]['runtimes'].each do |hash|
         hash.each do |name, properties|
           exe, ver = properties['executable'], properties['version']

diff --git a/staging/lib/vcap/staging/version.rb b/staging/lib/vcap/staging/version.rb
@@ -1,5 +1,5 @@
 module VCAP
   module Staging
-    VERSION = '0.1.41'
+    VERSION = '0.1.42'
   end
 end