god 0.7.19 → 0.7.20

data/History.txt

@@ -1,3 +1,8 @@
+== 0.7.20 / 2009-09-24
+  * Minor Enhancements
+    * Rewrite `god status` command to be not as horrible. Add ability to get
+      status for individual tasks.
+
 == 0.7.19 / 2009-09-21
   * Minor Enhancements
     * Teach `god status` to take a task name as a param and return

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 7
-:patch: 19
+:patch: 20

data/god.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{god}
-  s.version = "0.7.19"
+  s.version = "0.7.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-09-21}
+  s.date = %q{2009-09-24}
   s.default_executable = %q{god}
   s.description = %q{God is an easy to configure, easy to extend monitoring framework written in Ruby.}
   s.email = %q{tom@mojombo.com}

data/lib/god/cli/command.rb

@@ -66,46 +66,47 @@ module God
       end
       
       def status_command
-        task = @args[1]
-        
-        watches = {}
-        @server.status.each do |name, status|
+        exitcode = 0
+        statuses = @server.status
+        groups = {}
+        statuses.each do |name, status|
           g = status[:group] || ''
-          unless watches.has_key?(g)
-            watches[g] = {}
-          end
-          watches[g][name] = status
+          groups[g] ||= {}
+          groups[g][name] = status
         end
-        if task
-          failcount = 0
-          if watches[task]
-            puts "#{task}:"
-            watches[task].keys.sort.each do |name|
-              state = watches[task][name][:state]
-              failcount += 1 if state != :up
-              print "  " unless task.empty?
-              puts "#{name}: #{state}"
-            end
-          elsif watches['']
-            watches[''].keys.sort.each do |name|
-              state = watches[''][name][:state]
-              failcount += 1 if state != :up
+        
+        if item = @args[1]
+          if single = statuses[item]
+            # specified task (0 -> up, 1 -> unmonitored, 2 -> other)
+            state = single[:state]
+            puts "#{item}: #{state}"
+            exitcode = state == :up ? 0 : (state == :unmonitored ? 1 : 2) 
+          elsif groups[item]
+            # specified group (0 -> up, N -> other)
+            puts "#{item}:"
+            groups[item].keys.sort.each do |name|
+              state = groups[item][name][:state]
+              print "  "
               puts "#{name}: #{state}"
+              exitcode += 1 unless state == :up
             end
           else
-            failcount = 1
+            puts "Task or Group '#{item}' not found."
+            exit(1)
           end
-          exit!(failcount)
         else
-          watches.keys.sort.each do |group|
+          # show all groups and watches
+          groups.keys.sort.each do |group|
             puts "#{group}:" unless group.empty?
-            watches[group].keys.sort.each do |name|
-              state = watches[group][name][:state]
+            groups[group].keys.sort.each do |name|
+              state = groups[group][name][:state]
               print "  " unless group.empty?
               puts "#{name}: #{state}"
             end
           end
         end
+        
+        exit(exitcode)
       end
       
       def signal_command

data/test/configs/child_polls/child_polls.god

@@ -1,6 +1,6 @@
 God.watch do |w|
   w.name = 'child-polls'
-  w.start = File.join(GOD_ROOT, *%w[test configs child_polls simple_server.rb]) + ' ' + ENV['RAILS_ENV']
+  w.start = File.join(GOD_ROOT, *%w[test configs child_polls simple_server.rb])
   w.interval = 5
   w.grace = 2
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.7.19
+  version: 0.7.20
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -07:00
 default_executable: god
 dependencies: []