vmc 0.4.0.beta.54 → 0.4.0.beta.55

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

@@ -185,6 +185,20 @@ module VMC
       raise UserError, msg
     end
 
+    def table(headers, rows)
+      tabular(
+        !quiet? && headers.collect { |h| h && b(h) },
+        *rows)
+    end
+
+    def name_list(xs)
+      if xs.empty?
+        d("none")
+      else
+        xs.collect { |x| c(x.name, :name) }.join(", ")
+      end
+    end
+
     def sane_target_url(url)
       unless url =~ /^https?:\/\//
         begin

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

@@ -42,7 +42,7 @@ module VMC
     input :framework, :desc => "Filter by framework regexp"
     input :url, :desc => "Filter by url regexp"
     input :one_line, :alias => "-l", :type => :boolean, :default => false,
-      :desc => "One line per app; tabular format"
+      :desc => "Single-line tabular format"
     def apps
       if space = input[:space] || client.current_space
         apps =
@@ -72,26 +72,18 @@ module VMC
       apps = apps.sort_by(&:name)
 
       if input[:one_line]
-        rows = apps.collect { |a|
-          [ c(a.name, :name),
-            app_status(a),
-            "#{a.total_instances} x #{human_mb(a.memory)}",
-            v2? && (a.production ? "prod" : "dev"),
-            a.runtime.name,
-            a.url
-          ]
-        }
 
-        tabular(
-          !quiet? && [
-            b("name"),
-            b("status"),
-            b("usage"),
-            v2? && b("plan"),
-            b("runtime"),
-            b("url")
-          ],
-          *rows)
+        table(
+          ["name", "status", "usage", v2? && "plan", "runtime", "url"],
+          apps.collect { |a|
+            [ c(a.name, :name),
+              app_status(a),
+              "#{a.total_instances} x #{human_mb(a.memory)}",
+              v2? && (a.production ? "prod" : "dev"),
+              a.runtime.name,
+              a.urls.size == 1 ? a.url : "#{a.url}, ..."
+            ]
+          })
       else
         spaced(apps) do |a|
           display_app(a)
@@ -461,10 +453,11 @@ module VMC
       :desc => "Path of file to read"
     def file
       app = input[:app]
+      path = input[:path]
 
       file =
         with_progress("Getting file contents") do
-          app.file(*input[:path].split("/"))
+          app.file(*path.split("/"))
         end
 
       if quiet?
@@ -476,6 +469,12 @@ module VMC
           line l
         end
       end
+    rescue CFoundry::APIError => e
+      if e.error_code == 190001
+        fail "Invalid path #{b(path)} for app #{b(app.name)}"
+      else
+        raise
+      end
     end
 
     desc "Examine an app's files"
@@ -501,6 +500,12 @@ module VMC
       else
         invoke :file, :app => app, :path => path
       end
+    rescue CFoundry::APIError => e
+      if e.error_code == 190001
+        fail "Invalid path #{b(path)} for app #{b(app.name)}"
+      else
+        raise
+      end
     end
 
 
@@ -540,27 +545,30 @@ module VMC
           app.stats
         end
 
-      spaced(stats.sort_by(&:first)) do |idx, info|
-        line
+      line unless quiet?
 
-        if info[:state] == "DOWN"
-          line "Instance #{c("\##{idx}", :instance)} is down."
-          next
-        end
+      table(
+        %w{instance cpu memory disk},
+        stats.sort_by(&:first).collect { |idx, info|
+          idx = c("\##{idx}", :instance)
 
-        stats = info[:stats]
-        usage = stats[:usage]
-        line "instance #{c("\##{idx}", :instance)}:"
-        indented do
-          if usage
-            line "cpu: #{percentage(usage[:cpu])} of #{b(stats[:cores])} cores"
-            line "memory: #{usage(usage[:mem] * 1024, stats[:mem_quota])}"
-            line "disk: #{usage(usage[:disk], stats[:disk_quota])}"
+          if info[:state] == "DOWN"
+            [idx, c("down", :bad)]
           else
-            line c("stats unavailable (not running?)", :bad)
+            stats = info[:stats]
+            usage = stats[:usage]
+
+            if usage
+              [ idx,
+                "#{percentage(usage[:cpu])} of #{b(stats[:cores])} cores",
+                "#{usage(usage[:mem] * 1024, stats[:mem_quota])}",
+                "#{usage(usage[:disk], stats[:disk_quota])}"
+              ]
+            else
+              [idx, c("n/a", :neutral)]
+            end
           end
-        end
-      end
+        })
     end
 
 

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

