Skip to content
Browse files

[staging] Do not assume Sinatra and Rails support

  Only check ruby runtimes for Sinatra and Rails when they are
supported. So that we can create a minimal set of staging plugin
manifests in stager functional tests.

Change-Id: I847349a09283fb58d22b52988583911af0d66fe6
  • Loading branch information...
1 parent 763f431 commit 99c8252c5aa1c49f5924d2e5411d0a134b14f36a @d d committed
View
2 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
View
BIN ...ller/vendor/cache/vcap_staging-0.1.41.gem → ...ller/vendor/cache/vcap_staging-0.1.42.gem
Binary file not shown.
View
2 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
View
BIN stager/vendor/cache/vcap_staging-0.1.41.gem → stager/vendor/cache/vcap_staging-0.1.42.gem
Binary file not shown.
View
2 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
View
2 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']
View
2 staging/lib/vcap/staging/version.rb
@@ -1,5 +1,5 @@
module VCAP
module Staging
- VERSION = '0.1.41'
+ VERSION = '0.1.42'
end
end

0 comments on commit 99c8252

Please sign in to comment.
Something went wrong with that request. Please try again.