rrd-ffi 0.2.3 → 0.2.5

data/.gitignore

@@ -3,3 +3,4 @@
 pkg
 doc
 coverage
+.idea

data/CHANGELOG.rdoc

@@ -9,6 +9,14 @@
 * TODO: Add memory leak test
 * TODO: Add tune methods to RRD::Base instance
 
+== 2010-08-31 version 0.2.5
+
+* Added support for repeated parameters like --color BACK#FFFFFF --color FONT#000000 (Kamil Grabowski)
+* Fixed draw lines and areas without :label param (Kamil Grabowski)
+
+== 2010-07-23 version 0.2.4
+* Added ActiveSupport to extend Fixnum and Integer time helpers (Wojciech Wnętrzak)
+
 == 2010-05-18 version 0.2.3
 * Fixed Bang methods to work with jruby, ruby 1.8.6, ruby 1.9.1
 

data/README.rdoc

@@ -1,4 +1,4 @@
-= Introduction 
+= Introduction
 
 rrd-ffi is a gem for using rrd actions in your ruby code.
 
@@ -83,8 +83,9 @@ From source:
   end
   
   # Generating a graph with memory and cpu usage from myrrd.rrd file
-  RRD.graph "graph.png", :title => "Test", :width => 800, :height => 250 do
+  RRD.graph "graph.png", :title => "Test", :width => 800, :height => 250, :color => ["FONT#000000", "BACK#FFFFFF"] do
     area "myrrd.rrd", :cpu0 => :average, :color => "#00FF00", :label => "CPU 0"
+    line "myrrd.rrd", :cpu0 => :average, :color => "#007f3f"
     line "myrrd.rrd", :memory => :average, :color => "#0000FF", :label => "Memory"
   end
 

data/Rakefile

@@ -19,9 +19,10 @@ begin
     gem.description = %Q{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!}
     gem.email = "morellon@gmail.com"
     gem.homepage = "http://github.com/morellon/rrd-ffi"
-    gem.authors = ["morellon", "fnando", "rafaelrosafu", "dalcico"]
+    gem.authors = ["morellon"]
     gem.add_development_dependency "rspec"
     gem.add_dependency "ffi"
+    gem.add_dependency "activesupport"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/rrd.rb

@@ -4,42 +4,46 @@ require "rrd/wrapper"
 require "rrd/base"
 require "rrd/graph"
 require "rrd/builder"
-require "rrd/ext/fixnum"
+require "rrd/time_extension"
 
 module RRD
   extend self
-  
+
   BANG_METHODS = [:graph!]
-  
+
   def graph(image_file, options = {}, &block)
     graph = Graph.new(image_file, options)
     graph.instance_eval(&block)
     graph.save
   end
-  
+
   def error
     Wrapper.error
   end
-  
+
   def to_line_parameters(hash, known_flags = [])
     used_flags = []
     known_flags.each do |flag|
       used_flags << "--#{flag}".gsub(/_/, "-") if hash.delete(flag)
     end
-    
+
     line_params = []
-    hash.each_pair { |key,value| line_params += ["--#{key}".gsub(/_/, "-"), value.to_s] }
-    line_params = Hash[*line_params]
-    
-    params = []
-    line_params.keys.sort.each { |key| params += [key, line_params[key]] }
-    used_flags + params
+
+    hash.each_pair do |key,value|
+      if value.kind_of? Array
+        value.each {|v| line_params += ["--#{key}".gsub(/_/, "-"), v.to_s]}
+      else
+        line_params += ["--#{key}".gsub(/_/, "-"), value.to_s]
+      end
+    end
+
+    used_flags + line_params
   end
-  
+
   def methods
     super + BANG_METHODS
   end
-  
+
   def bang(method, *args, &block)
     result = send(method, *args, &block)
     raise error unless result

data/lib/rrd/graph.rb

@@ -80,19 +80,26 @@ module RRD
       [definition, printable]
     end
     
-    def save
+    def save    
+      Wrapper.graph(*generate_args)
+    end
+    
+    private
+    def generate_args
       args = [output]
       args += RRD.to_line_parameters(parameters, GRAPH_FLAGS)
       args += definitions
       args += printables
-      
-      Wrapper.graph(*args)
     end
     
-    private
     def draw(type, options)
-      options[:label] = options[:label].gsub(/^:/, "\\:").gsub(/([^\\]):/, "\\1\\:") # Escape all non-escaped ':'
-      printable = "#{type}:#{options[:data]}#{options[:color]}:#{options[:label]}"
+      printable = "#{type}:#{options[:data]}#{options[:color]}"
+
+      if options[:label]
+        options[:label] = options[:label].gsub(/^:/, "\\:").gsub(/([^\\]):/, "\\1\\:") # Escape all non-escaped ':'
+        printable += ":#{options[:label]}"
+      end
+
       printables << printable
       printable
     end

data/lib/rrd/time_extension.rb

@@ -0,0 +1,18 @@
+require 'active_support/version'
+
+if ActiveSupport::VERSION::MAJOR >= 3
+  require 'active_support/core_ext/numeric/time'
+  require 'active_support/core_ext/integer/time'
+else
+  require 'active_support/duration'
+  require 'active_support/core_ext/numeric/time'
+  require 'active_support/core_ext/integer/time'
+
+  class Numeric
+    include ActiveSupport::CoreExtensions::Numeric::Time
+  end
+
+  class Integer
+    include ActiveSupport::CoreExtensions::Integer::Time
+  end
+end

data/lib/rrd/version.rb

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

data/rrd-ffi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rrd-ffi}
-  s.version = "0.2.3"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["morellon", "fnando", "rafaelrosafu", "dalcico"]
-  s.date = %q{2010-05-18}
+  s.authors = ["morellon"]
+  s.date = %q{2010-08-31}
   s.description = %q{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!}
   s.email = %q{morellon@gmail.com}
   s.extra_rdoc_files = [
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
      "lib/rrd.rb",
      "lib/rrd/base.rb",
      "lib/rrd/builder.rb",
-     "lib/rrd/ext/fixnum.rb",
      "lib/rrd/graph.rb",
+     "lib/rrd/time_extension.rb",
      "lib/rrd/version.rb",
      "lib/rrd/wrapper.rb",
      "rrd-ffi.gemspec",
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/morellon/rrd-ffi}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{RRDTool gem using librrd and ffi}
   s.test_files = [
     "spec/rrd/base_spec.rb",
@@ -56,16 +56,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<ffi>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<ffi>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<ffi>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
   end
 end
 

data/spec/rrd/base_spec.rb

@@ -40,8 +40,8 @@ describe RRD::Base do
   it "should fetch data from rrd file" do
     start_time = Time.now - 3600
     end_time = Time.now
-    raw_params = ["AVERAGE", "--end", "#{end_time.to_i}", "--resolution", "1", "--start", "#{start_time.to_i}"]
-    RRD::Wrapper.should_receive(:fetch).with(RRD_FILE, *raw_params).and_return([])
+    raw_params = ["AVERAGE", "--start", "#{start_time.to_i}", "--end", "#{end_time.to_i}", "--resolution", "1" ]
+    RRD::Wrapper.should_receive(:fetch).with(RRD_FILE, raw_params[0], anything, anything, anything, anything, anything, anything).and_return([])
     @rrd.fetch(:average, :start => start_time, :end => end_time, :resolution => 1.second)
   end
   

data/spec/rrd/graph_spec.rb

@@ -4,7 +4,8 @@ describe RRD::Graph do
     
   before do
     RRD::Base.new(RRD_FILE).restore(XML_FILE)
-    @graph = RRD::Graph.new IMG_FILE, :title => "Title", :width => 800, :height => 200, :full_size_mode => true
+    @graph = RRD::Graph.new IMG_FILE, :title => "Title", :width => 800, :height => 200, :full_size_mode => true,
+                            :color => ["FONT#000000", "BACK#FFFFFF"]
   end
   
   it "should store definition for rrd data" do
@@ -27,6 +28,11 @@ describe RRD::Graph do
     result.should == "LINE1:mem#0000FF:Memory"
   end
   
+  it "should store printable for line drawing withou label" do
+    result = @graph.draw_line :data => "mem", :color => "#0000FF", :width => 1
+    result.should == "LINE1:mem#0000FF"
+  end
+  
   it "should store printable for area drawing" do
     result = @graph.draw_area :data => "cpu", :color => "#00FF00", :label => "CPU 0"
     result.should == "AREA:cpu#00FF00:CPU 0"
@@ -47,6 +53,12 @@ describe RRD::Graph do
     result[0].should == "DEF:memory_average=#{RRD_FILE}:memory:AVERAGE"
     result[1].should == "LINE1:memory_average#0000FF:Memory\\: Avg"
   end
+
+  it "should store definition and printable for line (without label)" do
+    result = @graph.line RRD_FILE, :memory => :average, :color => "#0000FF"
+    result[0].should == "DEF:memory_average=#{RRD_FILE}:memory:AVERAGE"
+    result[1].should == "LINE1:memory_average#0000FF"
+  end
   
   it "should store definition and printable for area" do
     result = @graph.area RRD_FILE, :memory => :average, :color => "#0000FF", :label => "Memory: Avg"
@@ -55,17 +67,23 @@ describe RRD::Graph do
   end
   
   it "should create a graph correctly" do
+    expected_args = [IMG_FILE,
+                    "--full-size-mode",
+                    "--color", "FONT#000000",
+                    "--color", "BACK#FFFFFF",
+                    "--title", "Title",
+                    "--start", #starting_time,
+                    "--height", "200",
+                    "--end", #ending_time,
+                    "--width", "800",
+                    "DEF:memory_average=#{RRD_FILE}:memory:AVERAGE",
+                    "LINE1:memory_average#0000FF:Memory\\: Avg"]
     @graph.line RRD_FILE, :memory => :average, :color => "#0000FF", :label => "Memory: Avg"
-    RRD::Wrapper.should_receive(:graph).with(IMG_FILE,
-                                            "--full-size-mode",
-                                            "--end", anything(),
-                                            "--height", "200",
-                                            "--start", anything(),
-                                            "--title", "Title",
-                                            "--width", "800",
-                                            "DEF:memory_average=#{RRD_FILE}:memory:AVERAGE",
-                                            "LINE1:memory_average#0000FF:Memory\\: Avg").and_return true
-    @graph.save
+    generated_args = @graph.send(:generate_args)
+    generated_args.size.should == expected_args.size + 2
+    generated_args.first.should == expected_args.first
+    (expected_args - generated_args).should be_empty
   end
+
   
 end

metadata

@@ -1,40 +1,65 @@
 --- !ruby/object:Gem::Specification 
 name: rrd-ffi
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  hash: 29
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - morellon
-- fnando
-- rafaelrosafu
-- dalcico
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -03:00
+date: 2010-08-31 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ffi
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 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: morellon@gmail.com
 executables: []
@@ -52,8 +77,8 @@ files:
 - lib/rrd.rb
 - lib/rrd/base.rb
 - lib/rrd/builder.rb
-- lib/rrd/ext/fixnum.rb
 - lib/rrd/graph.rb
+- lib/rrd/time_extension.rb
 - lib/rrd/version.rb
 - lib/rrd/wrapper.rb
 - rrd-ffi.gemspec
@@ -74,21 +99,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RRDTool gem using librrd and ffi

data/lib/rrd/ext/fixnum.rb

@@ -1,39 +0,0 @@
-#TODO: Change to ActiveSupport from Rails 3
-class Fixnum
-  def second
-    self
-  end
-  alias :seconds :second
-  
-  def minute
-    second * 60
-  end
-  alias :minutes :minute
-  
-  def hour
-    minute * 60
-  end
-  alias :hours :hour
-  
-  def day
-    hour * 24
-  end
-  alias :days :day
-  
-  def week
-    day * 7
-  end
-  alias :weeks :week
-  
-  def month
-    day * 30
-  end
-  alias :months :month
-  
-  def year
-    day * 365
-  end
-  alias :years :year
-end
-  
-