vmc 0.4.0.beta.17 → 0.4.0.beta.18

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

@@ -183,7 +183,7 @@ module VMC
           app.urls = []
         end
       else
-        domain = client.target.sub(/^https?:\/\/api\.(.+)\/?/, '\1')
+        domain = client.target.sub(/^https?:\/\/[^\.]+\.(.+)\/?/, '\1')
         app.urls = [input[:url, "#{name}.#{domain}"]]
       end
 
@@ -679,8 +679,7 @@ module VMC
 
       puts "" unless quiet?
 
-      vars.each do |pair|
-        name, val = pair.split("=", 2)
+      vars.each do |name, val|
         puts "#{c(name, :name)}: #{val}"
       end
     end
@@ -716,10 +715,8 @@ module VMC
       fail "Unknown application '#{appname}'" unless app.exists?
 
       with_progress("Updating #{c(app.name, :name)}") do
-        app.update!("env" =>
-                      app.env.reject { |v|
-                        v.start_with?("#{name}=")
-                      }.push("#{name}=#{value}"))
+        app.env[name] = value
+        app.update!
       end
 
       if app.started? && input[:restart]
@@ -748,10 +745,8 @@ module VMC
       fail "Unknown application '#{appname}'" unless app.exists?
 
       with_progress("Updating #{c(app.name, :name)}") do
-        app.update!("env" =>
-                      app.env.reject { |v|
-                        v.start_with?("#{name}=")
-                      })
+        app.env.delete(name)
+        app.update!
       end
 
       if app.started? && input[:restart]

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

@@ -19,21 +19,28 @@ module VMC
     end
 
     def input_state(options)
-      CFState.new(options)
+      if options.key? :default
+        answer = show_default(options)
+      end
+
+      CFState.new(options, answer)
+    end
+
+    def show_default(options)
+      case options[:default]
+      when true
+        "y"
+      when false
+        "n"
+      when nil
+        ""
+      else
+        show_choice(options[:default], options)
+      end
     end
 
     def prompt(question, options)
-      value =
-        case options[:default]
-        when true
-          "y"
-        when false
-          "n"
-        when nil
-          ""
-        else
-          options[:default].to_s
-        end
+      value = show_default(options)
 
       print "#{question}"
       print c("> ", :prompt)
@@ -57,9 +64,16 @@ module VMC
         end
 
         state.clear_default!
-      end
 
-      super
+        # tab with a default accepts it and moves to the end
+        if which == :tab
+          state.goto(ans.size)
+        else
+          super
+        end
+      else
+        super
+      end
 
       print "\n" if which == :enter
     end
@@ -67,24 +81,8 @@ module VMC
     class CFState < ::Interactive::InputState
       def initialize(options = {}, answer = nil, position = 0)
         @options = options
-
-        if answer
-          @answer = answer
-        elsif options[:default]
-          case options[:default]
-          when true
-            @answer = "y"
-          when false
-            @answer = "n"
-          else
-            @answer = options[:default].to_s
-          end
-
-          @default = true
-        else
-          @answer = ""
-        end
-
+        @answer = answer || ""
+        @default = options.key? :default
         @position = position
         @done = false
       end

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

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

metadata

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