@@ -53,26 +53,31 @@ module VMC
 
     desc "List available organizations"
     group :organizations
+    input :one_line, :alias => "-l", :type => :boolean, :default => false,
+      :desc => "Single-line tabular format"
+    input :full, :type => :boolean, :default => false,
+      :desc => "Show full information for apps, service instances, etc."
     def orgs
       orgs =
         with_progress("Getting organizations") do
-          client.organizations
+          client.organizations(1)
         end
 
       line unless quiet?
 
-      orgs.each do |o|
-        line c(o.name, :name)
-      end
-    end
-
-    private
-
-    def name_list(xs)
-      if xs.empty?
-        d("none")
+      if input[:one_line]
+        table(
+          %w{name spaces domains},
+          orgs.collect { |o|
+            [ c(o.name, :name),
+              name_list(o.spaces),
+              name_list(o.domains)
+            ]
+          })
       else
-        xs.collect { |x| c(x.name, :name) }.join(", ")
+        orgs.each do |o|
+          invoke :org, :organization => o, :full => input[:full]
+        end
       end
     end
   end

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

@@ -11,6 +11,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"
     def services
       instances =
         with_progress("Getting service instances") do
@@ -27,8 +29,12 @@ module VMC
         !instance_matches(i, input)
       end
 
-      spaced(instances) do |i|
-        display_service_instance(i)
+      if input[:one_line]
+        display_tabular_service_instances(instances)
+      else
+        spaced(instances) do |i|
+          display_service_instance(i)
+        end
       end
     end
 
@@ -292,11 +298,15 @@ module VMC
         plan = i.service_plan
         service = plan.service
 
+        apps = i.service_bindings.collect { |b|
+          c(b.app.name, :name)
+        }.join(", ")
+
         line "#{c(i.name, :name)}: #{service.label} #{service.version}"
 
         indented do
-          line "description: #{service.description}"
           line "provider: #{c(service.provider, :name)}"
+          line "bound to: #{apps}" unless apps.empty?
           line "plan: #{c(plan.name, :name)}"
 
           indented do
@@ -308,6 +318,31 @@ 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

@@ -83,17 +83,32 @@ module VMC
           :desc => "Organization to list spaces from") {
       client.current_organization
     }
+    input :one_line, :alias => "-l", :type => :boolean, :default => false,
+      :desc => "Single-line tabular format"
+    input :full, :type => :boolean, :default => false,
+      :desc => "Show full information for apps, service instances, etc."
     def spaces
       org = input[:organization]
       spaces =
         with_progress("Getting spaces in #{c(org.name, :name)}") do
-          org.spaces
+          org.spaces(1)
         end
 
       line unless quiet?
 
-      spaces.each do |s|
-        line c(s.name, :name)
+      if input[:one_line]
+        table(
+          %w{name apps services},
+          spaces.collect { |s|
+            [ c(s.name, :name),
+              name_list(s.apps),
+              name_list(s.service_instances)
+            ]
+          })
+      else
+        spaces.each do |s|
+          invoke :space, :space => s, :full => input[:full]
+        end
       end
     end
 
@@ -227,15 +242,5 @@ module VMC
         invoke :target, :organization => client.current_organization
       end
     end
-
-    private
-
-    def name_list(xs)
-      if xs.empty?
-        d("none")
-      else
-        xs.collect { |x| c(x.name, :name) }.join(", ")
-      end
-    end
   end
 end

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

@@ -374,9 +374,7 @@ module VMC
           line "description: #{b(r.description)}" if r.description
 
           # TODO: probably won't have this in final version
-          apps = r.apps.collect { |a| c(a.name, :name) }
-          app_list = apps.empty? ? d("none") : apps.join(", ")
-          line "apps: #{app_list}"
+          line "apps: #{name_list(r.apps)}"
         end
       end
     end

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

@@ -61,7 +61,15 @@ module VMC
 
     desc "Update a user's password"
     group :admin, :user, :hidden => true
-    input(:user, :argument => :optional, :desc => "User to update") {
+    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(:password, :desc => "New password") {

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.54"
+  VERSION = "0.4.0.beta.55"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -2207452118
+  hash: -3856277458
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 54
-  version: 0.4.0.beta.54
+  - 55
+  version: 0.4.0.beta.55
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-18 00:00:00 Z
+date: 2012-09-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure