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

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

@@ -1,158 +1,164 @@
-require 'win32ole'
-require 'socket'
-require 'date'
-require 'time'
-
-# 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'
-
-    # Returns the boot time as a Time object.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.boot_time # => Fri Dec 12 20:18:58 -0700 2008
-    #
-    def self.boot_time(host=Socket.gethostname)
-      cs = "winmgmts://#{host}/root/cimv2"
-      begin
-        wmi = WIN32OLE.connect(cs)
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
-      else
-        query = "select LastBootupTime from Win32_OperatingSystem"
-        results = wmi.ExecQuery(query)
-        results.each{ |ole|
-          time_array = parse_ms_date(ole.LastBootupTime)
-          return Time.mktime(*time_array)
-        }
-      end
-    end
-
-    # Calculates and returns the number of days, hours, minutes and
-    # seconds the +host+ has been running as a colon-separated string.
-    #
-    # The localhost is used if no +host+ is provided.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.uptime # => "1:9:55:11"
-    #
-    def self.uptime(host=Socket.gethostname)
-      get_dhms(host).join(':')
-    end
-
-    # Calculates and returns the number of days, hours, minutes and
-    # seconds the +host+ has been running as a four-element Array.
-    # The localhost is used if no +host+ is provided.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.dhms # => [1, 9, 55, 11]
-    #
-    def self.dhms(host=Socket.gethostname)
-      get_dhms(host)
-    end
-
-    # Returns the total number of days the system has been up on +host+,
-    # or the localhost if no host is provided.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.days # => 1
-    #
-    def self.days(host=Socket.gethostname)
-      hours(host) / 24
-    end
-
-    # Returns the total number of hours the system has been up on +host+,
-    # or the localhost if no host is provided.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.hours # => 33
-    #
-    def self.hours(host=Socket.gethostname)
-      minutes(host) / 60
-    end
-
-    # Returns the total number of minutes the system has been up on +host+,
-    # or the localhost if no host is provided.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.minutes # => 1980
-    #
-    def self.minutes(host=Socket.gethostname)
-      seconds(host) / 60
-    end
-
-    # Returns the total number of seconds the system has been up on +host+,
-    # or the localhost if no host is provided.
-    #
-    # Example:
-    #
-    #    Sys::Uptime.seconds # => 118800
-    #
-    def self.seconds(host=Socket.gethostname)
-      get_seconds(host)
-    end
-
-    private
-
-    # Converts a string in the format '20040703074625.015625-360' into a
-    # Ruby Time object.
-    #
-    def self.parse_ms_date(str)
-      return if str.nil?
-      return Time.parse(str.split('.').first)
-    end
-
-    # Get the actual days, hours, minutes and seconds since boot using WMI.
-    #
-    def self.get_dhms(host)
-      seconds = get_seconds(host)
-
-      days = (seconds / 86400).to_i
-      seconds -= days * 86400
-      hours = seconds / 3600
-      seconds -= hours * 3600
-      minutes = seconds / 60
-      seconds -= minutes * 60
-
-      [days, hours, minutes, seconds]
-    end
-
-    # Returns the number of seconds since boot.
-    #
-    def self.get_seconds(host)
-      cs = "winmgmts://#{host}/root/cimv2"
-      begin
-        wmi = WIN32OLE.connect(cs)
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
-      else
-        query = "select LastBootupTime from Win32_OperatingSystem"
-        results = wmi.ExecQuery(query)
-        now = Time.now
-
-        results.each{ |ole|
-          time_array = parse_ms_date(ole.LastBootupTime)
-          boot_time = Time.mktime(*time_array)
-          break
-        }
-      end
-
-      (now - boot_time).to_i
-    end
-  end
-end
+require 'win32ole'
+require 'socket'
+require 'date'
+require 'time'
+
+# 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.6.0'
+
+    # Returns the boot time as a Time object.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.boot_time # => Fri Dec 12 20:18:58 -0700 2008
+    #
+    def self.boot_time(host = Socket.gethostname)
+      cs = "winmgmts://#{host}/root/cimv2"
+      begin
+        wmi = WIN32OLE.connect(cs)
+      rescue WIN32OLERuntimeError => e
+        raise Error, e
+      else
+        query = "select LastBootupTime from Win32_OperatingSystem"
+        results = wmi.ExecQuery(query)
+        results.each{ |ole|
+          time_array = parse_ms_date(ole.LastBootupTime)
+          return Time.mktime(*time_array)
+        }
+      end
+    end
+
+    # Calculates and returns the number of days, hours, minutes and
+    # seconds the +host+ has been running as a colon-separated string.
+    #
+    # The localhost is used if no +host+ is provided.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.uptime # => "1:9:55:11"
+    #
+    def self.uptime(host = Socket.gethostname)
+      get_dhms(host).join(':')
+    end
+
+    # Calculates and returns the number of days, hours, minutes and
+    # seconds the +host+ has been running as a four-element Array.
+    # The localhost is used if no +host+ is provided.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.dhms # => [1, 9, 55, 11]
+    #
+    def self.dhms(host = Socket.gethostname)
+      get_dhms(host)
+    end
+
+    # Returns the total number of days the system has been up on +host+,
+    # or the localhost if no host is provided.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.days # => 1
+    #
+    def self.days(host = Socket.gethostname)
+      hours(host) / 24
+    end
+
+    # Returns the total number of hours the system has been up on +host+,
+    # or the localhost if no host is provided.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.hours # => 33
+    #
+    def self.hours(host=Socket.gethostname)
+      minutes(host) / 60
+    end
+
+    # Returns the total number of minutes the system has been up on +host+,
+    # or the localhost if no host is provided.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.minutes # => 1980
+    #
+    def self.minutes(host=Socket.gethostname)
+      seconds(host) / 60
+    end
+
+    # Returns the total number of seconds the system has been up on +host+,
+    # or the localhost if no host is provided.
+    #
+    # Example:
+    #
+    #    Sys::Uptime.seconds # => 118800
+    #
+    def self.seconds(host=Socket.gethostname)
+      get_seconds(host)
+    end
+
+    private
+
+    # Converts a string in the format '20040703074625.015625-360' into a
+    # Ruby Time object.
+    #
+    def self.parse_ms_date(str)
+      return if str.nil?
+      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)
+      seconds = get_seconds(host)
+
+      days = (seconds / 86400).to_i
+      seconds -= days * 86400
+      hours = seconds / 3600
+      seconds -= hours * 3600
+      minutes = seconds / 60
+      seconds -= minutes * 60
+
+      [days, hours, minutes, seconds]
+    end
+
+    private_class_method :get_dhms
+
+    # Returns the number of seconds since boot.
+    #
+    def self.get_seconds(host)
+      cs = "winmgmts://#{host}/root/cimv2"
+      begin
+        wmi = WIN32OLE.connect(cs)
+      rescue WIN32OLERuntimeError => e
+        raise Error, e
+      else
+        query = "select LastBootupTime from Win32_OperatingSystem"
+        results = wmi.ExecQuery(query)
+        now = Time.now
+
+        results.each{ |ole|
+          time_array = parse_ms_date(ole.LastBootupTime)
+          boot_time = Time.mktime(*time_array)
+          break
+        }
+      end
+
+      (now - boot_time).to_i
+    end
+
+    private_class_method :get_seconds
+  end
+end

data/sys-uptime.gemspec

@@ -1,21 +1,23 @@
-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.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
-    information. You can retrieve data in seconds, minutes, days, hours,
-    or all of the above.
-  EOF
-end
+require 'rubygems'
+
+Gem::Specification.new do |spec|
+  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.description = <<-EOF
+    The sys-uptime library is a simple interface for gathering uptime
+    information. You can retrieve data in seconds, minutes, days, hours,
+    or all of the above.
+  EOF
+end