Update stager to use new staging gem.

Change-Id: I49f571bf7630a48401bb6e9aa46bf0ff2a1655b1

cloud_controller/config/initializers/staging.rb

@@ -1,7 +1,7 @@
 require 'secure_user_manager'
 require 'vcap/staging/plugin/common'
 
-ENV['STAGING_CONFIG_DIR'] = AppConfig[:directories][:staging_manifests]
+StagingPlugin.manifest_root = AppConfig[:directories][:staging_manifests]
 # Activates the staging plugins and loads all included YAML files
 StagingPlugin.load_all_manifests
 

cloud_controller/script/run_plugin.rb

@@ -4,6 +4,8 @@
 require 'rubygems'
 require 'bundler/setup'
 
+require 'yajl'
+
 require 'vcap/staging/plugin/common'
 
 unless ARGV.length > 0
@@ -12,6 +14,17 @@
 end
 
 name = ARGV.shift
+args = ARGV.dup
+
+if args.length > 2
+  begin
+    args[2] = Yajl::Parser.parse(args[2], :symbolize_keys => true)
+  rescue => e
+    puts "ERROR DECODING ENVIRONMENT: #{e}"
+    exit 1
+  end
+end
+
 plugin_class = StagingPlugin.load_plugin_for(name)
-plugin_class.validate_arguments!
-plugin_class.new(*ARGV).stage_application
+plugin_class.validate_arguments!(*args)
+plugin_class.new(*args).stage_application

lib/services/api/messages.rb

@@ -37,7 +37,7 @@ class HandleUpdateRequest < JsonMessage
       end
 
       class ListHandlesResponse < JsonMessage
-        required :handles, [JsonSchema::WILDCARD]
+        required :handles, [::JsonSchema::WILDCARD]
       end
 
       #

stager/Gemfile

@@ -1,16 +1,14 @@
 source :rubygems
 
-gem 'active_support'
-gem 'i18n' # Active support apparently requires this but it isn't in the Gemfile??
 gem 'nats'
-gem 'nokogiri', '>= 1.4.4'
 gem 'rake'
 gem 'redis'
 gem 'resque'
 gem 'yajl-ruby', '>= 0.7.9'
 
 gem 'vcap_common', :path => '../common'
 gem 'vcap_logging', '>= 0.1.1'
+gem 'vcap_staging'
 
 group :test do
   gem 'rspec'

stager/Gemfile.lock

@@ -12,15 +12,11 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    active_support (3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
     addressable (2.2.6)
     crack (0.1.8)
     daemons (1.1.4)
     diff-lcs (1.1.2)
     eventmachine (0.12.10)
-    i18n (0.6.0)
     json (1.5.3)
     json_pure (1.5.3)
     little-plugger (1.1.2)
@@ -30,7 +26,6 @@ GEM
       daemons (>= 1.1.0)
       eventmachine (>= 0.12.10)
       json_pure (>= 1.5.1)
-    nokogiri (1.5.0)
     posix-spawn (0.3.6)
     rack (1.3.2)
     rake (0.9.2)
@@ -59,6 +54,7 @@ GEM
       rack (>= 1.0.0)
     tilt (1.3.2)
     vcap_logging (0.1.1)
+    vcap_staging (0.1.0)
     vegas (0.1.8)
       rack (>= 1.0.0)
     webmock (1.6.4)
@@ -70,16 +66,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_support
-  i18n
   nats
-  nokogiri (>= 1.4.4)
   rake
   redis
   resque
   rspec
   sinatra
   vcap_common!
   vcap_logging (>= 0.1.1)
+  vcap_staging
   webmock
   yajl-ruby (>= 0.7.9)

stager/bin/run_plugin

@@ -5,7 +5,7 @@ require 'bundler/setup'
 
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 
-require 'vcap/stager/plugin'
+require 'vcap/staging/plugin/common'
 
 unless ARGV.length == 2
   puts "Usage: run_staging_plugin [plugin name] [plugin config file]"

stager/lib/vcap/stager.rb

@@ -3,7 +3,6 @@
 
 require 'vcap/stager/errors'
 require 'vcap/stager/config'
-require 'vcap/stager/plugin'
 require 'vcap/stager/task'
 require 'vcap/stager/task_logger'
 require 'vcap/stager/task_result'