rrd-ffi 0.2.12 → 0.2.13

data/CHANGELOG.rdoc

@@ -9,6 +9,11 @@
 * TODO: Add memory leak test
 * TODO: Add tune methods to RRD::Base instance
 
+== 2012-11-13 version 0.2.13
+
+* Added RRD::Xport capabilities (neilljordan)
+* "--resolution" parameter forwarded to rrd fetch (fpellanda)
+
 == 2011-04-11 version 0.2.10
 
 * Fixes Segmentation Fault when using in a multi-thread environment

data/lib/rrd.rb

@@ -4,13 +4,14 @@ require "rrd/version"
 require "rrd/wrapper"
 require "rrd/base"
 require "rrd/graph"
+require "rrd/xport"
 require "rrd/builder"
 require "rrd/time_extension"
 
 module RRD
   extend self
 
-  BANG_METHODS = [:graph!]
+  BANG_METHODS = [:graph!, :xport!]
 
   def graph(image_file, options = {}, &block)
     graph = Graph.new(image_file, options)
@@ -18,6 +19,12 @@ module RRD
     graph.save
   end
 
+  def xport(options = {}, &block)
+    xport = Xport.new(options)
+    xport.instance_eval(&block)
+    xport.save
+  end
+
   def error
     Wrapper.error
   end

data/lib/rrd/version.rb

@@ -3,7 +3,7 @@ module RRD
   module Version  #:nodoc: all
     MAJOR = 0
     MINOR = 2
-    PATCH = 12
+    PATCH = 13
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/lib/rrd/wrapper.rb

@@ -121,8 +121,10 @@ module RRD
           args[2..-1].each_slice(2) {|v| options[v.first] = v.last}
           start_time = options["--start"]
           end_time = options["--end"]
+          step = options["--resolution"]
           start_time_ptr.put_int(0, start_time.to_i)
           end_time_ptr.put_int(0, end_time.to_i)
+          step_ptr.put_int(0, step.to_i)
           return false unless rrd_fetch_r(file, cf, start_time_ptr, end_time_ptr, step_ptr, ds_count_ptr, ds_names_ptr, values_ptr) == 0
         else
           return false unless rrd_fetch(args.size+1, argv, start_time_ptr, end_time_ptr, step_ptr, ds_count_ptr, ds_names_ptr, values_ptr) == 0

data/lib/rrd/xport.rb

@@ -0,0 +1,49 @@
+# -*- coding: UTF-8 -*-
+require 'digest/md5'
+module RRD
+  class Xport
+    attr_accessor :output, :parameters, :definitions, :printables
+
+    DEF_OPTIONS= [:from]
+    
+    def initialize(parameters = {})      
+      @parameters = {:start => Time.now - 1.day, :end => Time.now}.merge parameters
+      @parameters[:start] = @parameters[:start].to_i
+      @parameters[:end] = @parameters[:end].to_i
+      
+      @definitions = []
+      @printables = []
+    end
+    
+    def for_rrd_data(data_name, options)  
+      dataset = options.reject {|name, value| DEF_OPTIONS.include?(name.to_sym)}
+      definition = "DEF:#{data_name}=#{options[:from]}:#{dataset.keys.first}:#{dataset.values.first.to_s.upcase}"
+      definitions << definition
+      definition
+    end
+    
+    def using_calculated_data(data_name, options)
+      definition = "CDEF:#{data_name}=#{options[:calc]}"
+      definitions << definition
+      definition
+    end
+    
+    def xport(data_name, options)            
+      printable = "XPORT:#{data_name}:#{options[:label].gsub(/:/, '\\:')}"
+      printables << printable
+      [printable]
+    end
+    
+    def save    
+      Wrapper.xport(*generate_args)
+    end
+    
+    private
+    def generate_args
+      args = []
+      args += RRD.to_line_parameters(parameters)
+      args += definitions
+      args += printables
+    end    
+  end
+end

data/spec/rrd/xport_spec.rb

@@ -0,0 +1,69 @@
+require "spec_helper"
+require 'digest/md5'
+
+describe RRD::Xport do
+    
+  before do
+    @rrd = RRD::Base.new(RRD_FILE)
+    @rrd.restore(XML_FILE)
+
+    @xport = RRD::Xport.new :start => @rrd.starts_at, :end => @rrd.ends_at, :step => 2
+  end
+  
+  it "should store definition for rrd data" do
+    result = @xport.for_rrd_data "cpu0", :cpu0 => :average, :from => RRD_FILE
+    result.should == "DEF:cpu0=#{RRD_FILE}:cpu0:AVERAGE"
+  end
+
+  it "should store definition for calculated data" do
+    result = @xport.using_calculated_data "half_mem", :calc => "mem,2,/"
+    result.should == "CDEF:half_mem=mem,2,/"
+  end
+    
+  it "should store printable for xport" do
+    result = @xport.xport 'memory', :label => "Memory"
+    result[0].should == "XPORT:memory:Memory"
+  end
+  
+  it "should export data correctly" do
+    memory_ds_name = Digest::MD5.hexdigest("#{RRD_FILE}_memory_average")
+    cpu_ds_name = Digest::MD5.hexdigest("#{RRD_FILE}_cpu0_average")
+    expected_args = [
+      "--start", @rrd.starts_at.to_i.to_s,
+      "--end", @rrd.ends_at.to_i.to_s,    
+      "--step", "2",  
+      "DEF:memory=/Users/neilljordan/Documents/rrd-ffi/spec/vm.rrd:memory:AVERAGE",
+      "DEF:cpu0=#{RRD_FILE}:cpu0:AVERAGE",      
+      "CDEF:half_mem=memory,2,/",            
+      "XPORT:memory:Memory\\: Average",
+      "XPORT:cpu0:cpu0\\: Average",                    
+      "XPORT:half_mem:Half Memory",                    
+    ]
+
+    @xport.for_rrd_data "memory", :memory => :average, :from => RRD_FILE
+    @xport.for_rrd_data "cpu0", :cpu0 => :average, :from => RRD_FILE
+    @xport.using_calculated_data "half_mem", :calc => "memory,2,/"
+    @xport.xport "memory", :label => "Memory: Average"
+    @xport.xport "cpu0", :label => "cpu0: Average"
+    @xport.xport "half_mem", :label => "Half Memory"
+
+    generated_args = @xport.send(:generate_args)
+    generated_args.should == expected_args
+
+    data = @xport.save
+
+    expected_data = [
+      ["time", "Memory: Average", "cpu0: Average", "Half Memory"],
+      [1266944780, 536870912.0, 0.0002, 268435456.0],
+      [1266944785, 536870912.0, 0.0022, 268435456.0],
+      [1266944790, 536870912.0, 0.0022, 268435456.0],
+    ]
+
+    data[0,4].should == expected_data
+  end
+
+  it "should export via dsl" do
+
+  end
+
+end

