impulse 0.0.3 → 0.0.4

data/README.rdoc

@@ -1,6 +1,6 @@
 = impulse
 
-* http://github.com/lloydpick/impulse
+* http://github.com/forward/impulse
 
 == DESCRIPTION:
 
@@ -82,17 +82,25 @@ Note that it will attempt to guess as much of the options as it can, as you can
 
 == PARAMS:
 
-Default parameters...
+Default graph parameters for draw()...
 
-  :filename => 'impuse.png', 
+  :filename => 'impulse.png',
+  :rrd_path => '.',
+  :output_path => '.',
   :height => 200, 
   :width => 600, 
-  :title => 'Impuse Graph', 
+  :title => 'Impulse Graph', 
   :vertical => '',
-  :legend => ''
+  :legend => '',
+  :thickness => 1
   
 All can be configured on a per graph basis.
 
+Default plot parameters for push()...
+
+  :rrd_path => '.', 
+  
+All can be configured on a per RRD basis.
 
 == QUICK NOTE
 

data/impulse.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  
+  s.add_development_dependency(%q<rake>)
 end

data/lib/impulse/version.rb

@@ -1,3 +1,3 @@
 module Impulse
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/impulse.rb

@@ -7,29 +7,34 @@ module Impulse
     end
     
     def push(name, datas, params = {})
-      create_or_find_rrd(name, datas)
-      push_to_rrd(name, datas)
+      params = { 
+        :rrd_path => '.',
+      }.merge(params)
+      create_or_find_rrd(name, datas, params)
+      push_to_rrd(name, datas, params)
     end
     
     def draw(name, time_scale = :day, params = {})
       params = { 
-        :filename => 'impuse.png', 
+        :filename => 'impulse.png',
+        :rrd_path => '.',
+        :output_path => '.', 
         :height => 200, 
         :width => 600, 
-        :title => 'Impuse Graph', 
+        :title => 'Impulse Graph', 
         :vertical => '',
         :legend => '',
         :thickness => 1
       }.merge(params)
       
       defaults = "-E -W 'Generated at #{Time.at(Time.now)}' -e now -h #{params[:height]} -w #{params[:width]}"
-      cmd = ["rrdtool graph #{params[:filename]} -s -#{seconds_for(time_scale)} #{defaults} -t '#{params[:title]}' -v '#{params[:vertical]}'"]
+      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)
         c = 0
         name.each do |k,v|
           v = { :color => '#FF0000', :data => :data }.merge(v)
-          cmd << "DEF:d#{c}=#{v[:name]}.rrd:#{v[:data].to_s}:MAX"
+          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
         end
@@ -42,26 +47,26 @@ module Impulse
     end
     
     private
-    def create_or_find_rrd(name, datas)
+    def create_or_find_rrd(name, datas , params)
       averages = "RRA:AVERAGE:0.5:1:576 RRA:MIN:0.5:1:576 RRA:MAX:0.5:1:576 RRA:AVERAGE:0.5:6:432 RRA:MIN:0.5:6:432 RRA:MAX:0.5:6:432 RRA:AVERAGE:0.5:24:540 RRA:MIN:0.5:24:540 RRA:MAX:0.5:24:540 RRA:AVERAGE:0.5:288:450 RRA:MIN:0.5:288:450 RRA:MAX:0.5:288:450"
-      unless File.exist?(name + ".rrd")
+      unless File.exist?(params[:rrd_path] + "/" + name + ".rrd")
         puts 'Creating RRD' if @debug
         if datas.is_a?(Hash)
           entries = []
           datas.each do |k,v|
             entries << "DS:#{k.to_s}:GAUGE:600:0:U"
           end
-          system "rrdtool create #{name}.rrd --step 300 --start #{Time.now.to_i - 1} #{entries.join(' ')} #{averages}"
+          system "rrdtool create #{params[:rrd_path]}/#{name}.rrd --step 300 --start #{Time.now.to_i - 1} #{entries.join(' ')} #{averages}"
         else
-          system "rrdtool create #{name}.rrd --step 300 --start #{Time.now.to_i - 1} DS:data:GAUGE:600:0:U #{averages}"
+          system "rrdtool create #{params[:rrd_path]}/#{name}.rrd --step 300 --start #{Time.now.to_i - 1} DS:data:GAUGE:600:0:U #{averages}"
         end
       end
     end
     
-    def push_to_rrd(name, data)
-      if File.exist?(name + ".rrd")
+    def push_to_rrd(name, data, params)
+      if File.exist?(params[:rrd_path] + "/" + name + ".rrd")
         puts 'Updating RRD' if @debug
-        system "rrdtool update #{name}.rrd #{Time.now.to_i}:#{data}"
+        system "rrdtool update #{params[:rrd_path]}/#{name}.rrd #{Time.now.to_i}:#{data}"
       end
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: impulse
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Lloyd Pick
@@ -15,9 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 Z
-dependencies: []
-
+date: 2011-09-05 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id001
+  name: rake
+  prerelease: false
 description: Ability to make RRDTool graphs with zero thought
 email: 
 - lloydpick+impulse@gmail.com
@@ -35,6 +49,7 @@ files:
 - impulse.gemspec
 - lib/impulse.rb
 - lib/impulse/version.rb
+has_rdoc: true
 homepage: https://github.com/lloydpick/impulse
 licenses: []
 
@@ -64,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: impulse
-rubygems_version: 1.8.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: RubyGem to help make very quick RRDTool graphs