librrd 1.0.0 → 1.0.1

data/CHANGES.md

@@ -1,6 +1,18 @@
 ChangeLog
 =========
 
+# 1.0.1
+* Mac OS X changes to build with rrdtool from Homebrew. (aia)
+* Unbreak test setup for ruby 1.9.2.
+* Force a cleanup before running the tests to avoid errors
+  with incompatible ruby versions.
+
+# 1.0.0
+* Moved test.rb to test/unit tests.
+* Update development instructions. (auxesis)
+* Alias RRD to LibRRD Ruby users aren't confused about gem/library
+  naming conventions. (auxesis)
+
 # 0.2.0
 * Add RRDtool 1.2 bindings.
 * Fix build on OpenBSD.

data/README.md

@@ -15,8 +15,10 @@ The following systems, RRDtool versions and Ruby versions  have been tested.
 
 * Ubuntu 10.04 LTS (RRDtool 1.3.8)
   * Ruby 1.9.2p0, 1.8.7p302
-  * Rubinius 1.1.0
+  * Rubinius 1.1.0, 2.0.0pre
   * ruby-enterpriseedition 1.8.7 2010.02
+* Ubuntu 11.04 (RRDtool 1.4.3)
+  * Ruby 1.9.2p180, Ruby 1.8.7p334
 * CentOS 5.5 (RRDtool 1.2.27)
   * ruby-enterpriseedition 1.8.6 20090610
 * OpenBSD 4.8 (RRDtool 1.2.30)
@@ -33,8 +35,7 @@ Make sure you have the development package of `librrd` installed.
 
 Build the C extension:
 
-    ruby ext/librrd/extconf.rb
-    make
+    rake build_rrd
 
 Run the tests:
 

data/Rakefile

@@ -49,9 +49,9 @@ end
 task :default => :test
 
 require 'rake/testtask'
-task :test => :build_rrd
+task :test => [:clean, :build_rrd]
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << '.' << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = false
 end
@@ -67,6 +67,11 @@ end
 #
 #############################################################################
 
+desc "Cleanup compiled stuff"
+task :clean do
+  sh 'rm -f *.so *.o Makefile mkmf.log'
+  sh 'cd ext/librrd/ && rm -f *.so *.o Makefile mkmf.log'
+end
 
 
 #############################################################################
@@ -75,7 +80,7 @@ end
 #
 #############################################################################
 
-desc "Update gemspec, build gem, commit with 'Release x.x.x', create tag, push to github and gemcutter"
+desc "Update gemspec, build gem, commit with 'Release #{version}', create tag, push to github and gemcutter"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/ext/librrd/extconf.rb

@@ -6,6 +6,9 @@ when /openbsd/i
   $LDFLAGS += ' -L/usr/X11R6/lib'
   find_library('z', nil)
   find_library('freetype', nil)
+when /darwin/i
+  puts "Mac OS X"
+  $INCFLAGS += ' -I/usr/local/include'
 end
 
 dir_config("rrd")

data/librrd.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'librrd'
-  s.version           = '1.0.0'
-  s.date              = '2011-01-15'
+  s.version           = '1.0.1'
+  s.date              = '2011-11-24'
 
   s.summary     = "Ruby bindings for librrd"
   s.description = "Ruby bindings for librrd. Extracted from the RRDtool source."

data/test/test_librrd.rb

@@ -15,6 +15,9 @@ class TestLibRRD < Test::Unit::TestCase
   end
 
   def test_rrd_methods_defined
-    assert(%w(fetch dump graph update).all? {|m| LibRRD.methods.include?(m) })
+    assert(LibRRD.respond_to?(:fetch))
+    assert(LibRRD.respond_to?(:dump))
+    assert(LibRRD.respond_to?(:graph))
+    assert(LibRRD.respond_to?(:update))
   end
 end

data/test/test_rrd.rb

@@ -6,7 +6,7 @@ class TestRRD < Test::Unit::TestCase
   def setup
     @rrd_file   = 'test.rrd'
     @png_file   = "#{File.basename(@rrd_file, '.rrd')}.png"
-    @start_time = Time.parse('2011-01-15').to_i
+    @start_time = 1295046000
     @end_time   = @start_time + 300 * 300
   end
 
@@ -65,11 +65,11 @@ class TestRRD < Test::Unit::TestCase
     if RRD.respond_to?(:xport)
       assert_nothing_raised do
         fstart, fend, step, col, legend, data = RRD.xport(
-          "--start", start_time.to_s,
-          "--end", (start_time + 300 * 300).to_s,
+          "--start", @start_time.to_s,
+          "--end", (@start_time + 300 * 300).to_s,
           "--step", 10.to_s,
-          "DEF:A=#{rrd}:a:AVERAGE",
-          "DEF:B=#{rrd}:b:AVERAGE",
+          "DEF:A=#{@rrd_file}:a:AVERAGE",
+          "DEF:B=#{@rrd_file}:b:AVERAGE",
           "XPORT:A:a",
           "XPORT:B:b"
         )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: librrd
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Bernd Ahlers
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 +01:00
-default_executable: 
+date: 2011-11-24 00:00:00 Z
 dependencies: []
 
 description: Ruby bindings for librrd. Extracted from the RRDtool source.
@@ -47,7 +46,6 @@ files:
 - librrd.gemspec
 - test/test_librrd.rb
 - test/test_rrd.rb
-has_rdoc: true
 homepage: http://github.com/bernd/librrd-ruby
 licenses: []
 
@@ -78,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: Ruby bindings for librrd