vmc 0.4.0.beta.87 → 0.4.0.beta.88

data/vmc-ng/Rakefile

@@ -17,6 +17,7 @@ end
 
 task :install => :build do
   sh "gem install --local vmc-#{VMC::VERSION}"
+  sh "rm vmc-#{VMC::VERSION}.gem"
 end
 
 task :uninstall do

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

@@ -117,8 +117,8 @@ module VMC
       err e.message
     rescue SystemExit
       raise
-    rescue CFoundry::Denied => e
-      if !$vmc_asked_auth && [200, 10002].include?(e.error_code)
+    rescue CFoundry::Forbidden, CFoundry::InvalidAuthToken
+      if !$vmc_asked_auth
         $vmc_asked_auth = true
 
         line

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

@@ -316,7 +316,6 @@ module VMC
           if quiet?
             line i.id
           else
-            line
             display_instance(i)
           end
         end
@@ -324,7 +323,7 @@ module VMC
     end
 
 
-    desc "List an app's crashed "
+    desc "List an app's crashed instances"
     group :apps, :info, :hidden => true
     input :apps, :argument => :splat, :singular => :app,
       :desc => "Applications whose crashed instances to list",
@@ -343,7 +342,6 @@ module VMC
           if quiet?
             line i.id
           else
-            line
             display_crashed_instance(i)
           end
         end
@@ -492,12 +490,8 @@ module VMC
       end
     rescue CFoundry::NotFound
       fail "Invalid path #{b(path)} for app #{b(app.name)}"
-    rescue CFoundry::APIError => e
-      if e.error_code == 190001
-        fail e.description
-      else
-        raise
-      end
+    rescue CFoundry::FileError => e
+      fail e.description
     end
 
     desc "Examine an app's files"
@@ -965,10 +959,6 @@ module VMC
 
       app.command = input[:command] if framework.name == "standalone"
 
-      url = input[:url, name]
-
-      app.urls = [url] if url && !v2?
-
       default_memory = detector.suggested_memory(framework) || 64
       app.memory = megabytes(input[:memory, human_mb(default_memory)])
 
@@ -978,7 +968,26 @@ module VMC
         app.create!
       end
 
-      invoke :map, :app => app, :url => url if url && v2?
+      line unless quiet?
+
+      url = input[:url, name]
+
+      mapped_url = false
+      until !url || mapped_url
+        begin
+          invoke :map, :app => app, :url => url
+          mapped_url = true
+        rescue CFoundry::RouteHostTaken, CFoundry::UriAlreadyTaken => e
+          line c(e.description, :bad)
+          line
+
+          input.forget(:url)
+          url = input[:url, name]
+
+          # version bumps on v1 even though mapping fails
+          app.invalidate! unless v2?
+        end
+      end
 
       bindings = []
 

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

@@ -7,7 +7,7 @@ module VMC
     def users
       users =
         with_progress("Getting users") do
-          client.users
+          client.users(0)
         end
 
       spaced(users) do |u|

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.87"
+  VERSION = "0.4.0.beta.88"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -2790818236
+  hash: 2063530381
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 87
-  version: 0.4.0.beta.87
+  - 88
+  version: 0.4.0.beta.88
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-11 00:00:00 -08:00
+date: 2012-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -266,12 +266,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 97
+        hash: 103
         segments: 
         - 0
         - 3
-        - 57
-        version: 0.3.57
+        - 58
+        version: 0.3.58
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency