Add Ruby back to Rails path

- Fixes running tasks like "rake" from rails console

Change-Id: Ibe72db81960758f2f97d4ee05f044d6c2224ff8f

cloud_controller/Gemfile

@@ -8,7 +8,7 @@ gem 'nats', :require => 'nats/client'
 # VCAP common components
 gem 'vcap_common', :require => ['vcap/common', 'vcap/component']
 gem 'vcap_logging', :require => ['vcap/logging']
-gem 'vcap_staging', '~> 0.1.55'
+gem 'vcap_staging', '~> 0.1.56'
 gem 'cf-uaa-client', '~> 0.0.10', :git => 'git://github.com/cloudfoundry/uaa.git', :ref => '0000f736'
 
 # For queuing staging tasks

cloud_controller/Gemfile.lock

@@ -151,7 +151,7 @@ GEM
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
     vcap_logging (1.0.1)
-    vcap_staging (0.1.55)
+    vcap_staging (0.1.56)
       nokogiri (>= 1.4.4)
       rake
       rspec
@@ -192,5 +192,5 @@ DEPENDENCIES
   uuidtools (~> 2.1.2)
   vcap_common
   vcap_logging
-  vcap_staging (~> 0.1.55)
+  vcap_staging (~> 0.1.56)
   yajl-ruby (~> 0.8.3)

dev_setup/cookbooks/cloud_controller/templates/default/rails3.yml.erb

@@ -10,6 +10,7 @@ runtimes:
        rails_env: "production"
        bundle_gemfile:
        rack_env: "production"
+       path: <%= File.join(node[:ruby18][:path], "bin") %>:$PATH
   - "ruby19":
       version: "1.9.2p180"
       description: "Ruby 1.9.2"
@@ -18,6 +19,7 @@ runtimes:
        rails_env: "production"
        bundle_gemfile:
        rack_env: "production"
+       path: <%= File.join(node[:ruby][:path], "bin") %>:$PATH
 app_servers:
   - "thin":
       description: "Thin"

stager/Gemfile

@@ -7,7 +7,7 @@ gem 'yajl-ruby', '>= 0.7.9'
 
 gem 'vcap_common', '~> 1.0.8'
 gem 'vcap_logging', '>= 0.1.3'
-gem 'vcap_staging', '~> 0.1.55'
+gem 'vcap_staging', '~> 0.1.56'
 gem 'vcap-concurrency', '~> 0.0.1'
 gem 'stager-client', '~> 0.0.2'
 

stager/Gemfile.lock

@@ -49,7 +49,7 @@ GEM
       yajl-ruby (~> 0.8.3)
     vcap_logging (1.0.1)
       rake
-    vcap_staging (0.1.55)
+    vcap_staging (0.1.56)
       nokogiri (>= 1.4.4)
       rake
       rspec
@@ -75,6 +75,6 @@ DEPENDENCIES
   vcap-concurrency (~> 0.0.1)
   vcap_common (~> 1.0.8)
   vcap_logging (>= 0.1.3)
-  vcap_staging (~> 0.1.55)
+  vcap_staging (~> 0.1.56)
   webmock
   yajl-ruby (>= 0.7.9)

staging/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcap_staging (0.1.55)
+    vcap_staging (0.1.56)
       nokogiri (>= 1.4.4)
       rake
       rspec

staging/lib/vcap/staging/plugin/rails3/plugin.rb

@@ -85,7 +85,8 @@ class Rails3Plugin < StagingPlugin
     vars = environment_hash
     # PWD here is before we change to the 'app' directory.
     if uses_bundler?
-      vars['PATH'] = "$PWD/app/rubygems/ruby/#{library_version}/bin:/usr/bin:/bin"
+      path = vars['PATH'] ? vars['PATH'] : "$PATH"
+      vars['PATH'] = "$PWD/app/rubygems/ruby/#{library_version}/bin:#{path}"
       vars['GEM_PATH'] = vars['GEM_HOME'] = "$PWD/app/rubygems/ruby/#{library_version}"
     end
     vars['RUBYOPT'] = '-I$PWD/ruby -rstdsync'

staging/lib/vcap/staging/version.rb

@@ -1,5 +1,5 @@
 module VCAP
   module Staging
-    VERSION = '0.1.55'
+    VERSION = '0.1.56'
   end
 end

staging/spec/unit/rails3_spec.rb

@@ -20,7 +20,7 @@ describe "A Rails 3 application being staged" do
 export DISABLE_AUTO_CONFIG="mysql:postgresql"
 export GEM_HOME="$PWD/app/rubygems/ruby/1.8"
 export GEM_PATH="$PWD/app/rubygems/ruby/1.8"
-export PATH="$PWD/app/rubygems/ruby/1.8/bin:/usr/bin:/bin"
+export PATH="$PWD/app/rubygems/ruby/1.8/bin:$PATH"
 export RACK_ENV="production"
 export RAILS_ENV="production"
 export RUBYOPT="-I$PWD/ruby -rstdsync"
@@ -86,7 +86,7 @@ gem "cf-autoconfig"
 export DISABLE_AUTO_CONFIG="mysql:postgresql"
 export GEM_HOME="$PWD/app/rubygems/ruby/1.8"
 export GEM_PATH="$PWD/app/rubygems/ruby/1.8"
-export PATH="$PWD/app/rubygems/ruby/1.8/bin:/usr/bin:/bin"
+export PATH="$PWD/app/rubygems/ruby/1.8/bin:$PATH"
 export RACK_ENV="production"
 export RAILS_ENV="production"
 export RUBYOPT="-I$PWD/ruby -rstdsync"