vmc 0.4.0.beta.77 → 0.4.0.beta.78

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

@@ -88,8 +88,21 @@ module VMC
     }
     input :path, :default => ".",
       :desc => "Path containing the application"
-    input(:url, :desc => "URL bound to app") { |default|
-      ask("URL", :default => default)
+    input(:url, :desc => "URL bound to app") { |name|
+      choices = url_choices(name)
+
+      options = {
+        :choices => choices + ["none"],
+        :allow_other => true
+      }
+
+      options[:default] = choices.first if choices.size == 1
+
+      url = ask "URL", options
+
+      unless url == "none"
+        url
+      end
     }
     input(:memory, :desc => "Memory limit") { |default|
       ask("Memory Limit",
@@ -469,9 +482,11 @@ module VMC
           line l
         end
       end
+    rescue CFoundry::NotFound
+      fail "Invalid path #{b(path)} for app #{b(app.name)}"
     rescue CFoundry::APIError => e
       if e.error_code == 190001
-        fail "Invalid path #{b(path)} for app #{b(app.name)}"
+        fail e.description
       else
         raise
       end
@@ -500,9 +515,11 @@ module VMC
       else
         invoke :file, :app => app, :path => path
       end
+    rescue CFoundry::NotFound
+      fail "Invalid path #{b(path)} for app #{b(app.name)}"
     rescue CFoundry::APIError => e
       if e.error_code == 190001
-        fail "Invalid path #{b(path)} for app #{b(app.name)}"
+        fail e.description
       else
         raise
       end
@@ -940,14 +957,7 @@ module VMC
 
       app.command = input[:command] if framework.name == "standalone"
 
-      url =
-        if framework.name == "standalone"
-          if (given = input[:url, "none"]) != "none"
-            given
-          end
-        else
-          input[:url, "#{name}.#{target_base}"]
-        end
+      url = input[:url, name]
 
       app.urls = [url] if url && !v2?
 
@@ -1246,6 +1256,17 @@ module VMC
       client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
     end
 
+    def url_choices(name)
+      if v2?
+        client.current_space.domains.sort_by(&:name).collect do |d|
+          # TODO: check availability
+          "#{name}.#{d.name}"
+        end
+      else
+        ["#{name}.#{target_base}"]
+      end
+    end
+
     def memory_choices(exclude = 0)
       info = client.info
       used = info[:usage][:memory]

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.77"
+  VERSION = "0.4.0.beta.78"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 2296988067
+  hash: 1624197077
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 77
-  version: 0.4.0.beta.77
+  - 78
+  version: 0.4.0.beta.78
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-05 00:00:00 Z
+date: 2012-11-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure