sys-uptime 0.4.4 → 0.4.5

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.4.5 - 19-Nov-2006
+* Internal layout changes, minor doc updates and gemspec improvements.
+* No code changes.
+
 == 0.4.4 - 30-Jun-2006
 * Added inline rdoc documentation to the source files.
 * Added a gemspec.

data/MANIFEST

@@ -1,7 +1,6 @@
 CHANGES
 MANIFEST
 README
-extconf.rb
 install.rb
 sys-uptime.gemspec
 
@@ -9,7 +8,10 @@ doc/uptime.txt
 
 examples/test.rb
 
-lib/os/unix.c
-lib/os/windows.rb
+ext/extconf.rb
+ext/uptime.c
 
-test/tc_uptime.rb
+lib/sys/linux.rb
+lib/sys/windows.rb
+
+test/tc_uptime.rb

data/README

@@ -1,20 +1,20 @@
-== Description
+= Description
    A Ruby interface for getting system uptime information.
 
-== Prerequisites
+= Prerequisites
    Ruby 1.8.0 or later.
-   On Win32 systems, Ruby 1.8.2 or later is recommended.
+   Ruby 1.8.2 or later is recommended on MS Windows.
 
-== Installation
+= Installation
 === Unix:
-ruby extconf.rb
-make
-ruby test/tc_uptime.rb (optional)
-make site-install
+   ruby extconf.rb
+   make
+   ruby test/tc_uptime.rb (optional)
+   make install
 
 === Windows and Linux:
-ruby test\tc_uptime.rb (optional)
-ruby install.rb
+   ruby test\tc_uptime.rb (optional)
+   ruby install.rb
 
 == Notes
-For additional documentation see doc/uptime.txt.
+   For additional documentation see doc/uptime.txt.

data/ext/extconf.rb

@@ -0,0 +1,29 @@
+################################################
+# extconf.rb
+#
+# Configuration & build script for sys-uptime.
+################################################
+require 'mkmf'
+require 'fileutils'
+
+if RUBY_PLATFORM =~ /windows|win32|cygwin|mingw|dos|linux/i
+   STDERR.puts 'Run the "install.rb" script instead on this platform'
+   exit
+else 
+   # Don't install the pure Ruby libraries during 'make install'.
+   if File.basename(Dir.pwd) =~ /ext|sys-uptime/i
+      Dir.chdir('..'){
+         if File.exists?('lib/sys/windows.rb')
+            FileUtils.mv('lib/sys/windows.rb', 'lib/sys/windows.orig')
+         end
+      
+         if File.exists?('lib/sys/linux.rb')
+            FileUtils.mv('lib/sys/linux.rb', 'lib/sys/linux.orig')
+         end
+      }
+   end
+end
+
+have_header('sys/loadavg.h')
+have_header('utmpx.h')
+create_makefile('sys/uptime')

data/{lib/os/unix.c → ext/uptime.c}

@@ -1,5 +1,5 @@
 /******************************************************************************
- * unix.c (uptime.c)
+ * uptime.c
  *
  * Authors:
  *    Daniel Berger
@@ -7,7 +7,7 @@
  *
  * sys-uptime source code for most *nix platforms
  *****************************************************************************/
-#include "ruby.h"
+#include <ruby.h>
 
 #if defined (__FreeBSD__) || defined (__NetBSD__)
 #include <sys/time.h>
@@ -45,7 +45,7 @@
 
 #define MAXSTRINGSIZE 32 /* reasonable limit */
 
-#define SYS_UPTIME_VERSION "0.4.4"
+#define SYS_UPTIME_VERSION "0.4.5"
 
 VALUE cUptimeError;
 
@@ -59,7 +59,7 @@ unsigned long get_uptime_secs()
    mib[0] = CTL_KERN;
    mib[1] = KERN_BOOTTIME;
    if(sysctl(mib, 2, &tv, &tvlen, NULL, 0)){
-      rb_raise(cUptimeError,"sysctl() call failed");
+      rb_raise(cUptimeError, "sysctl() call failed");
    }
    return time(NULL) - tv.tv_sec;
 #else

data/test/tc_uptime.rb

@@ -1,76 +1,74 @@
 #################################
 # tc_uptime.rb
 #
-# Test suite for sys-uptime
+# Test suite for sys-uptime.
 #################################
 base = File.basename(Dir.pwd)
-if base == "test" || base =~ /sys-uptime.*/
-   require "ftools"
-   Dir.chdir("..") if base == "test"
+if base == 'test' || base =~ /sys-uptime.*/
+   require 'fileutils'
+   Dir.chdir('..') if base == 'test'
+   Dir.mkdir('sys') unless File.exists?('sys')
 
-   extension = ".so"
-   extension = ".bundle" if RUBY_PLATFORM =~ /powerpc|darwin/i
-   extension = ".sl" if RUBY_PLATFORM =~ /hpux/i
-   
-   Dir.mkdir("sys") unless File.exists?("sys")
-
-   if PLATFORM.match("mswin")
-      File.copy("lib/os/windows.rb", "sys/uptime.rb")
-   elsif PLATFORM.match("linux")
-      File.copy("lib/os/linux.rb", "sys/uptime.rb")
+   if RUBY_PLATFORM.match('mswin')
+      FileUtils.cp('lib/sys/windows.rb', 'sys/uptime.rb') rescue nil
+   elsif RUBY_PLATFORM.match('linux')
+      FileUtils.cp('lib/sys/linux.rb', 'sys/uptime.rb') rescue nil
    else
-      file = "uptime" + extension  
-      File.copy(file,"sys")
+      require 'rbconfig'
+      file = 'ext/uptime.' + Config::CONFIG['DLEXT']
+      FileUtils.cp(file, 'sys')
    end
-   $LOAD_PATH.unshift Dir.pwd
+
+   $LOAD_PATH.unshift(Dir.pwd)
+   $LOAD_PATH.unshift(Dir.pwd + '/lib')
 end
 
-require "sys/uptime"
-require "test/unit"
+require 'sys/uptime'
+require 'test/unit'
 include Sys
 
 class TC_Uptime < Test::Unit::TestCase
    def test_version
-      assert_equal('0.4.4', Uptime::VERSION, "Bad VERSION")
+      assert_equal('0.4.5', Uptime::VERSION)
    end
 
    def test_seconds
       assert_respond_to(Uptime, :seconds)
       assert_nothing_raised{ Uptime.seconds }
-      assert_kind_of(Fixnum, Uptime.seconds,"Bad seconds() type")
-      assert_equal(true, Uptime.seconds > 0, "Bad seconds() return value")
+      assert_kind_of(Fixnum, Uptime.seconds)
+      assert_equal(true, Uptime.seconds > 0)
    end
 
    def test_minutes
       assert_respond_to(Uptime, :minutes)
       assert_nothing_raised{ Uptime.minutes }
-      assert_kind_of(Fixnum, Uptime.minutes,"Bad minutes() type")
+      assert_kind_of(Fixnum, Uptime.minutes)
    end
 
    def test_hours
       assert_respond_to(Uptime, :hours)
       assert_nothing_raised{ Uptime.hours }
-      assert_kind_of(Fixnum, Uptime.hours,"Bad hours() type")
+      assert_kind_of(Fixnum, Uptime.hours)
    end
 
    def test_days
       assert_respond_to(Uptime,:days)
       assert_nothing_raised{ Uptime.days }
-      assert_kind_of(Fixnum, Uptime.days,"Bad days() type")
+      assert_kind_of(Fixnum, Uptime.days)
    end 
 
    def test_uptime
       assert_respond_to(Uptime,:uptime)
       assert_nothing_raised{ Uptime.uptime }
-      assert_kind_of(String, Uptime.uptime,"Bad uptime() type")
-      assert_equal(false, Uptime.uptime.empty?,"Empty string uptime()")
+      assert_kind_of(String, Uptime.uptime)
+      assert_equal(false, Uptime.uptime.empty?)
    end
    
    def test_dhms
       assert_respond_to(Uptime,:dhms)
       assert_nothing_raised{ Uptime.dhms }
-      assert_kind_of(Array, Uptime.dhms,"Bad uptime() type")
-      assert_equal(false, Uptime.dhms.empty?,"Empty array from dhms()")
+      assert_kind_of(Array, Uptime.dhms)
+      assert_equal(false, Uptime.dhms.empty?)
       assert_equal(4, Uptime.dhms.length)
    end
    

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sys-uptime
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2006-06-30 00:00:00 -06:00
+  version: 0.4.5
+date: 2006-11-20 00:00:00 -07:00
 summary: A Ruby interface for getting system uptime information.
 require_paths: 
 - lib
@@ -32,10 +32,10 @@ files:
 - doc/uptime.txt
 - test/tc_uptime.rb
 - CHANGES
-- MANIFEST
 - README
-- extconf.rb
-- lib/os/unix.c
+- MANIFEST
+- ext/uptime.c
+- ext/extconf.rb
 test_files: 
 - test/tc_uptime.rb
 rdoc_options: []
@@ -43,10 +43,13 @@ rdoc_options: []
 extra_rdoc_files: 
 - CHANGES
 - README
+- MANIFEST
+- doc/uptime.txt
+- ext/uptime.c
 executables: []
 
 extensions: 
-- extconf.rb
+- ext/extconf.rb
 requirements: []
 
 dependencies: []

data/extconf.rb

@@ -1,36 +0,0 @@
-##############################################
-# extconf.rb
-#
-# Configuration & build script for sys-uptime
-##############################################
-require 'mkmf'
-require 'ftools'
-
-#######################################################################
-# In case this is run more than one time, delete the link/copy if it
-# already exists.
-#######################################################################
-uptime_file = "uptime.c"
-File.delete(uptime_file) if File.exists?(uptime_file)
-
-case RUBY_PLATFORM
-   when /windows|win32|cygwin|mingw|dos|linux/i
-      STDERR.puts "Run the 'install.rb' script instead on this platform"
-      exit
-   else 
-      have_header("sys/loadavg.h")
-      c_file = "lib/os/unix.c"
-
-      File.symlink(c_file, uptime_file)
-
-      if File.exists?("lib/os/windows.rb")
-         File.move("lib/os/windows.rb", "lib/os/windows.orig") # Don't install
-      end
-
-      if File.exists?("lib/os/linux.rb")
-         File.move("lib/os/linux.rb", "lib/os/linux.orig") # Don't install
-      end
-end
-
-have_header("utmpx.h")
-create_makefile('sys/uptime')