vmc 0.4.0.beta.36 → 0.4.0.beta.37

data/vmc-ng/lib/vmc/cli.rb

@@ -40,12 +40,12 @@ module VMC
 
     option(:force, :alias => "-f", :type => :boolean,
            :desc => "Skip interaction when possible") {
-      option(:script)
+      input[:script]
     }
 
     option(:quiet, :alias => "-q", :type => :boolean,
            :desc => "Simplify output format") {
-      option(:script)
+      input[:script]
     }
 
     option(:script, :type => :boolean,
@@ -55,7 +55,7 @@ module VMC
 
     option(:color, :type => :boolean, :default => true,
            :desc => "Use colorful output") {
-      !option(:quiet)
+      !input[:quiet]
     }
 
     option :trace, :alias => "-t", :type => :boolean,
@@ -63,7 +63,7 @@ module VMC
 
 
     def default_action
-      if option(:version)
+      if input[:version]
         line "vmc #{VERSION}"
       else
         super
@@ -90,11 +90,11 @@ module VMC
       end
     end
 
-    def execute(cmd, argv)
-      if option(:help)
+    def run(name)
+      if input[:help]
         invoke :help, :command => cmd.name.to_s
       else
-        cmd.context.new.precondition if cmd.context <= CLI
+        precondition
         super
       end
     rescue Interrupt
@@ -153,19 +153,19 @@ module VMC
     end
 
     def quiet?
-      option(:quiet)
+      input[:quiet]
     end
 
     def force?
-      option(:force)
+      input[:force]
     end
 
     def color_enabled?
-      option(:color)
+      input[:color]
     end
 
     def verbose?
-      option(:verbose)
+      input[:verbose]
     end
 
     def err(msg, status = 1)
@@ -244,8 +244,8 @@ module VMC
       end
     end
 
-    def target_info
-      info = targets_info[client_target]
+    def target_info(target = client_target)
+      info = targets_info[target]
 
       if info.is_a? String
         { :token => info }
@@ -262,15 +262,15 @@ module VMC
       end
     end
 
-    def save_target_info(info)
+    def save_target_info(info, target = client_target)
       ts = targets_info
-      ts[client_target] = info
+      ts[target] = info
       save_targets(ts)
     end
 
-    def remove_target_info
+    def remove_target_info(target = client_target)
       ts = targets_info
-      ts.delete client_target
+      ts.delete target
       save_targets(ts)
     end
 
@@ -287,23 +287,23 @@ module VMC
       client
     end
 
-    def client
+    def client(target = client_target)
       return @@client if defined?(@@client) && @@client
 
-      info = target_info
+      info = target_info(target)
 
       @@client =
         case info[:version]
         when 2
-          CFoundry::V2::Client.new(client_target, info[:token])
+          CFoundry::V2::Client.new(target, info[:token])
         when 1
-          CFoundry::V1::Client.new(client_target, info[:token])
+          CFoundry::V1::Client.new(target, info[:token])
         else
-          CFoundry::Client.new(client_target, info[:token])
+          CFoundry::Client.new(target, info[:token])
         end
 
-      @@client.proxy = option(:proxy)
-      @@client.trace = option(:trace)
+      @@client.proxy = input[:proxy]
+      @@client.trace = input[:trace]
 
       unless info.key? :version
         info[:version] =
@@ -314,7 +314,7 @@ module VMC
             1
           end
 
-        save_target_info(info)
+        save_target_info(info, target)
       end
 
       if org = info[:organization]

data/vmc-ng/lib/vmc/cli/app.rb

@@ -5,8 +5,6 @@ require "vmc/detect"
 
 module VMC
   class App < CLI
-    MEM_CHOICES = ["64M", "128M", "256M", "512M"]
-
     # TODO: don't hardcode; bring in from remote
     MEM_DEFAULTS_FRAMEWORK = {
       "rails3" => "256M",
@@ -43,7 +41,7 @@ module VMC
     input :runtime, :desc => "Filter by runtime regexp"
     input :framework, :desc => "Filter by framework regexp"
     input :url, :desc => "Filter by url regexp"
-    def apps(input)
+    def apps
       if space = input[:space] || client.current_space
         apps =
           with_progress("Getting applications in #{c(space.name, :name)}") do
@@ -79,7 +77,7 @@ module VMC
     group :apps
     input :app, :argument => :required, :from_given => by_name("app"),
       :desc => "App to show"
-    def app(input)
+    def app
       display_app(input[:app])
     end
 
@@ -95,7 +93,8 @@ module VMC
     }
     input(:memory, :desc => "Memory limit") { |framework, runtime|
       ask("Memory Limit",
-          :choices => MEM_CHOICES,
+          :choices => memory_choices,
+          :allow_other => true,
           :default =>
             MEM_DEFAULTS_RUNTIME[runtime] ||
               MEM_DEFAULTS_FRAMEWORK[framework] ||
@@ -144,7 +143,7 @@ module VMC
           :desc => "Interactively bind services?") {
       ask "Bind other services to application?", :default => false
     }
-    def push(input)
+    def push
       path = File.expand_path(input[:path])
 
       name = input[:name]
@@ -250,7 +249,7 @@ module VMC
       :from_given => by_name("app")
     input :debug_mode, :aliases => "-d",
       :desc => "Debug mode to start in"
-    def start(input)
+    def start
       apps = input[:apps]
       fail "No applications given." if apps.empty?
 
@@ -287,7 +286,7 @@ module VMC
     input :apps, :argument => :splat, :singular => :app,
       :desc => "Applications to start",
       :from_given => by_name("app")
-    def stop(input)
+    def stop
       apps = input[:apps]
       fail "No applications given." if apps.empty?
 
@@ -312,7 +311,7 @@ module VMC
       :from_given => by_name("app")
     input :debug_mode, :aliases => "-d",
       :desc => "Debug mode to start in"
-    def restart(input)
+    def restart
       invoke :stop, :apps => input[:apps]
       invoke :start, :apps => input[:apps],
         :debug_mode => input[:debug_mode]
@@ -337,7 +336,7 @@ module VMC
       :desc => "Delete orphaned instances"
     input :all, :default => false,
       :desc => "Delete all applications"
-    def delete(input)
+    def delete
       apps = client.apps
 
       if input[:all]
@@ -375,7 +374,7 @@ module VMC
     input :apps, :argument => :splat, :singular => :app,
       :desc => "Applications to start",
       :from_given => by_name("app")
-    def instances(input)
+    def instances
       no_v2
 
       apps = input[:apps]
@@ -408,12 +407,13 @@ module VMC
       ask("Instances", :default => default)
     }
     input(:memory, :desc => "Memory limit") { |default|
-      ask("Memory Limit", :choices => MEM_CHOICES,
+      ask("Memory Limit", :choices => memory_choices(default),
+          :allow_other => true,
           :default => human_size(default * 1024 * 1024, 0))
     }
     input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
-    def scale(input)
+    def scale
       app = input[:app]
 
       instances = input.given(:instances)
@@ -452,7 +452,7 @@ module VMC
       :desc => "Instance of application to get the logs of"
     input :all, :default => false,
       :desc => "Get logs for every instance"
-    def logs(input)
+    def logs
       no_v2
 
       app = input[:app]
@@ -502,7 +502,7 @@ module VMC
       :from_given => by_name("app")
     input :path, :argument => true, :default => "/",
       :desc => "Path of file to read"
-    def file(input)
+    def file
       no_v2
 
       app = input[:app]
@@ -524,7 +524,7 @@ module VMC
       :from_given => by_name("app")
     input :path, :argument => true, :default => "/",
       :desc => "Path of directory to list"
-    def files(input)
+    def files
       no_v2
 
       app = input[:app]
@@ -546,7 +546,7 @@ module VMC
     input :apps, :argument => :splat, :singular => :app,
       :desc => "Applications to start",
       :from_given => by_name("app")
-    def health(input)
+    def health
       apps = input[:apps]
       fail "No applications given." if apps.empty?
 
@@ -569,7 +569,7 @@ module VMC
     input :app, :argument => true,
       :desc => "Application to get the stats for",
       :from_given => by_name("app")
-    def stats(input)
+    def stats
       no_v2
 
       app = input[:app]
@@ -607,7 +607,7 @@ module VMC
       :from_given => by_name("app")
     input :url, :argument => true,
       :desc => "URL to route"
-    def map(input)
+    def map
       no_v2
 
       app = input[:app]
@@ -629,7 +629,7 @@ module VMC
     input(:url, :argument => true, :desc => "URL to unmap") { |choices|
       ask("Which URL?", :choices => choices)
     }
-    def unmap(input)
+    def unmap
       no_v2
 
       app = input[:app]
@@ -655,7 +655,7 @@ module VMC
     input :app, :argument => true,
       :desc => "Application to inspect the environment of",
       :from_given => by_name("app")
-    def env(input)
+    def env
       app = input[:app]
 
       vars =
@@ -684,7 +684,7 @@ module VMC
       :desc => "Environment variable value"
     input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
-    def set_env(input)
+    def set_env
       app = input[:app]
       name = input[:name]
 
@@ -718,7 +718,7 @@ module VMC
       :desc => "Environment variable name"
     input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
-    def unset_env(input)
+    def unset_env
       app = input[:app]
       name = input[:name]
 
@@ -735,7 +735,7 @@ module VMC
 
     desc "DEPRECATED. Use 'push' instead."
     input :app, :argument => :optional
-    def update(input)
+    def update
       fail "The 'update' command is no longer needed; use 'push' instead."
     end
 
@@ -977,5 +977,21 @@ module VMC
     def target_base
       client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
     end
+
+    def memory_choices(exclude = 0)
+      info = client.info
+      used = info[:usage][:memory]
+      limit = info[:limits][:memory]
+      available = limit - used + exclude
+
+      mem = 64
+      choices = []
+      until mem > available
+        choices << human_size(mem * 1024 * 1024, precision = 0)
+        mem *= 2
+      end
+
+      choices
+    end
   end
 end

data/vmc-ng/lib/vmc/cli/organization.rb

@@ -23,7 +23,7 @@ module VMC
     }
     input :full, :type => :boolean,
       :desc => "Show full information for appspaces"
-    def org(input)
+    def org
       org = input[:organization]
 
       if quiet?
@@ -53,7 +53,7 @@ module VMC
 
     desc "List available organizations"
     group :organizations
-    def orgs(input)
+    def orgs
       orgs =
         with_progress("Getting organizations") do
           client.organizations

data/vmc-ng/lib/vmc/cli/service.rb

@@ -11,7 +11,7 @@ module VMC
     input :version, :desc => "Filter by service version"
     input :app, :desc => "Limit to application's service bindings",
       :from_given => by_name("app")
-    def services(input)
+    def services
       instances =
         with_progress("Getting service instances") do
           client.service_instances(2)
@@ -38,7 +38,7 @@ module VMC
     input :instance, :argument => :required,
       :from_given => by_name("service instance", :service_instance),
       :desc => "Service instance to show"
-    def service(input)
+    def service
       display_service_instance(input[:instance])
     end
 
@@ -81,7 +81,7 @@ module VMC
     input :version, :desc => "Service version"
     input :app, :alias => "--bind", :from_given => by_name("app"),
       :desc => "Application to immediately bind to"
-    def create_service(input)
+    def create_service
       services = client.services
 
       if input[:provider]
@@ -157,7 +157,7 @@ module VMC
       ask "Which application?", :choices => client.apps(2),
         :display => proc(&:name)
     }
