vmc 0.4.0.beta.21 → 0.4.0.beta.22

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

@@ -40,14 +40,18 @@ module VMC
       }
     end
 
+    def self.by_name(what)
+      proc { |name|
+        client.send(:"#{what}_by_name", name) ||
+          fail("Unknown #{what} '#{name}'")
+      }
+    end
+
 
     desc "List your applications"
     group :apps
     input :space, :desc => "Show apps in given space",
-      :from_given => proc { |name|
-        client.space_by_name(name) || \
-          fail("Unknown space '#{name}'")
-      }
+      :from_given => by_name("space")
     input :name, :desc => "Filter by name regexp"
     input :runtime, :desc => "Filter by runtime regexp"
     input :framework, :desc => "Filter by framework regexp"
@@ -56,7 +60,8 @@ module VMC
       if space = input[:space] || client.current_space
         apps =
           with_progress("Getting applications in #{c(space.name, :name)}") do
-            space.apps
+            # depth of 2 for service binding instance names
+            space.apps(2)
           end
       else
         apps =
@@ -82,7 +87,8 @@ module VMC
     input(:name, :argument => true, :desc => "Application name") {
       ask("Name")
     }
-    input :path, :desc => "Path containing the application"
+    input :path, :default => ".",
+      :desc => "Path containing the application"
     input(:url, :desc => "URL bound to app") { |default|
       ask("URL", :default => default)
     }
@@ -98,8 +104,8 @@ module VMC
           :desc => "Number of instances to run") {
       ask("Instances", :default => 1)
     }
-    input(:framework, :desc => "Framework to use",
-          :from_given => find_by_name("framework")) { |choices, default, other|
+    input(:framework, :from_given => find_by_name("framework"),
+          :desc => "Framework to use") { |choices, default, other|
       choices = choices.sort_by(&:name)
       choices << other if other
 
@@ -138,13 +144,13 @@ module VMC
       ask "Bind other services to application?", :default => false
     }
     def push(input)
-      path = File.expand_path(input[:path] || ".")
+      path = File.expand_path(input[:path])
 
-      name = input[:name] if input[:name]
+      name = input[:name]
 
       if exists = client.app_by_name(name)
         upload_app(exists, path)
-        invoke :restart, :name => exists.name if input[:restart]
+        invoke :restart, :app => exists if input[:restart]
         return
       end
 
@@ -193,43 +199,35 @@ module VMC
 
       app.memory = megabytes(input[:memory, framework, runtime])
 
-      bindings = []
-      if !v2? && input[:create_services] && !force?
-        services = client.services
+      app = filter(:create_app, app)
 
-        while true
-          instance = invoke :create_service
+      with_progress("Creating #{c(app.name, :name)}") do
+        app.create!
+      end
 
-          bindings << instance.name
+      bindings = []
 
+      if input[:create_services] && !force?
+        while true
+          invoke :create_service, :app => app
           break unless ask "Create another service?", :default => false
         end
       end
 
-      if !v2? && input[:bind_services] && !force?
-        services = client.service_instances.collect(&:name)
+      if input[:bind_services] && !force?
+        instances = client.service_instances
 
         while true
-          choices = services - bindings
-          break if choices.empty?
+          invoke :bind_service, :app => app
 
-          bindings << ask("Bind which service?", :choices => choices.sort)
+          break if (instances - app.services).empty?
 
-          unless bindings.size < services.size &&
-                  ask("Bind another service?", :default => false)
-            break
-          end
+          break unless ask("Bind another service?", :default => false)
         end
       end
 
-      app.services = bindings
-
       app = filter(:push_app, app)
 
-      with_progress("Creating #{c(name, :name)}") do
-        app.create!
-      end
-
       begin
         upload_app(app, path)
       rescue
@@ -237,32 +235,27 @@ module VMC
         raise
       end
 
-      invoke :start, :name => app.name if input[:start]
+      invoke :start, :app => app if input[:start]
     end
 
 
     desc "Start an application"
     group :apps, :manage
-    input :names, :argument => :splat, :singular => :name,
-      :desc => "Applications to start"
+    input :apps, :argument => :splat, :singular => :app,
+      :desc => "Applications to start",
+      :from_given => find_by_name("app")
     input :debug_mode, :aliases => "-d",
       :desc => "Debug mode to start in"
     def start(input)
-      names = input[:names]
-      fail "No applications given." if names.empty?
-
-      apps = client.apps
-
-      names.each do |name|
-        app = apps.find { |a| a.name == name }
-
-        fail "Unknown application '#{name}'" unless app
+      apps = input[:apps, client.apps]
+      fail "No applications given." if apps.empty?
 
+      apps.each do |app|
         app = filter(:start_app, app)
 
         switch_mode(app, input[:debug_mode])
 
-        with_progress("Starting #{c(name, :name)}") do |s|
+        with_progress("Starting #{c(app.name, :name)}") do |s|
           if app.started?
             s.skip do
               err "Already started."
@@ -279,7 +272,7 @@ module VMC
 
         if app.debug_mode && !quiet?
           puts ""
-          instances(name)
+          invoke :instances, :app => app
         end
       end
     end
@@ -287,20 +280,15 @@ module VMC
 
     desc "Stop an application"
     group :apps, :manage
-    input :names, :argument => :splat, :singular => :name,
-      :desc => "Applications to stop"
+    input :apps, :argument => :splat, :singular => :app,
+      :desc => "Applications to start",
+      :from_given => find_by_name("app")
     def stop(input)
-      names = input[:names]
-      fail "No applications given." if names.empty?
-
-      apps = client.apps
-
-      names.each do |name|
-        app = apps.find { |a| a.name == name }
+      apps = input[:apps, client.apps]
+      fail "No applications given." if apps.empty?
 
-        fail "Unknown application '#{name}'" unless app
-
-        with_progress("Stopping #{c(name, :name)}") do |s|
+      apps.each do |app|
+        with_progress("Stopping #{c(app.name, :name)}") do |s|
           if app.stopped?
             s.skip do
               err "Application is not running."
@@ -315,28 +303,31 @@ module VMC
 
     desc "Stop and start an application"
     group :apps, :manage
-    input :names, :argument => :splat, :singular => :name,
-      :desc => "Applications to stop"
+    input :apps, :argument => :splat, :singular => :app,
+      :desc => "Applications to start",
+      :from_given => find_by_name("app")
     input :debug_mode, :aliases => "-d",
       :desc => "Debug mode to start in"
     def restart(input)
-      invoke :stop, :names => input[:names]
-      invoke :start, :names => input[:names],
+      apps = client.apps
+
+      invoke :stop, :apps => input[:apps, apps]
+      invoke :start, :apps => input[:apps, apps],
         :debug_mode => input[:debug_mode]
     end
 
 
     desc "Delete an application"
     group :apps, :manage
-    input(:really, :type => :boolean, :forget => true) { |name, color|
-      force? || ask("Really delete #{c(name, color)}?", :default => false)
-    }
     input(:apps, :argument => :splat, :singular => :app,
           :desc => "Applications to delete",
-          :from_given => find_by_name("application")) { |apps|
+          :from_given => find_by_name("app")) { |apps|
       [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 :orphaned, :aliases => "-o", :type => :boolean,
       :desc => "Delete orphaned instances"
     input :all, :default => false,
@@ -387,18 +378,19 @@ module VMC
 
     desc "List an app's instances"
     group :apps, :info, :hidden => true
-    input :names, :argument => :splat, :singular => :name,
-      :desc => "Applications to list instances of"
+    input :apps, :argument => :splat, :singular => :app,
+      :desc => "Applications to start",
+      :from_given => find_by_name("app")
     def instances(input)
       no_v2
 
-      names = input[:names]
-      fail "No applications given." if names.empty?
+      apps = input[:apps, client.apps]
+      fail "No applications given." if apps.empty?
 
-      names.each do |name|
+      apps.each do |app|
         instances =
-          with_progress("Getting instances for #{c(name, :name)}") do
-            client.app_by_name(name).instances
+          with_progress("Getting instances for #{c(app.name, :name)}") do
+            app.instances
           end
 
         instances.each do |i|
@@ -415,7 +407,8 @@ module VMC
 
     desc "Update the instances/memory limit for an application"
     group :apps, :info, :hidden => true
-    input :name, :argument => true, :desc => "Application to update"
+    input :app, :argument => true, :desc => "Application to update",
+      :from_given => by_name("app")
     input(:instances, :type => :numeric,
           :desc => "Number of instances to run") { |default|
       ask("Instances", :default => default)
@@ -427,8 +420,7 @@ module VMC
     input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
     def scale(input)
-      name = input[:name]
-      app = client.app_by_name(name)
+      app = input[:app]
 
       instances = input.given(:instances)
       memory = input.given(:memory)
@@ -445,22 +437,23 @@ module VMC
 
       return unless memory_changed || instances_changed
 
-      with_progress("Scaling #{c(name, :name)}") do
+      with_progress("Scaling #{c(app.name, :name)}") do
         app.total_instances = instances.to_i if instances
         app.memory = megs if memory
         app.update!
       end
 
       if memory_changed && app.started? && input[:restart]
-        invoke :restart, :name => name
+        invoke :restart, :app => app
       end
     end
 
 
     desc "Print out an app's logs"
     group :apps, :info, :hidden => true
-    input :name, :argument => true,
-      :desc => "Application to get the logs of"
+    input :app, :argument => true,
+      :desc => "Application to get the logs of",
+      :from_given => by_name("app")
     input :instance, :type => :numeric, :default => 0,
       :desc => "Instance of application to get the logs of"
     input :all, :default => false,
@@ -468,10 +461,7 @@ module VMC
     def logs(input)
       no_v2
 
-      name = input[:name]
-
-      app = client.app_by_name(name)
-      fail "Unknown application '#{name}'" unless app.exists?
+      app = input[:app]
 
       instances =
         if input[:all]
@@ -484,16 +474,15 @@ module VMC
         if input[:all]
           fail "No instances found."
         else
-          fail "Instance #{name} \##{input[:instance]} not found."
+          fail "Instance #{app.name} \##{input[:instance]} not found."
         end
       end
 
       instances.each do |i|
         logs =
           with_progress(
-            "Getting logs for " +
-              c(name, :name) + " " +
-              c("\##{i.index}", :instance)) do
+              "Getting logs for #{c(app.name, :name)}" +
+                c("\##{i.index}", :instance)) do
             i.files("logs")
           end
 
@@ -514,16 +503,19 @@ module VMC
 
     desc "Print out an app's file contents"
     group :apps, :info, :hidden => true
-    input :name, :argument => true,
-      :desc => "Application to inspect the files of"
+    input :app, :argument => true,
+      :desc => "Application to inspect the files of",
+      :from_given => by_name("app")
     input :path, :argument => true, :default => "/",
       :desc => "Path of file to read"
     def file(input)
       no_v2
 
+      app = input[:app]
+
       file =
         with_progress("Getting file contents") do
-          client.app(input[:name]).file(*input[:path].split("/"))
+          app.file(*input[:path].split("/"))
         end
 
       puts "" unless quiet?
@@ -533,16 +525,19 @@ module VMC
 
     desc "Examine an app's files"
     group :apps, :info, :hidden => true
-    input :name, :argument => true,
-      :desc => "Application to inspect the files of"
+    input :app, :argument => true,
+      :desc => "Application to inspect the files of",
+      :from_given => by_name("app")
     input :path, :argument => true, :default => "/",
       :desc => "Path of directory to list"
     def files(input)
       no_v2
 
+      app = input[:app]
+
       files =
         with_progress("Getting file listing") do
-          client.app(input[:name]).files(*input[:path].split("/"))
+          app.files(*input[:path].split("/"))
         end
 
       puts "" unless quiet?
@@ -554,22 +549,22 @@ module VMC
 
     desc "Get application health"
     group :apps, :info, :hidden => true
-    input :names, :argument => :splat, :singular => :name,
-      :desc => "Application to check the status of"
+    input :apps, :argument => :splat, :singular => :app,
+      :desc => "Applications to start",
+      :from_given => find_by_name("application")
     def health(input)
-      # TODO: get all apps and filter
+      apps = input[:apps, client.apps]
+      fail "No applications given." if apps.empty?
 
-      apps =
-        with_progress("Getting application health") do
-          input[:names].collect do |n|
-            [n, app_status(client.app_by_name(n))]
-          end
+      health =
+        with_progress("Getting health status") do
+          apps.collect { |a| [a, app_status(a)] }
         end
 
-      apps.each do |name, status|
+      health.each do |app, status|
         unless quiet?
           puts ""
-          print "#{c(name, :name)}: "
+          print "#{c(app.name, :name)}: "
         end
 
         puts status
@@ -579,49 +574,53 @@ module VMC
 
     desc "Display application instance status"
     group :apps, :info, :hidden => true
-    input :name, :argument => true,
-      :desc => "Application to get the stats for"
+    input :app, :argument => true,
+      :desc => "Application to get the stats for",
+      :from_given => by_name("app")
     def stats(input)
       no_v2
 
+      app = input[:app]
+
       stats =
-        with_progress("Getting stats for #{c(input[:name], :name)}") do
-          client.app_by_name(input[:name]).stats
+        with_progress("Getting stats for #{c(app.name, :name)}") do
+          app.stats
         end
 
-      stats.sort_by { |k, _| k }.each do |idx, info|
+      stats.sort_by(&:first).each do |idx, info|
         puts ""
 
-        if info["state"] == "DOWN"
+        if info[:state] == "DOWN"
           puts "Instance #{c("\##{idx}", :instance)} is down."
           next
         end
 
-        stats = info["stats"]
-        usage = stats["usage"]
+        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"])}"
+        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])}"
       end
     end
 
 
     desc "Add a URL mapping for an app"
     group :apps, :info, :hidden => true
-    input :name, :argument => true,
-      :desc => "Application to add the URL to"
+    input :app, :argument => true,
+      :desc => "Application to add the URL to",
+      :from_given => by_name("app")
     input :url, :argument => true,
       :desc => "URL to route"
     def map(input)
       no_v2
 
-      name = input[:name]
+      app = input[:app]
+
       simple = input[:url].sub(/^https?:\/\/(.*)\/?/i, '\1')
 
-      with_progress("Updating #{c(name, :name)}") do
-        app = client.app_by_name(name)
+      with_progress("Updating #{c(app.name, :name)}") do
         app.urls << simple
         app.update!
       end
@@ -630,24 +629,21 @@ module VMC
 
     desc "Remove a URL mapping from an app"
     group :apps, :info, :hidden => true
-    input :name, :argument => true,
-      :desc => "Application to remove the URL from"
+    input :app, :argument => true,
+      :desc => "Application to remove the URL from",
+      :from_given => by_name("app")
     input(:url, :argument => true, :desc => "URL to unmap") { |choices|
       ask("Which URL?", :choices => choices)
     }
     def unmap(input)
       no_v2
 
-      name = input[:name]
-      app = client.app_by_name(name)
-
+      app = input[:app]
       url = input[:url, app.urls]
 
       simple = url.sub(/^https?:\/\/(.*)\/?/i, '\1')
 
