vmc 0.4.0.beta.64 → 0.4.0.beta.65

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

@@ -7,10 +7,9 @@ module VMC
   class App < CLI
     desc "List your applications"
     group :apps
-    input(:space, :desc => "Show apps in given space",
-          :from_given => by_name("space")) {
-      client.current_space
-    }
+    input :space, :from_given => by_name("space"),
+      :default => proc { client.current_space },
+      :desc => "Show apps in given space"
     input :name, :desc => "Filter by name regexp"
     input :runtime, :desc => "Filter by runtime regexp"
     input :framework, :desc => "Filter by framework regexp"
@@ -223,8 +222,9 @@ module VMC
       [ask("Delete which application?", :choices => apps.sort_by(&:name),
            :display => proc(&:name))]
     }
-    input(:really, :type => :boolean, :forget => true) { |name, color|
-      force? || ask("Really delete #{c(name, color)}?", :default => false)
+    input(:really, :type => :boolean, :forget => true,
+          :default => proc { force? || interact }) { |name, color|
+      ask("Really delete #{c(name, color)}?", :default => false)
     }
     input :routes, :type => :boolean, :default => false,
       :desc => "Delete associated routes"
@@ -1055,7 +1055,9 @@ module VMC
       puts "#{b(c(i.state.downcase, state_color(i.state)))} "
 
       indented do
-        line "started: #{c(i.since.strftime("%F %r"), :cyan)}"
+        if s = i.since
+          line "started: #{c(s.strftime("%F %r"), :cyan)}"
+        end
 
         if d = i.debugger
           line "debugger: port #{b(d[:port])} at #{b(d[:ip])}"

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

@@ -16,11 +16,11 @@ module VMC
 
     desc "Show organization information"
     group :organizations
-    input(:organization, :aliases => ["--org", "-o"],
-          :argument => :optional, :from_given => by_name("organization"),
-          :desc => "Organization to show") {
-      client.current_organization
-    }
+    input :organization, :aliases => ["--org", "-o"],
+      :argument => :optional,
+      :from_given => by_name("organization"),
+      :default => proc { client.current_organization },
+      :desc => "Organization to show"
     input :full, :type => :boolean,
       :desc => "Show full information for spaces, domains, etc."
     def org

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

@@ -4,10 +4,10 @@ module VMC
   class Service < CLI
     desc "List your service instances"
     group :services
-    input(:space, :desc => "Show services in given space",
-          :from_given => by_name("space")) {
-      client.current_space
-    }
+    input :space,
+      :from_given => by_name("space"),
+      :default => proc { client.current_space },
+      :desc => "Show services in given space"
     input :name, :desc => "Filter by name"
     input :service, :desc => "Filter by service type"
     input :plan, :desc => "Filter by service plan"
@@ -15,8 +15,8 @@ module VMC
     input :version, :desc => "Filter by service version"
     input :app, :desc => "Limit to application's service bindings",
       :from_given => by_name("app")
-    input :one_line, :alias => "-l", :type => :boolean, :default => false,
-      :desc => "Single-line tabular format"
+    input :full, :type => :boolean, :default => false,
+      :desc => "Verbose output format"
     def services
       msg =
         if space = input[:space]
@@ -40,12 +40,33 @@ module VMC
         !instance_matches(i, input)
       end
 
-      if input[:one_line]
-        display_tabular_service_instances(instances)
-      else
+      if input[:full]
         spaced(instances) do |i|
           display_service_instance(i)
         end
+      else
+        table(
+          ["name", "service", "version", v2? && "plan", v2? && "bound apps"],
+          instances.collect { |i|
+            if v2?
+              plan = i.service_plan
+              service = plan.service
+
+              label = service.label
+              version = service.version
+              apps = name_list(i.service_bindings.collect(&:app))
+            else
+              label = i.vendor
+              version = i.version
+            end
+
+            [ c(i.name, :name),
+              label,
+              version,
+              v2? && plan.name,
+              apps
+            ]
+          })
       end
     end
 
@@ -227,8 +248,9 @@ module VMC
       ask "Which service instance?", :choices => instances,
         :display => proc(&:name)
     }
-    input(:really, :type => :boolean, :forget => true) { |name, color|
-      force? || ask("Really delete #{c(name, color)}?", :default => false)
+    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 services"
@@ -330,31 +352,6 @@ module VMC
       end
     end
 
-    def display_tabular_service_instances(instances)
-      table(
-        ["name", "service", "version", v2? && "plan", v2? && "bound apps"],
-        instances.collect { |i|
-          if v2?
-            plan = i.service_plan
-            service = plan.service
-
-            label = service.label
-            version = service.version
-            apps = name_list(i.service_bindings.collect(&:app))
-          else
-            label = i.vendor
-            version = i.version
-          end
-
-          [ c(i.name, :name),
-            label,
-            version,
-            v2? && plan.name,
-            apps
-          ]
-        })
-    end
-
     def human_list(xs)
       if xs.size == 1
         xs.first

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

@@ -23,15 +23,14 @@ module VMC
 
     desc "Show space information"
     group :spaces
-    input(:organization, :aliases => ["--org", "-o"],
-          :from_given => by_name("organization"),
-          :desc => "Space's organization") {
-      client.current_organization
-    }
-    input(:space, :argument => :optional, :from_given => space_by_name,
-          :desc => "Space to show") {
-      client.current_space
-    }
+    input :organization, :aliases => ["--org", "-o"],
+      :from_given => by_name("organization"),
+      :default => proc { client.current_organization },
+      :desc => "Space's organization"
+    input :space, :argument => :optional,
+      :from_given => space_by_name,
+      :default => proc { client.current_space },
+      :desc => "Space to show"
     input :full, :type => :boolean,
       :desc => "Show full information for apps, service instances, etc."
     def space
@@ -78,11 +77,10 @@ module VMC
 
     desc "List spaces in an organization"
     group :spaces
-    input(:organization, :aliases => ["--org", "-o"],
-          :argument => :optional, :from_given => by_name("organization"),
-          :desc => "Organization to list spaces from") {
-      client.current_organization
-    }
+    input :organization, :argument => :optional, :aliases => ["--org", "-o"],
+      :from_given => by_name("organization"),
+      :default => proc { client.current_organization },
+      :desc => "Organization to list spaces from"
     input :one_line, :alias => "-l", :type => :boolean, :default => false,
       :desc => "Single-line tabular format"
     input :full, :type => :boolean, :default => false,
@@ -118,11 +116,10 @@ module VMC
     input(:name, :argument => :optional, :desc => "Space name") {
       ask("Name")
     }
-    input(:organization, :aliases => ["--org", "-o"],
-          :argument => :optional, :from_given => by_name("organization"),
-          :desc => "Parent organization") {
-      client.current_organization
-    }
+    input :organization, :argument => :optional, :aliases => ["--org", "-o"],
+      :from_given => by_name("organization"),
+      :default => proc { client.current_organization },
+      :desc => "Parent organization"
     input :target, :alias => "-t", :type => :boolean
     input :manager, :type => :boolean, :default => true,
       :desc => "Add current user as manager"
@@ -186,13 +183,13 @@ module VMC
       ask "Which space in #{c(org.name, :name)}?", :choices => spaces,
         :display => proc(&:name)
     }
-    input(:organization, :aliases => ["--org", "-o"],
-          :from_given => by_name("organization"),
-          :desc => "Space's organization") {
-      client.current_organization
-    }
-    input(:really, :type => :boolean, :forget => true) { |space|
-      force? || ask("Really delete #{c(space.name, :name)}?", :default => false)
+    input :organization, :aliases => ["--org", "-o"],
+      :from_given => by_name("organization"),
+      :default => proc { client.current_organization },
+      :desc => "Space's organization"
+    input(:really, :type => :boolean, :forget => true,
+          :default => proc { force? || interact }) { |space|
+      ask("Really delete #{c(space.name, :name)}?", :default => false)
     }
     input(:recursive, :alias => "-r", :type => :boolean, :forget => true) {
       ask "Delete #{c("EVERYTHING", :bad)}?", :default => false

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

@@ -30,8 +30,8 @@ module VMC
       :desc => "List supported frameworks"
     input :services, :type => :boolean,
       :desc => "List supported services"
-    input(:all, :type => :boolean, :alias => "-a",
-          :desc => "Show all information")
+    input :all, :type => :boolean, :alias => "-a",
+      :desc => "Show all information"
     def info
       all = input[:all]
 
@@ -133,8 +133,8 @@ module VMC
     group :start
     input :url, :argument => :optional,
       :desc => "Target URL to switch to"
-    input(:interactive, :alias => "-i", :type => :boolean,
-          :desc => "Interactively select organization/space")
+    input :interactive, :alias => "-i", :type => :boolean,
+      :desc => "Interactively select organization/space"
     input(:organization, :aliases => ["--org", "-o"],
           :from_given => find_by_name("organization"),
           :desc => "Organization") { |orgs|
@@ -197,8 +197,8 @@ module VMC
     input :username, :alias => "--email", :argument => :optional,
       :desc => "Account email"
     input :password, :desc => "Account password"
-    input(:interactive, :alias => "-i", :type => :boolean,
-          :desc => "Interactively select organization/space")
+    input :interactive, :alias => "-i", :type => :boolean,
+      :desc => "Interactively select organization/space"
     input(:organization, :aliases => ["--org", "-o"],
           :from_given => find_by_name("organization"),
           :desc => "Organization") { |orgs|

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

@@ -46,8 +46,9 @@ module VMC
     desc "Delete a user"
     group :admin, :user, :hidden => true
     input :email, :argument => true, :desc => "User to delete"
-    input(:really, :type => :boolean, :forget => true) { |email|
-      force? || ask("Really delete user #{c(email, :name)}?", :default => false)
+    input(:really, :type => :boolean, :forget => true,
+          :default => proc { force? || interact }) { |email|
+      ask("Really delete user #{c(email, :name)}?", :default => false)
     }
     def delete_user
       email = input[:email]
@@ -61,17 +62,16 @@ module VMC
 
     desc "Update a user's password"
     group :admin, :user, :hidden => true
-    input(:user, :argument => :optional,
-          :from_given => proc { |email|
-            if v2? && client.current_user.email != email
-              fail "You can only change your own password on V2."
-            else
-              client.user(email)
-            end
-          },
-          :desc => "User to update") {
-      client.current_user
-    }
+    input :user, :argument => :optional,
+      :from_given => proc { |email|
+        if v2? && client.current_user.email != email
+          fail "You can only change your own password on V2."
+        else
+          client.user(email)
+        end
+      },
+      :desc => "User to update",
+      :default => proc { client.current_user }
     input(:password, :desc => "New password") {
       ask("Current Password", :echo => "*", :forget => true)
     }

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.64"
+  VERSION = "0.4.0.beta.65"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -3047156276
+  hash: 1083977469
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 64
-  version: 0.4.0.beta.64
+  - 65
+  version: 0.4.0.beta.65
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-09 00:00:00 Z
+date: 2012-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 67
+        hash: 65
         segments: 
         - 0
         - 3
-        - 40
-        version: 0.3.40
+        - 41
+        version: 0.3.41
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -297,12 +297,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 1
+        version: 0.2.1
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
@@ -313,12 +313,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
         - 4
-        - 8
-        version: 0.4.8
+        - 9
+        version: 0.4.9
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency