impulse 0.0.5 → 0.0.6

data/README.rdoc

@@ -92,7 +92,8 @@ Default graph parameters for draw()...
   :title => 'Impulse Graph', 
   :vertical => '',
   :legend => '',
-  :thickness => 1
+  :thickness => 1,
+  :sort => false
   
 All can be configured on a per graph basis.
 

data/lib/impulse.rb

@@ -13,7 +13,7 @@ module Impulse
       create_or_find_rrd(name, datas, params)
       push_to_rrd(name, datas, params)
     end
-    
+
     def draw(name, time_scale = :day, params = {})
       params = { 
         :filename => 'impulse.png',
@@ -24,20 +24,37 @@ module Impulse
         :title => 'Impulse Graph', 
         :vertical => '',
         :legend => '',
-        :thickness => 1
+        :thickness => 1,
+        :sort => false
       }.merge(params)
       
       defaults = "-E -W 'Generated at #{Time.at(Time.now)}' -e now -h #{params[:height]} -w #{params[:width]}"
       cmd = ["rrdtool graph #{params[:output_path]}/#{params[:filename]} -s -#{seconds_for(time_scale)} #{defaults} -t '#{params[:title]}' -v '#{params[:vertical]}'"]
-      
+       
       if name.is_a?(Hash)
+        max_legend_length = name.keys.size > 1 ? name.keys.max {|a,b| a.length <=> b.length }.length : name.keys.first.length
+              
         c = 0
-        name.each do |k,v|
-          v = { :color => '#FF0000', :data => :data }.merge(v)
-          cmd << "DEF:d#{c}=#{params[:rrd_path]}/#{v[:name]}.rrd:#{v[:data].to_s}:MAX"
-          cmd << "LINE#{params[:thickness]}:d#{c}#{v[:color]}:'#{k}' GPRINT:d#{c}:LAST:\"Last\\:%8.0lf\" GPRINT:d#{c}:MIN:\"	Min\\:%8.0lf\" GPRINT:d#{c}:AVERAGE:\"	Avg\\:%8.0lf\" GPRINT:d#{c}:MAX:\"	Max\\:%8.0lf\\n\""
-          c += 1
+        
+        if params[:sort]
+          name.keys.sort.each do |k|
+            v = name[k]
+            legend = "%-#{max_legend_length}s" % k
+            v = { :color => '#FF0000', :data => :data }.merge(v)
+            cmd << "DEF:d#{c}=#{params[:rrd_path]}/#{v[:name]}.rrd:#{v[:data].to_s}:MAX"
+            cmd << "LINE#{params[:thickness]}:d#{c}#{v[:color]}:'#{legend}' GPRINT:d#{c}:LAST:\"Last\\:%8.0lf\" GPRINT:d#{c}:MIN:\"	Min\\:%8.0lf\" GPRINT:d#{c}:AVERAGE:\"	Avg\\:%8.0lf\" GPRINT:d#{c}:MAX:\"	Max\\:%8.0lf\\n\""
+            c += 1
+          end
+        else
+          name.each do |k,v|
+            legend = "%-#{max_legend_length}s" % k
+            v = { :color => '#FF0000', :data => :data }.merge(v)
+            cmd << "DEF:d#{c}=#{params[:rrd_path]}/#{v[:name]}.rrd:#{v[:data].to_s}:MAX"
+            cmd << "LINE#{params[:thickness]}:d#{c}#{v[:color]}:'#{legend}' GPRINT:d#{c}:LAST:\"Last\\:%8.0lf\" GPRINT:d#{c}:MIN:\"	Min\\:%8.0lf\" GPRINT:d#{c}:AVERAGE:\"	Avg\\:%8.0lf\" GPRINT:d#{c}:MAX:\"	Max\\:%8.0lf\\n\""
+            c += 1
+          end
         end
+
       else
         cmd << "DEF:average=#{params[:rrd_path]}/#{name}.rrd:data:MAX"
         cmd << "LINE#{params[:thickness]}:average#FF0000:'#{params[:legend]}' GPRINT:average:LAST:\"Last\\:%8.0lf\" GPRINT:average:MIN:\"	Min\\:%8.0lf\" GPRINT:average:AVERAGE:\"	Avg\\:%8.0lf\" GPRINT:average:MAX:\"	Max\\:%8.0lf\\n\""

data/lib/impulse/version.rb

@@ -1,3 +1,3 @@
 module Impulse
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,46 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: impulse
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Lloyd Pick
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-03-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2164485860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: rake
+  version_requirements: *2164485860
 description: Ability to make RRDTool graphs with zero thought
-email: 
+email:
 - lloyd.pick+impulse@forward.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -50,36 +38,26 @@ files:
 - lib/impulse/version.rb
 homepage: https://github.com/forward/impulse
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: impulse
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RubyGem to help make very quick RRDTool graphs
 test_files: []
-