city-watch 0.7.0 → 0.7.1

data/lib/city_watch/reader/watchman.rb

@@ -61,6 +61,25 @@ module Reader
 			"<img src=\"data:image/png;base64,#{sparkline(dat)}\" alt=\"#{alt}\" title=\"#{alt} max: #{dat.max} min: #{dat.min}\"/>"
 		end
 		
+		def sparkline_for(set)
+			dat = get_data_set(set)
+			if dat.length > 1
+				puts dat.inspect
+				require 'base64'
+				require 'city_watch/util/spark_pr'
+				Base64.encode64(Spark.smooth(dat.map {|(tm,val)| val }, :height => 14, :step => 4).to_png).gsub("\n",'')
+			end
+		end
+
+		def sparkline_img_tag_for(set)
+			dat = get_data_set(set)
+			if dat.length > 1
+				"<img src=\"data:image/png;base64,#{sparkline(dat)}\" alt=\"#{set}\" title=\"#{set} max: #{dat.max} min: #{dat.min}\"/>"
+			else
+				""
+			end
+		end
+		
 		def key(more)
 			"#{key_prefix}::#{more}"
 		end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/views/watchmen/CPUUsage/summary.html.erb

@@ -1,5 +1,4 @@
 <h4><%=@name%></h4>
-<%= sparkline_image_tags.map {|(name,tag)| tag }.join("&nbsp;")%><br/>
-<strong>User: </strong><%=@current_data["usr"]%><br/>
-<strong>Idle: </strong><%=@current_data["idle"]%><br/>
-<strong>System: </strong><%=@current_data["sys"]%><br/>
+<strong>User: </strong><%=@current_data["usr"]%>&nbsp;<%=sparkline_img_tag_for(:cpu_user)%><br/>
+<strong>Idle: </strong><%=@current_data["idle"]%>&nbsp;<%=sparkline_img_tag_for(:cpu_idle)%><br/>
+<strong>System: </strong><%=@current_data["sys"]%>&nbsp;<%=sparkline_img_tag_for(:cpu_system)%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: city-watch
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis