errand 0.7.4 → 0.8.0

data/.gitignore

@@ -7,4 +7,3 @@ pkg
 *.gem
 *.o
 *.so
-errand.gemspec

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p0
+1.9.3-p125

data/CHANGELOG.md

@@ -1,4 +1,3 @@
-0.7.4 - 2013/02/22
- - Chore: switched from using system package manager RRDtool to librrd-ruby
- - Chore: remove use of Jeweler
+0.8.0 - 2013/02/23
+ - Chore: switched from using librrd-ruby to rrd-ffi, to be more portable
 

data/Gemfile

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-source :rubygems
+source 'http://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,16 +1,24 @@
 PATH
   remote: .
   specs:
-    errand (0.7.4)
-      librrd (= 1.0.3)
+    errand (0.8.0)
+      rrd-ffi (= 0.2.13)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     colorize (0.5.8)
     diff-lcs (1.1.3)
-    librrd (1.0.3)
+    ffi (1.4.0)
+    i18n (0.6.1)
+    multi_json (1.6.1)
     rake (0.8.7)
+    rrd-ffi (0.2.13)
+      activesupport
+      ffi
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/errand.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "errand/version"
+
+Gem::Specification.new do |s|
+  s.name        = "errand"
+  s.version     = Errand::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = [ "Lindsay Holmwood" ]
+  s.email       = [ "lindsay@holmwood.id.au" ]
+  s.homepage    = "https://github.com/auxesis/errand"
+  s.summary     = "Ruby language binding for RRD tool version 1.2+"
+  s.description = "Errand provides Ruby bindings for RRD functions (via rrd-ffi), and a concise DSL for interacting with RRDs."
+
+  s.rubyforge_project = "errand"
+
+  s.required_ruby_version     = ">= 1.8.7"
+  s.required_rubygems_version = ">= 1.3.6"
+
+  s.files         = `git ls-files`.split("\n")
+  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_runtime_dependency     "rrd-ffi",  "= 0.2.13"
+  s.add_development_dependency "rake",     ">= 0"
+  s.add_development_dependency "rspec",    ">= 0"
+  s.add_development_dependency "colorize", ">= 0"
+end

data/lib/errand.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # Attempt to load the native RRD library provided by the operating system.
-require 'RRD'
+require 'rrd'
 
 # Errand:
 # Wraps the RRD Ruby library provided by your distribution's package manager,
@@ -11,7 +11,7 @@ class Errand
   def initialize(opts={})
     raise ArgumentError unless opts[:filename]
     @filename = opts[:filename]
-    @backend = ::RRD
+    @backend = ::RRD::Wrapper
   end
 
   def dump(opts={})
@@ -24,28 +24,26 @@ class Errand
   end
 
   def fetch(opts={})
-    start  = (opts[:start] || Time.now.to_i - 3600).to_s
-    finish = (opts[:finish] || Time.now.to_i).to_s
+    start    = (opts[:start] || Time.now.to_i - 3600).to_s
+    finish   = (opts[:finish] || Time.now.to_i).to_s
     function = opts[:function] ? opts[:function].to_s.upcase : "AVERAGE"
 
-    args = [@filename, "--start", start, "--end", finish, function]
+    args   = [ @filename, function, "--start", start, "--end", finish ]
 
-    data = @backend.fetch(*args)
-    start  = data[0]
-    finish = data[1]
-    labels = data[2]
-    values = data[3]
+    data   = @backend.fetch(*args)
+    labels = data.shift
     points = {}
 
-    # compose a saner representation of the data
     labels.each_with_index do |label, index|
       points[label] = []
-      values.each do |tuple|
-        value = tuple[index].nan? ? nil : tuple[index]
+      data.each do |tuple|
+        value = tuple[index]
         points[label] << value
       end
     end
 
+    points.delete('time')
+
     {:start => start, :finish => finish, :data => points}
   end
 

data/lib/errand/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 class Errand
-  VERSION = "0.7.4"
+  VERSION = "0.8.0"
 end

data/spec/errand_spec.rb

@@ -1,57 +1,80 @@
-#!/usr/bin/env ruby 
+#!/usr/bin/env ruby
 
 $: <<  File.expand_path(File.join(File.dirname(__FILE__), '..'))
 require 'lib/errand'
 require 'tmpdir'
 
-describe Errand do 
+describe Errand do
 
   before(:all) do
     @tmpdir = Dir.mktmpdir
   end
 
-  before(:each) do 
+  before(:each) do
     @rrd = Errand.new(:filename => File.join(@tmpdir, 'test.rrd'))
   end
 
-  it "should create data" do 
+  it "should create data" do
 
-    @rrd.create(:start => Time.now.to_i - 1, :step => 300, 
-                :sources => [ 
+    @rrd.create(:start => Time.now.to_i - 1, :step => 300,
+                :sources => [
                   {:name => "Counter", :type => :counter, :heartbeat => 1800, :min => 0, :max => 4294967295},
                   {:name => "Total", :type => :derive, :heartbeat => 1800, :min => 0, :max => 'U'} ],
                 :archives => [
                   {:function => :average, :xff => 0.5, :steps => 1, :rows => 2400}]).should be_true
-    
+
     sources = @rrd.info.keys.grep(/^ds\[/).map { |ds| ds[3..-1].split(']').first}.uniq
     sources.size.should == 2
 
   end
 
   it "should dump data" do
-    @rrd.create(:start => Time.now.to_i - 1, :step => 300, 
-                :sources => [ 
+    @rrd.create(:start => Time.now.to_i - 1, :step => 300,
+                :sources => [
                   {:name => "Counter", :type => :counter, :heartbeat => 1800, :min => 0, :max => 4294967295},
                   {:name => "Total", :type => :derive, :heartbeat => 1800, :min => 0, :max => 'U'} ],
                 :archives => [
                   {:function => :average, :xff => 0.5, :steps => 1, :rows => 2400}]).should be_true
-   
+
     tmpfile = File.join(@tmpdir, 'test.out')
     lambda {
       @rrd.dump(:filename => tmpfile)
-      @rrd.dump # <= no args 
+      @rrd.dump # <= no args
     }.should_not raise_error
   end
 
-  it "should update rrds" do 
-    @rrd.create(:start => Time.now.to_i - 1, :step => 1, 
-                :sources => [ 
-                  {:name => "Sum", :type => :gauge, :heartbeat => 1800, :min => 0, :max => 4294967295},
-                  {:name => "Total", :type => :gauge, :heartbeat => 1800, :min => 0, :max => 'U'} ],
-                :archives => [
-                  {:function => :average, :xff => 0.5, :steps => 1, :rows => 2400}]).should be_true
-
-    @rrd.update(:sources => [ 
+  it "should update rrds" do
+    attrs = {
+      :start => Time.now.to_i - 1,
+      :step  => 1,
+      :sources => [
+        {
+          :name => "Sum",
+          :type => :gauge,
+          :heartbeat => 1800,
+          :min => 0,
+          :max => 4294967295
+        },
+        {
+          :name => "Total",
+          :type => :gauge,
+          :heartbeat => 1800,
+          :min => 0,
+          :max => 'U'
+        }
+      ],
+      :archives => [
+        {
+          :function => :average,
+          :xff => 0.5,
+          :steps => 1,
+          :rows => 2400
+        }
+      ]
+    }
+    @rrd.create(attrs).should be_true
+
+    @rrd.update(:sources => [
                   {:name => "Sum", :value => 1},
                   {:name => "Total", :value => 30}]).should be_true
 
@@ -60,10 +83,10 @@ describe Errand do
     end
   end
 
-  it "should update with weird data" do 
+  it "should update with weird data" do
     time = Time.now.to_i - 300
-    @rrd.create(:start => time - 1, :step => 1, 
-                :sources => [ 
+    @rrd.create(:start => time - 1, :step => 1,
+                :sources => [
                   {:name => "Sum", :type => :gauge, :heartbeat => 1800, :min => 0, :max => 4294967295},
                   {:name => "Total", :type => :gauge, :heartbeat => 1800, :min => 0, :max => 'U'} ],
                 :archives => [
@@ -74,9 +97,9 @@ describe Errand do
       updates << {:name => "Sum", :time => time + i , :value => 1}
       updates << {:name => "Total", :time => time + i * 4, :value => 30}
     end
-    
+
     @rrd.update(:sources => updates)
-    
+
     @rrd.fetch[:data].each_pair do |source, values|
       values.compact.size.should > 0
     end
@@ -84,15 +107,15 @@ describe Errand do
 
   it "should fetch data" do
     time = Time.now.to_i - 300
-    @rrd.create(:start => time - 1, :step => 1, 
-                :sources => [ 
+    @rrd.create(:start => time - 1, :step => 1,
+                :sources => [
                   {:name => "Sum", :type => :gauge, :heartbeat => 1800, :min => 0, :max => 4294967295},
                   {:name => "Total", :type => :gauge, :heartbeat => 1800, :min => 0, :max => 'U'} ],
                 :archives => [
                   {:function => :average, :xff => 0.5, :steps => 1, :rows => 2400}]).should be_true
 
     100.times do |i|
-      @rrd.update(:sources => [ 
+      @rrd.update(:sources => [
                     {:name => "Sum", :time => time + i, :value => 1},
                     {:name => "Total", :time => time + i, :value => 30}]).should be_true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errand
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: librrd
-  requirement: &10134780 !ruby/object:Gem::Requirement
+  name: rrd-ffi
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 0.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *10134780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10145700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10145700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10144440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10144440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &10160900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,9 +69,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10160900
-description: Errand provides Ruby bindings for RRD functions (via librrd), and a concise
-  DSL for interacting with RRDs.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Errand provides Ruby bindings for RRD functions (via rrd-ffi), and a
+  concise DSL for interacting with RRDs.
 email:
 - lindsay@holmwood.id.au
 executables: []
@@ -73,12 +93,13 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- errand.gemspec
 - lib/errand.rb
 - lib/errand/version.rb
 - spec/errand_spec.rb
 - spec/spec.opts
 - test/test_rrdtool.rb
-homepage: http://auxesis.github.com/errand
+homepage: https://github.com/auxesis/errand
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -97,8 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.11
+rubyforge_project: errand
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby language binding for RRD tool version 1.2+