-      fail "Unknown application '#{name}'" unless app.exists?
-
-      with_progress("Updating #{c(name, :name)}") do |s|
+      with_progress("Updating #{c(app.name, :name)}") do |s|
         unless app.urls.delete(simple)
           s.fail do
             err "URL #{url} is not mapped to this application."
@@ -662,22 +658,14 @@ module VMC
 
     desc "Show all environment variables set for an app"
     group :apps, :info, :hidden => true
-    input :name, :argument => true,
-      :desc => "Application to inspect the environment of"
+    input :app, :argument => true,
+      :desc => "Application to inspect the environment of",
+      :from_given => by_name("app")
     def env(input)
-      appname = input[:name]
+      app = input[:app]
 
       vars =
-        with_progress("Getting env for #{c(input[:name], :name)}") do |s|
-          app = client.app_by_name(appname)
-
-          unless app.exists?
-            s.fail do
-              err "Unknown application '#{appname}'"
-              return
-            end
-          end
-
+        with_progress("Getting env for #{c(app.name, :name)}") do |s|
           app.env
         end
 
@@ -693,20 +681,21 @@ module VMC
 
     desc "Set an environment variable"
     group :apps, :info, :hidden => true
+    input :app, :argument => true,
+      :desc => "Application to set the variable for",
+      :from_given => by_name("app")
     input :name, :argument => true,
-      :desc => "Application to set the variable for"
-    input :var, :argument => true,
       :desc => "Environment variable name"
     input :value, :argument => :optional,
       :desc => "Environment variable value"
     input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
     def set_env(input)
-      appname = input[:name]
-      name = input[:var]
+      app = input[:app]
+      name = input[:name]
 
       if value = input[:value]
-        name = input[:var]
+        name = input[:name]
       elsif name["="]
         name, value = name.split("=")
       end
@@ -715,16 +704,13 @@ module VMC
         fail "Invalid variable name; must match #{VALID_ENV_VAR.inspect}"
       end
 
-      app = client.app_by_name(appname)
-      fail "Unknown application '#{appname}'" unless app.exists?
-
       with_progress("Updating #{c(app.name, :name)}") do
         app.env[name] = value
         app.update!
       end
 
       if app.started? && input[:restart]
-        invoke :restart, :name => app.name
+        invoke :restart, :app => app
       end
     end
 
@@ -735,18 +721,16 @@ module VMC
 
     desc "Remove an environment variable"
     group :apps, :info, :hidden => true
+    input :app, :argument => true,
+      :desc => "Application to set the variable for",
+      :from_given => by_name("app")
     input :name, :argument => true,
-      :desc => "Application to remove the variable from"
-    input :var, :argument => true,
       :desc => "Environment variable name"
     input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
     def delete_env(input)
-      appname = input[:name]
-      name = input[:var]
-
-      app = client.app_by_name(appname)
-      fail "Unknown application '#{appname}'" unless app.exists?
+      app = input[:app]
+      name = input[:name]
 
       with_progress("Updating #{c(app.name, :name)}") do
         app.env.delete(name)
@@ -754,7 +738,7 @@ module VMC
       end
 
       if app.started? && input[:restart]
-        invoke :restart, :name => app.name
+        invoke :restart, :app => app
       end
     end
 
@@ -814,7 +798,8 @@ module VMC
       end
 
       unless a.services.empty?
-        puts "  services: #{a.services.collect { |s| b(s) }.join(", ")}"
+        print "  services: "
+        puts a.services.collect { |s| b(s.name) }.join(", ")
       end
     end
 
@@ -929,9 +914,9 @@ module VMC
       orphaned = []
 
       apps.each do |a|
-        a.services.each do |s|
-          if apps.none? { |x| x != a && x.services.include?(s) }
-            orphaned << s
+        a.services.each do |i|
+          if apps.none? { |x| x != a && x.services.include?(i) }
+            orphaned << i
           end
         end
       end
@@ -939,17 +924,18 @@ module VMC
       orphaned
     end
 
-    def delete_orphaned_services(names, orphaned)
-      return if names.empty?
+    def delete_orphaned_services(instances, orphaned)
+      return if instances.empty?
 
       puts "" unless quiet?
 
-      names.select { |s|
+      instances.select { |i|
         orphaned ||
-          ask("Delete orphaned service #{c(s, :name)}?", :default => false)
-      }.each do |name|
+          ask("Delete orphaned service instance #{c(i.name, :name)}?",
+              :default => false)
+      }.each do |instance|
         # TODO: splat
-        invoke :delete_service, :name => name, :really => true
+        invoke :delete_service, :instance => instance, :really => true
       end
     end
 

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

@@ -2,7 +2,21 @@ require "vmc/cli"
 
 module VMC
   class Service < CLI
-    desc "List your services"
+    def self.find_by_name(what)
+      proc { |name, choices|
+        choices.find { |c| c.name == name } ||
+          fail("Unknown #{what} '#{name}'")
+      }
+    end
+
+    def self.by_name(what, obj = what)
+      proc { |name, *_|
+        client.send(:"#{obj}_by_name", name) ||
+          fail("Unknown #{what} '#{name}'")
+      }
+    end
+
+    desc "List your service instances"
     group :services
     input :name, :desc => "Filter by name regexp"
     input :app, :desc => "Filter by bound application regexp"
@@ -30,10 +44,6 @@ module VMC
       services.select { |s| s.label == label }
     }
 
-    plan_from_name = proc { |name, plans|
-      plans.find { |p| p.name == name }
-    }
-
     desc "Create a service"
     group :services, :manage
     input(:service, :argument => true,
@@ -55,7 +65,7 @@ module VMC
       ask "Name?", :default => "#{service.label}-#{random}"
     }
     input(:plan, :desc => "Service plan",
-          :from_given => plan_from_name) { |plans|
+          :from_given => find_by_name("plan")) { |plans|
       if d100 = plans.find { |p| p.name == "D100" }
         d100
       else
@@ -65,7 +75,8 @@ module VMC
       end
     }
     input :provider, :desc => "Service provider"
-    input :bind, :alias => "--app",
+    input :version, :desc => "Service version"
+    input :app, :alias => "--bind", :from_given => by_name("app"),
       :desc => "Application to immediately bind to"
     def create_service(input)
       services = client.services
@@ -74,8 +85,13 @@ module VMC
         services.reject! { |s| s.provider != input[:provider] }
       end
 
+      if input[:version]
+        services.reject! { |s| s.version != input[:version] }
+      end
+
       until services.size < 2
-        services = input[:service, services]
+        # cast to Array since it might be given as a Service with #invoke
+        services = Array(input[:service, services])
         input.forget(:service)
       end
 
@@ -103,61 +119,75 @@ module VMC
         instance.create!
       end
 
-      if app = input[:bind]
-        invoke :bind_service, :name => instance.name, :app => app
+      if app = input[:app]
+        invoke :bind_service, :instance => instance, :app => app
       end
 
       instance
     end
 
 
-    desc "Bind a service to an application"
+    desc "Bind a service instance to an application"
     group :services, :manage
-    input(:name, :argument => true,
-          :desc => "Service to bind") { |choices|
-      ask "Which service?", :choices => choices
+    input(:instance, :argument => true,
+          :from_given => by_name("instance", :service_instance),
+          :desc => "Service to bind") { |app|
+      instances = client.service_instances
+      fail "No service instances." if instances.empty?
+
+      ask "Which service instance?",
+        :choices => instances - app.services,
+        :display => proc(&:name)
     }
     input(:app, :argument => true,
-          :desc => "Application to bind to") { |choices|
-      ask "Which application?", :choices => choices
+          :from_given => by_name("app"),
+          :desc => "Application to bind to") {
+      ask "Which application?", :choices => client.apps(2),
+        :display => proc(&:name)
     }
     def bind_service(input)
-      name = input[:name, client.service_instances.collect(&:name)]
-      appname = input[:app, client.apps.collect(&:name)]
+      app = input[:app]
+      instance = input[:instance, app]
 
-      with_progress("Binding #{c(name, :name)} to #{c(appname, :name)}") do
-        client.app_by_name(appname).bind(name)
+      with_progress(
+          "Binding #{c(instance.name, :name)} to #{c(app.name, :name)}") do
+        app.bind(instance)
       end
     end
 
 
     desc "Unbind a service from an application"
     group :services, :manage
-    input(:name, :argument => true,
-          :desc => "Service to unbind") { |choices|
-      ask "Which service?", :choices => choices
+    input(:instance, :argument => true,
+          :from_given => find_by_name("instance"),
+          :desc => "Service to bind") { |instances|
+      ask "Which service instance?", :choices => instances,
+        :display => proc(&:name)
     }
     input(:app, :argument => true,
-          :desc => "Application to unbind from") { |choices|
-      ask "Which application?", :choices => choices
+          :from_given => find_by_name("app"),
+          :desc => "Application to bind to") { |apps|
+      ask "Which application?", :choices => apps,
+        :display => proc(&:name)
     }
     def unbind_service(input)
-      appname = input[:app, client.apps.collect(&:name)]
-
-      app = client.app_by_name(appname)
-      name = input[:name, app.services]
+      app = input[:app, client.apps(2)]
+      instance = input[:instance, app.services]
 
-      with_progress("Unbinding #{c(name, :name)} from #{c(appname, :name)}") do
-        app.unbind(name)
+      with_progress(
+          "Unbinding #{c(instance.name, :name)} from #{c(app.name, :name)}") do
+        app.unbind(instance)
       end
     end
 
 
     desc "Delete a service"
     group :services, :manage
-    input(:name, :argument => true,
-          :desc => "Service to delete") { |choices|
-      ask "Delete which service?", :choices => choices
+    input(:instance, :argument => true,
+          :from_given => find_by_name("instance"),
+          :desc => "Service to bind") { |instances|
+      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)
@@ -167,8 +197,8 @@ module VMC
       if input[:all]
         return unless input[:really, "ALL SERVICES", :bad]
 
-        with_progress("Deleting all services") do
-          client.service_instances.collect(&:delete!)
+        client.service_instances.each do |i|
+          invoke :delete_service, :instance => i, :really => true
         end
 
         return
@@ -177,13 +207,21 @@ module VMC
       instances = client.service_instances
       fail "No services." if instances.empty?
 
-      name = input[:name, instances.collect(&:name)]
-      service = instances.find { |i| i.name == name }
+      instance = input[:instance, instances]
+
+      return unless input[:really, instance.name, :name]
 
-      return unless input[:really, name, :name]
+      with_progress("Deleting #{c(instance.name, :name)}") do |s|
+        bindings = instance.service_bindings
 
-      with_progress("Deleting #{c(name, :name)}") do
-        service.delete!
+        if bindings.empty?
+          instance.delete!
+        else
+          s.skip do
+            apps = bindings.collect(&:app).collect { |a| b(a.name) }
+            err "Service instance is bound to #{human_list(apps)}."
+          end
+        end
       end
     end
 
@@ -229,5 +267,16 @@ module VMC
         puts "    description: #{plan.description}"
       end
     end
+
+    def human_list(xs)
+      if xs.size == 1
+        xs.first
+      elsif xs.size == 2
+        "#{xs.first} and #{xs.last}"
+      else
+        last = xs.pop
+        xs.join(", ") + ", and #{last}"
+      end
+    end
   end
 end

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

@@ -146,11 +146,6 @@ module VMC
         with_progress("Setting target to #{display}") do
           set_target(target)
         end
-
-        unless quiet?
-          puts ""
-          display_org_and_space
-        end
       end
 
       return unless v2? && client.logged_in?
@@ -428,7 +423,7 @@ module VMC
         if !input[:interactive] && spaces.size == 1 && !input.given?(:space)
           space = spaces.first
         else
-          puts "" if changed_org
+          puts "" if input[:interactive] && changed_org
           space = input[:space, spaces.sort_by(&:name)]
         end
 

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

@@ -92,6 +92,7 @@ module VMC
     rescue Mothership::Error
       raise
     rescue UserError => e
+      log_error(e)
       err e.message
     rescue CFoundry::Denied => e
       if !$vmc_asked_auth && e.error_code == 200
@@ -290,13 +291,17 @@ module VMC
       @@client.proxy = option(:proxy)
       @@client.trace = option(:trace)
 
-      info[:version] ||=
-        case @@client
-        when CFoundry::V2::Client
-          2
-        else
-          1
-        end
+      unless info.key? :version
+        info[:version] =
+          case @@client
+          when CFoundry::V2::Client
+            2
+          else
+            1
+          end
+
+        save_target_info(info)
+      end
 
       if org = info[:organization]
         @@client.current_organization = @@client.organization(org)
@@ -306,8 +311,6 @@ module VMC
         @@client.current_space = @@client.space(space)
       end
 
-      save_target_info(info)
-
       @@client
     end
 

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.21"
+  VERSION = "0.4.0.beta.22"
 end

data/vmc-ng/spec/start/target_spec.rb

@@ -6,6 +6,16 @@ describe "Start#target" do
   end
 
   describe "switching target url" do
+    before(:all) do
+      @old_target = File.read(File.expand_path(VMC::TARGET_FILE))
+    end
+
+    after(:all) do
+      File.open(File.expand_path(VMC::TARGET_FILE), "w") do |io|
+        io.print @old_target
+      end
+    end
+
     before(:each) do
       @old_client = client
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196425
+  hash: 62196431
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 21
-  version: 0.4.0.beta.21
+  - 22
+  version: 0.4.0.beta.22
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
         - 3
-        - 8
-        version: 0.3.8
+        - 9
+        version: 0.3.9
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 0
         - 0
-        - 8
-        version: 0.0.8
+        - 10
+        version: 0.0.10
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -281,12 +281,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 1
-        version: 0.3.1
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency