vmc 0.4.0.beta.23 → 0.4.0.beta.24

data/vmc-ng/lib/vmc.rb

@@ -5,3 +5,4 @@ require "vmc/cli/start"
 require "vmc/cli/app"
 require "vmc/cli/service"
 require "vmc/cli/user"
+require "vmc/cli/space"

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

@@ -10,6 +10,7 @@ require "cfoundry"
 
 require "vmc/constants"
 require "vmc/errors"
+require "vmc/spacing"
 
 require "vmc/cli/help"
 require "vmc/cli/interactive"
@@ -20,6 +21,7 @@ $vmc_asked_auth = false
 module VMC
   class CLI < Mothership
     include VMC::Interactive
+    include VMC::Spacing
     include Mothership::Pretty
     include Mothership::Progress
 
@@ -58,7 +60,7 @@ module VMC
 
     def default_action
       if option(:version)
-        puts "vmc #{VERSION}"
+        line "vmc #{VERSION}"
       else
         super
       end
@@ -98,8 +100,8 @@ module VMC
       if !$vmc_asked_auth && e.error_code == 200
         $vmc_asked_auth = true
 
-        puts ""
-        puts c("Not authenticated! Try logging in:", :warning)
+        line
+        line c("Not authenticated! Try logging in:", :warning)
 
         invoke :login
 

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

@@ -1,3 +1,5 @@
+require "set"
+
 require "vmc/cli"
 require "vmc/detect"
 
@@ -71,17 +73,26 @@ module VMC
       end
 
       if apps.empty? and !quiet?
-        puts ""
-        puts "No applications."
+        line "No applications."
         return
       end
 
-      apps.each.with_index do |a, num|
+      line unless quiet?
+
+      spaced(apps) do |a|
         display_app(a) if app_matches(a, input)
       end
     end
 
 
+    desc "Show app information"
+    group :apps
+    input :app, :argument => :required, :from_given => by_name("app"),
+      :desc => "App to show"
+    def app(input)
+      display_app(input[:app])
+    end
+
     desc "Push an application, syncing changes if it exists"
     group :apps, :manage
     input(:name, :argument => true, :desc => "Application name") {
@@ -243,14 +254,14 @@ module VMC
     group :apps, :manage
     input :apps, :argument => :splat, :singular => :app,
       :desc => "Applications to start",
-      :from_given => find_by_name("app")
+      :from_given => by_name("app")
     input :debug_mode, :aliases => "-d",
       :desc => "Debug mode to start in"
     def start(input)
-      apps = input[:apps, client.apps]
+      apps = input[:apps]
       fail "No applications given." if apps.empty?
 
-      apps.each do |app|
+      spaced(apps) do |app|
         app = filter(:start_app, app)
 
         switch_mode(app, input[:debug_mode])
@@ -271,7 +282,7 @@ module VMC
         check_application(app)
 
         if app.debug_mode && !quiet?
-          puts ""
+          line
           invoke :instances, :app => app
         end
       end
@@ -282,12 +293,12 @@ module VMC
     group :apps, :manage
     input :apps, :argument => :splat, :singular => :app,
       :desc => "Applications to start",
-      :from_given => find_by_name("app")
+      :from_given => by_name("app")
     def stop(input)
-      apps = input[:apps, client.apps]
+      apps = input[:apps]
       fail "No applications given." if apps.empty?
 
-      apps.each do |app|
+      spaced(apps) do |app|
         with_progress("Stopping #{c(app.name, :name)}") do |s|
           if app.stopped?
             s.skip do
@@ -305,14 +316,12 @@ module VMC
     group :apps, :manage
     input :apps, :argument => :splat, :singular => :app,
       :desc => "Applications to start",
-      :from_given => find_by_name("app")
+      :from_given => by_name("app")
     input :debug_mode, :aliases => "-d",
       :desc => "Debug mode to start in"
     def restart(input)
-      apps = client.apps
-
-      invoke :stop, :apps => input[:apps, apps]
-      invoke :start, :apps => input[:apps, apps],
+      invoke :stop, :apps => input[:apps]
+      invoke :start, :apps => input[:apps],
         :debug_mode => input[:debug_mode]
     end
 
@@ -321,7 +330,10 @@ module VMC
     group :apps, :manage
     input(:apps, :argument => :splat, :singular => :app,
           :desc => "Applications to delete",
-          :from_given => find_by_name("app")) { |apps|
+          :from_given => by_name("app")) {
+      apps = client.apps
+      fail "No applications." if apps.empty?
+
       [ask("Delete which application?", :choices => apps.sort_by(&:name),
            :display => proc(&:name))]
     }
@@ -333,32 +345,23 @@ module VMC
     input :all, :default => false,
       :desc => "Delete all applications"
     def delete(input)
+      apps = client.apps
+
       if input[:all]
         return unless input[:really, "ALL APPS", :bad]
 
-        apps = client.apps
-
-        orphaned = find_orphaned_services(apps)
-
-        apps.each do |a|
-          with_progress("Deleting #{c(a.name, :name)}") do
-            a.delete!
-          end
-        end
-
-        delete_orphaned_services(orphaned, input[:orphaned])
-
-        return
+        to_delete = apps
+        others = []
+      else
+        to_delete = input[:apps]
+        others = apps - to_delete
       end
 
-      apps = client.apps
-      fail "No applications." if apps.empty?
-
-      to_delete = input[:apps, apps]
+      orphaned = find_orphaned_services(to_delete, others)
 
       deleted = []
-      to_delete.each do |app|
-        really = input[:really, app.name, :name]
+      spaced(to_delete) do |app|
+        really = input[:all] || input[:really, app.name, :name]
         next unless really
 
         deleted << app
@@ -368,11 +371,9 @@ module VMC
         end
       end
 
-      unless deleted.empty?
-        delete_orphaned_services(
-          find_orphaned_services(deleted, apps - deleted),
-          input[:orphaned])
-      end
+      delete_orphaned_services(orphaned, input[:orphaned])
+
+      to_delete
     end
 
 
@@ -380,24 +381,24 @@ module VMC
     group :apps, :info, :hidden => true
     input :apps, :argument => :splat, :singular => :app,
       :desc => "Applications to start",
-      :from_given => find_by_name("app")
+      :from_given => by_name("app")
     def instances(input)
       no_v2
 
-      apps = input[:apps, client.apps]
+      apps = input[:apps]
       fail "No applications given." if apps.empty?
 
-      apps.each do |app|
+      spaced(apps) do |app|
         instances =
           with_progress("Getting instances for #{c(app.name, :name)}") do
             app.instances
           end
 
-        instances.each do |i|
+        spaced(instances) do |i|
           if quiet?
-            puts i.index
+            line i.index
           else
-            puts ""
+            line
             display_instance(i)
           end
         end
@@ -478,7 +479,7 @@ module VMC
         end
       end
 
-      instances.each do |i|
+      spaced(instances) do |i|
         logs =
           with_progress(
               "Getting logs for #{c(app.name, :name)}" +
@@ -486,16 +487,16 @@ module VMC
             i.files("logs")
           end
 
-        puts "" unless quiet?
+        line unless quiet?
 
-        logs.each do |log|
+        spaced(logs) do |log|
           body =
             with_progress("Reading " + b(log.join("/"))) do
               i.file(*log)
             end
 
-          puts body
-          puts "" unless body.empty?
+          lines body
+          line unless body.empty?
         end
       end
     end
@@ -518,7 +519,7 @@ module VMC
           app.file(*input[:path].split("/"))
         end
 
-      puts "" unless quiet?
+      line unless quiet?
 
       print file
     end
@@ -540,9 +541,9 @@ module VMC
           app.files(*input[:path].split("/"))
         end
 
-      puts "" unless quiet?
+      line unless quiet?
       files.each do |file|
-        puts file.join("/")
+        line file.join("/")
       end
     end
 
@@ -551,9 +552,9 @@ module VMC
     group :apps, :info, :hidden => true
     input :apps, :argument => :splat, :singular => :app,
       :desc => "Applications to start",
-      :from_given => find_by_name("application")
+      :from_given => by_name("app")
     def health(input)
-      apps = input[:apps, client.apps]
+      apps = input[:apps]
       fail "No applications given." if apps.empty?
 
       health =
@@ -561,12 +562,10 @@ module VMC
           apps.collect { |a| [a, app_status(a)] }
         end
 
-      health.each do |app, status|
-        unless quiet?
-          puts ""
-          print "#{c(app.name, :name)}: "
-        end
+      line unless quiet?
 
+      spaced(health) do |app, status|
+        start_line "#{c(app.name, :name)}: " unless quiet?
         puts status
       end
     end
@@ -587,21 +586,23 @@ module VMC
           app.stats
         end
 
-      stats.sort_by(&:first).each do |idx, info|
-        puts ""
+      spaced(stats.sort_by(&:first)) do |idx, info|
+        line
 
         if info[:state] == "DOWN"
-          puts "Instance #{c("\##{idx}", :instance)} is down."
+          line "Instance #{c("\##{idx}", :instance)} is down."
           next
         end
 
         stats = info[:stats]
         usage = stats[:usage]
-        puts "instance #{c("\##{idx}", :instance)}:"
-        print "  cpu: #{percentage(usage[:cpu])} of"
-        puts " #{b(stats[:cores])} cores"
-        puts "  memory: #{usage(usage[:mem] * 1024, stats[:mem_quota])}"
-        puts "  disk: #{usage(usage[:disk], stats[:disk_quota])}"
+        line "instance #{c("\##{idx}", :instance)}:"
+
+        indented do
+          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])}"
+        end
       end
     end
 
