[staging] Do not put ruby bin dir on path

We won't need that. Vendoring the staging gem also bumps vcap_common
and nats versions in CC and Stager's bundles.
  This diff also sunsets an ugly fix in 268b4d (Change I4f2f08).

  Test plan:
    - Passed unit tests
    - Passed BVTs on dev instance

Change-Id: Idab1e6e746432342d1ee7964283dca1bbdfe4bf6

cloud_controller/Gemfile.lock

@@ -74,7 +74,7 @@ GEM
     mime-types (1.16)
     mocha (0.9.12)
     mysql2 (0.2.7)
-    nats (0.4.22.beta.8)
+    nats (0.4.22)
       daemons (>= 1.1.4)
       eventmachine (>= 0.12.10)
       json_pure (>= 1.6.1)
@@ -134,7 +134,7 @@ GEM
       polyglot (>= 0.3.1)
     tzinfo (0.3.26)
     uuidtools (2.1.2)
-    vcap_common (1.0.8)
+    vcap_common (1.0.9)
       eventmachine (~> 0.12.11.cloudfoundry.3)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)
@@ -142,7 +142,7 @@ GEM
       yajl-ruby (~> 0.8.3)
     vcap_logging (0.1.3)
     vcap_stager (0.1.11)
-    vcap_staging (0.1.45)
+    vcap_staging (0.1.46)
       nokogiri (>= 1.4.4)
       rake
       rspec

stager/Gemfile.lock

@@ -13,23 +13,23 @@ GEM
     little-plugger (1.1.3)
     logging (1.5.2)
       little-plugger (>= 1.1.2)
-    nats (0.4.22.beta.8)
+    nats (0.4.22)
       daemons (>= 1.1.4)
       eventmachine (>= 0.12.10)
       json_pure (>= 1.6.1)
       thin (>= 1.3.1)
-    nokogiri (1.5.0)
+    nokogiri (1.5.2)
     posix-spawn (0.3.6)
     rack (1.4.1)
     rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
@@ -39,14 +39,14 @@ GEM
       rack (>= 1.0.0)
     tilt (1.3.2)
     uuidtools (2.1.2)
-    vcap_common (1.0.8)
+    vcap_common (1.0.9)
       eventmachine (~> 0.12.11.cloudfoundry.3)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
     vcap_logging (0.1.3)
-    vcap_staging (0.1.45)
+    vcap_staging (0.1.46)
       nokogiri (>= 1.4.4)
       rake
       rspec

staging/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcap_staging (0.1.45)
+    vcap_staging (0.1.46)
       nokogiri (>= 1.4.4)
       rake
       rspec
@@ -19,29 +19,29 @@ GEM
     diff-lcs (1.1.3)
     eventmachine (0.12.11.cloudfoundry.3)
     json_pure (1.6.5)
-    nats (0.4.22.beta.8)
+    nats (0.4.22)
       daemons (>= 1.1.4)
       eventmachine (>= 0.12.10)
       json_pure (>= 1.6.1)
       thin (>= 1.3.1)
-    nokogiri (1.5.0)
+    nokogiri (1.5.2)
     posix-spawn (0.3.6)
     rack (1.4.1)
     rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     uuidtools (2.1.2)
-    vcap_common (1.0.8)
+    vcap_common (1.0.9)
       eventmachine (~> 0.12.11.cloudfoundry.3)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)

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

@@ -85,8 +85,7 @@ class Rails3Plugin < StagingPlugin
     vars = environment_hash
     # PWD here is before we change to the 'app' directory.
     if uses_bundler?
-      local_bin_path = File.dirname(runtime['executable'])
-      vars['PATH'] = "$PWD/app/rubygems/ruby/#{library_version}/bin:#{local_bin_path}:/usr/bin:/bin"
+      vars['PATH'] = "$PWD/app/rubygems/ruby/#{library_version}/bin:/usr/bin:/bin"
       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.45'
+    VERSION = '0.1.46'
   end
 end

staging/spec/unit/rails3_spec.rb

@@ -15,16 +15,12 @@ describe "A Rails 3 application being staged" do
       start_script.should be_executable_file
       script_body = File.read(start_script)
 
-      # FIXME sunset this by Monday, March 5
-      # The expected string should really stay hardcoded
-      local_bin_path = ENV['VCAP_RUNTIME_RUBY18']? File.dirname(ENV['VCAP_RUNTIME_RUBY18']) : '/usr/bin'
-
       script_body.should == <<-EXPECTED
 #!/bin/bash
 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:#{local_bin_path}:/usr/bin:/bin"
+export PATH="$PWD/app/rubygems/ruby/1.8/bin:/usr/bin:/bin"
 export RACK_ENV="production"
 export RAILS_ENV="production"
 export RUBYOPT="-I$PWD/ruby -rstdsync"
@@ -84,16 +80,13 @@ gem "cf-autoconfig"
         executable = '%VCAP_LOCAL_RUNTIME%'
         start_script = File.join(staged_dir, 'startup')
         script_body = File.read(start_script)
-        # FIXME sunset this by Monday, March 5
-        # The expected string should really stay hardcoded
-        local_bin_path = ENV['VCAP_RUNTIME_RUBY18']? File.dirname(ENV['VCAP_RUNTIME_RUBY18']) : '/usr/bin'
 
         script_body.should == <<-EXPECTED
 #!/bin/bash
 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:#{local_bin_path}:/usr/bin:/bin"
+export PATH="$PWD/app/rubygems/ruby/1.8/bin:/usr/bin:/bin"
 export RACK_ENV="production"
 export RAILS_ENV="production"
 export RUBYOPT="-I$PWD/ruby -rstdsync"