errand 0.7.0 → 0.7.1

data/README.md

@@ -47,10 +47,16 @@ Otherwise, simply run:
 This should build a library named `rrd.so` in the current directory. If it 
 doesn't, please report bugs at [http://github.com/eric/rubyrrdtool/issues](http://github.com/eric/rubyrrdtool/issues)!
 
-Building gem
-============
+Building the gem
+================
+
+Errand is managed by Jeweller, which generates the gemspec for you: 
+
+    rake gemspec
+
+Once the gemspec is generated, build the gem: 
 
-gem build errand.gemspec 
+    gem build errand.gemspec 
 
 Testing 
 =======

data/Rakefile

@@ -9,7 +9,6 @@ begin
     gemspec.email = "lindsay@holmwood.id.au"
     gemspec.homepage = "http://auxesis.github.com/errand"
     gemspec.authors = ["Lindsay Holmwood"]
-    gemspec.extensions = ["extconf.rb"]
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/errand.rb

@@ -1,13 +1,36 @@
 #!/usr/bin/env ruby 
 
-$: << File.expand_path(File.join(File.dirname(__FILE__), '..'))
-require 'errand_backend'
+# Attempt to load the native RRD library provided by the operating system. 
+begin 
+  # Ruby Enterprise Edition will try to load everything from /usr/local/lib/ruby. 
+  # As the distribution generally installs the RRD bindings in /usr/lib/ruby, we
+  # have to explicitly hack the load path so REE knows where to find the Ruby 
+  # RRD bindings. 
+  case RUBY_VERSION[/^1\.\d/]
+  when /^1\.8/
+    version = "1.8"
+  when /^1\.9/
+    version = RUBY_VERSION
+  end
+  
+  %w(i386 i486).each do |arch|
+    $: << "/usr/lib/ruby/#{version}/#{arch}-linux"
+  end
+  
+  require 'RRD'
+rescue LoadError
+  exit 1
+end
+
+# Errand:
+# Wraps the RRD Ruby library provided by your distribution's package manager, 
+# exposing a more Ruby-like and accessible interface. 
 
 class Errand
   def initialize(opts={})
     raise ArgumentError unless opts[:filename]
     @filename = opts[:filename]
-    @backend = ::ErrandBackend
+    @backend = ::RRD
   end
 
   def dump(opts={})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: errand
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 +13:00
+date: 2010-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -17,8 +17,8 @@ description: Errand provides Ruby bindings for RRD functions (via librrd), and a
 email: lindsay@holmwood.id.au
 executables: []
 
-extensions: 
-- extconf.rb
+extensions: []
+
 extra_rdoc_files: 
 - README.md
 files: 
@@ -28,11 +28,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- extconf.rb
 - lib/errand.rb
-- lib/graph.rb
-- rrd_info.h
-- rrdtool_main.c
 - spec/errand_spec.rb
 - spec/spec.opts
 - test/test_rrdtool.rb

data/extconf.rb

@@ -1,30 +0,0 @@
-# $Id: extconf.rb,v 1.4 2008/03/11 22:47:06 dbach Exp $
-
-require 'mkmf'
-
-# If there are build errors, be sure to say where your rrdtool lives:
-#
-# ruby ./extconf.rb --with-rrd-dir=/usr/local/rrdtool-1.2.12
-
-libpaths=%w(/lib /usr/lib /usr/local/lib /sw/lib /opt/local/lib)
-%w(art_lgpl_2 freetype png z).sort.reverse.each do |lib|
-	find_library(lib, nil, *libpaths)
-end
-
-dir_config("rrd")
-# rrd_first is only defined rrdtool >= 1.2.x
-have_library("rrd", "rrd_first")
-
-# rrd_dump_r has 2nd arg in rrdtool >= 1.2.14
-if try_link(<<EOF)
-#include <rrd.h>
-main()
-{
-  rrd_dump_r("/dev/null", NULL);
-}
-EOF
-    $CFLAGS += " -DHAVE_RRD_DUMP_R_2"
-end
-
-create_makefile("errand_backend")
-

data/lib/graph.rb

@@ -1,75 +0,0 @@
-#
-# ideas for a graphing DSL
-#
-
-module RRDtool
-
-  # Simple Ruby object to generate the RRD graph parameters
-  #
-  class Graph
-    
-    # Graph attributes can appear in any order
-    attr :image_file, :image_format
-    attr :title
-    attr :vertical_label
-    
-    attr :width, :height
-    attr :start, :duration, :step
-    attr :upper_limit, :lower_limit
-    
-    # LATER: there are lots of other RRDtool graph attributes
-    
-    def initialize
-      @graph_command = []
-    end
-
-    # 
-    # The graph commands must be preserved in order
-    #
-
-    # Create a DEF
-    def fetch(name, rrd_file, value, type)
-      # format: DEF:name=rrd_file:value:type
-      @graph_command << "DEF:#{name}=#{rrd_file}:#{value}:#{type}"
-    end
-    
-    # Create a CDEF
-    def compute(name, expr)
-      # format: CDEF:name=expr
-      @graph_command << "CDEF:#{name}=#{expr}"
-    end
-    
-    # Create GPRINT
-    def gprint(name, type, print_expr)
-      # format: GPRINTF:name:type:print_expr
-      @graph_command << "GPRINTF:#{name}:#{type}:#{print_expr}"    
-    end
-    
-    # Create a LINE(1,2,...)
-    def line(name, width, color, label)
-      # format: LINEwidth:name#color:label
-      @graph_command << "LINE#{width}:#{name}##{color}:#{label}"
-    end
-    
-    # Create a AREA
-    def area(name, color)
-      # format: AREA:name#color
-      @graph_command << "AREA:#{name}##{color}"
-    end
-    
-    # Create a STACK
-    def stack(name, color)
-      # format: STACK:name#color
-      @graph_command << "STACK:#{name}##{color}"
-    end
-
-    # Turn the graph definition into a real image
-    def publish
-      # LATER: add in the graph attributes -- 
-      # i.e., turn the graph attribute hash into an array of [ '--key', 'value', ...]
-      RRDtool.graph @graph_command
-    end
-
-  end
-
-end

data/rrd_info.h

@@ -1,47 +0,0 @@
-/* -*- C -*-
- * file:   rrd_info.h
- * date:   $Date: 2008/03/11 22:47:06 $
- * init:   2005-07-26
- * vers:   $Version$
- * auth:   $Author: dbach $
- * -----
- * 
- * Support file to add rrd_info() to rrd.h
- * 
- */
-#ifndef __RRD_INFO_H
-#define __RRD_INFO_H
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-/* rrd info interface
-enum info_type   { RD_I_VAL=0,
-	       RD_I_CNT,
-	       RD_I_STR, 
-		   RD_I_INT };
-*/
-
-typedef union infoval { 
-    unsigned long u_cnt; 
-    rrd_value_t   u_val;
-    char         *u_str;
-    int		  u_int;
-} infoval;
-
-typedef struct info_t {
-    char            *key;
-    rrd_info_type_t  type;
-    union infoval   value;
-    struct info_t   *next;
-} info_t;
-
-//info_t *rrd_info(int, char **);
-
-
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-#endif /* __RRD_INFO_H */

data/rrdtool_main.c

@@ -1,260 +0,0 @@
-/* $Id: rrdtool_main.c,v 1.1 2008/03/11 22:47:06 dbach Exp $
- * Substantial penalty for early withdrawal.
- */
-
-#include <unistd.h>
-#include <math.h>   /* for isnan */
-#include <ruby.h>
-#include <rrd.h>
-#include "rrd_info.h"
-
-typedef struct string_arr_t {
-    int len;
-    char **strings;
-} string_arr;
-
-VALUE mRRD;
-VALUE rb_eRRDError;
-
-typedef int (*RRDFUNC)(int argc, char ** argv);
-#define RRD_CHECK_ERROR  \
-    if (rrd_test_error()) \
-      rb_raise(rb_eRRDError, rrd_get_error()); \
-    rrd_clear_error();
-
-string_arr string_arr_new(VALUE rb_strings)
-{
-    string_arr a;
-    char buf[64];
-    int i;
-   
-    Check_Type(rb_strings, T_ARRAY);
-    a.len = RARRAY_LEN(rb_strings) + 1;
-
-    a.strings = malloc(a.len * sizeof(char *));
-    a.strings[0] = "dummy";     /* first element is a dummy element */
-
-    for (i = 0; i < a.len - 1; i++) {
-        VALUE v = rb_ary_entry(rb_strings, i);
-        switch (TYPE(v)) {
-        case T_STRING:
-            a.strings[i + 1] = strdup(STR2CSTR(v));
-            break;
-        case T_FIXNUM:
-            snprintf(buf, 63, "%d", FIX2INT(v));
-            a.strings[i + 1] = strdup(buf);
-            break;
-        default:
-            rb_raise(rb_eTypeError, "invalid argument - %s, expected T_STRING or T_FIXNUM on index %d", rb_class2name(CLASS_OF(v)), i);
-            break;
-        }
-    }
-
-    return a;
-}
-
-void string_arr_delete(string_arr a)
-{
-    int i;
-
-    /* skip dummy first entry */
-    for (i = 1; i < a.len; i++) {
-        free(a.strings[i]);
-    }
-
-    free(a.strings);
-}
-
-void reset_rrd_state()
-{
-    optind = 0; 
-    opterr = 0;
-    rrd_clear_error();
-}
-
-VALUE rrd_call(RRDFUNC func, VALUE args)
-{
-    string_arr a;
-
-    a = string_arr_new(args);
-    reset_rrd_state();
-    func(a.len, a.strings);
-    string_arr_delete(a);
-
-    RRD_CHECK_ERROR
-
-    return Qnil;
-}
-
-VALUE rb_rrd_create(VALUE self, VALUE args)
-{
-    return rrd_call(rrd_create, args);
-}
-
-VALUE rb_rrd_dump(VALUE self, VALUE args)
-{
-    return rrd_call(rrd_dump, args);
-}
-
-VALUE rb_rrd_fetch(VALUE self, VALUE args)
-{
-    string_arr a;
-    unsigned long i, j, k, step, ds_cnt;
-    rrd_value_t *raw_data;
-    char **raw_names;
-    VALUE data, names, result;
-    time_t start, end;
-
-    a = string_arr_new(args);
-    reset_rrd_state();
-    rrd_fetch(a.len, a.strings, &start, &end, &step, &ds_cnt, &raw_names, &raw_data);
-    string_arr_delete(a);
-
-    RRD_CHECK_ERROR
-
-    names = rb_ary_new();
-    for (i = 0; i < ds_cnt; i++) {
-        rb_ary_push(names, rb_str_new2(raw_names[i]));
-        free(raw_names[i]);
-    }
-    free(raw_names);
-
-    k = 0;
-    data = rb_ary_new();
-    for (i = start; i < end; i += step) {
-        VALUE line = rb_ary_new2(ds_cnt);
-        for (j = 0; j < ds_cnt; j++) {
-            rb_ary_store(line, j, rb_float_new(raw_data[k]));
-            k++;
-        }
-        rb_ary_push(data, line);
-    }
-    free(raw_data);
-   
-    result = rb_ary_new2(4);
-    rb_ary_store(result, 0, INT2NUM(start));
-    rb_ary_store(result, 1, INT2NUM(end));
-    rb_ary_store(result, 2, names);
-    rb_ary_store(result, 3, data);
-    return result;
-}
-
-VALUE rb_rrd_graph(VALUE self, VALUE args)
-{
-    string_arr a;
-    char **calcpr, **p;
-    VALUE result, print_results;
-    int xsize, ysize;
-    double ymin, ymax;
-
-    a = string_arr_new(args);
-    reset_rrd_state();
-    rrd_graph(a.len, a.strings, &calcpr, &xsize, &ysize, NULL, &ymin, &ymax);
-    string_arr_delete(a);
-
-    RRD_CHECK_ERROR
-
-    result = rb_ary_new2(3);
-    print_results = rb_ary_new();
-    p = calcpr;
-    for (p = calcpr; p && *p; p++) {
-        rb_ary_push(print_results, rb_str_new2(*p));
-        free(*p);
-    }
-    free(calcpr);
-    rb_ary_store(result, 0, print_results);
-    rb_ary_store(result, 1, INT2FIX(xsize));
-    rb_ary_store(result, 2, INT2FIX(ysize));
-    return result;
-}
-
-VALUE rb_rrd_info(VALUE self, VALUE args)
-{
-    string_arr a;
-    info_t *p, *data;
-    VALUE result;
-
-    a = string_arr_new(args);
-    data = rrd_info(a.len, a.strings);
-    string_arr_delete(a);
-
-    RRD_CHECK_ERROR
-
-    result = rb_hash_new();
-    while (data) {
-        VALUE key = rb_str_new2(data->key);
-        switch (data->type) {
-        case RD_I_VAL:
-            if (isnan(data->value.u_val)) {
-                rb_hash_aset(result, key, Qnil);
-            }
-            else {
-                rb_hash_aset(result, key, rb_float_new(data->value.u_val));
-            }
-            break;
-        case RD_I_CNT:
-            rb_hash_aset(result, key, INT2FIX(data->value.u_cnt));
-            break;
-        case RD_I_STR:
-            rb_hash_aset(result, key, rb_str_new2(data->value.u_str));
-            free(data->value.u_str);
-            break;
-        }
-        p = data;
-        data = data->next;
-        free(p);
-    }
-    return result;
-}
-
-VALUE rb_rrd_last(VALUE self, VALUE args)
-{
-    string_arr a;
-    time_t last;
-
-    a = string_arr_new(args);
-    reset_rrd_state();
-    last = rrd_last(a.len, a.strings);
-    string_arr_delete(a);
-
-    RRD_CHECK_ERROR
-
-    return rb_funcall(rb_cTime, rb_intern("at"), 1, INT2FIX(last));
-}
-
-VALUE rb_rrd_resize(VALUE self, VALUE args)
-{
-    return rrd_call(rrd_resize, args);
-}
-
-VALUE rb_rrd_restore(VALUE self, VALUE args)
-{
-    return rrd_call(rrd_restore, args);
-}
-
-VALUE rb_rrd_tune(VALUE self, VALUE args)
-{
-    return rrd_call(rrd_tune, args);
-}
-
-VALUE rb_rrd_update(VALUE self, VALUE args)
-{
-    return rrd_call(rrd_update, args);
-}
-
-void Init_errand_backend() 
-{
-    mRRD = rb_define_module("ErrandBackend");
-    rb_eRRDError = rb_define_class("ErrandError", rb_eStandardError);
-
-    rb_define_module_function(mRRD, "create", rb_rrd_create, -2);
-    rb_define_module_function(mRRD, "dump", rb_rrd_dump, -2);
-    rb_define_module_function(mRRD, "fetch", rb_rrd_fetch, -2);
-    rb_define_module_function(mRRD, "graph", rb_rrd_graph, -2);
-    rb_define_module_function(mRRD, "last", rb_rrd_last, -2);
-    rb_define_module_function(mRRD, "resize", rb_rrd_resize, -2);
-    rb_define_module_function(mRRD, "restore", rb_rrd_restore, -2);
-    rb_define_module_function(mRRD, "tune", rb_rrd_tune, -2);
-    rb_define_module_function(mRRD, "update", rb_rrd_update, -2);
-    rb_define_module_function(mRRD, "info", rb_rrd_info, -2);
-}