data/spec/rrd_spec.rb

@@ -24,8 +24,8 @@ describe RRD do
     
     result.should be_true
     File.should be_file(IMG_FILE)
-  end
-  
+  end  
+
   it "should list all bang methods" do
     (RRD.methods & RRD::BANG_METHODS).should == RRD::BANG_METHODS
   end
@@ -45,4 +45,47 @@ describe RRD do
     result.should be_true
     File.should be_file(IMG_FILE)
   end
+
+
+  it "should export data using xport dsl" do
+    rrd = RRD::Base.new(RRD_FILE)
+    data = RRD.xport :start => rrd.starts_at, :end => rrd.ends_at, :step => 2 do
+      for_rrd_data "memory", :memory => :average, :from => RRD_FILE
+      for_rrd_data "cpu0", :cpu0 => :average, :from => RRD_FILE
+      using_calculated_data "half_mem", :calc => "memory,2,/"
+      xport "memory", :label => "Memory: Average"
+      xport "cpu0", :label => "cpu0: Average"
+      xport "half_mem", :label => "Half Memory"    
+    end
+
+    expected_data = [
+      ["time", "Memory: Average", "cpu0: Average", "Half Memory"],
+      [1266944780, 536870912.0, 0.0002, 268435456.0],
+      [1266944785, 536870912.0, 0.0022, 268435456.0],
+      [1266944790, 536870912.0, 0.0022, 268435456.0],
+    ]
+
+    data[0,4].should == expected_data    
+  end  
+
+  it "should export data using xport!" do
+    rrd = RRD::Base.new(RRD_FILE)
+    data = RRD.xport! :start => rrd.starts_at, :end => rrd.ends_at, :step => 2 do
+      for_rrd_data "memory", :memory => :average, :from => RRD_FILE
+      for_rrd_data "cpu0", :cpu0 => :average, :from => RRD_FILE
+      using_calculated_data "half_mem", :calc => "memory,2,/"
+      xport "memory", :label => "Memory: Average"
+      xport "cpu0", :label => "cpu0: Average"
+      xport "half_mem", :label => "Half Memory"    
+    end
+
+    expected_data = [
+      ["time", "Memory: Average", "cpu0: Average", "Half Memory"],
+      [1266944780, 536870912.0, 0.0002, 268435456.0],
+      [1266944785, 536870912.0, 0.0022, 268435456.0],
+      [1266944790, 536870912.0, 0.0022, 268435456.0],
+    ]
+
+    data[0,4].should == expected_data    
+  end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rrd-ffi
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 -03:00
-default_executable: 
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2166215140 !ruby/object:Gem::Requirement
+  requirement: &2156342600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166215140
+  version_requirements: *2156342600
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2166214720 !ruby/object:Gem::Requirement
+  requirement: &2156354480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166214720
+  version_requirements: *2156354480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166214300 !ruby/object:Gem::Requirement
+  requirement: &2156362240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166214300
+  version_requirements: *2156362240
 description: Provides bindings for many RRD functions (using ffi gem and librrd),
   as well as DSLs for graphic and rrd building. You must have librrd in your system!
 email:
@@ -68,15 +67,16 @@ files:
 - lib/rrd/time_extension.rb
 - lib/rrd/version.rb
 - lib/rrd/wrapper.rb
+- lib/rrd/xport.rb
 - rrd-ffi.gemspec
 - spec/rrd/base_spec.rb
 - spec/rrd/builder_spec.rb
 - spec/rrd/graph_spec.rb
 - spec/rrd/wrapper_spec.rb
+- spec/rrd/xport_spec.rb
 - spec/rrd_spec.rb
 - spec/spec_helper.rb
 - spec/vm.xml
-has_rdoc: true
 homepage: http://github.com/morellon/rrd-ffi
 licenses: []
 post_install_message: 
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: DSL + Bindings for librrd using FFI
@@ -106,6 +106,7 @@ test_files:
 - spec/rrd/builder_spec.rb
 - spec/rrd/graph_spec.rb
 - spec/rrd/wrapper_spec.rb
+- spec/rrd/xport_spec.rb
 - spec/rrd_spec.rb
 - spec/spec_helper.rb
 - spec/vm.xml