city-watch 0.3.0 → 0.3.1

data/lib/city_watch/commands/mpstat.rb

@@ -9,17 +9,18 @@ class MPstat
 	end
 	
 	def data
+		headers = false
 		command_output.split("\n").map {|line| line.split("\s") }.inject([]) do |output,line|
 			if line[1] == "CPU"
 				headers = line.map {|hdr| hdr.gsub(/%/,'').to_sym}
-				next
+				headers[0] = :run
+			elsif headers
+				pkt = {}
+				line.each_with_index do |itm,idx|
+					pkt[headers[idx]] = itm
+				end
+				output << pkt
 			end
-			next unless headers
-			pkt = {}
-			line.each_with_index do |itm,idx|
-				pkt[headers[idx]] = itm
-			end
-			output << pkt
 			output
 		end
 	end

data/lib/city_watch/commands/ps.rb

@@ -10,22 +10,20 @@ class PS
 	
 	def data
 		headers = false
-		output = []
-		command_output.split("\n").map {|line| line.split("\s") }.each do |line|
+		command_output.split("\n").map {|line| line.split("\s") }.inject([]) do |output,line|
 			if !headers
 				headers = line.map {|hdr| hdr.downcase.to_sym}
-				next
+			else
+				pkt = {}
+				cmd = line.slice!(10,line.size-1)
+				line << cmd.join(" ")
+				line.each_with_index do |itm,idx|
+					pkt[headers[idx]] = itm
+				end
+				output << pkt
 			end
-			next unless headers
-			pkt = {}
-			cmd = line.slice!(10,line.size-1)
-			line << cmd.join(" ")
-			line.each_with_index do |itm,idx|
-				pkt[headers[idx]] = itm
-			end
-			output << pkt
+			output
 		end
-		output
 	end
 	
 end

data/lib/city_watch/watchmen/cpu_usage.rb

@@ -4,7 +4,7 @@ class CPUUsage
 	
 	def self.data
 		out = MPstat.data.select do |line|
-			line[:command][/^Average:/]
+			line[:run][/^Average:/]
 		end
 		out.length > 0 ? out.first.merge({:summary => [:usr, :idle, :sys]}) : {:nodata => true}
 	end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: city-watch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - John Bragg