vmc-ng/lib/vmc/cli/domain.rb in vmc-0.4.0.beta.79 vs vmc-ng/lib/vmc/cli/domain.rb in vmc-0.4.0.beta.80

@@ -102,26 +102,30 @@
       domain.owning_organization = org unless input[:shared]
 
       with_progress("Creating domain #{c(name, :name)}") do
         domain.create!
       end
+
+      domain
     end
 
 
     desc "Add a domain to a space"
     group :domains
-    input(:domain, :argument => :optional,
-          :from_given => by_name("domain"),
-          :desc => "Domain to add") {
-      ask "Which domain?", :choices => client.current_organization.domains,
-        :display => proc(&:name)
-    }
+    input :name, :argument => :required,
+      :desc => "Domain to add"
     input :space, :from_given => by_name("space"),
       :default => proc { client.current_space },
       :desc => "Space to add the domain to"
     def add_domain
       space = input[:space]
-      domain = input[:domain]
+      name = input[:name].sub(/^\*\./, "")
+
+      org = space.organization
+
+      domain =
+        org.domains.find { |d| d.name == name } ||
+          invoke(:create_domain, :org => org, :name => name)
 
       with_progress("Adding #{c(domain.name, :name)} to #{c(space.name, :name)}") do
         space.add_domain(domain)
       end
     end