vmc 0.4.0.beta.80 → 0.4.0.beta.81

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

@@ -66,11 +66,13 @@ module VMC
       end
     end
 
-    def precondition
+    def check_target
       unless File.exists? target_file
         fail "Please select a target with 'vmc target'."
       end
+    end
 
+    def check_logged_in
       unless client.logged_in?
         if force?
           fail "Please log in with 'vmc login'."
@@ -81,6 +83,11 @@ module VMC
           invalidate_client
         end
       end
+    end
+
+    def precondition
+      check_target
+      check_logged_in
 
       return unless v2?
 
@@ -97,6 +104,7 @@ module VMC
       if input[:help]
         invoke :help, :command => cmd.name.to_s
       else
+        @command = cmd
         precondition
         super
       end

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

@@ -148,7 +148,7 @@ module VMC
       domain = input[:domain, space]
 
       with_progress("Removing #{c(domain.name, :name)} from #{c(space.name, :name)}") do
-        space.add_domain(domain)
+        space.remove_domain(domain)
       end
     end
   end

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

@@ -3,7 +3,9 @@ require "vmc/cli"
 module VMC
   class Organization < CLI
     def precondition
-      super
+      check_target
+      check_logged_in
+
       fail "This command is v2-only." unless v2?
     end
 
@@ -26,6 +28,11 @@ module VMC
     def org
       org = input[:organization]
 
+      unless org
+        return if quiet?
+        fail "No current organization."
+      end
+
       if quiet?
         puts org.name
         return
@@ -80,5 +87,90 @@ module VMC
         end
       end
     end
+
+
+    desc "Create an organization"
+    group :organizations
+    input(:name, :argument => :optional, :desc => "Organization name") {
+      ask("Name")
+    }
+    input :target, :alias => "-t", :type => :boolean,
+      :desc => "Switch to the organization after creation"
+    input :add_self, :type => :boolean, :default => true,
+      :desc => "Add yourself to the organization"
+    def create_org
+      org = client.organization
+      org.name = input[:name]
+      org.users = [client.current_user] if input[:add_self]
+
+      with_progress("Creating organization #{c(org.name, :name)}") do
+        org.create!
+      end
+
+      if input[:target]
+        invoke :target, :organization => org
+      end
+    end
+
+
+    desc "Delete an organization"
+    group :organizations
+    input(:organization, :aliases => ["--org", "-o"],
+          :argument => :optional,
+          :from_given => by_name("organization"),
+          :desc => "Organization to delete") { |orgs|
+      ask "Which organization?", :choices => orgs,
+        :display => proc(&:name)
+    }
+    input(:really, :type => :boolean, :forget => true,
+          :default => proc { force? || interact }) { |org|
+      ask("Really delete #{c(org.name, :name)}?", :default => false)
+    }
+    input(:recursive, :alias => "-r", :type => :boolean, :forget => true) {
+      ask "Delete #{c("EVERYTHING", :bad)}?", :default => false
+    }
+    input :warn, :type => :boolean, :default => true,
+      :desc => "Show warning if it was the last org"
+    def delete_org
+      orgs = client.organizations
+      fail "No organizations." if orgs.empty?
+
+      org = input[:organization, orgs]
+      return unless input[:really, org]
+
+      spaces = org.spaces
+      unless spaces.empty?
+        unless force?
+          line "This organization is not empty!"
+          line
+          line "spaces: #{name_list(spaces)}"
+          line
+
+          return unless input[:recursive]
+        end
+
+        spaces.each do |s|
+          invoke :delete_space, :space => s, :really => true,
+            :recursive => true, :warn => false
+        end
+      end
+
+      is_current = org == client.current_organization
+
+      with_progress("Deleting organization #{c(org.name, :name)}") do
+        org.delete!
+      end
+
+      if orgs.size == 1
+        return unless input[:warn]
+
+        line
+        line c("There are no longer any organizations.", :warning)
+        line "You may want to create one with #{c("create-org", :good)}."
+      elsif is_current
+        invalidate_target
+        invoke :target
+      end
+    end
   end
 end

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

@@ -3,7 +3,9 @@ require "vmc/cli"
 module VMC
   class Space < CLI
     def precondition
-      super
+      check_target
+      check_logged_in
+
       fail "This command is v2-only." unless v2?
     end
 
@@ -37,6 +39,11 @@ module VMC
       org = input[:organization]
       space = input[:space, org]
 
+      unless space
+        return if quiet?
+        fail "No current space."
+      end
+
       if quiet?
         puts space.name
         return
@@ -122,7 +129,8 @@ module VMC
       :from_given => by_name("organization"),
       :default => proc { client.current_organization },
       :desc => "Parent organization"
-    input :target, :alias => "-t", :type => :boolean
+    input :target, :alias => "-t", :type => :boolean,
+      :desc => "Switch to the space after creation"
     input :manager, :type => :boolean, :default => true,
       :desc => "Add current user as manager"
     input :developer, :type => :boolean, :default => true,
@@ -196,6 +204,8 @@ module VMC
     input(:recursive, :alias => "-r", :type => :boolean, :forget => true) {
       ask "Delete #{c("EVERYTHING", :bad)}?", :default => false
     }
+    input :warn, :type => :boolean, :default => true,
+      :desc => "Show warning if it was the last space"
     def delete_space
       org = input[:organization]
       space = input[:space, org]
@@ -233,6 +243,8 @@ module VMC
       org.invalidate!
 
       if org.spaces.empty?
+        return unless input[:warn]
+
         line
         line c("There are no longer any spaces in #{b(org.name)}.", :warning)
         line "You may want to create one with #{c("create-space", :good)}."

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

@@ -404,7 +404,15 @@ module VMC
       if changed_org || input.given?(:space) || !space_valid?(info[:space])
         spaces = org.spaces
 
-        fail "No spaces!" if spaces.empty?
+        if spaces.empty?
+          if changed_org
+            line c("There are no spaces in #{b(org.name)}.", :warning)
+            line "You may want to create one with #{c("create-space", :good)}."
+            return
+          else
+            fail "No spaces!"
+          end
+        end
 
         if spaces.size == 1 && !input.given?(:space)
           space = spaces.first

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.80"
+  VERSION = "0.4.0.beta.81"
 end

metadata

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