@@ -669,10 +670,10 @@ module VMC
           app.env
         end
 
-      puts "" unless quiet?
+      line unless quiet?
 
       vars.each do |name, val|
-        puts "#{c(name, :name)}: #{val}"
+        line "#{c(name, :name)}: #{val}"
       end
     end
 
@@ -776,30 +777,30 @@ module VMC
 
     def display_app(a)
       if quiet?
-        puts a.name
+        line a.name
         return
       end
 
-      puts ""
-
       status = app_status(a)
 
-      puts "#{c(a.name, :name)}: #{status}"
+      line "#{c(a.name, :name)}: #{status}"
 
-      puts "  platform: #{b(a.framework.name)} on #{b(a.runtime.name)}"
+      indented do
+        line "platform: #{b(a.framework.name)} on #{b(a.runtime.name)}"
 
-      print "  usage: #{b(human_size(a.memory * 1024 * 1024, 0))}"
-      print " #{c(IS_UTF8 ? "\xc3\x97" : "x", :dim)} #{b(a.total_instances)}"
-      print " instance#{a.total_instances == 1 ? "" : "s"}"
-      puts ""
+        start_line "usage: #{b(human_size(a.memory * 1024 * 1024, 0))}"
+        print " #{c(IS_UTF8 ? "\xc3\x97" : "x", :dim)} #{b(a.total_instances)}"
+        print " instance#{a.total_instances == 1 ? "" : "s"}"
 
-      unless a.urls.empty?
-        puts "  urls: #{a.urls.collect { |u| b(u) }.join(", ")}"
-      end
+        line
+
+        unless a.urls.empty?
+          line "urls: #{a.urls.collect { |u| b(u) }.join(", ")}"
+        end
 
-      unless a.services.empty?
-        print "  services: "
-        puts a.services.collect { |s| b(s.name) }.join(", ")
+        unless a.services.empty?
+          line "services: #{a.services.collect { |s| b(s.name) }.join(", ")}"
+        end
       end
     end
 
@@ -848,8 +849,8 @@ module VMC
       with_progress("Checking #{c(app.name, :name)}") do |s|
         if app.debug_mode == "suspend"
           s.skip do
-            puts "Application is in suspended debugging mode."
-            puts "It will wait for you to attach to it before starting."
+            line "Application is in suspended debugging mode."
+            line "It will wait for you to attach to it before starting."
           end
         end
 
@@ -896,22 +897,24 @@ module VMC
     end
 
     def display_instance(i)
-      print "instance #{c("\##{i.index}", :instance)}: "
+      start_print "instance #{c("\##{i.index}", :instance)}: "
       puts "#{b(c(i.state.downcase, state_color(i.state)))} "
 
-      puts "  started: #{c(i.since.strftime("%F %r"), :cyan)}"
+      indented do
+        line "started: #{c(i.since.strftime("%F %r"), :cyan)}"
 
-      if d = i.debugger
-        puts "  debugger: port #{b(d[:port])} at #{b(d[:ip])}"
-      end
+        if d = i.debugger
+          line "debugger: port #{b(d[:port])} at #{b(d[:ip])}"
+        end
 
-      if c = i.console
-        puts "  console: port #{b(c[:port])} at #{b(c[:ip])}"
+        if c = i.console
+          line "console: port #{b(c[:port])} at #{b(c[:ip])}"
+        end
       end
     end
 
     def find_orphaned_services(apps, others = [])
-      orphaned = []
+      orphaned = Set.new
 
       apps.each do |a|
         a.services.each do |i|
@@ -927,7 +930,7 @@ module VMC
     def delete_orphaned_services(instances, orphaned)
       return if instances.empty?
 
-      puts "" unless quiet?
+      line unless quiet?
 
       instances.select { |i|
         orphaned ||

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

@@ -7,6 +7,7 @@ Mothership::Help.groups(
     [:info, "Information"]],
   [:services, "Services",
     [:manage, "Management"]],
+  [:spaces, "Spaces"],
   [:admin, "Administration",
     [:user, "User Management"]])
 

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

@@ -30,16 +30,28 @@ module VMC
           client.service_instances(2)
         end
 
+      line unless quiet?
+
       if instances.empty? and !quiet?
-        puts ""
-        puts "No services."
+        line "No services."
       end
 
-      instances.each.with_index do |i, n|
-        display_instance(i) if instance_matches(i, input)
+      spaced(instances) do |i|
+        display_service_instance(i) if instance_matches(i, input)
       end
     end
 
+
+    desc "Show service instance information"
+    group :services
+    input :instance, :argument => :required,
+      :from_given => by_name("service instance", :service_instance),
+      :desc => "Service instance to show"
+    def service(input)
+      display_service_instance(input[:instance])
+    end
+
+
     services_from_label = proc { |label, services|
       services.select { |s| s.label == label }
     }
@@ -89,9 +101,19 @@ module VMC
         services.reject! { |s| s.version != input[:version] }
       end
 
+      if plan = input.given(:plan)
+        services.reject! { |s|
+          if plan.is_a?(String)
+            s.service_plans.none? { |p| p.name == plan.upcase }
+          else
+            s.service_plans.include? plan
+          end
+        }
+      end
+
       until services.size < 2
         # cast to Array since it might be given as a Service with #invoke
-        services = Array(input[:service, services])
+        services = Array(input[:service, services.sort_by(&:label)])
         input.forget(:service)
       end
 
@@ -130,7 +152,7 @@ module VMC
     desc "Bind a service instance to an application"
     group :services, :manage
     input(:instance, :argument => true,
-          :from_given => by_name("instance", :service_instance),
+          :from_given => by_name("service instance", :service_instance),
           :desc => "Service to bind") { |app|
       instances = client.service_instances
       fail "No service instances." if instances.empty?
@@ -165,20 +187,20 @@ module VMC
     desc "Unbind a service from an application"
     group :services, :manage
     input(:instance, :argument => true,
-          :from_given => find_by_name("instance"),
-          :desc => "Service to bind") { |instances|
-      ask "Which service instance?", :choices => instances,
+          :from_given => find_by_name("service instance"),
+          :desc => "Service to bind") { |app|
+      ask "Which service instance?", :choices => app.services,
         :display => proc(&:name)
     }
     input(:app, :argument => true,
           :from_given => find_by_name("app"),
-          :desc => "Application to bind to") { |apps|
-      ask "Which application?", :choices => apps,
+          :desc => "Application to bind to") {
+      ask "Which application?", :choices => client.apps(2),
         :display => proc(&:name)
     }
     def unbind_service(input)
-      app = input[:app, client.apps(2)]
-      instance = input[:instance, app.services]
+      app = input[:app]
+      instance = input[:instance, app]
 
       with_progress(
           "Unbinding #{c(instance.name, :name)} from #{c(app.name, :name)}") do
@@ -190,8 +212,11 @@ module VMC
     desc "Delete a service"
     group :services, :manage
     input(:instance, :argument => true,
-          :from_given => find_by_name("instance"),
-          :desc => "Service to bind") { |instances|
+          :from_given => by_name("service instance", :service_instance),
+          :desc => "Service to bind") {
+      instances = client.service_instances
+      fail "No services." if instances.empty?
+
       ask "Which service instance?", :choices => instances,
         :display => proc(&:name)
     }
@@ -210,10 +235,7 @@ module VMC
         return
       end
 
-      instances = client.service_instances
-      fail "No services." if instances.empty?
-
-      instance = input[:instance, instances]
+      instance = input[:instance]
 
       return unless input[:really, instance.name, :name]
 
@@ -259,18 +281,23 @@ module VMC
       true
     end
 
-    def display_instance(i)
+    def display_service_instance(i)
       if quiet?
-        puts i.name
+        line i.name
       else
         plan = i.service_plan
         service = plan.service
 
-        puts ""
-        puts "#{c(i.name, :name)}: #{service.label} #{service.version}"
-        puts "  description: #{service.description}"
-        puts "  plan: #{c(plan.name, :name)}"
-        puts "    description: #{plan.description}"
+        line "#{c(i.name, :name)}: #{service.label} #{service.version}"
+
+        indented do
+          line "description: #{service.description}"
+          line "plan: #{c(plan.name, :name)}"
+
+          indented do
+            line "description: #{plan.description}"
+          end
+        end
       end
     end
 

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

@@ -0,0 +1,67 @@
+require "vmc/cli"
+
+module VMC
+  class Space < CLI
+    def precondition
+      super
+      fail "This command is v2-only." unless v2?
+    end
+
+    def self.by_name(what, obj = what)
+      proc { |name, *_|
+        client.send(:"#{obj}_by_name", name) ||
+          fail("Unknown #{what} '#{name}'")
+      }
+    end
+
+    desc "Show space information"
+    group :spaces
+    input(:space, :argument => :optional, :from_given => by_name("space"),
+          :desc => "Space to show") {
+      client.current_space
+    }
+    input :full, :type => :boolean,
+      :desc => "Show full information for apps, service instances, etc."
+    def space(input)
+      space = input[:space]
+
+      line "name: #{c(space.name, :name)}"
+      line "organization: #{c(space.organization.name, :name)}"
+
+      if input[:full]
+        line
+        line "apps:"
+
+        spaced(space.apps(2)) do |a|
+          indented do
+            invoke :app, :app => a
+          end
+        end
+      else
+        line "apps: #{name_list(space.apps)}"
+      end
+
+      if input[:full]
+        line
+        line "services:"
+        spaced(space.service_instances(2)) do |i|
+          indented do
+            invoke :service, :instance => i
+          end
+        end
+      else
+        line "services: #{name_list(space.service_instances)}"
+      end
+    end
+
+    private
+
+    def name_list(xs)
+      if xs.empty?
+        c("none", :dim)
+      else
+        xs.collect { |x| c(x.name, :name) }.join(", ")
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require "base64"
+
 require "vmc/cli"
 
 module VMC
@@ -26,10 +28,10 @@ module VMC
     group :start
     input :runtimes, :type => :boolean,
       :desc => "List supported runtimes"
-    input :services, :type => :boolean,
-      :desc => "List supported services"
     input :frameworks, :type => :boolean,
       :desc => "List supported frameworks"
+    input :services, :type => :boolean,
+      :desc => "List supported services"
     input(:all, :type => :boolean, :alias => "-a",
           :desc => "Show all information")
     def info(input)
@@ -42,13 +44,6 @@ module VMC
           end
       end
 
-      if all || input[:services]
-        services =
-          with_progress("Getting services") do
-            client.services
-          end
-      end
-
       if all || input[:frameworks]
         frameworks =
           with_progress("Getting frameworks") do
@@ -56,63 +51,82 @@ module VMC
           end
       end
 
+      if all || input[:services]
+        services =
+          with_progress("Getting services") do
+            client.services
+          end
+      end
+
       info = client.info
 
       showing_any = runtimes || services || frameworks
 
       unless !all && showing_any
-        puts "" if showing_any
-        puts info[:description]
-        puts ""
-        puts "target: #{b(client.target)}"
-        puts "  version: #{info[:version]}"
-        puts "  support: #{info[:support]}"
+        line if showing_any
+        line info[:description]
+        line
+        line "target: #{b(client.target)}"
+
+        indented do
+          line "version: #{info[:version]}"
+          line "support: #{info[:support]}"
+        end
 
         if user = client.current_user
-          puts ""
-          puts "user: #{b(user.email || user.guid)}"
+          line
+          line "user: #{b(user.email || token_data[:email] || user.guid)}"
         end
       end
 
       if runtimes
         unless quiet?
-          puts ""
-          puts "runtimes:"
+          line
+          line "runtimes:"
         end
 
-        puts "  #{c("none", :dim)}" if runtimes.empty? && !quiet?
-
-        runtimes.each.with_index do |r, i|
-          display_runtime(r)
-          puts "" unless quiet? || i + 1 == runtimes.size
+        indented do
+          if runtimes.empty? && !quiet?
+            line "#{c("none", :dim)}"
+          else
+            spaced(runtimes) do |r|
+              display_runtime(r)
+            end
+          end
         end
       end
 
-      if services
+      if frameworks
         unless quiet?
-          puts ""
-          puts "services:"
+          line
+          line "frameworks:"
         end
 
-        puts "  #{c("none", :dim)}" if services.empty? && !quiet?
-
-        services.each.with_index do |s, i|
-          display_service(s)
-          puts "" unless quiet? || i + 1 == services.size
+        indented do
+          if frameworks.empty? && !quiet?
+            line "#{c("none", :dim)}"
+          else
+            spaced(frameworks) do |f|
+              display_framework(f)
+            end
+          end
         end
       end
 
-      if frameworks
+      if services
         unless quiet?
-          puts ""
-          puts "frameworks:"
+          line
+          line "services:"
         end
 
-        puts "  #{c("none", :dim)}" if frameworks.empty? && !quiet?
-
-        frameworks.each.with_index do |f, i|
-          display_framework(f)
-          puts "" unless quiet? || i + 1 == frameworks.size
+        indented do
+          if services.empty? && !quiet?
+            line "#{c("none", :dim)}"
+          else
+            spaced(services) do |s|
+              display_service(s)
+            end
+          end
         end
       end
     end
@@ -137,6 +151,7 @@ module VMC
       if !input[:interactive] && !input.given?(:url) &&
           !input.given?(:organization) && !input.given?(:space)
         display_target
+        display_org_and_space unless quiet?
         return
       end
 
@@ -157,6 +172,9 @@ module VMC
         select_org_and_space(input, info)
 
         save_target_info(info)
+      elsif !quiet?
+        line
+        display_org_and_space
       end
     end
 
@@ -165,7 +183,7 @@ module VMC
     group :start, :hidden => true
     def targets(input)
       targets_info.each do |target, _|
-        puts target
+        line target
         # TODO: print org/space
       end
     end
@@ -189,7 +207,7 @@ module VMC
       ask("Space", :choices => spaces, :display => proc(&:name))
     }
     def login(input)
-      display_target unless quiet?
+      show_context
 
       credentials =
         { :username => input[:username],
@@ -232,7 +250,7 @@ module VMC
       invalidate_client
 
       if v2?
-        puts "" if input[:interactive]
+        line if input[:interactive]
         select_org_and_space(input, info)
         save_target_info(info)
       end
@@ -264,7 +282,7 @@ module VMC
     input :login, :type => :boolean, :default => true,
       :desc => "Automatically log in?"
     def register(input)
-      display_target unless quiet?
+      show_context
 
       email = input[:email]
       password = input[:password]
@@ -287,7 +305,7 @@ module VMC
     group :start, :hidden => true
     def colors(input)
       user_colors.each do |n, c|
-        puts "#{n}: #{c(c.to_s, n)}"
+        line "#{n}: #{c(c.to_s, n)}"
       end
     end
 
@@ -310,30 +328,33 @@ module VMC
       end
     end
 
-    def display_target
-      return if displayed_target?
+    def show_context
+      return if quiet? || displayed_target?
+
+      display_target
 
+      line
+
+      @@displayed_target = true
+    end
+
+    def display_target
       if quiet?
         puts client.target
       else
-        puts "target: #{c(client.target, :name)}"
-        display_org_and_space
+        line "target: #{c(client.target, :name)}"
       end
-
-      puts ""
-
-      @@displayed_target = true
     end
 
     def display_org_and_space
       return unless v2?
 
       if org = client.current_organization
-        puts "organization: #{c(org.name, :name)}"
+        line "organization: #{c(org.name, :name)}"
       end
 
       if space = client.current_space
-        puts "space: #{c(space.name, :name)}"
+        line "space: #{c(space.name, :name)}"
       end
     rescue CFoundry::APIError
     end
@@ -342,14 +363,16 @@ module VMC
       if quiet?
         puts r.name
       else
-        puts "  #{c(r.name, :name)}:"
+        line "#{c(r.name, :name)}:"
 
-        puts "    description: #{b(r.description)}" if r.description
+        indented do
+          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? ? c("none", :dim) : apps.join(", ")
-        puts "    apps: #{app_list}"
+          # TODO: probably won't have this in final version
+          apps = r.apps.collect { |a| c(a.name, :name) }
+          app_list = apps.empty? ? c("none", :dim) : apps.join(", ")
+          line "apps: #{app_list}"
+        end
       end
     end
 
@@ -357,10 +380,13 @@ module VMC
       if quiet?
         puts s.label
       else
-        puts "  #{c(s.label, :name)}:"
-        puts "    description: #{s.description}"
-        puts "    version: #{s.version}"
-        puts "    provider: #{s.provider}"
+        line "#{c(s.label, :name)}:"
+
+        indented do
+          line "description: #{s.description}"
+          line "version: #{s.version}"
+          line "provider: #{s.provider}"
+        end
       end
     end
 
@@ -368,12 +394,15 @@ module VMC
       if quiet?
         puts f.name
       else
-        puts "  #{c(f.name, :name)}:"
-        puts "    description: #{b(f.description)}" if f.description
+        line "#{c(f.name, :name)}:"
 
-        # TODO: probably won't show this in final version; just for show
-        apps = f.apps.collect { |a| c(a.name, :name) }
-        puts "    apps: #{apps.empty? ? c("none", :dim) : apps.join(", ")}"
+        indented do
+          line "description: #{b(f.description)}" if f.description
+
+          # TODO: probably won't show this in final version; just for show
+          apps = f.apps.collect { |a| c(a.name, :name) }
+          line "apps: #{apps.empty? ? c("none", :dim) : apps.join(", ")}"
+        end
       end
     end
 
@@ -423,7 +452,7 @@ module VMC
         if !input[:interactive] && spaces.size == 1 && !input.given?(:space)
           space = spaces.first
         else
-          puts "" if input[:interactive] && changed_org
+          line if input[:interactive] && changed_org
           space = input[:space, spaces.sort_by(&:name)]
         end
 
@@ -432,5 +461,21 @@ module VMC
         end
       end
     end
+
+    # grab the metadata from a token that looks like:
+    #
+    # bearer (base64 ...)
+    def token_data
+      return @token_data if @token_data
+
+      tok = Base64.decode64(client.base.token.sub(/^bearer\s+/, ""))
+      tok.sub!(/\{.+?\}/, "") # clear algo
+      @token_data = JSON.parse(tok[/\{.+?\}/], :symbolize_names => true)
+
+    # normally i don't catch'em all, but can't expect all tokens to be the
+    # proper format, so just silently fail as this is not critical
+    rescue
+      {}
+    end
   end
 end

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

@@ -10,7 +10,7 @@ module VMC
           client.users
         end
 
-      users.each do |u|
+      spaced(users) do |u|
         display_user(u)
       end
     end
@@ -91,9 +91,11 @@ module VMC
       if quiet?
         puts u.email
       else
-        puts ""
-        puts "#{c(u.email, :name)}:"
-        puts "  admin?: #{c(u.admin?, u.admin? ? :yes : :no)}"
+        line "#{c(u.email, :name)}:"
+
+        indented do
+          line "admin?: #{c(u.admin?, u.admin? ? :yes : :no)}"
+        end
       end
     end
   end

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

@@ -0,0 +1,45 @@
+module VMC
+  module Spacing
+    @@indentation = 0
+
+    def indented
+      @@indentation += 1
+      yield
+    ensure
+      @@indentation -= 1
+    end
+
+    def line(msg = "")
+      return puts "" if msg.empty?
+
+      start_line(msg)
+      puts ""
+    end
+
+    def start_line(msg)
+      print "  " * @@indentation
+      print msg
+    end
+
+    def lines(blob)
+      blob.each_line do |line|
+        start_line(line)
+      end
+
+      line
+    end
+
+    def quiet?
+      false
+    end
+
+    def spaced(vals)
+      num = 0
+      vals.each do |val|
+        line unless quiet? || num == 0
+        yield val
+        num += 1
+      end
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.23"
+  VERSION = "0.4.0.beta.24"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196429
+  hash: 62196435
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 23
-  version: 0.4.0.beta.23
+  - 24
+  version: 0.4.0.beta.24
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-23 00:00:00 Z
+date: 2012-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 3
-        - 10
-        version: 0.3.10
+        - 11
+        version: 0.3.11
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -281,12 +281,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 4
-        - 0
-        version: 0.4.0
+        - 1
+        version: 0.4.1
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
@@ -374,6 +374,7 @@ files:
 - vmc-ng/lib/vmc/cli/help.rb
 - vmc-ng/lib/vmc/cli/interactive.rb
 - vmc-ng/lib/vmc/cli/service.rb
+- vmc-ng/lib/vmc/cli/space.rb
 - vmc-ng/lib/vmc/cli/start.rb
 - vmc-ng/lib/vmc/cli/user.rb
 - vmc-ng/lib/vmc/cli.rb
@@ -381,6 +382,7 @@ files:
 - vmc-ng/lib/vmc/detect.rb
 - vmc-ng/lib/vmc/errors.rb
 - vmc-ng/lib/vmc/plugin.rb
+- vmc-ng/lib/vmc/spacing.rb
 - vmc-ng/lib/vmc/version.rb
 - vmc-ng/lib/vmc.rb
 - vmc-ng/spec/app/apps_spec.rb