-    def bind_service(input)
+    def bind_service
       app = input[:app]
       instance = input[:instance, app]
 
@@ -188,7 +188,7 @@ module VMC
       ask "Which application?", :choices => client.apps(2),
         :display => proc(&:name)
     }
-    def unbind_service(input)
+    def unbind_service
       app = input[:app]
       instance = input[:instance, app]
 
@@ -214,7 +214,7 @@ module VMC
       force? || ask("Really delete #{c(name, color)}?", :default => false)
     }
     input :all, :default => false, :desc => "Delete all services"
-    def delete_service(input)
+    def delete_service
       if input[:all]
         return unless input[:really, "ALL SERVICES", :bad]
 

data/vmc-ng/lib/vmc/cli/space.rb

@@ -34,7 +34,7 @@ module VMC
     }
     input :full, :type => :boolean,
       :desc => "Show full information for apps, service instances, etc."
-    def space(input)
+    def space
       org = input[:organization]
       space = input[:space, org]
 
@@ -83,7 +83,7 @@ module VMC
           :desc => "Organization to list spaces from") {
       client.current_organization
     }
-    def spaces(input)
+    def spaces
       org = input[:organization]
       spaces =
         with_progress("Getting spaces in #{c(org.name, :name)}") do
@@ -115,7 +115,7 @@ module VMC
       :desc => "Add current user as developer"
     input :auditor, :type => :boolean, :default => false,
       :desc => "Add current user as auditor"
-    def create_space(input)
+    def create_space
       space = client.space
       space.organization = input[:organization]
       space.name = input[:name]
@@ -152,7 +152,7 @@ module VMC
     desc "Switch to a space, creating it if it doesn't exist"
     group :spaces, :hidden => true
     input :name, :argument => true, :desc => "Space name"
-    def take_space(input)
+    def take_space
       if space = client.space_by_name(input[:name])
         invoke :target, :space => space
       else
@@ -182,7 +182,7 @@ module VMC
     input(:recursive, :alias => "-r", :type => :boolean, :forget => true) {
       ask "Delete #{c("EVERYTHING", :bad)}?", :default => false
     }
-    def delete_space(input)
+    def delete_space
       org = input[:organization]
       space = input[:space, org]
       return unless input[:really, space]

data/vmc-ng/lib/vmc/cli/start.rb

@@ -32,7 +32,7 @@ module VMC
       :desc => "List supported services"
     input(:all, :type => :boolean, :alias => "-a",
           :desc => "Show all information")
-    def info(input)
+    def info
       all = input[:all]
 
       if all || input[:runtimes]
@@ -145,7 +145,7 @@ module VMC
           :desc => "Space") { |spaces|
       ask("Space", :choices => spaces, :display => proc(&:name))
     }
-    def target(input)
+    def target
       if !input[:interactive] && !input.given?(:url) &&
           !input.given?(:organization) && !input.given?(:space)
         display_target
@@ -156,6 +156,7 @@ module VMC
       if input.given?(:url)
         target = sane_target_url(input[:url])
         with_progress("Setting target to #{c(target, :name)}") do
+          client(target).info # check that it's valid before setting
           set_target(target)
         end
       end
@@ -183,7 +184,7 @@ module VMC
 
     desc "List known targets."
     group :start, :hidden => true
-    def targets(input)
+    def targets
       targets_info.each do |target, _|
         line target
         # TODO: print org/space
@@ -208,7 +209,7 @@ module VMC
           :desc => "Space") { |spaces|
       ask("Space", :choices => spaces, :display => proc(&:name))
     }
-    def login(input)
+    def login
       show_context
 
       credentials =
@@ -263,7 +264,7 @@ module VMC
 
     desc "Log out from the target"
     group :start
-    def logout(input)
+    def logout
       with_progress("Logging out") do
         remove_target_info
       end
@@ -283,7 +284,7 @@ module VMC
     }
     input :login, :type => :boolean, :default => true,
       :desc => "Automatically log in?"
-    def register(input)
+    def register
       show_context
 
       email = input[:email]
@@ -305,7 +306,7 @@ module VMC
 
     desc "Show color configuration"
     group :start, :hidden => true
-    def colors(input)
+    def colors
       user_colors.each do |n, c|
         line "#{n}: #{c(c.to_s, n)}"
       end

data/vmc-ng/lib/vmc/cli/user.rb

@@ -4,7 +4,7 @@ module VMC
   class User < CLI
     desc "List all users"
     group :admin, :hidden => true
-    def users(input)
+    def users
       users =
         with_progress("Getting users") do
           client.users
@@ -27,7 +27,7 @@ module VMC
     input(:verify, :desc => "Repeat password") {
       ask("Verify Password", :echo => "*", :forget => true)
     }
-    def create_user(input)
+    def create_user
       email = input[:email]
       password = input[:password]
 
@@ -49,7 +49,8 @@ module VMC
     input(:really, :type => :boolean, :forget => true) { |email|
       force? || ask("Really delete user #{c(email, :name)}?", :default => false)
     }
-    def delete_user(input)
+    def delete_user
+      email = input[:email]
       return unless input[:really, email]
 
       with_progress("Deleting #{c(email, :name)}") do
@@ -69,7 +70,7 @@ module VMC
     input(:verify, :desc => "Repeat new password") {
       ask("Verify Password", :echo => "*", :forget => true)
     }
-    def passwd(input)
+    def passwd
       email = input[:email]
       password = input[:password]
       verify = input[:verify]

data/vmc-ng/lib/vmc/plugin.rb

@@ -21,6 +21,13 @@ module VMC
 
       enabled = Set.new(matching.collect(&:name))
 
+      Gem.loaded_specs["vmc"].dependencies.each do |dep|
+        if dep.name =~ /vmc-plugin/ && dep.type == :runtime
+          require "#{dep.name}/plugin"
+          enabled.delete dep.name
+        end
+      end
+
       # allow explicit enabling/disabling of gems via config
       plugins = File.expand_path(VMC::PLUGINS_FILE)
       if File.exists?(plugins) && yaml = YAML.load_file(plugins)

data/vmc-ng/lib/vmc/spec_helpers.rb

@@ -1,3 +1,5 @@
+require "rspec"
+
 require "cfoundry"
 require "vmc"
 
@@ -5,11 +7,11 @@ require "vmc/spec_helpers/eventlog"
 require "vmc/spec_helpers/patches"
 
 
-TARGET = ENV["VMC_TEST_TARGET"] || "http://localhost:8181"
-USER = ENV["VMC_TEST_USER"] || "sre@vmware.com"
-PASSWORD = ENV["VMC_TEST_PASSWORD"] || "test"
-
 module VMCHelpers
+  TARGET = ENV["VMC_TEST_TARGET"] || "http://localhost:8181"
+  USER = ENV["VMC_TEST_USER"] || "sre@vmware.com"
+  PASSWORD = ENV["VMC_TEST_PASSWORD"] || "test"
+
   def random_str
     format("%x", rand(1000000))
   end
@@ -104,14 +106,14 @@ module VMCHelpers
 
     thd = Thread.new do
       begin
-        VMC::CLI.new.invoke(command, inputs, given)
+        VMC::CLI.new.invoke(command, inputs, given, :quiet => true)
       rescue SystemExit => e
         unless e.status == 0
           raise <<EOF
 execution failed with status #{e.status}!
 
 stdout:
-#{$stdout.string.inspect}
+#{$stdout.string}
 
 stderr:
 #{$stderr.string}
@@ -195,7 +197,12 @@ module VMCMatchers
     end
 
     def matches?(log)
-      @actual = log.wait_for_event(EventLog::GotInput).value
+      input = log.wait_for_event(EventLog::GotInput)
+      until input.name == @name
+        input = log.wait_for_event(EventLog::GotInput)
+      end
+
+      @actual = input.value
       @actual == @expected
     end
 
@@ -398,9 +405,12 @@ RSpec.configure do |c|
   c.include VMCMatchers
 
   c.before(:all) do
-    VMC::CLI.client = CFoundry::Client.new(TARGET)
+    VMC::CLI.client = CFoundry::Client.new(VMCHelpers::TARGET)
+
+    client.login(
+      :username => VMCHelpers::USER,
+      :password => VMCHelpers::PASSWORD)
 
-    client.login(:username => USER, :password => PASSWORD)
     client.current_organization = client.organizations.first
     client.current_space = client.current_organization.spaces.first
   end

data/vmc-ng/lib/vmc/spec_helpers/eventlog.rb

@@ -76,6 +76,10 @@ class EventLog
     val = next_event
 
     until val.is_a?(type)
+      if val.important?
+        raise "Tried to skip important event while waiting for a #{type}: #{val}"
+      end
+
       val = next_event
     end
 
@@ -137,7 +141,13 @@ class EventLog
   end
 
 
-  class Printed
+  class Event
+    def important?
+      true
+    end
+  end
+
+  class Printed < Event
     attr_reader :line
 
     def initialize(line)
@@ -149,7 +159,7 @@ class EventLog
     end
   end
 
-  class Asked
+  class Asked < Event
     attr_reader :message, :options
 
     def initialize(message, options = {})
@@ -162,7 +172,7 @@ class EventLog
     end
   end
 
-  class GotInput
+  class GotInput < Event
     attr_reader :name, :value
 
     def initialize(name, value)
@@ -173,9 +183,13 @@ class EventLog
     def to_s
       "<GotInput #@name '#@value'>"
     end
+
+    def important?
+      false
+    end
   end
 
-  class Raised
+  class Raised < Event
     attr_reader :exception
 
     def initialize(exception)
@@ -187,7 +201,7 @@ class EventLog
     end
   end
 
-  class Progress
+  class Progress < Event
     attr_reader :message
 
     def initialize(message)

data/vmc-ng/lib/vmc/spec_helpers/patches.rb

@@ -1,7 +1,20 @@
+require "mothership"
+require "interact"
+require "vmc"
+
 # [EventLog]
 $vmc_event = nil
 
 class VMC::CLI
+  def run(name)
+    if input[:help]
+      invoke :help, :command => cmd.name.to_s
+    else
+      precondition
+      super
+    end
+  end
+
   class ProgressEventReporter
     def initialize(message, skipper)
       @message = message
@@ -63,10 +76,10 @@ class VMC::CLI
 end
 
 class Mothership::Inputs
-  alias_method :vmc_spec_get, :[]
+  alias_method :vmc_spec_get, :get
 
-  def [](name, *args)
-    val = vmc_spec_get(name, *args)
+  def get(name, context, *args)
+    val = vmc_spec_get(name, context, *args)
     $vmc_event.got_input(name, val) if $vmc_event
     val
   end

data/vmc-ng/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.36"
+  VERSION = "0.4.0.beta.37"
 end

data/vmc-ng/spec/app/apps_spec.rb

@@ -4,6 +4,8 @@ describe "App#apps" do
   it "lists app names" do
     with_random_apps do |apps|
       running(:apps) do
+        does("Getting applications in #{client.current_space.name}")
+
         apps.sort_by(&:name).each do |a|
           outputs(a.name)
         end
@@ -16,6 +18,8 @@ describe "App#apps" do
       name = sample(apps).name
 
       running(:apps, :name => name) do
+        does("Getting applications in #{client.current_space.name}")
+
         apps.sort_by(&:name).each do |a|
           if a.name == name
             outputs(a.name)
@@ -30,6 +34,8 @@ describe "App#apps" do
       runtime = sample(apps).runtime
 
       running(:apps, :runtime => runtime.name) do
+        does("Getting applications in #{client.current_space.name}")
+
         apps.sort_by(&:name).each do |a|
           if a.runtime =~ /#{runtime}/
             outputs(a.name)
@@ -44,6 +50,8 @@ describe "App#apps" do
       framework = sample(apps).framework
 
       running(:apps, :framework => framework.name) do
+        does("Getting applications in #{client.current_space.name}")
+
         apps.sort_by(&:name).each do |a|
           if a.framework == framework
             outputs(a.name)
@@ -58,6 +66,8 @@ describe "App#apps" do
       with_random_apps do |other_apps|
         with_random_apps(space) do |apps|
           running(:apps, :space => space) do
+            does("Getting applications in #{space.name}")
+
             apps.sort_by(&:name).each do |a|
               outputs(a.name)
             end

data/vmc-ng/spec/app/push_spec.rb

@@ -21,7 +21,7 @@ describe "App#push" do
 
         asks("Instances")
         given(instances)
-        has_input(:instance, instances)
+        has_input(:instances, instances)
 
         asks("Framework")
         given(framework.name)
@@ -43,11 +43,11 @@ describe "App#push" do
 
         asks("Create services for application?")
         given("n")
-        has_input(:create_instances, false)
+        has_input(:create_services, false)
 
         asks("Bind other services to application?")
         given("n")
-        has_input(:bind_instances, false)
+        has_input(:bind_services, false)
 
         does("Uploading #{name}")
         does("Starting #{name}")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1553307275
+  hash: -1929453892
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 36
-  version: 0.4.0.beta.36
+  - 37
+  version: 0.4.0.beta.37
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-21 00:00:00 Z
+date: 2012-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -233,12 +233,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 31
         segments: 
         - 0
         - 4
-        - 7
-        version: 0.4.7
+        - 8
+        version: 0.4.8
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 35
         segments: 
         - 0
         - 3
-        - 23
-        version: 0.3.23
+        - 24
+        version: 0.3.24
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
         - 0
+        - 1
         - 0
-        - 14
-        version: 0.0.14
+        version: 0.1.0
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -290,9 +290,25 @@ dependencies:
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: multi_json
+  name: tunnel-dummy-vmc-plugin
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :runtime
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: multi_json
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -304,49 +320,56 @@ dependencies:
         - 6
         version: 1.3.6
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 35
         segments: 
+        - 2
+        - 11
         - 0
-        version: "0"
+        version: 2.11.0
   type: :runtime
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: simplecov
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 0
-        version: "0"
+        - 6
+        - 4
+        version: 0.6.4
   type: :runtime
-  version_requirements: *id020
+  version_requirements: *id021
 description: 
 email: support@vmware.com
 executables: 
@@ -437,7 +460,7 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- vmc/lib
+- vmc-ng/lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: