vmc 0.4.0.beta.41 → 0.4.0.beta.42

data/vmc/lib/cli/commands/user.rb

@@ -1,3 +1,5 @@
+require "cfoundry"
+
 module VMC::Cli::Command
 
   class User < Base
@@ -56,7 +58,8 @@ module VMC::Cli::Command
     private
 
     def login_and_save_token(email, password)
-      token = client.login(email, password)
+      cfoundry = CFoundry::Client.new(client.target)
+      token = cfoundry.login(:username => email, :password => password)
       VMC::Cli::Config.store_token(token, @options[:token_file])
     end
 

data/vmc/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.18'
+    VERSION = '0.3.19'
   end
 end

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

@@ -209,7 +209,7 @@ module VMC
         app.create!
       end
 
-      invoke :map, :app => app, :url => url if v2?
+      invoke :map, :app => app, :url => url if url && v2?
 
       bindings = []
 
@@ -506,8 +506,6 @@ module VMC
     input :path, :argument => true, :default => "/",
       :desc => "Path of file to read"
     def file
-      no_v2
-
       app = input[:app]
 
       file =
@@ -528,8 +526,6 @@ module VMC
     input :path, :argument => true, :default => "/",
       :desc => "Path of directory to list"
     def files
-      no_v2
-
       app = input[:app]
 
       files =
@@ -618,14 +614,18 @@ module VMC
       if v2?
         host, domain_name = simple.split(".", 2)
 
+        domain =
+          client.current_space.domains.find { |d|
+            d.name == domain_name
+          }
+
+        fail "Invalid domain '#{domain_name}'" unless domain
+
         route = client.routes.find { |r|
-          r.host == host && r.domain.name == domain_name
+          r.host == host && r.domain == domain
         }
 
         unless route
-          domain = client.domain_by_name(domain_name)
-          fail "Invalid domain '#{domain_name}'" unless domain
-
           route = client.route
 
           with_progress("Creating route #{c(simple, :name)}") do

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

@@ -90,7 +90,7 @@ module VMC
       end
     end
 
-    def run(name)
+    def execute(cmd, argv, global = {})
       if input[:help]
         invoke :help, :command => cmd.name.to_s
       else

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

@@ -104,7 +104,9 @@ module VMCHelpers
 
     main = Thread.current
 
+    thd_group = ThreadGroup.new
     thd = Thread.new do
+      thd_group.add(thd)
       begin
         VMC::CLI.new.invoke(command, inputs, given, :quiet => true)
       rescue SystemExit => e
@@ -131,7 +133,7 @@ EOF
 
       $vmc_event.should complete
     ensure
-      thd.kill
+      thd_group.list.each(&:kill)
     end
   ensure
     $stdin = before_in

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.41"
+  VERSION = "0.4.0.beta.42"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -259037938
+  hash: 3401249061
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 41
-  version: 0.4.0.beta.41
+  - 42
+  version: 0.4.0.beta.42
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-31 00:00:00 Z
+date: 2012-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -164,9 +164,25 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: cfoundry
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 0
+        - 3
+        - 27
+        version: 0.3.27
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,11 +192,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -192,11 +208,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -208,11 +224,11 @@ dependencies:
         - 0
         version: 1.5.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -224,11 +240,11 @@ dependencies:
         - 5
         version: 1.6.5
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: interact
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -240,43 +256,43 @@ dependencies:
         - 8
         version: 0.4.8
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: cfoundry
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 43
         segments: 
         - 0
         - 3
-        - 27
-        version: 0.3.27
+        - 28
+        version: 0.3.28
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: mothership
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 31
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 2
+        version: 0.1.2
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: manifests-vmc-plugin
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -288,11 +304,11 @@ dependencies:
         - 4
         version: 0.4.4
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: tunnel-dummy-vmc-plugin
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -304,11 +320,11 @@ dependencies:
         - 1
         version: 0.0.1
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: multi_json
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -320,11 +336,11 @@ dependencies:
         - 6
         version: 1.3.6
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -337,11 +353,11 @@ dependencies:
         - 2
         version: 0.9.2.2
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -353,11 +369,11 @@ dependencies:
         - 0
         version: 2.11.0
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: simplecov
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -369,7 +385,7 @@ dependencies:
         - 4
         version: 0.6.4
   type: :development
-  version_requirements: *id021
+  version_requirements: *id022
 description: 
 email: support@vmware.com
 executables: