vmc 0.4.0.beta.85 → 0.4.0.beta.86

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

@@ -90,6 +90,7 @@ module VMC
       :from_given => by_name("organization"),
       :default => proc { client.current_organization },
       :desc => "Organization to list spaces from"
+    input :name, :desc => "Filter by name"
     input :one_line, :alias => "-l", :type => :boolean, :default => false,
       :desc => "Single-line tabular format"
     input :full, :type => :boolean, :default => false,
@@ -103,6 +104,10 @@ module VMC
 
       line unless quiet?
 
+      spaces.reject! do |s|
+        !space_matches(s, input)
+      end
+
       if input[:one_line]
         table(
           %w{name apps services},
@@ -185,13 +190,14 @@ module VMC
 
     desc "Delete a space and its contents"
     group :spaces
-    input(:space, :argument => :optional, :from_given => space_by_name,
+    input(:spaces, :argument => :splat,
+          :from_given => space_by_name,
           :desc => "Space to delete") { |org|
       spaces = org.spaces
       fail "No spaces." if spaces.empty?
 
-      ask "Which space in #{c(org.name, :name)}?", :choices => spaces,
-        :display => proc(&:name)
+      [ask "Which space in #{c(org.name, :name)}?", :choices => spaces,
+        :display => proc(&:name)]
     }
     input :organization, :aliases => ["--org", "-o"],
       :from_given => by_name("organization"),
@@ -208,38 +214,22 @@ module VMC
       :desc => "Show warning if it was the last space"
     def delete_space
       org = input[:organization]
-      space = input[:space, org]
-      return unless input[:really, space]
+      spaces = input[:spaces, org]
 
-      apps = space.apps
-      instances = space.service_instances
+      deleted_current = false
 
-      unless apps.empty? && instances.empty?
-        unless force?
-          line "This space is not empty!"
-          line
-          line "apps: #{name_list(apps)}"
-          line "service instances: #{name_list(instances)}"
-          line
+      spaces.each do |space|
+        next unless input[:really, space]
 
-          return unless input[:recursive]
-        end
+        next unless clear_space(space)
 
-        apps.each do |a|
-          invoke :delete, :app => a, :really => true
-        end
+        deleted_current ||= space == client.current_space
 
-        instances.each do |i|
-          invoke :delete_service, :instance => i, :really => true
+        with_progress("Deleting space #{c(space.name, :name)}") do
+          space.delete!
         end
       end
 
-      is_current = space == client.current_space
-
-      with_progress("Deleting space #{c(space.name, :name)}") do
-        space.delete!
-      end
-
       org.invalidate!
 
       if org.spaces.empty?
@@ -248,10 +238,47 @@ module VMC
         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)}."
-      elsif is_current
+      elsif deleted_current
         invalidate_client
         invoke :target, :organization => client.current_organization
       end
     end
+
+    private
+
+    def space_matches(s, options)
+      if name = options[:name]
+        return false if s.name !~ /#{name}/
+      end
+
+      true
+    end
+
+    def clear_space(space)
+      apps = space.apps
+      instances = space.service_instances
+
+      return true if apps.empty? && instances.empty?
+
+      unless force?
+        line "This space is not empty!"
+        line
+        line "apps: #{name_list(apps)}"
+        line "service instances: #{name_list(instances)}"
+        line
+
+        return unless input[:recursive]
+      end
+
+      apps.each do |a|
+        invoke :delete, :app => a, :really => true
+      end
+
+      instances.each do |i|
+        invoke :delete_service, :instance => i, :really => true
+      end
+
+      true
+    end
   end
 end

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.85"
+  VERSION = "0.4.0.beta.86"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 2616878885
+  hash: 2721457587
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 85
-  version: 0.4.0.beta.85
+  - 86
+  version: 0.4.0.beta.86
 platform: ruby
 authors: 
 - VMware
@@ -266,12 +266,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 125
+        hash: 99
         segments: 
         - 0
         - 3
-        - 55
-        version: 0.3.55
+        - 56
+        version: 0.3.56
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency