vmc 0.5.0.beta.12 → 0.5.0.rc1

data/lib/vmc/cli.rb

@@ -63,7 +63,7 @@ module VMC
     end
 
     def check_target
-      unless File.exists? target_file
+      unless client && client.target
         fail "Please select a target with 'vmc target'."
       end
     end
@@ -96,14 +96,8 @@ module VMC
       end
     end
 
-    def execute(cmd, argv, global = {})
-      if input[:help]
-        invoke :help, :command => cmd.name.to_s
-      else
-        @command = cmd
-        precondition
-        super
-      end
+    def wrap_errors
+      yield
     rescue CFoundry::Timeout => e
       err(e.message)
     rescue Interrupt
@@ -122,6 +116,8 @@ module VMC
         line
         line c("Not authenticated! Try logging in:", :warning)
 
+        # TODO: there's no color here; global flags not being passed
+        # through (mothership bug?)
         invoke :login
 
         retry
@@ -132,18 +128,52 @@ module VMC
       err "Denied: #{e.description}"
 
     rescue Exception => e
-      ensure_config_dir
-
       log_error(e)
 
       msg = e.class.name
       msg << ": #{e}" unless e.to_s.empty?
       msg << "\nFor more information, see #{VMC::CRASH_FILE}"
       err msg
+
       raise if debug?
     end
 
+    def execute(cmd, argv, global = {})
+      if input[:help]
+        invoke :help, :command => cmd.name.to_s
+      else
+        wrap_errors do
+          @command = cmd
+          precondition
+
+          save_token_if_it_changes do
+            super
+          end
+        end
+      end
+    end
+
+    def save_token_if_it_changes
+      return yield unless client && client.token
+
+      before_token = client.token
+
+      yield
+
+      after_token = client.token
+
+      return unless after_token
+
+      if before_token != after_token
+        info = target_info
+        info[:token] = after_token.auth_header
+        save_target_info(info)
+      end
+    end
+
     def log_error(e)
+      ensure_config_dir
+
       msg = e.class.name
       msg << ": #{e}" unless e.to_s.empty?
 
@@ -277,8 +307,9 @@ module VMC
     end
 
     def client_target
-      check_target
-      File.read(target_file).chomp
+      if File.exists?(target_file)
+        File.read(target_file).chomp
+      end
     end
 
     def ensure_config_dir
@@ -300,13 +331,14 @@ module VMC
       new_toks = File.expand_path(VMC::TOKENS_FILE)
       old_toks = File.expand_path(VMC::OLD_TOKENS_FILE)
 
-      info = if File.exist? new_toks
-        YAML.load_file(new_toks)
-      elsif File.exist? old_toks
-        MultiJson.load(File.read(old_toks))
-      else
-        {}
-      end
+      info =
+        if File.exist? new_toks
+          YAML.load_file(new_toks)
+        elsif File.exist? old_toks
+          MultiJson.load(File.read(old_toks))
+        end
+
+      info ||= {}
 
       normalize_targets_info(info)
     end
@@ -314,7 +346,7 @@ module VMC
     def normalize_targets_info(info_by_url)
       info_by_url.reduce({}) do |hash, pair|
         key, value = pair
-        hash[key] = value.is_a?(String) ? {:token => value } : value
+        hash[key] = value.is_a?(String) ? { :token => value } : value
         hash
       end
     end
@@ -358,6 +390,7 @@ module VMC
 
     def client(target = client_target)
       return @@client if defined?(@@client) && @@client
+      return unless target
 
       info = target_info(target)
       token = info[:token] && CFoundry::AuthToken.from_hash(info)
@@ -392,6 +425,11 @@ module VMC
       end
 
       @@client
+    rescue CFoundry::InvalidTarget
+    end
+
+    def fail_unknown(display, name)
+      fail("Unknown #{display} '#{name}'.")
     end
 
     class << self
@@ -411,14 +449,14 @@ module VMC
           choices ||= instance_exec(&blk) if block_given?
 
           choices.find { |c| c.name == name } ||
-            fail("Unknown #{display} '#{name}'.")
+            fail_unknown(display, name)
         }
       end
 
       def by_name(what, display = what)
         proc { |name, *_|
           client.send(:"#{what}_by_name", name) ||
-            fail("Unknown #{display} '#{name}'.")
+            fail_unknown(display, name)
         }
       end
 
@@ -428,7 +466,7 @@ module VMC
           choices ||= instance_exec(&blk) if block_given?
 
           choices.find { |c| c.name.upcase == name.upcase } ||
-            fail("Unknown #{display} '#{name}'.")
+            fail_unknown(display, name)
         }
       end
     end

data/lib/vmc/cli/app/push.rb

@@ -12,7 +12,16 @@ module VMC::App
     group :apps, :manage
     input :name,      :desc => "Application name", :argument => :optional
     input :path,      :desc => "Path containing the bits", :default => "."
-    input :url,       :desc => "URL to bind to app"
+    input :host,      :desc => "Subdomain for the app's URL"
+    input :domain,    :desc => "Domain for the app",
+                      :from_given => proc { |given, app|
+                        if !v2? || given == "none"
+                          given
+                        else
+                          app.space.domain_by_name(given) ||
+                            fail_unknown("domain", given)
+                        end
+                      }
     input :memory,    :desc => "Memory limit"
     input :instances, :desc => "Number of instances to run", :type => :integer
     input :framework, :desc => "Framework to use", :from_given => by_name(:framework)
@@ -50,7 +59,7 @@ module VMC::App
     def setup_new_app(path)
       self.path = path
       app = create_app(get_inputs)
-      map_url(app)
+      map_route(app)
       create_services(app)
       bind_services(app)
       upload_app(app, path)
@@ -80,5 +89,17 @@ module VMC::App
       err "Upload failed. Try again with 'vmc push'."
       raise
     end
+
+    def wrap_message_format_errors
+      yield
+    rescue CFoundry::MessageParseError => e
+      md = e.description.match /Field: ([^,]+)/
+      field = md[1]
+
+      case field
+      when "buildpack"
+        fail "Buildpack must be a public git repository URI."
+      end
+    end
   end
 end

data/lib/vmc/cli/app/push/create.rb

@@ -59,21 +59,25 @@ module VMC::App
       app = filter(:create_app, app)
 
       with_progress("Creating #{c(app.name, :name)}") do
-        app.create!
+        wrap_message_format_errors do
+          app.create!
+        end
       end
 
       app
     end
 
-    def map_url(app)
+    def map_route(app)
       line unless quiet?
 
-      url = input[:url, app.name]
+      host = input[:host, app.name] if v2?
+      domain = input[:domain, app]
 
       mapped_url = false
-      until url == "none" || !url || mapped_url
+      until domain == "none" || !domain || mapped_url
         begin
-          invoke :map, :app => app, :url => url
+          host = "" if host == "none"
+          invoke :map, :app => app, :host => host, :domain => domain
           mapped_url = true
         rescue CFoundry::RouteHostTaken, CFoundry::UriAlreadyTaken => e
           raise if force?
@@ -81,8 +85,11 @@ module VMC::App
           line c(e.description, :bad)
           line
 
-          input.forget(:url)
-          url = input[:url, app.name]
+          input.forget(:host) if v2?
+          input.forget(:domain)
+
+          host = input[:host, app.name] if v2?
+          domain = input[:domain, app]
 
           # version bumps on v1 even though mapping fails
           app.invalidate! unless v2?

data/lib/vmc/cli/app/push/interactions.rb

@@ -4,17 +4,24 @@ module VMC::App
       ask("Name")
     end
 
-    def ask_url(name)
-      choices = url_choices(name)
+    def ask_host(name)
+      ask "Subdomain", :choices => [name, "none"],
+        :default => name,
+        :allow_other => true
+    end
+
+    def ask_domain(app)
+      choices = v2? ? app.space.domains : ["#{app.name}.#{target_base}"]
 
       options = {
         :choices => choices + ["none"],
+        :display => proc { |d| d.is_a?(String) ? d : d.name },
         :allow_other => true
       }
 
       options[:default] = choices.first if choices.size == 1
 
-      ask "URL", options
+      ask "Domain", options
     end
 
     def ask_memory(default)

data/lib/vmc/cli/app/push/sync.rb

@@ -25,7 +25,9 @@ module VMC::App
     def commit_changes(app)
       if app.changed?
         with_progress("Updating #{c(app.name, :name)}") do
-          app.update!
+          wrap_message_format_errors do
+            app.update!
+          end
         end
       end
 
@@ -42,7 +44,7 @@ module VMC::App
         human_mb(val)
       when :framework, :runtime
         val.name
-      when :command
+      when :command, :buildpack
         "'#{val}'"
       when :production
         bool(val)

data/lib/vmc/cli/app/stats.rb

@@ -36,7 +36,7 @@ module VMC::App
 
             if usage
               [ idx,
-                "#{percentage(usage[:cpu])} of #{b(stats[:cores])} cores",
+                "#{percentage(usage[:cpu])}",
                 "#{usage(usage[:mem], stats[:mem_quota])}",
                 "#{usage(usage[:disk], stats[:disk_quota])}"
               ]

data/lib/vmc/cli/route/map.rb

@@ -6,29 +6,33 @@ module VMC::Route
 
     desc "Add a URL mapping"
     group :apps, :info, :hidden => true
-    input :url, :desc => "URL to map", :argument => true
-    input :app, :desc => "Application to add the URL to", :argument => :optional,
-          :from_given => by_name(:app)
-    input :space, :desc => "Space to add the URL to",
-          :from_given => by_name(:space)
+    input :app, :desc => "Application to add the URL to",
+          :argument => :optional, :from_given => by_name(:app)
+    input :host, :desc => "Host name for the route",
+          :argument => :optional, :default => ""
+    input :domain, :desc => "Domain to add the route to",
+          :argument => true,
+          :from_given => proc { |name, space|
+            if v2?
+              space.domain_by_name(name) ||
+                fail_unknown("domain", name)
+            else
+              name
+            end
+          }
     def map
-      if input.has?(:space)
-        space = input[:space]
-      else
-        app = input[:app]
-        space = app.space if v2?
-      end
+      app = input[:app]
+      space = app.space if v2?
 
-      url = input[:url].sub(/^https?:\/\/(.*)\/?/i, '\1')
+      host = input[:host]
+      domain = input[:domain, space]
 
       if v2?
-        host, domain_name = url.split(".", 2)
-        domain = find_domain(space, domain_name)
         route = find_or_create_route(domain, host, space)
         bind_route(route, app) if app
       else
         with_progress("Updating #{c(app.name, :name)}") do
-          app.urls << url
+          app.urls << domain
           app.update!
         end
       end
@@ -56,7 +60,9 @@ module VMC::Route
       route.domain = domain
       route.space = space
 
-      with_progress("Creating route #{c(route.name, :name)}") { route.create! }
+      with_progress("Creating route #{c(route.name, :name)}") do
+        route.create!
+      end
 
       route
     end

data/lib/vmc/cli/service/create.rb

@@ -69,7 +69,7 @@ module VMC::Service
         service.type = offering.type
         service.vendor = offering.label
         service.version = offering.version
-        service.tier = "free"
+        service.tier = v1_service_tier(offering)
       end
 
       with_progress("Creating service #{c(service.name, :name)}") do
@@ -102,10 +102,25 @@ module VMC::Service
       ask "Name?", :default => "#{offering.label}-#{random}"
     end
 
-    def ask_plan(plans)
-      ask "Which plan?", :choices => plans.sort_by(&:name),
-        :display => proc { |p| "#{p.name}: #{p.description}" },
+    def ask_plan(plans, default_plan = nil)
+      ask "Which plan?",
+        :choices => plans.sort_by(&:name),
+        :indexed => true,
+        :display => proc { |p| "#{p.name}: #{p.description || 'No description'}" },
+        :default => default_plan,
         :complete => proc(&:name)
     end
+
+    def v1_service_tier(service)
+      plans = service.service_plans
+      fail "No service plans" if plans.empty?
+      if plans.length == 1
+        plan = plans[0]
+      else
+        plan = ask_plan(plans, service.default_service_plan)
+      end
+      plan.name
+    end
+
   end
 end

data/lib/vmc/cli/start/info.rb

@@ -2,6 +2,10 @@ require "vmc/cli/start/base"
 
 module VMC::Start
   class Info < Base
+    def precondition
+      check_target
+    end
+
     desc "Display information on the current target, user, etc."
     group :start
     input :runtimes, :desc => "List supported runtimes", :alias => "-r",

data/lib/vmc/cli/start/login.rb

@@ -3,6 +3,10 @@ require "vmc/cli/start/target_interactions"
 
 module VMC::Start
   class Login < Base
+    def precondition
+      check_target
+    end
+
     desc "Authenticate with the target"
     group :start
     input :username, :value => :email, :desc => "Account email",

data/lib/vmc/cli/start/logout.rb

@@ -2,6 +2,10 @@ require "vmc/cli/start/base"
 
 module VMC::Start
   class Logout < Base
+    def precondition
+      check_target
+    end
+
     desc "Log out from the target"
     group :start
     def logout