vmc 0.4.0.beta.63 → 0.4.0.beta.64

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

@@ -171,6 +171,22 @@ module VMC
       input[:verbose]
     end
 
+    def user_colors
+      return @user_colors if @user_colors
+
+      colors = File.expand_path(COLORS_FILE)
+
+      @user_colors = super.dup
+
+      if File.exists?(colors)
+        YAML.load_file(colors).each do |k, v|
+          @user_colors[k.to_sym] = v.to_sym
+        end
+      end
+
+      @user_colors
+    end
+
     def err(msg, status = 1)
       if quiet?
         $stderr.puts(msg)

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

@@ -933,7 +933,7 @@ module VMC
 
       if input[:create_services] && !force?
         while true
-          invoke :create_service, :app => app
+          invoke :create_service, { :app => app }, :plan => :interact
           break unless ask "Create another service?", :default => false
         end
       end

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

@@ -85,14 +85,14 @@ module VMC
       ask "Name?", :default => "#{service.label}-#{random}"
     }
     input(:plan, :desc => "Service plan",
+          :default => proc { |plans|
+            plans.find { |p| p.name == "D100" } ||
+              interact
+          },
           :from_given => find_by_name_insensitive("plan")) { |plans|
-      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
+      ask "Which plan?", :choices => plans.sort_by(&:name),
+        :display => proc { |p| "#{p.name}: #{p.description}" },
+        :complete => proc(&:name)
     }
     input :provider, :desc => "Service provider"
     input :version, :desc => "Service version"

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.63"
+  VERSION = "0.4.0.beta.64"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -33416758
+  hash: -3047156276
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 63
-  version: 0.4.0.beta.63
+  - 64
+  version: 0.4.0.beta.64
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-05 00:00:00 Z
+date: 2012-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -297,12 +297,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 5
-        version: 0.1.5
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency