sys-uptime 0.5.4 → 0.6.0

data/CHANGES

@@ -1,7 +1,8 @@
-== 0.5.4 - 26-Jul-2011
-* Refactored and updated Rakefile and gemspec.
-* Some internal file reorganization and renaming.
-* License changed to Artistic 2.0.
+== 0.6.0 - 11-Dec-2011
+* Switched Unix code to use FFI.
+* Removed all of the C related tasks from the Rakefile and added the gem:build
+  and gem:install tasks.
+* Internal directory layout changes, with appropriate changes to the gemspec.
 
 == 0.5.3 - 7-May-2009
 * Altered the Uptime.seconds implementation on Linux so that it works with

data/MANIFEST

@@ -2,11 +2,12 @@
 * MANIFEST
 * Rakefile
 * README
+* install.rb
 * sys-uptime.gemspec
 * doc/uptime.txt
-* examples/sys_uptime_example.rb
+* examples/test.rb
 * ext/extconf.rb
 * ext/sys/uptime.c
-* lib/linux/sys/uptime.rb
-* lib/windows/sys/uptime.rb
-* test/test_sys_uptime.rb
+* lib/sys/linux.rb
+* lib/sys/windows.rb
+* test/test_sys_uptime.rb

data/README

@@ -1,14 +1,67 @@
 = Description
-   A Ruby interface for getting system uptime information.
+  A Ruby interface for getting system uptime information.
 
 = Prerequisites
-   Ruby 1.8.0 or later.
-   Ruby 1.8.2 or later is recommended on MS Windows.
-   A C compiler, except for MS Windows.
+  ffi 0.5.0 or later.
 
 = Installation
-   rake test (optional)
-   rake install (non-gem) or rake install_gem (gem).
+  gem install sys-uptime                    # Unix platforms
+  gem install sys-uptime --platform mswin32 # MS Windows
 
-== Notes
-   For additional documentation see doc/uptime.txt.
+= Synopsis
+  require 'sys/uptime'
+  include Sys
+
+  # Get everything
+  p Uptime.uptime
+  p Uptime.dhms.join(', ')
+
+  # Get individual units
+  p Uptime.days
+  p Uptime.hours
+  p Uptime.minutes
+  p Uptime.seconds
+
+  # Get the boot time
+  p Uptime.boot_time
+
+= Notes
+  On MS Windows the Uptime.uptime and Uptime_boot_time methods optionally
+  takes a host name as a single argument. The default is localhost.
+
+  The current time, users and load average are not included in this library
+  module, even though you may be used to seeing them with the command
+  line version 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-2010, 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
+  Andrea Fazzi for help with the FFI version.
+
+  Mike Hall for help with the BSD side of things for the original C code.
+
+  Ola Eriksson, whose source code I shamelessly plagiarized to get a better
+  implementation for systems that have the utmpx.h header file for the
+  original C code.
+
+== Author
+  Daniel J. Berger

data/Rakefile

@@ -1,87 +1,44 @@
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
-require 'rbconfig'
-include Config
 
-CLEAN.include(
-  '**/*.gem',                # Gem files
-  '**/*.rbc',                # Rubinius
-  '**/*.o',                  # C object file
-  '**/*.log',                # Ruby extension build log
-  '**/Makefile',             # C Makefile
-  '**/conftest.dSYM',        # OS X build directory
-  "**/*.#{CONFIG['DLEXT']}", # C shared object
-  'lib/sys/uptime.rb'        # Renamed source file
-)
+CLEAN.include("**/*.gem", "**/*.rbx", "**/*.rbc")
 
-desc "Build the sys-uptime library on UNIX systems"
-task :build => [:clean] do
-  Dir.chdir('ext') do
-    unless Config::CONFIG['host_os'] =~ /windows|mswin|win32|mingw|cygwin|dos|linux/i
-      ruby 'extconf.rb'
-      sh 'make'
-      cp "uptime." + CONFIG['DLEXT'], "sys"
-    end
-  end
-end
-
-namespace :gem do
-  desc "Create the gem for the sys-uptime library"
+namespace 'gem' do
+  desc 'Build the sys-uptime gem'
   task :create => [:clean] do
     spec = eval(IO.read('sys-uptime.gemspec'))
-
-    case Config::CONFIG['host_os']
-      when /windows|win32|cygwin|mingw|dos|mswin/
-        spec.platform = Gem::Platform::CURRENT
-        spec.platform.cpu = 'universal'
-        spec.require_paths = ['lib', 'lib/windows'] 
-      when /linux/
-        spec.platform = Gem::Platform.new('universal-linux')
-        spec.require_paths = ['lib', 'lib/linux'] 
-      else
-        spec.platform = Gem::Platform::RUBY
-        spec.extensions = ['ext/extconf.rb']
-        spec.extra_rdoc_files << 'ext/sys/uptime.c'
+    
+    if File::ALT_SEPARATOR
+      spec.require_paths = ['lib', 'lib/windows']
+      spec.platform = Gem::Platform::CURRENT
+      spec.platform.cpu = 'universal'
+      spec.platform.version = nil
+    else
+      spec.require_paths = ['lib', 'lib/unix']
+      spec.add_dependency('ffi', '>= 1.0.0')
     end
 
     Gem::Builder.new(spec).build
   end
 
-  desc "Install the sys-uptime library"
-  task :install => [:create] do
-    gem_name = Dir['*.gem'].first
-    sh "gem install #{gem_name}"
+  desc 'Install the sys-uptime gem'
+  task :install => [:build] do
+    file = Dir["*.gem"].first
+    sh "gem install #{file}"
   end
 end
 
-task :example => [:build] do
-  case Config::CONFIG['host_os']
-    when /windows|win32|cygwin|mingw|dos|mswin/
-      path = 'lib/windows'
-    when /linux/
-      path = 'lib/linux'
-    else
-      path = 'ext'
+desc "Run the test suite"
+Rake::TestTask.new do |t|
+  if File::ALT_SEPARATOR
+    t.libs << 'lib/windows'
+  else
+    t.libs << 'lib/unix'
   end
-  sh "ruby -I#{path} examples/sys_uptime_example.rb" 
-end
 
-desc "Run the test suite"
-Rake::TestTask.new("test") do |t|
-  task :test => :build
-  t.libs << 'test' << '.'
   t.warning = true
   t.verbose = true
-
-  case Config::CONFIG['host_os']
-    when /windows|win32|cygwin|mingw|dos|mswin/
-      t.libs << 'lib/windows'
-    when /linux/
-      t.libs << 'lib/linux'
-    else
-      t.libs << 'ext'
-  end
 end
 
 task :default => :test

data/examples/{sys_uptime_example.rb → uptime_test.rb}

@@ -1,5 +1,5 @@
 ###########################################################
-# sys_uptime_example.rb
+# uptime_test.rb
 #
 # A generic test script for general futzing. You can run
 # this script via the 'rake example' task.

data/lib/unix/sys/uptime.rb

@@ -0,0 +1,213 @@
+require 'ffi'
+
+# The Sys module serves as a namespace only.
+module Sys
+
+  # The Uptime class encapsulates various bits of information regarding your
+  # system's uptime, including boot time.
+  class Uptime
+    extend FFI::Library
+    ffi_lib FFI::Library::LIBC
+
+    # Error typically raised in one of the Uptime methods should fail.
+    class Error < StandardError; end
+
+    # The version of the sys-uptime library
+    VERSION = '0.6.0'
+
+    private
+
+    # Hit this issue on Linux, not sure why
+    begin
+      find_type(:clock_t)
+    rescue TypeError
+      typedef(:long, :clock_t)
+    end
+
+    attach_function :strerror, [:int],     :string
+    attach_function :sysconf,  [:int],     :long
+    attach_function :time,     [:pointer], :time_t
+    attach_function :times,    [:pointer], :clock_t
+
+    private_class_method :strerror, :sysconf, :time, :times
+
+    begin
+      attach_function :sysctl, [:pointer, :uint, :pointer, :pointer, :pointer, :size_t], :int
+      private_class_method :sysctl
+    rescue FFI::NotFoundError
+      attach_function :setutxent, [], :void
+      attach_function :getutxent, [], :pointer
+      attach_function :endutxent, [], :void
+      private_class_method :setutxent, :getutxent, :endutxent
+    end
+
+    CTL_KERN      = 1   # Kernel
+    KERN_BOOTTIME = 21  # Time kernel was booted
+    TICKS         = 100 # Ticks per second (TODO: use sysconf)
+    BOOT_TIME     = 2   # Boot time
+
+    class Tms < FFI::Struct
+      layout(
+        :tms_utime, :clock_t,
+        :tms_stime, :clock_t,
+        :tms_cutime, :clock_t,
+        :tms_cstime, :clock_t
+      )
+    end
+
+    class Timeval < FFI::Struct
+      layout(
+        :tv_sec,  :long,
+        :tv_usec, :long
+      )
+    end
+
+    class ExitStatus < FFI::Struct
+      layout(
+        :e_termination, :short,
+        :e_exit, :short
+      )
+    end
+
+    class Utmpx < FFI::Struct
+      layout(
+        :ut_user, [:char, 32],
+        :ut_id,   [:char, 4],
+        :ut_line, [:char, 32],
+        :ut_pid,  :pid_t,
+        :ut_type, :short,
+        :ut_exit, ExitStatus,
+        :ut_tv,   Timeval,
+        :ut_session, :int,
+        :padding, [:int, 5],
+        :ut_host, [:char, 257]
+      )
+    end
+
+    public
+
+    # Returns a Time object indicating the time the system was last booted.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.boot_time # => Mon Jul 13 06:08:25 -0600 2009
+    #
+    def self.boot_time
+      if Config::CONFIG['host_os'] =~ /linux/i
+        Time.now - self.seconds
+      elsif respond_to?(:sysctl, true)
+        tv = Timeval.new
+        mib  = FFI::MemoryPointer.new(:int, 2).write_array_of_int([CTL_KERN, KERN_BOOTTIME])
+        size = FFI::MemoryPointer.new(:long, 1).write_int(tv.size)
+
+        if sysctl(mib, 2, tv, size, nil, 0) != 0
+          raise SystemCallError, 'sysctl() - ' + strerror(FFI.errno)
+        end
+
+        Time.at(tv[:tv_sec], tv[:tv_usec])
+      else
+        begin
+          setutxent()
+          while ent = Utmpx.new(getutxent())
+            if ent[:ut_type] == BOOT_TIME
+              time = Time.at(ent[:ut_tv][:tv_sec], ent[:ut_tv][:tv_usec])
+              break
+            end
+          end
+        ensure
+          endutxent()
+        end
+        time
+      end
+    end
+
+    # Returns the total number of seconds of uptime.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.seconds => 118800
+    #
+    def self.seconds
+      if Config::CONFIG['host_os'] =~ /linux/i
+        begin
+          IO.read('/proc/uptime').split.first.to_i
+        rescue Exception => err
+          raise Error, err
+        end
+      elsif respond_to?(:sysctl, true)
+        tv   = Timeval.new
+        mib  = FFI::MemoryPointer.new(:int, 2).write_array_of_int([CTL_KERN, KERN_BOOTTIME])
+        size = FFI::MemoryPointer.new(:long, 1).write_int(tv.size)
+
+        if sysctl(mib, 2, tv, size, nil, 0) != 0
+          raise SystemCallError, 'sysctl() - ' + strerror(FFI.errno)
+        end
+
+        time(nil) - tv[:tv_sec]
+      else
+        tms = Tms.new
+        times(tms) / TICKS
+      end
+    end
+
+    # Returns the total number of minutes of uptime.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.minutes # => 678
+    #
+    def self.minutes
+      seconds / 60
+    end
+
+    # Returns the total number of hours of uptime.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.hours # => 31
+    #
+    def self.hours
+      seconds / 3600
+    end
+
+    # Returns the total number of days of uptime.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.days # => 2
+    #
+    def self.days
+      seconds / 86400
+    end
+
+    # Returns the uptime as a colon separated string, including days,
+    # hours, minutes and seconds.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.uptime # => "1:9:24:57"
+    #
+    def self.uptime
+      secs  = seconds
+      days  = secs / 86400
+      secs  -= days * 86400
+      hours = secs / 3600
+      secs  -= hours * 3600
+      mins  = secs / 60
+      secs  -= mins * 60
+
+      "#{days}:#{hours}:#{mins}:#{secs}"
+    end
+
+    # Returns the uptime as a four element array, including days, hours,
+    # minutes and seconds.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.dhms # => [1,9,24,57]
+    #
+    def self.dhms
+      uptime.split(':')
+    end
+  end
+end

data/lib/windows/sys/uptime.rb

@@ -14,7 +14,7 @@ module Sys
     class Error < StandardError; end
 
     # The version of the sys-uptime library.
-    VERSION = '0.5.4'
+    VERSION = '0.6.0'
 
     # Returns the boot time as a Time object.
     #
@@ -22,7 +22,7 @@ module Sys
     #
     #    Sys::Uptime.boot_time # => Fri Dec 12 20:18:58 -0700 2008
     #
-    def self.boot_time(host=Socket.gethostname)
+    def self.boot_time(host = Socket.gethostname)
       cs = "winmgmts://#{host}/root/cimv2"
       begin
         wmi = WIN32OLE.connect(cs)
@@ -47,7 +47,7 @@ module Sys
     #
     #    Sys::Uptime.uptime # => "1:9:55:11"
     #
-    def self.uptime(host=Socket.gethostname)
+    def self.uptime(host = Socket.gethostname)
       get_dhms(host).join(':')
     end
 
@@ -59,7 +59,7 @@ module Sys
     #
     #    Sys::Uptime.dhms # => [1, 9, 55, 11]
     #
-    def self.dhms(host=Socket.gethostname)
+    def self.dhms(host = Socket.gethostname)
       get_dhms(host)
     end
 
@@ -70,7 +70,7 @@ module Sys
     #
     #    Sys::Uptime.days # => 1
     #
-    def self.days(host=Socket.gethostname)
+    def self.days(host = Socket.gethostname)
       hours(host) / 24
     end
 
@@ -117,6 +117,8 @@ module Sys
       return Time.parse(str.split('.').first)
     end
 
+    private_class_method :parse_ms_date
+
     # Get the actual days, hours, minutes and seconds since boot using WMI.
     #
     def self.get_dhms(host)
@@ -132,6 +134,8 @@ module Sys
       [days, hours, minutes, seconds]
     end
 
+    private_class_method :get_dhms
+
     # Returns the number of seconds since boot.
     #
     def self.get_seconds(host)
@@ -154,5 +158,7 @@ module Sys
 
       (now - boot_time).to_i
     end
+
+    private_class_method :get_seconds
   end
 end

data/sys-uptime.gemspec

@@ -1,17 +1,19 @@
 require 'rubygems'
 
 Gem::Specification.new do |spec|
-  spec.name              = 'sys-uptime'
-  spec.version           = '0.5.4'
-  spec.author            = 'Daniel J. Berger'
-  spec.email             = 'djberg96@gmail.com'
-  spec.homepage          = 'http://www.rubyforge.org/projects/sysutils'
-  spec.platform          = Gem::Platform::RUBY
-  spec.summary           = 'A Ruby interface for getting system uptime information.'
-  spec.test_file         = 'test/test_sys_uptime.rb'
-  spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/uptime.txt']
+  spec.name      = 'sys-uptime'
+  spec.version   = '0.6.0'
+  spec.author    = 'Daniel J. Berger'
+  spec.license   = 'Artistic 2.0'
+  spec.email     = 'djberg96@gmail.com'
+  spec.homepage  = 'https://github.com/djberg96/sys-uptime'
+  spec.platform  = Gem::Platform::RUBY
+  spec.summary   = 'A Ruby interface for getting system uptime information.'
+  spec.test_file = 'test/test_sys_uptime.rb'
+  spec.files     = Dir["**/*"].reject{ |f| f.include?('git') }
+
+  spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST']
   spec.rubyforge_project = 'sysutils'
-  spec.files             =  Dir['**/*'].delete_if{ |item| item.include?('git') }
 
   spec.description = <<-EOF
     The sys-uptime library is a simple interface for gathering uptime

data/test/test_sys_uptime.rb

@@ -4,62 +4,106 @@
 # 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
-  def test_version
-    assert_equal('0.5.4', Uptime::VERSION)
+  test "version is set to expected value" do
+    assert_equal('0.6.0', Uptime::VERSION)
   end
 
-  def test_seconds
+  test "seconds method basic functionality" do
     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
+  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 }
-    assert_kind_of(Fixnum, Uptime.minutes)
   end
 
-  def test_hours
+  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 }
-    assert_kind_of(Fixnum, Uptime.hours)
   end
 
-  def test_days
-    assert_respond_to(Uptime,:days)
+  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)
-  end 
+    assert_true(Uptime.days >= 0)
+  end
 
-  def test_uptime
-    assert_respond_to(Uptime,:uptime)
+  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_equal(false, Uptime.uptime.empty?)
+    assert_false(Uptime.uptime.empty?)
   end
-   
-  def test_dhms
-    assert_respond_to(Uptime,:dhms)
+
+  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)
-    assert_equal(false, Uptime.dhms.empty?)
+  end
+
+  test "dhms method returns an array of four elements" do
+    assert_false(Uptime.dhms.empty?)
     assert_equal(4, Uptime.dhms.length)
   end
-   
-  def test_boot_time
-    assert_respond_to(Uptime,:boot_time)
+
+  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
 
-  def test_uptime_error
+  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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sys-uptime
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,42 +15,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 Z
-dependencies: []
-
+date: 2011-12-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ffi
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
 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: 
-- ext/extconf.rb
+extensions: []
+
 extra_rdoc_files: 
 - CHANGES
 - README
 - MANIFEST
-- doc/uptime.txt
-- ext/sys/uptime.c
 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
-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: 
 - lib
+- lib/unix
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -72,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sysutils
-rubygems_version: 1.8.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Ruby interface for getting system uptime information.

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);
-}

data/lib/linux/sys/uptime.rb

@@ -1,101 +0,0 @@
-# The Sys module serves as a namespace only.
-module Sys
-
-  # The Uptime class encapsulates various bits of information regarding your
-  # system's uptime, including boot time.
-  class Uptime
-
-    # Error typically raised in one of the Uptime methods should fail.
-    class Error < StandardError; end
-
-    # The version of the sys-uptime library.
-    VERSION = '0.5.4'
-
-    # The file to read uptime information from.
-    UPTIME_FILE = '/proc/uptime'
-
-    # Returns the total number of seconds of uptime.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.seconds # => 118800
-    #
-    def self.seconds
-      begin
-        IO.read(UPTIME_FILE).split.first.to_i
-      rescue Exception => err
-        raise Error, err
-      end
-    end
-
-    # Returns the total number of minutes of uptime.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.minutes # => 678
-    #
-    def self.minutes
-      self.seconds / 60
-    end
-
-    # Returns the total number of hours of uptime.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.hours # => 31
-    #
-    def self.hours
-      self.minutes / 60
-    end
-
-    # Returns the total number of days of uptime.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.days # => 2
-    #
-    def self.days
-      self.hours / 24
-    end
-
-    # Returns the uptime as a colon separated string, including days,
-    # hours, minutes and seconds.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.uptime # => "1:9:24:57"
-    #
-    def self.uptime
-      seconds = self.seconds
-      days    = seconds / 86400
-      seconds -= days * 86400
-      hours   = seconds / 3600
-      seconds -= hours * 3600
-      minutes = seconds / 60
-      seconds -= minutes * 60
-
-      "#{days}:#{hours}:#{minutes}:#{seconds}"
-    end
-
-    # Returns the uptime as a four element array, including days, hours,
-    # minutes and seconds.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.dhms # => [1,9,24,57]
-    #
-    def self.dhms
-      self.uptime.split(":")
-    end
-
-    # Returns the time the system was booted as a Time object.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.boot_time
-    #
-    def self.boot_time
-      Time.now - self.seconds
-    end
-  end
-end