vmc 0.4.0.beta.18 → 0.4.0.beta.19

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

@@ -40,7 +40,13 @@ module VMC
           :desc => "What kind of service (e.g. redis, mysql)",
           :from_given => services_from_label) { |services|
       [ask("What kind?", :choices => services.sort_by(&:label),
-           :display => proc { |s| "#{c(s.label, :name)} v#{s.version}" },
+           :display => proc { |s|
+              str = "#{c(s.label, :name)} v#{s.version}"
+              if s.provider != "core"
+                str << ", via #{s.provider}"
+              end
+              str
+           },
            :complete => proc { |s| "#{s.label} v#{s.version}" })]
     }
     input(:name, :argument => true,
@@ -48,37 +54,42 @@ module VMC
       random = sprintf("%x", rand(1000000))
       ask "Name?", :default => "#{service.label}-#{random}"
     }
-    input(:version, :desc => "Version of the service") { |services|
-      ask "Which version?", :choices => services,
-        :display => proc(&:version)
-    }
     input(:plan, :desc => "Service plan",
           :from_given => plan_from_name) { |plans|
-      ask "Which plan?", :choices => plans.sort_by(&:name),
-        :display => proc { |p| "#{p.name}: #{p.description}" },
-        :complete => proc(&:name)
+      if d100 = plans.find { |p| p.name == "D100" }
+        d100
+      else
+        ask "Which plan?", :choices => plans.sort_by(&:name),
+          :display => proc { |p| "#{p.name}: #{p.description}" },
+          :complete => proc(&:name)
+      end
     }
+    input :provider, :desc => "Service provider"
     input :bind, :alias => "--app",
       :desc => "Application to immediately bind to"
     def create_service(input)
       services = client.services
 
-      services = input[:service, services]
+      if input[:provider]
+        services.reject! { |s| s.provider != input[:provider] }
+      end
 
-      if services.size == 1
-        service = services.first
-      else
-        service = input[:version, services]
+      until services.size < 2
+        services = input[:service, services]
+        input.forget(:service)
+      end
+
+      if services.empty?
+        fail "Cannot find services matching the given criteria."
       end
 
-      plans = service.service_plans
-      plan = plans.find { |p| p.name == "D100" } || input[:plan, plans]
+      service = services.first
 
       instance = client.service_instance
       instance.name = input[:name, service]
 
       if v2?
-        instance.service_plan = plan
+        instance.service_plan = input[:plan, service.service_plans]
         instance.space = client.current_space
         instance.credentials = {} # TODO: ?
       else

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

@@ -2,6 +2,13 @@ require "vmc/cli"
 
 module VMC
   class Start < CLI
+    # Make sure we only show the target once
+    @@displayed_target = false
+
+    def displayed_target?
+      @@displayed_target
+    end
+
     desc "Display information on the current target, user, etc."
     group :start
     input :runtimes, :type => :boolean,
@@ -113,12 +120,6 @@ module VMC
       if !input.given?(:url) && !input.given?(:organization) &&
           !input.given?(:space)
         display_target
-
-        if v2? && client.current_organization && client.current_space
-          puts "Organization: #{c(client.current_organization.name, :name)}"
-          puts "Space: #{c(client.current_space.name, :name)}"
-        end
-
         return
       end
 
@@ -135,6 +136,7 @@ module VMC
       return unless v2?
 
       unless client.logged_in?
+        puts "" unless quiet?
         invoke :login
         @client = nil
       end
@@ -187,10 +189,7 @@ module VMC
       ask("Space", :choices => choices)
     }
     def login(input)
-      unless quiet?
-        display_target
-        puts ""
-      end
+      display_target unless quiet?
 
       credentials =
         { :username => input[:username],
@@ -260,10 +259,7 @@ module VMC
     input :login, :type => :boolean, :default => true,
       :desc => "Automatically log in?"
     def register(input)
-      unless quiet?
-        puts "Target: #{c(client_target, :name)}"
-        puts ""
-      end
+      display_target unless quiet?
 
       email = input[:email]
       password = input[:password]
@@ -277,9 +273,7 @@ module VMC
       end
 
       if input[:login]
-        with_progress("Logging in") do
-          save_token(client.login(email, password))
-        end
+        invoke :login, :username => email, :password => password
       end
     end
 
@@ -295,11 +289,22 @@ module VMC
     private
 
     def display_target
+      return if @@displayed_target
+
       if quiet?
         puts client.target
       else
         puts "Target: #{c(client.target, :name)}"
+
+        if v2? && client.current_organization && client.current_space
+          puts "Organization: #{c(client.current_organization.name, :name)}"
+          puts "Space: #{c(client.current_space.name, :name)}"
+        end
       end
+
+      puts ""
+
+      @@displayed_target = true
     end
 
     def display_runtime(r)

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.18"
+  VERSION = "0.4.0.beta.19"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196423
+  hash: 62196421
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 18
-  version: 0.4.0.beta.18
+  - 19
+  version: 0.4.0.beta.19
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-15 00:00:00 Z
+date: 2012-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 3
-        - 4
-        version: 0.3.4
+        - 5
+        version: 0.3.5
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency