vmc 0.4.0.beta.52 → 0.4.0.beta.53

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

@@ -104,6 +104,8 @@ module VMC
     rescue UserError => e
       log_error(e)
       err e.message
+    rescue SystemExit
+      raise
     rescue CFoundry::Denied => e
       if !$vmc_asked_auth && e.error_code == 200
         $vmc_asked_auth = true

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

@@ -75,7 +75,7 @@ module VMC
         rows = apps.collect { |a|
           [ c(a.name, :name),
             app_status(a),
-            "#{human_mb(a.memory)} x #{a.total_instances}",
+            "#{a.total_instances} x #{human_mb(a.memory)}",
             v2? && (a.production ? "prod" : "dev"),
             a.runtime.name,
             a.url

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

@@ -50,12 +50,14 @@ module VMC
       end
     end
 
-    def handler(which, state)
+    def handler(event, state)
       ans = state.answer
       pos = state.position
 
+      exit if event == :eof
+
       if state.default?
-        if which.is_a?(Array) and which[0] == :key
+        if event.is_a?(Array) and event[0] == :key
           # initial non-movement keypress clears default answer
           clear_input(state)
         else
@@ -66,7 +68,7 @@ module VMC
         state.clear_default!
 
         # tab with a default accepts it and moves to the end
-        if which == :tab
+        if event == :tab
           state.goto(ans.size)
         else
           super
@@ -75,7 +77,7 @@ module VMC
         super
       end
 
-      print "\n" if which == :enter
+      print "\n" if event == :enter
     end
 
     class CFState < ::Interactive::InputState

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.52"
+  VERSION = "0.4.0.beta.53"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -1036793520
+  hash: 3537657029
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 52
-  version: 0.4.0.beta.52
+  - 53
+  version: 0.4.0.beta.53
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-14 00:00:00 Z
+date: 2012-09-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -297,12 +297,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 0
         - 4
-        - 5
-        version: 0.4.5
+        - 6
+        version: 0.4.6
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency