Merge branch 'yeti-ng'

Change-Id: I627e9cc4f97ea29cbc526ff5bf6522f60f7b5347

Gemfile

@@ -1,18 +1,20 @@
 source "http://rubygems.org"
-#source "http://ruby.taobao.org"
 
 gem "rake"
 gem "rspec"
-gem "cfoundry", "~> 0.3.27"
-gem "multi_json"
+gem "cfoundry", "= 0.4.18"
 gem "vcap_logging", ">= 1.0"
 gem "interact"
 gem "rest-client"
 gem "mongo"
 gem "bson_ext"
 gem "yajl-ruby"
 gem "nokogiri"
-gem "vmc", "~> 0.3.18"
-gem "cli"
+gem "fuubar"
+gem "progressbar", "~> 0.11.0"
+gem "rest-client"
+gem "console-vmc-plugin"
+
 gem "caldecott"
-gem "rspec_parallel", ">= 0.1.4"
+gem "rspec_parallel", ">= 0.1.6"
+gem "cf-uaac", "= 1.3.3"

Gemfile.lock

@@ -1,78 +1,100 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     addressable (2.2.8)
     async_sinatra (0.5.0)
       rack (>= 1.2.1)
       sinatra (>= 1.0)
-    bson (1.6.2)
-    bson_ext (1.6.2)
-      bson (~> 1.6.2)
+    bson (1.8.0)
+      activesupport
+    bson_ext (1.8.0)
+      bson (~> 1.8.0)
     caldecott (0.0.5)
       addressable (~> 2.2.6)
       async_sinatra (~> 0.5.0)
       em-http-request (~> 0.3.0)
       em-websocket (~> 0.3.1)
+      json (~> 1.6.1)
       uuidtools (~> 2.1.2)
-    cfoundry (0.3.27)
-      json_pure (~> 1.6.5)
-      rest-client (~> 1.6.1)
-      rubyzip (~> 0.9.5)
-    cli (1.1.1)
+    cf-uaa-lib (1.3.3)
+      multi_json
+    cf-uaac (1.3.3)
+      cf-uaa-lib (<= 1.3.3, >= 1.3.3)
+      em-http-request (= 0.3.0)
+      eventmachine
+      highline
+      json_pure
+      launchy
+    cfoundry (0.4.18)
+      multi_json (~> 1.3)
+      multipart-post (~> 1.1)
+      rubyzip (~> 0.9)
+    console-vmc-plugin (0.0.4)
+      tunnel-vmc-plugin (~> 0.1.8)
     diff-lcs (1.1.3)
     em-http-request (0.3.0)
       addressable (>= 2.0.0)
       escape_utils
       eventmachine (>= 0.12.9)
-    em-websocket (0.3.6)
+    em-websocket (0.3.8)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
     escape_utils (0.2.4)
-    eventmachine (0.12.10)
-    interact (0.4.2)
-    json_pure (1.6.7)
-    mime-types (1.18)
-    mongo (1.6.2)
-      bson (~> 1.6.2)
-    multi_json (1.3.6)
-    nokogiri (1.5.2)
+    eventmachine (1.0.0)
+    fuubar (1.1.0)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.2.0)
+      ruby-progressbar (~> 1.0.0)
+    highline (1.6.15)
+    i18n (0.6.1)
+    interact (0.5.0)
+    json (1.6.7)
+    json_pure (1.7.5)
+    launchy (2.1.0)
+      addressable (~> 2.2.6)
+    mime-types (1.19)
+    mongo (1.8.0)
+      bson (~> 1.8.0)
+    multi_json (1.5.0)
+    multipart-post (1.1.5)
+    nokogiri (1.5.5)
     progressbar (0.11.0)
     rack (1.4.1)
-    rack-protection (1.2.0)
+    rack-protection (1.3.1)
       rack
-    rake (0.9.2.2)
-    rb-readline (0.4.2)
+    rake (10.0.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec_parallel (0.1.4)
+    rspec-instafail (0.2.4)
+    rspec-mocks (2.12.0)
+    rspec_parallel (0.1.6)
       progressbar (>= 0.11.0)
-    rubyzip (0.9.8)
-    sinatra (1.3.2)
+    ruby-progressbar (1.0.2)
+    rubyzip (0.9.9)
+    sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    terminal-table (1.4.5)
     tilt (1.3.3)
-    uuidtools (2.1.2)
+    tunnel-vmc-plugin (0.1.10)
+      addressable (~> 2.2.6)
+      caldecott (~> 0.0.5)
+      cfoundry (~> 0.4.0)
+      eventmachine (~> 1.0.0.beta)
+      rest-client (~> 1.6.7)
+    uuidtools (2.1.3)
     vcap_logging (1.0.0)
       rake
-    vmc (0.3.18)
-      addressable (~> 2.2.6)
-      interact (~> 0.4.0)
-      json_pure (>= 1.5.1, < 1.7.0)
-      rb-readline (~> 0.4.2)
-      rest-client (>= 1.6.1, < 1.7.0)
-      rubyzip (~> 0.9.4)
-      terminal-table (~> 1.4.2)
-      uuidtools (~> 2.1.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -81,16 +103,17 @@ PLATFORMS
 DEPENDENCIES
   bson_ext
   caldecott
-  cfoundry (~> 0.3.27)
-  cli
+  cf-uaac (= 1.3.3)
+  cfoundry (= 0.4.18)
+  console-vmc-plugin
+  fuubar
   interact
   mongo
-  multi_json
   nokogiri
+  progressbar (~> 0.11.0)
   rake
   rest-client
   rspec
-  rspec_parallel (>= 0.1.4)
+  rspec_parallel (>= 0.1.6)
   vcap_logging (>= 1.0)
-  vmc (~> 0.3.18)
   yajl-ruby

Rakefile

@@ -135,7 +135,6 @@ task :rerun, :thread_number do |t, args|
   end
 end
 
-# alias of rerun, need to copy the logic to parse the thread parameter
 task :rerun_failure, :thread_number do |t, args|
   threads = 10
   threads = args[:thread_number].to_i if args[:thread_number]

lib/harness.rb

@@ -1,5 +1,7 @@
 require "vcap/logging"
 require "yaml"
+require "yajl"
+require "json"
 require "rest-client"
 
 module BVT
@@ -45,12 +47,19 @@ module Harness
 require "harness/http_response_code"
 require "harness/scripts_helper"
 require "harness/parallel_helper"
+require "harness/ccng_user_helper"
 
 ## to arrange rails console cases in parallel
 require "harness/parallel_monkey_patch"
 
-## in order to support service versions, require this monkey patch
-require "harness/cfoundry_monkey_patch"
+require "harness/console_helper"
+require "harness/cfconsole_monkey_patch"
+## support v2
+require "harness/space"
+require "harness/domain"
+
+## test ccng v1 API
+require "harness/ccng-v1-test-monkey-patch" if ENV['VCAP_BVT_CCNG_V1_TEST']
 
 ## exception handling in rest-client
 require "harness/restclient_monkey_patch"