vmc 0.4.0.beta.50 → 0.4.0.beta.51

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

@@ -127,6 +127,7 @@ module VMC
 
       msg = e.class.name
       msg << ": #{e}" unless e.to_s.empty?
+      msg << "\nFor more information, see #{VMC::CRASH_FILE}"
       err msg
     end
 

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

@@ -41,6 +41,8 @@ module VMC
     input :runtime, :desc => "Filter by runtime regexp"
     input :framework, :desc => "Filter by framework regexp"
     input :url, :desc => "Filter by url regexp"
+    input :one_line, :alias => "-l", :type => :boolean, :default => false,
+      :desc => "One line per app; tabular format"
     def apps
       if space = input[:space] || client.current_space
         apps =
@@ -67,8 +69,32 @@ module VMC
         !app_matches(a, input)
       end
 
-      spaced(apps.sort_by(&:name)) do |a|
-        display_app(a)
+      apps = apps.sort_by(&:name)
+
+      if input[:one_line]
+        rows = apps.collect { |a|
+          [ c(a.name, :name),
+            app_status(a),
+            "#{human_mb(a.memory)} x #{a.total_instances}",
+            v2? && (a.production ? "prod" : "dev"),
+            a.runtime.name,
+            a.url
+          ]
+        }
+
+        tabular(
+          [ b("name"),
+            b("status"),
+            b("usage"),
+            v2? && b("plan"),
+            b("runtime"),
+            b("url")
+          ],
+          *rows)
+      else
+        spaced(apps) do |a|
+          display_app(a)
+        end
       end
     end
 
@@ -322,7 +348,7 @@ module VMC
     input(:memory, :desc => "Memory limit") { |default|
       ask("Memory Limit", :choices => memory_choices(default),
           :allow_other => true,
-          :default => human_size(default * 1024 * 1024, 0))
+          :default => human_mb(default))
     }
     input :plan, :default => "D100",
       :desc => "Application plan (e.g. D100, P200)"
@@ -521,11 +547,14 @@ module VMC
         stats = info[:stats]
         usage = stats[:usage]
         line "instance #{c("\##{idx}", :instance)}:"
-
         indented do
-          line "cpu: #{percentage(usage[:cpu])} of #{b(stats[:cores])} cores"
-          line "memory: #{usage(usage[:mem] * 1024, stats[:mem_quota])}"
-          line "disk: #{usage(usage[:disk], stats[:disk_quota])}"
+          if usage
+            line "cpu: #{percentage(usage[:cpu])} of #{b(stats[:cores])} cores"
+            line "memory: #{usage(usage[:mem] * 1024, stats[:mem_quota])}"
+            line "disk: #{usage(usage[:disk], stats[:disk_quota])}"
+          else
+            line c("stats unavailable (not running?)", :bad)
+          end
         end
       end
     end
@@ -747,7 +776,7 @@ module VMC
       indented do
         line "platform: #{b(a.framework.name)} on #{b(a.runtime.name)}"
 
-        start_line "usage: #{b(human_size(a.memory * 1024 * 1024, 0))}"
+        start_line "usage: #{b(human_mb(a.memory))}"
         print " #{d(IS_UTF8 ? "\xc3\x97" : "x")} #{b(a.total_instances)}"
         print " instance#{a.total_instances == 1 ? "" : "s"}"
 
@@ -1108,6 +1137,10 @@ module VMC
       format("%.#{precision}fB", num)
     end
 
+    def human_mb(num)
+      human_size(num * 1024 * 1024, 0)
+    end
+
     def target_base
       client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
     end
@@ -1121,7 +1154,7 @@ module VMC
       mem = 64
       choices = []
       until mem > available
-        choices << human_size(mem * 1024 * 1024, precision = 0)
+        choices << human_mb(mem)
         mem *= 2
       end
 

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

@@ -22,7 +22,7 @@ module VMC
       client.current_organization
     }
     input :full, :type => :boolean,
-      :desc => "Show full information for appspaces"
+      :desc => "Show full information for spaces, domains, etc."
     def org
       org = input[:organization]
 

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

@@ -229,7 +229,9 @@ module VMC
 
       authenticated = false
       failed = false
-      until authenticated
+      remaining_attempts = 3
+      until authenticated || remaining_attempts <= 0
+        remaining_attempts -= 1
         unless force?
           ask_prompts(credentials, prompts)
         end

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

@@ -41,5 +41,45 @@ module VMC
         num += 1
       end
     end
+
+    def tabular(*rows)
+      spacings = []
+      rows.each do |row|
+        row.each.with_index do |col, i|
+          next unless col
+
+          width = text_width(col)
+
+          if !spacings[i] || width > spacings[i]
+            spacings[i] = width
+          end
+        end
+      end
+
+      columns = spacings.size
+      rows.each do |row|
+        row.each.with_index do |col, i|
+          next unless col
+
+          start_line justify(col, spacings[i])
+          print "   " unless i + 1 == columns
+        end
+
+        line
+      end
+    end
+
+    def trim_escapes(str)
+      str.gsub(/\e\[\d+m/, "")
+    end
+
+    def text_width(str)
+      trim_escapes(str).size
+    end
+
+    def justify(str, width)
+      trimmed = trim_escapes(str)
+      str.ljust(width + (str.size - trimmed.size))
+    end
   end
 end

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.50"
+  VERSION = "0.4.0.beta.51"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -1152463690
+  hash: 260162495
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 50
-  version: 0.4.0.beta.50
+  - 51
+  version: 0.4.0.beta.51
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-12 00:00:00 Z
+date: 2012-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure