vmc 0.4.0.beta.24 → 0.4.0.beta.25

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

@@ -9,6 +9,13 @@ module VMC
       }
     end
 
+    def self.find_by_name_insensitive(what)
+      proc { |name, choices|
+        choices.find { |c| c.name.upcase == name.upcase } ||
+          fail("Unknown #{what} '#{name}'")
+      }
+    end
+
     def self.by_name(what, obj = what)
       proc { |name, *_|
         client.send(:"#{obj}_by_name", name) ||
@@ -77,7 +84,7 @@ module VMC
       ask "Name?", :default => "#{service.label}-#{random}"
     }
     input(:plan, :desc => "Service plan",
-          :from_given => find_by_name("plan")) { |plans|
+          :from_given => find_by_name_insensitive("plan")) { |plans|
       if d100 = plans.find { |p| p.name == "D100" }
         d100
       else
@@ -102,13 +109,13 @@ module VMC
       end
 
       if plan = input.given(:plan)
-        services.reject! { |s|
+        services.reject! do |s|
           if plan.is_a?(String)
             s.service_plans.none? { |p| p.name == plan.upcase }
           else
             s.service_plans.include? plan
           end
-        }
+        end
       end
 
       until services.size < 2

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

@@ -172,10 +172,13 @@ module VMC
         select_org_and_space(input, info)
 
         save_target_info(info)
-      elsif !quiet?
-        line
-        display_org_and_space
       end
+
+      return if quiet?
+
+      line
+      display_target
+      display_org_and_space
     end
 
 
@@ -386,6 +389,15 @@ module VMC
           line "description: #{s.description}"
           line "version: #{s.version}"
           line "provider: #{s.provider}"
+
+          if v2?
+            line "plans:"
+            indented do
+              s.service_plans.sort_by(&:name).each do |p|
+                line "#{c(p.name, :name)}: #{p.description}"
+              end
+            end
+          end
         end
       end
     end

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

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

metadata

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