vmc 0.4.0.beta.75 → 0.4.0.beta.76

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

@@ -0,0 +1,159 @@
+require "vmc/cli"
+
+module VMC
+  class Domain < CLI
+    def precondition
+      super
+      fail "This command is v2-only." unless v2?
+    end
+
+
+    desc "List domains in a space"
+    group :domains
+    input :organization, :argument => :optional, :aliases => ["--org", "-o"],
+      :from_given => by_name("organization"),
+      :desc => "Organization to delete the domain from"
+    def domains
+      target = input[:organization] || client
+
+      domains =
+        with_progress("Getting domains") do
+          target.domains
+        end
+
+      line unless quiet?
+
+      table(
+        %w{name wildcard? owner},
+        domains.sort_by(&:name).collect { |r|
+          [ c(r.name, :name),
+            c(r.wildcard, r.wildcard ? :yes : :no),
+            if org = r.owning_organization
+              c(org.name, :name)
+            else
+              d("none")
+            end
+          ]
+        })
+    end
+
+
+    desc "Delete a domain"
+    group :domains
+    input(:domain, :argument => :optional,
+          :from_given => find_by_name("domain"),
+          :desc => "URL to map to the application") { |domains|
+      fail "No domains." if domains.empty?
+
+      ask "Which domain?", :choices => domains.sort_by(&:name),
+        :display => proc(&:name)
+    }
+    input :organization, :aliases => ["--org", "-o"],
+      :from_given => by_name("organization"),
+      :desc => "Organization to delete the domain from"
+    input(:really, :type => :boolean, :forget => true,
+          :default => proc { force? || interact }) { |name, color|
+      ask("Really delete #{c(name, color)}?", :default => false)
+    }
+    input :all, :type => :boolean, :default => false,
+      :desc => "Delete all domains"
+    def delete_domain
+      target = input[:organization] || client
+
+      if input[:all]
+        return unless input[:really, "ALL DOMAINS", :bad]
+
+        target.domains.each do |r|
+          begin
+            invoke :delete_domain, :domain => r, :really => true
+          rescue CFoundry::APIError => e
+            err "#{e.class}: #{e.message}"
+          end
+        end
+
+        return
+      end
+
+      domain = input[:domain, target.domains]
+
+      return unless input[:really, domain.name, :name]
+
+      with_progress("Deleting domain #{c(domain.name, :name)}") do
+        domain.delete!
+      end
+    end
+
+
+    desc "Create a domain"
+    group :domains
+    input :name, :argument => :required,
+      :desc => "Domain name to create (*.foo.com for wildcard)"
+    input :organization, :aliases => ["--org", "-o"],
+      :from_given => by_name("organization"),
+      :default => proc { client.current_organization },
+      :desc => "Organization to add the domain to"
+    def create_domain
+      org = input[:organization]
+      name = input[:name]
+      wildcard = false
+
+      # *.foo.com for wildcard
+      if name =~ /^\*\.(.+)$/
+        name = $1
+        wildcard = true
+      end
+
+      domain = client.domain
+      domain.name = name
+      domain.wildcard = wildcard
+      domain.owning_organization = org
+
+      with_progress("Creating domain #{c(name, :name)}") do
+        domain.create!
+        org.add_domain(domain) if org
+      end
+    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 :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]
+
+      with_progress("Adding #{c(domain.name, :name)} to #{c(space.name, :name)}") do
+        space.add_domain(domain)
+      end
+    end
+
+
+    desc "Remove a domain from a space"
+    group :domains
+    input(:domain, :argument => :optional,
+          :from_given => by_name("domain"),
+          :desc => "Domain to add") { |space|
+      ask "Which domain?", :choices => space.domains,
+        :display => proc(&:name)
+    }
+    input :space, :from_given => by_name("space"),
+      :default => proc { client.current_space },
+      :desc => "Space to add the domain to"
+    def remove_domain
+      space = input[:space]
+      domain = input[:domain, space]
+
+      with_progress("Removing #{c(domain.name, :name)} from #{c(space.name, :name)}") do
+        space.add_domain(domain)
+      end
+    end
+  end
+end

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

@@ -10,6 +10,7 @@ Mothership::Help.groups(
   [:organizations, "Organizations"],
   [:spaces, "Spaces"],
   [:routes, "Routes"],
+  [:domains, "Domains"],
   [:admin, "Administration",
     [:user, "User Management"]])
 

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

@@ -31,10 +31,8 @@ module VMC
     desc "Delete a route"
     group :routes
     input(:route, :argument => :optional,
-          :desc => "URL to map to the application") {
-      routes = client.routes
-      fail "No routes." if routes.empty?
-    
+          :from_given => find_by_name("route"),
+          :desc => "URL to map to the application") { |routes|
       ask "Which route?", :choices => routes.sort_by(&:name),
         :display => proc(&:name)
     }
@@ -55,7 +53,10 @@ module VMC
         return
       end
 
-      route = input[:route]
+      routes = client.routes
+      fail "No routes." if routes.empty?
+
+      route = input[:route, client.routes]
 
       return unless input[:really, route.name, :name]
 

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

@@ -71,6 +71,8 @@ module VMC
         else
           line "services: #{name_list(space.service_instances)}"
         end
+
+        line "domains: #{name_list(space.domains)}"
       end
     end
 

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.75"
+  VERSION = "0.4.0.beta.76"
 end

data/vmc-ng/lib/vmc.rb

@@ -8,3 +8,4 @@ require "vmc/cli/user"
 require "vmc/cli/space"
 require "vmc/cli/organization"
 require "vmc/cli/route"
+require "vmc/cli/domain"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1933729205
+  hash: 26822539
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 75
-  version: 0.4.0.beta.75
+  - 76
+  version: 0.4.0.beta.76
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-29 00:00:00 Z
+date: 2012-11-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 119
+        hash: 117
         segments: 
         - 0
         - 3
-        - 50
-        version: 0.3.50
+        - 51
+        version: 0.3.51
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -456,6 +456,7 @@ files:
 - vmc-ng/LICENSE
 - vmc-ng/Rakefile
 - vmc-ng/lib/vmc/cli/app.rb
+- vmc-ng/lib/vmc/cli/domain.rb
 - vmc-ng/lib/vmc/cli/help.rb
 - vmc-ng/lib/vmc/cli/interactive.rb
 - vmc-ng/lib/vmc/cli/organization.rb