sys-uptime 0.5.4-x86-mingw32 → 0.6.0-x86-mingw32

data/test/test_sys_uptime.rb

@@ -1,65 +1,109 @@
-#####################################################################
-# test_sys_uptime.rb
-#
-# Test suite for sys-uptime. This should generally be run via the
-# 'rake test' task, since it handles the pre-setup code for you.
-#####################################################################
-require 'sys/uptime'
-require 'test/unit'
-include Sys
-
-class TC_Sys_Uptime < Test::Unit::TestCase
-  def test_version
-    assert_equal('0.5.4', Uptime::VERSION)
-  end
-
-  def test_seconds
-    assert_respond_to(Uptime, :seconds)
-    assert_nothing_raised{ Uptime.seconds }
-    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)
-  end
-
-  def test_hours
-    assert_respond_to(Uptime, :hours)
-    assert_nothing_raised{ Uptime.hours }
-    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)
-  end 
-
-  def test_uptime
-    assert_respond_to(Uptime,:uptime)
-    assert_nothing_raised{ Uptime.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)
-    assert_equal(false, Uptime.dhms.empty?)
-    assert_equal(4, Uptime.dhms.length)
-  end
-   
-  def test_boot_time
-    assert_respond_to(Uptime,:boot_time)
-    assert_nothing_raised{ Uptime.boot_time }
-    assert_kind_of(Time, Uptime.boot_time)
-  end
-
-  def test_uptime_error
-    assert_kind_of(StandardError, Uptime::Error.new)
-  end
-end
+#####################################################################
+# test_sys_uptime.rb
+#
+# Test suite for sys-uptime. This should generally be run via the
+# 'rake test' task, since it handles the pre-setup code for you.
+#####################################################################
+require 'rubygems'
+gem 'test-unit'
+
+require 'sys/uptime'
+require 'test/unit'
+require 'socket'
+include Sys
+
+class TC_Sys_Uptime < Test::Unit::TestCase
+  test "version is set to expected value" do
+    assert_equal('0.6.0', Uptime::VERSION)
+  end
+
+  test "seconds method basic functionality" do
+    assert_respond_to(Uptime, :seconds)
+    assert_nothing_raised{ Uptime.seconds }
+  end
+
+  test "seconds method returns a plausible value" do
+    assert_kind_of(Integer, Uptime.seconds)
+    assert_true(Uptime.seconds > 300)
+  end
+
+  test "minutes method basic functionality" do
+    assert_respond_to(Uptime, :minutes)
+    assert_nothing_raised{ Uptime.minutes }
+  end
+
+  test "minutes method returns a plausible value" do
+    assert_kind_of(Integer, Uptime.minutes)
+    assert_true(Uptime.minutes > 5)
+  end
+
+  test "hours method basic functionality" do
+    assert_respond_to(Uptime, :hours)
+    assert_nothing_raised{ Uptime.hours }
+  end
+
+  test "hours method returns a plausible value" do
+    assert_kind_of(Integer, Uptime.hours)
+    assert_true(Uptime.hours > 0)
+  end
+
+  test "days method basic functionality" do
+    assert_respond_to(Uptime, :days)
+    assert_nothing_raised{ Uptime.days }
+  end
+
+  test "days method returns a plausible value" do
+    assert_kind_of(Fixnum, Uptime.days)
+    assert_true(Uptime.days >= 0)
+  end
+
+  test "uptime method basic functionality" do
+    assert_respond_to(Uptime, :uptime)
+    assert_nothing_raised{ Uptime.uptime }
+  end
+
+  test "uptime method returns a non-empty string" do
+    assert_kind_of(String, Uptime.uptime)
+    assert_false(Uptime.uptime.empty?)
+  end
+
+  test "uptime method does not accept any arguments" do
+    omit_if(File::ALT_SEPARATOR)
+    assert_raise(ArgumentError){ Uptime.uptime(1) }
+  end
+
+  test "uptime accepts a host name on Windows" do
+    omit_unless(File::ALT_SEPARATOR, "MS Windows only")
+    assert_nothing_raised{ Uptime.uptime(Socket.gethostname) }
+  end
+
+  test "dhms method basic functionality" do
+    assert_respond_to(Uptime, :dhms)
+    assert_nothing_raised{ Uptime.dhms }
+    assert_kind_of(Array, Uptime.dhms)
+  end
+
+  test "dhms method returns an array of four elements" do
+    assert_false(Uptime.dhms.empty?)
+    assert_equal(4, Uptime.dhms.length)
+  end
+
+  test "boot_time method basic functionality" do
+    assert_respond_to(Uptime, :boot_time)
+    assert_nothing_raised{ Uptime.boot_time }
+  end
+
+  test "boot_time method returns a Time object" do
+    assert_kind_of(Time, Uptime.boot_time)
+  end
+
+  test "Uptime class cannot be instantiated" do
+    assert_kind_of(StandardError, Uptime::Error.new)
+  end
+
+  test "Ensure that ffi functions are private" do
+    methods = Uptime.methods(false).map{ |e| e.to_s }
+    assert_false(Uptime.methods.include?('time'))
+    assert_false(Uptime.methods.include?('times'))
+  end
+end

metadata

@@ -1,82 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sys-uptime
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 4
-  version: 0.5.4
+version: !ruby/object:Gem::Version
+  version: 0.6.0
+  prerelease: 
 platform: x86-mingw32
-authors: 
+authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-27 00:00:00 -06:00
-default_executable: 
+date: 2011-12-11 00:00:00.000000000Z
 dependencies: []
-
-description: "    The sys-uptime library is a simple interface for gathering uptime\n    information. You can retrieve data in seconds, minutes, days, hours,\n    or all of the above.\n"
+description: ! "    The sys-uptime library is a simple interface for gathering uptime\n
+  \   information. You can retrieve data in seconds, minutes, days, hours,\n    or
+  all of the above.\n"
 email: djberg96@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
-- doc/uptime.txt
-files: 
+files:
 - CHANGES
-- doc/uptime.txt
-- examples/sys_uptime_example.rb
-- ext/extconf.rb
-- ext/sys/uptime.c
-- lib/linux/sys/uptime.rb
+- examples/uptime_test.rb
+- lib/unix/sys/uptime.rb
 - lib/windows/sys/uptime.rb
 - MANIFEST
 - Rakefile
 - README
 - sys-uptime.gemspec
 - test/test_sys_uptime.rb
-has_rdoc: true
-homepage: http://www.rubyforge.org/projects/sysutils
-licenses: []
-
+homepage: https://github.com/djberg96/sys-uptime
+licenses:
+- Artistic 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - lib/windows
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sysutils
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A Ruby interface for getting system uptime information.
-test_files: 
+test_files:
 - test/test_sys_uptime.rb

data/doc/uptime.txt

@@ -1,98 +0,0 @@
-== Description
-  The sys-uptime library provides uptime and boot time information, similar
-  to the 'uptime' Unix command.
-
-== Synopsis
-  require 'sys/uptime'
-  include Sys
-
-  p Uptime.days
-  p Uptime.hours
-  p Uptime.minutes
-  p Uptime.seconds
-  p Uptime.dhms.join(', ')
-  p Uptime.uptime
-  p Uptime.boot_time
-    
-== Constants
-VERSION
-  Returns the current version number of this library.
-    
-== Class Methods
-Uptime.boot_time
-  Returns the boot time as a Time object.
-    
-Uptime.days
-  Returns the total number of days the system has been up.
-    
-Uptime.hours
-  Returns the total number of hours the system has been up.
-    
-Uptime.minutes
-  Returns the total number of minutes the system has been up.
-    
-Uptime.seconds
-  Returns the total number of seconds the system has been up.
-    
-Uptime.dhms
-  Calculates and returns the number of days, hours, minutes and
-  seconds the system has been running as a four-element Array.
-    
-Uptime.uptime
-  Calculates and returns the number of days, hours, minutes and
-  seconds the system has been running as a colon-separated string.
-    
-== Exceptions
-Uptime::Error
-  Raised if something goes wrong. On Unix, this would likely mean a
-  failure of the times() function. That would be highly unusual.
-   
-  On Windows, it probably means you failed to connect to WMI properly. The
-  mostly likely reason would be that the WMI service wasn't running.
-    
-== Notes
-  On MS Windows each of the class methods optionally takes a host name as
-  a single argument. The default is localhost (or whatever the result of
-  Socket.gethostname returns).
-
-  The current time, users and load average are NOT included in this
-  module, even though you may be used to seeing them with the command
-  line version of 'uptime'.  This is because these things have
-  absolutely nothing to do with uptime. At least, not as I logically
-  think of uptime.
-    
-  This library was tested successfully on a Solaris system with over 1600
-  days of uptime.
-    
-== Known Bugs
-  None that I am aware of.  Please log any bugs you find on the project
-  website at http://www.rubyforge.org/projects/sysutils.
-
-== Questions
-  "Doesn't Struct::Tms do this?" - No.
-    
-== License
-  Artistic 2.0
-    
-== Copyright
-  Copyright 2002-2011, Daniel J. Berger
-
-  All Rights Reserved. This module is free software. It may be used,
-  redistributed and/or modified under the same terms as Ruby itself.
-    
-== Warranty
-  This library is provided "as is" and without any express or
-  implied warranties, including, without limitation, the implied
-  warranties of merchantability and fitness for a particular purpose.
-
-== Acknowledgements
-  Mike Hall for help with the BSD side of things.
-  Ola Eriksson, whose source code I shamelessly plagiarized to get a better
-  implementation for systems that have the utmpx.h header file.
-
-== Authors
-  Daniel J. Berger
-  Mike Hall
-    
-== See Also
-  uptime(1)

data/ext/extconf.rb

@@ -1,28 +0,0 @@
-##########################################################################
-# extconf.rb
-#
-# Configuration & build script for sys-uptime. Generally speaking you
-# should build sys-uptime with the 'rake build' task instead of running
-# this script manually.
-##########################################################################
-require 'mkmf'
-require 'fileutils'
-
-if RUBY_PLATFORM =~ /windows|win32|cygwin|mingw|dos|linux/i
-  STDERR.puts "Do not compile on this platform. Run 'rake gem:install' instead."
-  exit
-end
-
-dir_config('uptime')
-
-have_header('sys/loadavg.h')
-
-if have_func('sysctl')
-  have_header('sys/param.h')
-  have_header('sys/time.h')
-  have_header('sys/types.h')
-else
-  have_header('utmpx.h')
-end
-
-create_makefile('sys/uptime', 'sys')

data/ext/sys/uptime.c

@@ -1,250 +0,0 @@
-/******************************************************************************
- * uptime.c
- *
- * Authors:
- *    Daniel Berger
- *    Mike Hall
- *
- * sys-uptime source code for most *nix platforms
- *****************************************************************************/
-#include <ruby.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef HAVE_SYSCTL
-
-#include <sys/sysctl.h>
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#else
-
-#include <sys/times.h>
-#include <unistd.h>
-#include <time.h>
-
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif
-
-#ifdef _SC_CLK_TCK
-#define TICKS sysconf(_SC_CLK_TCK)
-#else
-#define TICKS sysconf(CLOCKS_PER_SEC)
-#endif
-
-#endif
-
-#ifdef HAVE_SYS_LOADAVG_H
-#include <sys/loadavg.h>
-#endif
-
-#define MAXSTRINGSIZE 32 /* reasonable limit */
-
-#define SYS_UPTIME_VERSION "0.5.4"
-
-VALUE cUptimeError;
-
-unsigned long get_uptime_secs()
-{
-#ifdef HAVE_SYSCTL
-   struct timeval tv;
-   size_t tvlen = sizeof(tv);
-   int mib[2];
-
-   mib[0] = CTL_KERN;
-   mib[1] = KERN_BOOTTIME;
-
-   if(sysctl(mib, 2, &tv, &tvlen, NULL, 0))
-      rb_raise(cUptimeError, "sysctl() call failed %s", strerror(errno));
-
-   return time(NULL) - tv.tv_sec;
-#else
-   struct tms tms;
-   unsigned long seconds;
-   seconds = times(&tms) / TICKS;
-
-   if(-1 == seconds)
-      rb_raise(cUptimeError, "times() function failed: %s", strerror(errno));
-
-   if(seconds < 0)
-      rb_raise(cUptimeError, "value returned larger than type could handle");
-
-   return seconds;
-#endif
-}
-
-/*
- * call-seq:
- *    Uptime.seconds
- *
- * Returns the total number of seconds the system has been up.
- */
-static VALUE uptime_seconds()
-{
-   return UINT2NUM(get_uptime_secs());
-}
-
-/*
- * call-seq:
- *    Uptime.minutes
- *
- * Returns the total number of minutes the system has been up.
- */
-static VALUE uptime_minutes()
-{
-   return UINT2NUM(get_uptime_secs() / 60);
-}
-
-/*
- * call-seq:
- *    Uptime.hours
- *
- * Returns the total number of hours the system has been up.
- */
-static VALUE uptime_hours()
-{
-   return UINT2NUM(get_uptime_secs() / 3600);
-}
-
-/*
- * call-seq:
- *    Uptime.days
- *
- * Returns the total number of days the system has been up.
- */
-static VALUE uptime_days()
-{
-   return UINT2NUM(get_uptime_secs() / 86400);
-}
-
-/*
- * call-seq:
- *    Uptime.uptime
- *
- * Calculates and returns the number of days, hours, minutes and
- * seconds the system has been running as a colon-separated string.
- */
-static VALUE uptime_uptime()
-{
-   char c_string[MAXSTRINGSIZE];
-   long seconds, days, hours, minutes;
-
-   seconds = get_uptime_secs();
-   days = seconds/86400;
-   seconds -= days*86400;
-   hours = seconds/3600;
-   seconds -= hours*3600;
-   minutes = seconds/60;
-   seconds -= minutes*60;
-
-   sprintf(c_string, "%ld:%ld:%ld:%ld", days, hours, minutes, seconds);
-
-   return rb_str_new2(c_string);
-}
-
-/*
- * call-seq:
- *    Uptime.dhms
- *
- * Calculates and returns the number of days, hours, minutes and
- * seconds the system has been running as a four-element Array.
- */
-static VALUE uptime_dhms()
-{
-   VALUE a = rb_ary_new2(4);
-   long s, m, h, d;
-
-   s = get_uptime_secs();
-   d =  s                / (24*60*60);
-   h = (s -= d*24*60*60) / (   60*60);
-   m = (s -= h*   60*60) /        60;
-   s      -= m*      60;
-
-   rb_ary_push(a, INT2FIX(d));
-   rb_ary_push(a, INT2FIX(h));
-   rb_ary_push(a, INT2FIX(m));
-   rb_ary_push(a, INT2FIX(s));
-
-   return a;
-}
-
-/*
- * call-seq:
- *    Uptime.boot_time
- *
- * Returns the boot time as a Time object.
- */
-static VALUE uptime_btime(){
-   VALUE v_time = Qnil;
-
-#ifdef HAVE_SYSCTL
-   struct timeval tv;
-   size_t tvlen = sizeof(tv);
-   int mib[2];
-
-   mib[0] = CTL_KERN;
-   mib[1] = KERN_BOOTTIME;
-
-   if(sysctl(mib, 2, &tv, &tvlen, NULL, 0))
-      rb_raise(cUptimeError, "sysctl() call failed: %s", strerror(errno));
-
-   v_time = rb_time_new(tv.tv_sec,tv.tv_usec);
-#else
-#ifdef HAVE_UTMPX_H
-   struct utmpx* ent;
-
-   setutxent();
-
-   while( (ent = getutxent()) ){
-      if(ent->ut_type == BOOT_TIME){
-         v_time = rb_time_new(ent->ut_tv.tv_sec, ent->ut_tv.tv_usec);
-         break;
-      }
-   }
-
-   endutxent();
-#else
-   rb_raise(cUptimeError, "boot_time method not implemented on this platform");
-#endif
-#endif
-
-   return v_time;
-}
-
-void Init_uptime()
-{
-   VALUE mSys, cUptime;
-
-   /* The Sys module only serves as a toplevel namespace */
-   mSys = rb_define_module("Sys");
-
-   /* The Uptime encapsulates various bits of uptime information */
-   cUptime = rb_define_class_under(mSys, "Uptime", rb_cObject);
-
-   /* The Uptime::Error class is raised if any of the Uptime methods fail */
-   cUptimeError = rb_define_class_under(cUptime, "Error", rb_eStandardError);
-
-   /* 0.5.4: The version of this library */
-   rb_define_const(cUptime, "VERSION", rb_str_new2(SYS_UPTIME_VERSION));
-
-   /* Singleton Methods */
-
-   rb_define_singleton_method(cUptime, "seconds", uptime_seconds, 0);
-   rb_define_singleton_method(cUptime, "minutes", uptime_minutes, 0);
-   rb_define_singleton_method(cUptime, "hours",   uptime_hours,   0);
-   rb_define_singleton_method(cUptime, "days",    uptime_days,    0);
-   rb_define_singleton_method(cUptime, "uptime",  uptime_uptime,  0);
-   rb_define_singleton_method(cUptime, "dhms",    uptime_dhms,    0);
-   rb_define_singleton_method(cUptime, "boot_time", uptime_btime, 0);
-}