vmc 0.4.0.beta.65 → 0.4.0.beta.66

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

@@ -269,7 +269,7 @@ module VMC
     desc "List an app's instances"
     group :apps, :info, :hidden => true
     input :apps, :argument => :splat, :singular => :app,
-      :desc => "Applications to start",
+      :desc => "Applications whose instances to list",
       :from_given => by_name("app")
     def instances
       apps = input[:apps]
@@ -293,6 +293,33 @@ module VMC
     end
 
 
+    desc "List an app's crashed "
+    group :apps, :info, :hidden => true
+    input :apps, :argument => :splat, :singular => :app,
+      :desc => "Applications whose crashed instances to list",
+      :from_given => by_name("app")
+    def crashes
+      apps = input[:apps]
+      fail "No applications given." if apps.empty?
+
+      spaced(apps) do |app|
+        instances =
+          with_progress("Getting crashed instances for #{c(app.name, :name)}") do
+            app.crashes
+          end
+
+        spaced(instances) do |i|
+          if quiet?
+            line i.id
+          else
+            line
+            display_crashed_instance(i)
+          end
+        end
+      end
+    end
+
+
     desc "Update the instances/memory limit for an application"
     group :apps, :info, :hidden => true
     input :app, :argument => true, :desc => "Application to update",
@@ -384,24 +411,25 @@ module VMC
       end
 
       spaced(instances) do |i|
-        logs =
-          with_progress(
-              "Getting logs for #{c(app.name, :name)} " +
-                c("\##{i.id}", :instance)) do
-            i.files("logs")
-          end
+        show_instance_logs(app, i)
+      end
+    end
 
-        line unless quiet?
 
-        spaced(logs) do |log|
-          body =
-            with_progress("Reading " + b(log.join("/"))) do
-              i.file(*log)
-            end
+    desc "Print out the logs for an app's crashed instances"
+    group :apps, :info, :hidden => true
+    input :app, :argument => true,
+      :desc => "Application to get the logs of",
+      :from_given => by_name("app")
+    def crashlogs
+      app = input[:app]
 
-          lines body
-          line unless body.empty?
-        end
+      crashes = app.crashes
+
+      fail "No crashed instances found." if crashes.empty?
+
+      spaced(crashes) do |i|
+        show_instance_logs(app, i)
       end
     end
 
@@ -511,7 +539,7 @@ module VMC
 
       table(
         %w{instance cpu memory disk},
-        stats.sort_by(&:first).collect { |idx, info|
+        stats.sort_by { |idx, _| idx.to_i }.collect { |idx, info|
           idx = c("\##{idx}", :instance)
 
           if info[:state] == "DOWN"
@@ -1056,7 +1084,7 @@ module VMC
 
       indented do
         if s = i.since
-          line "started: #{c(s.strftime("%F %r"), :cyan)}"
+          line "started: #{c(s.strftime("%F %r"), :neutral)}"
         end
 
         if d = i.debugger
@@ -1069,6 +1097,43 @@ module VMC
       end
     end
 
+    def display_crashed_instance(i)
+      start_line "instance #{c("\##{i.id}", :instance)}: "
+      puts "#{b(c("crashed", :error))} "
+
+      indented do
+        if s = i.since
+          line "since: #{c(s.strftime("%F %r"), :neutral)}"
+        end
+      end
+    end
+
+    def show_instance_logs(app, i)
+      return unless i.id
+
+      logs =
+        with_progress(
+            "Getting logs for #{c(app.name, :name)} " +
+              c("\##{i.id}", :instance)) do
+          i.files("logs")
+        end
+
+      line unless quiet?
+
+      spaced(logs) do |log|
+        begin
+          body =
+            with_progress("Reading " + b(log.join("/"))) do |s|
+              i.file(*log)
+            end
+
+          lines body
+          line unless body.empty?
+        rescue CFoundry::NotFound
+        end
+      end
+    end
+
     def find_orphaned_services(apps, others = [])
       orphaned = Set.new
 

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.65"
+  VERSION = "0.4.0.beta.66"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1083977469
+  hash: -614476860
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 65
-  version: 0.4.0.beta.65
+  - 66
+  version: 0.4.0.beta.66
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-11 00:00:00 Z
+date: 2012-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 65
+        hash: 71
         segments: 
         - 0
         - 3
-        - 41
-        version: 0.3.41
+        - 42
+        version: 0.3.42
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency