vmc 0.4.0.beta.62 → 0.4.0.beta.63

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

@@ -226,9 +226,11 @@ module VMC
     input(:really, :type => :boolean, :forget => true) { |name, color|
       force? || ask("Really delete #{c(name, color)}?", :default => false)
     }
+    input :routes, :type => :boolean, :default => false,
+      :desc => "Delete associated routes"
     input :orphaned, :aliases => "-o", :type => :boolean,
       :desc => "Delete orphaned instances"
-    input :all, :default => false,
+    input :all, :type => :boolean, :default => false,
       :desc => "Delete all applications"
     def delete
       apps = client.apps
@@ -253,6 +255,7 @@ module VMC
         deleted << app
 
         with_progress("Deleting #{c(app.name, :name)}") do
+          app.routes.collect(&:delete!) if input[:routes]
           app.delete!
         end
       end
@@ -595,8 +598,13 @@ module VMC
       if v2?
         host, domain_name = simple.split(".", 2)
 
-        route = app.routes.find do |r|
-          r.host == host && r.domain.name == domain_name
+        domain =
+          client.current_space.domains(0, :name => domain_name).first
+
+        fail "Invalid domain '#{domain_name}'" unless domain
+
+        route = app.routes(0, :host => host).find do |r|
+          r.domain == domain
         end
 
         fail "Invalid route '#{simple}'" unless route

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

@@ -230,7 +230,8 @@ module VMC
     input(:really, :type => :boolean, :forget => true) { |name, color|
       force? || ask("Really delete #{c(name, color)}?", :default => false)
     }
-    input :all, :default => false, :desc => "Delete all services"
+    input :all, :type => :boolean, :default => false,
+      :desc => "Delete all services"
     def delete_service
       if input[:all]
         return unless input[:really, "ALL SERVICES", :bad]

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.62"
+  VERSION = "0.4.0.beta.63"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 552684857
+  hash: -33416758
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 62
-  version: 0.4.0.beta.62
+  - 63
+  version: 0.4.0.beta.63
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-04 00:00:00 Z
+date: 2012-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 93
+        hash: 67
         segments: 
         - 0
         - 3
-        - 39
-        version: 0.3.39
+        - 40
+        version: 0.3.40
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency