sys-uptime 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bf1eb6f4cd27a729aaa980cbf240ffc981fbab03cf25e7cc1e14a01d2a980ae
-  data.tar.gz: 97b84f93298523a7449fd61097dc791ee9d89c573afa4e67ec5521705ff03303
+  metadata.gz: '09aa4c4ea6a68982ee2b7574e18041b0a476f06f3531e71736d83d54b3322b49'
+  data.tar.gz: 4aab0dd2a800aa78d4597876c1e7889e8970037e9493d1a0faf7780c81133b9b
 SHA512:
-  metadata.gz: 5eff9d33d6c1d85181a1f888f62840013884a9e5f72bdc20a0fd64ca92933645a8384b3181bf884f17e9f4b066abcd4c3510e7289583ca2d975ec1cb897c7cd5
-  data.tar.gz: '09a624b51158caf2b4e2d38583cd853455c761ea5e99aa8ae28a3be1fb93591708975d84e7afb27da95e52bc5b87edd56ffb1bee25eb0118bc512f9f41423e1d'
+  metadata.gz: 222cc669eccbd1d04ea4d5410be8193b265dac268c4bb1e652d9e560a8d4c119225626abf103112988402d215d78ebab1ce317350e87cdd95af5c561ddd9b7c1
+  data.tar.gz: 599316932c555fb289ff1f9aa277e397f33764e474ce16d9e8244e0e3373d9a60fc355f688afe7f963f42c033c6c0df927d0295b8df42796023a813aa780b77f

data/{CHANGES.rdoc → CHANGES.md}

@@ -1,4 +1,18 @@
-== 0.7.3 - 31-Dec-2019
+## 0.7.6 - 9-Apr-2023
+* Constructor is now officially private, as are several constants that were
+  never meant to be public.
+* Lots of rubocop suggested updates.
+* Minor refactoring for Windows.
+* Minor updates, including Rakefile and gemspec metadata.
+
+## 0.7.5 - 29-Oct-2020
+* Switched docs to markdown format.
+* Added a Gemfile.
+
+## 0.7.4 - 18-Mar-2020
+* Added a LICENSE file as per the requirements of the Apache-2.0 license.
+
+## 0.7.3 - 31-Dec-2019
 * Attempting to call Sys::Uptime.new will now raise an error. I thought
   this was already the case, but apparently one of the tests was bad.
 * Added explicit .rdoc extensions to various text files so that github
@@ -7,48 +21,48 @@
 * Updated the gemspec to reflect the filename updates, as well as the
   added development dependency.
 
-== 0.7.2 - 4-Nov-2018
+## 0.7.2 - 4-Nov-2018
 * Added metadata to the gemspec.
 * The VERSION constant is now frozen.
 * Updated cert.
 
-== 0.7.1 - 14-May-2016
+## 0.7.1 - 14-May-2016
 * Altered internal layout, which also fixed a require bug. Thanks go
   to jkburges for the spot.
 * Moved the VERSION constant into a single file shared by all platforms.
 
-== 0.7.0 - 3-Oct-2015
+## 0.7.0 - 3-Oct-2015
 * Changed license to Apache 2.0.
 * Added a cert. This gem is now signed.
 * Added a sys-uptime.rb file for convenience.
 * Gem related tasks in the Rakefile now assume Rubygems 2.x.
 
-== 0.6.2 - 8-Nov-2014
+## 0.6.2 - 8-Nov-2014
 * Minor updates to gemspec and Rakefile.
 
-== 0.6.1 - 22-Oct-2012
+## 0.6.1 - 22-Oct-2012
 * Refactored a private method in the MS Windows source.
 * Minor fix for one private method test.
 * Fixed an RbConfig vs Config warning. Thanks Pedro Carrico.
 
-== 0.6.0 - 11-Dec-2011
+## 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
+## 0.5.3 - 7-May-2009
 * Altered the Uptime.seconds implementation on Linux so that it works with
   both Ruby 1.8.x and 1.9.x. Thanks go to Alexey Chebotar for the spot.
 
-== 0.5.2 - 13-Dec-2008
+## 0.5.2 - 13-Dec-2008
 * Fixed a date/time issue in the Windows version caused by Ruby itself.
 * Fixed the Uptime.seconds, Uptime.minutes and Uptime.hours methods on MS
   Windows.
 * Renamed the test file to 'test_sys_uptime.rb'.
 * Some minor updates to the Rakefile.
 
-== 0.5.1 - 26-Jul-2007
+## 0.5.1 - 26-Jul-2007
 * Fixed bug in the MS Windows version caused by incorrect parsing of an
   MS specific date format (caused by a bug in Ruby 1.8.6). Thanks go to
   Robert H. for the spot.
@@ -57,7 +71,7 @@
 * Added an 'install_gem' Rake task, and updated the README installation
   instructions.
 
-== 0.5.0 - 30-Mar-2007
+## 0.5.0 - 30-Mar-2007
 * For platforms that use C code, the code now always uses the sysctl()
   function if supported by your system. This replaces the platform specific
   checks I was doing for the various BSD flavors.
@@ -67,20 +81,20 @@
 * Added a Rakefile - users should now use the 'test' and 'install' rake tasks.
 * Updates to the MANIFEST, README and uptime.txt files.
 
-== 0.4.5 - 19-Nov-2006
+## 0.4.5 - 19-Nov-2006
 * Internal layout changes, minor doc updates and gemspec improvements.
 * No code changes.
 
-== 0.4.4 - 30-Jun-2006
+## 0.4.4 - 30-Jun-2006
 * Added inline rdoc documentation to the source files.
 * Added a gemspec.
 
-== 0.4.3 - 18-Dec-2005
+## 0.4.3 - 18-Dec-2005
 * Changed the Linux version to pure Ruby.  The current method of determining
   uptime in unix.c does not work in Linux kernel 2.6+.  So, from now on it
   reads out of /proc/uptime.
 
-== 0.4.2 - 6-May-2005
+## 0.4.2 - 6-May-2005
 * Fixed a potential boot_time bug.
 * Removed the version.h file.  It's no longer needed since the Windows
   version is pure Ruby.
@@ -92,13 +106,13 @@
 * Made most documents rdoc friendly.
 * Moved project to RubyForge.
 
-== 0.4.1 - 14-Dec-2004
+## 0.4.1 - 14-Dec-2004
 * Moved freebsd code into unix.c file.
 * Should now work past 249 days (2**31) on systems that have utmpx.h.
 * Fixed a bug with regards to boot_time, where it was possible that it would
   simply be empty.
 
-== 0.4.0 - 8-Jul-2004
+## 0.4.0 - 8-Jul-2004
 * Removed all reference to the CLK_TCK constant, as per documentation from
   Richard Stevens that it is deprecated and that sysconf() should be used
   instead (well, I knew about this, but ignored it until now).
@@ -118,18 +132,18 @@
 * Removed the uptime.html file - you may generate that on your own.
 * Added warranty and license info.
 
-== 0.3.2 - 30-Dec-2003
+## 0.3.2 - 30-Dec-2003
 * Cleaned up some warnings that showed up with -Wall on some unix platforms
   (int vs long format, explicit include)
 * Minor test suite and extconf.rb changes
 
-== 0.3.1 - 25-Jun-2003
+## 0.3.1 - 25-Jun-2003
 * Modified test files to handle HP-UX extensions
 * Minor doc updates
 * Added the dhms() method.  Actually, this was in the 0.3.0
   release, I just forgot to mention it in this file :)
 
-== 0.3.0 - 22-Jun-2003
+## 0.3.0 - 22-Jun-2003
 * Added OS X support - thanks go to Mike Hall for the patch
 * Fixed incorrect values in FreeBSD (again Mike Hall)
 * Modified tc_unix.rb test suite to handle OS X, along with a bit
@@ -138,7 +152,7 @@
 * Separated FreeBSD/OS X source into its own file (freebsd.c).
   The #ifdefs were starting to get too ugly for me
 
-== 0.2.1 - 13-May-2003
+## 0.2.1 - 13-May-2003
 * Fixed bug in extconf.rb file, and made some major changes
 * Modified test.rb for those without TestUnit
 * Modified TestUnit tests - some bogus tests were removed
@@ -148,7 +162,7 @@
 * Docs automatically included in doc directory (i.e. no more interactive
   document creation)
 
-== 0.2.0 - 13-Mar-2003
+## 0.2.0 - 13-Mar-2003
 * Added MS Windows support
 * Added a VERSION constant
 * Added a test suite (for those with TestUnit installed)
@@ -157,7 +171,7 @@
 * Changelog and Manifest are now CHANGES and MANIFEST, respectively
 * Many changes to extconf.rb
 
-== 0.1.3 - 6-Jan-2003
+## 0.1.3 - 6-Jan-2003
 * Added a VERSION class method
 * Added a copyright notice
 * Fixed up the docs a bit and moved them to the doc directory
@@ -165,14 +179,14 @@
 * Modified test.rb script to make it better
 * Changed install instructions slightly
 
-== 0.1.2 - 25-Aug-2002
+## 0.1.2 - 25-Aug-2002
 * Slight change to preprocessor commands to avoid redefining CLK_TCK on
   those systems that define it in time.h
 * Added an INSTALL file
 
-== 0.1.1 - 21-Jun-2002
+## 0.1.1 - 21-Jun-2002
 * The CLK_TCK constant wasn't necessarily being set correctly, which could
   lead to some odd results.  This has been fixed.
 
-== 0.1.0 - 17-Jun-2002
+## 0.1.0 - 17-Jun-2002
 * Initial release

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/{README.rdoc → README.md}

@@ -1,31 +1,35 @@
-== Description
+[![Ruby](https://github.com/djberg96/sys-uptime/actions/workflows/ruby.yml/badge.svg)](https://github.com/djberg96/sys-uptime/actions/workflows/ruby.yml)
+
+## Description
 A Ruby interface for getting system uptime information.
 
-== Prerequisites
+## Prerequisites
 ffi 0.1.0 or later on Unixy platforms.
 
-== Installation
+## Installation
 
-gem install sys-uptime
+`gem install sys-uptime`
 
-== Synopsis
-  require 'sys-uptime'
-  include Sys
+## Synopsis
+```ruby
+require 'sys-uptime'
+include Sys
 
-  # Get everything
-  p Uptime.uptime
-  p Uptime.dhms.join(', ')
+# 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 individual units
+p Uptime.days
+p Uptime.hours
+p Uptime.minutes
+p Uptime.seconds
 
-  # Get the boot time
-  p Uptime.boot_time
+# Get the boot time
+p Uptime.boot_time
+```
 
-== Notes
+## 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.
 
@@ -33,28 +37,28 @@ 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
+## Known Bugs
 None that I am aware of. Please log any bugs you find on the project
 website at https://github.com/djberg96/sys-uptime.
 
-== Questions
+## Questions
 "Doesn't Struct::Tms do this?" - No.
     
-== License
+## License
 Apache-2.0
     
-== Copyright
-Copyright 2002-2019, Daniel J. Berger
+## Copyright
+Copyright 2002-2023, 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
+## 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
+## Acknowledgements
 Andrea Fazzi for help with the FFI version.
 
 Mike Hall for help with the BSD side of things for the original C code.
@@ -63,5 +67,5 @@ 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
+## Author
 Daniel J. Berger

data/Rakefile

@@ -2,23 +2,17 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-CLEAN.include("**/*.gem", "**/*.rbx", "**/*.rbc")
+CLEAN.include("**/*.gem", "**/*.rbx", "**/*.rbc", "**/*.lock")
 
 namespace 'gem' do
   desc 'Build the sys-uptime gem'
   task :create => [:clean] do
     require 'rubygems/package'
-    spec = eval(IO.read('sys-uptime.gemspec'))
+    spec = Gem::Specification.load('sys-uptime.gemspec')
     spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
-    
-    if File::ALT_SEPARATOR
-      spec.platform = Gem::Platform.new(['universal','mingw32'])
-    else
-      spec.add_dependency('ffi', '>= 1.0.0')
-    end
-
-    Gem::Package.build(spec, true)
+    Gem::Package.build(spec)
   end
 
   desc 'Install the sys-uptime gem'
@@ -28,6 +22,8 @@ namespace 'gem' do
   end
 end
 
+RuboCop::RakeTask.new
+
 desc "Run the test suite"
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/sys/unix/sys/uptime.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 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
@@ -12,8 +13,6 @@ module Sys
     # Error typically raised in one of the Uptime methods should fail.
     class Error < StandardError; end
 
-    private
-
     # Hit this issue on Linux, not sure why
     begin
       find_type(:clock_t)
@@ -29,7 +28,7 @@ module Sys
     private_class_method :strerror, :sysconf, :time, :times, :new
 
     begin
-      attach_function :sysctl, [:pointer, :uint, :pointer, :pointer, :pointer, :size_t], :int
+      attach_function :sysctl, %i[pointer uint pointer pointer pointer size_t], :int
       private_class_method :sysctl
     rescue FFI::NotFoundError
       attach_function :setutxent, [], :void
@@ -43,6 +42,11 @@ module Sys
     TICKS         = 100 # Ticks per second (TODO: use sysconf)
     BOOT_TIME     = 2   # Boot time
 
+    private_constant :CTL_KERN
+    private_constant :KERN_BOOTTIME
+    private_constant :TICKS
+    private_constant :BOOT_TIME
+
     class Tms < FFI::Struct
       layout(
         :tms_utime, :clock_t,
@@ -52,6 +56,8 @@ module Sys
       )
     end
 
+    private_constant :Tms
+
     class Timeval < FFI::Struct
       layout(
         :tv_sec,  :long,
@@ -59,6 +65,8 @@ module Sys
       )
     end
 
+    private_constant :Timeval
+
     class ExitStatus < FFI::Struct
       layout(
         :e_termination, :short,
@@ -66,6 +74,8 @@ module Sys
       )
     end
 
+    private_constant :ExitStatus
+
     class Utmpx < FFI::Struct
       layout(
         :ut_user, [:char, 32],
@@ -81,7 +91,7 @@ module Sys
       )
     end
 
-    public
+    private_constant :Utmpx
 
     # Returns a Time object indicating the time the system was last booted.
     #
@@ -91,14 +101,14 @@ module Sys
     #
     def self.boot_time
       if RbConfig::CONFIG['host_os'] =~ /linux/i
-        Time.now - self.seconds
+        Time.now - 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)
+          raise SystemCallError, "sysctl function failed: #{strerror(FFI.errno)}"
         end
 
         Time.at(tv[:tv_sec], tv[:tv_usec])
@@ -126,18 +136,20 @@ module Sys
     #
     def self.seconds
       if RbConfig::CONFIG['host_os'] =~ /linux/i
+        # rubocop:disable Lint/RescueException
         begin
-          IO.read('/proc/uptime').split.first.to_i
+          File.read('/proc/uptime').split.first.to_i
         rescue Exception => err
           raise Error, err
         end
+        # rubocop:enable Lint/RescueException
       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)
+          raise SystemCallError, "sysctl function failed: #{strerror(FFI.errno)}"
         end
 
         time(nil) - tv[:tv_sec]
@@ -187,11 +199,11 @@ module Sys
     def self.uptime
       secs  = seconds
       days  = secs / 86400
-      secs  -= days * 86400
+      secs -= days * 86400
       hours = secs / 3600
-      secs  -= hours * 3600
-      mins  = secs / 60
-      secs  -= mins * 60
+      secs -= hours * 3600
+      mins = secs / 60
+      secs -= mins * 60
 
       "#{days}:#{hours}:#{mins}:#{secs}"
     end

data/lib/sys/uptime.rb

@@ -1,12 +1,18 @@
+# frozen_string_literal: true
+
 if File::ALT_SEPARATOR
   require_relative 'windows/sys/uptime'
 else
   require_relative 'unix/sys/uptime'
 end
 
+# The Sys module serves as a namespace only.
 module Sys
+  # The Uptime class serves as a base singleton class to hang uptime related methods on.
   class Uptime
     # The version of the sys-uptime library
-    VERSION = '0.7.4'.freeze
+    VERSION = '0.7.6'
+
+    private_class_method :new
   end
 end

data/lib/sys/windows/sys/uptime.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'win32ole'
 require 'socket'
 require 'date'
@@ -5,11 +7,9 @@ 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
 
@@ -26,15 +26,12 @@ module Sys
       cs = "winmgmts://#{host}/root/cimv2"
       begin
         wmi = WIN32OLE.connect(cs)
-      rescue WIN32OLERuntimeError => e
-        raise Error, e
+      rescue WIN32OLERuntimeError => err
+        raise Error, err
       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)
-        }
+        query = 'select LastBootupTime from Win32_OperatingSystem'
+        result = wmi.ExecQuery(query).itemIndex(0).LastBootupTime
+        Time.parse(result.split('.').first)
       end
     end
 
@@ -81,7 +78,7 @@ module Sys
     #
     #    Sys::Uptime.hours # => 33
     #
-    def self.hours(host=Socket.gethostname)
+    def self.hours(host = Socket.gethostname)
       minutes(host) / 60
     end
 
@@ -92,7 +89,7 @@ module Sys
     #
     #    Sys::Uptime.minutes # => 1980
     #
-    def self.minutes(host=Socket.gethostname)
+    def self.minutes(host = Socket.gethostname)
       seconds(host) / 60
     end
 
@@ -103,7 +100,7 @@ module Sys
     #
     #    Sys::Uptime.seconds # => 118800
     #
-    def self.seconds(host=Socket.gethostname)
+    def self.seconds(host = Socket.gethostname)
       get_seconds(host)
     end
 
@@ -114,7 +111,7 @@ module Sys
     #
     def self.parse_ms_date(str)
       return if str.nil?
-      return Time.parse(str.split('.').first)
+      Time.parse(str.split('.').first)
     end
 
     private_class_method :parse_ms_date
@@ -139,7 +136,7 @@ module Sys
     # Returns the number of seconds since boot.
     #
     def self.get_seconds(host)
-      (Time.now - boot_time).to_i
+      (Time.now - boot_time(host)).to_i
     end
 
     private_class_method :get_seconds

data/lib/sys-uptime.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'sys/uptime'

data/spec/sys_uptime_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #####################################################################
 # sys_uptime_spec.rb
 #
@@ -5,99 +7,105 @@
 # 'rake test' task, since it handles the pre-setup code for you.
 #####################################################################
 require 'sys/uptime'
-require 'test-unit'
+require 'rspec'
 require 'socket'
 
-describe Sys::Uptime do
-  example "version is set to expected value" do
-    expect(Sys::Uptime::VERSION).to eql('0.7.4')
+RSpec.describe Sys::Uptime do
+  let(:plausible_seconds) { ENV['CI'] ? 30 : 120 }
+
+  example 'version is set to expected value' do
+    expect(Sys::Uptime::VERSION).to eql('0.7.6')
     expect(Sys::Uptime::VERSION.frozen?).to be(true)
   end
 
-  example "seconds method basic functionality" do
-    expect(Sys::Uptime).to respond_to(:seconds)
-    expect{ Sys::Uptime.seconds }.not_to raise_error
+  example 'constructor is private' do
+    expect{ described_class.new }.to raise_error(NoMethodError)
+  end
+
+  example 'seconds method basic functionality' do
+    expect(described_class).to respond_to(:seconds)
+    expect{ described_class.seconds }.not_to raise_error
   end
 
-  example "seconds method returns a plausible value" do
-    expect(Sys::Uptime.seconds).to be_kind_of(Integer)
-    expect(Sys::Uptime.seconds).to be > 300
+  example 'seconds method returns a plausible value' do
+    expect(described_class.seconds).to be_a(Integer)
+    expect(described_class.seconds).to be > plausible_seconds
   end
 
-  example "minutes method basic functionality" do
-    expect(Sys::Uptime).to respond_to(:minutes)
-    expect{ Sys::Uptime.minutes }.not_to raise_error
+  example 'minutes method basic functionality' do
+    expect(described_class).to respond_to(:minutes)
+    expect{ described_class.minutes }.not_to raise_error
   end
 
-  example "minutes method returns a plausible value" do
-    expect(Sys::Uptime.minutes).to be_kind_of(Integer)
-    expect(Sys::Uptime.minutes).to be > 5
+  example 'minutes method returns a plausible value', :unless => ENV.fetch('CI', nil) do
+    expect(described_class.minutes).to be_a(Integer)
+    expect(described_class.minutes).to be > 3
   end
 
-  example "hours method basic functionality" do
-    expect(Sys::Uptime).to respond_to(:hours)
-    expect{ Sys::Uptime.hours }.not_to raise_error
+  example 'hours method basic functionality' do
+    expect(described_class).to respond_to(:hours)
+    expect{ described_class.hours }.not_to raise_error
   end
 
-  example "hours method returns a plausible value" do
-    expect(Sys::Uptime.hours).to be_kind_of(Integer)
-    expect(Sys::Uptime.hours).to be > 0
+  example 'hours method returns a plausible value' do
+    expect(described_class.hours).to be_a(Integer)
+    expect(described_class.hours).to be >= 0
   end
 
-  example "days method basic functionality" do
-    expect(Sys::Uptime).to respond_to(:days)
-    expect{ Sys::Uptime.days }.not_to raise_error
+  example 'days method basic functionality' do
+    expect(described_class).to respond_to(:days)
+    expect{ described_class.days }.not_to raise_error
   end
 
-  example "days method returns a plausible value" do
-    expect(Sys::Uptime.days).to be_kind_of(Integer)
-    expect(Sys::Uptime.days).to be >= 0
+  example 'days method returns a plausible value' do
+    expect(described_class.days).to be_a(Integer)
+    expect(described_class.days).to be >= 0
   end
 
-  example "uptime method basic functionality" do
-    expect(Sys::Uptime).to respond_to(:uptime)
-    expect{ Sys::Uptime.uptime }.not_to raise_error
+  example 'uptime method basic functionality' do
+    expect(described_class).to respond_to(:uptime)
+    expect{ described_class.uptime }.not_to raise_error
   end
 
-  example "uptime method returns a non-empty string" do
-    expect(Sys::Uptime.uptime).to be_kind_of(String)
-    expect(Sys::Uptime.uptime.empty?).to be(false)
+  example 'uptime method returns a non-empty string' do
+    expect(described_class.uptime).to be_a(String)
+    expect(described_class.uptime.empty?).to be(false)
   end
 
-  example "uptime method does not accept any arguments", :unless => File::ALT_SEPARATOR do
-    expect{ Sys::Uptime.uptime(1) }.to raise_error(ArgumentError)
+  example 'uptime method does not accept any arguments', :unless => File::ALT_SEPARATOR do
+    expect{ described_class.uptime(1) }.to raise_error(ArgumentError)
   end
 
-  example "uptime accepts a host name on Windows", :if => File::ALT_SEPARATOR do
-    expect{ Sys::Uptime.uptime(Socket.gethostname) }.not_to raise_error
+  example 'uptime accepts a host name on Windows', :if => File::ALT_SEPARATOR do
+    expect{ described_class.uptime(Socket.gethostname) }.not_to raise_error
   end
 
-  example "dhms method basic functionality" do
-    expect(Sys::Uptime).to respond_to(:dhms)
-    expect{ Sys::Uptime.dhms }.not_to raise_error
-    expect(Sys::Uptime.dhms).to be_kind_of(Array)
+  example 'dhms method basic functionality' do
+    expect(described_class).to respond_to(:dhms)
+    expect{ described_class.dhms }.not_to raise_error
+    expect(described_class.dhms).to be_a(Array)
   end
 
-  example "dhms method returns an array of four elements" do
-    expect(Sys::Uptime.dhms).not_to be_empty
-    expect(Sys::Uptime.dhms.length).to eql(4)
+  example 'dhms method returns an array of four elements' do
+    expect(described_class.dhms).not_to be_empty
+    expect(described_class.dhms.length).to eq(4)
   end
 
-  example "boot_time method basic functionality" do
-    expect(Sys::Uptime).to respond_to(:boot_time)
-    expect{ Sys::Uptime.boot_time }.not_to raise_error
+  example 'boot_time method basic functionality' do
+    expect(described_class).to respond_to(:boot_time)
+    expect{ described_class.boot_time }.not_to raise_error
   end
 
-  example "boot_time method returns a Time object" do
-    expect(Sys::Uptime.boot_time).to be_kind_of(Time)
+  example 'boot_time method returns a Time object' do
+    expect(described_class.boot_time).to be_a(Time)
   end
 
-  example "Uptime class cannot be instantiated" do
-    expect{ Sys::Uptime.new }.to raise_error(StandardError)
+  example 'Uptime class cannot be instantiated' do
+    expect{ described_class.new }.to raise_error(StandardError)
   end
 
-  example "Ensure that ffi functions are private" do
-    methods = Sys::Uptime.methods(false).map{ |e| e.to_s }
+  example 'Ensure that ffi functions are private' do
+    methods = described_class.methods(false).map(&:to_s)
     expect(methods).not_to include('time', 'times')
   end
 end

data/sys-uptime.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-uptime'
-  spec.version    = '0.7.4'
+  spec.version    = '0.7.6'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -12,16 +12,26 @@ Gem::Specification.new do |spec|
   spec.files      = Dir["**/*"].reject{ |f| f.include?('git') }
   spec.cert_chain = ['certs/djberg96_pub.pem']
 
-  spec.extra_rdoc_files = Dir["*.rdoc"]
-  spec.add_development_dependency 'rspec', '~> 3'
+  if File::ALT_SEPARATOR
+    spec.platform = Gem::Platform.new(['universal', 'mingw32'])
+  else
+    spec.add_dependency('ffi', '~> 1.1')
+  end
+
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('rspec', '~> 3.9')
+  spec.add_development_dependency('rubocop')
+  spec.add_development_dependency('rubocop-rspec')
 
   spec.metadata = {
-    'homepage_uri'      => 'https://github.com/djberg96/sys-uptime',
-    'bug_tracker_uri'   => 'https://github.com/djberg96/sys-uptime/issues',
-    'changelog_uri'     => 'https://github.com/djberg96/sys-uptime/blob/ffi/CHANGES',
-    'documentation_uri' => 'https://github.com/djberg96/sys-uptime/wiki',
-    'source_code_uri'   => 'https://github.com/djberg96/sys-uptime',
-    'wiki_uri'          => 'https://github.com/djberg96/sys-uptime/wiki'
+    'homepage_uri'          => 'https://github.com/djberg96/sys-uptime',
+    'bug_tracker_uri'       => 'https://github.com/djberg96/sys-uptime/issues',
+    'changelog_uri'         => 'https://github.com/djberg96/sys-uptime/blob/main/CHANGES.md',
+    'documentation_uri'     => 'https://github.com/djberg96/sys-uptime/wiki',
+    'source_code_uri'       => 'https://github.com/djberg96/sys-uptime',
+    'wiki_uri'              => 'https://github.com/djberg96/sys-uptime/wiki',
+    'rubygems_mfa_required' => 'true',
+    'github_repo'           => 'https://github.com/djberg96/sys-uptime'
   }
 
   spec.description = <<-EOF

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: sys-uptime
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,36 +35,78 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 description: |2
       The sys-uptime library is a simple interface for gathering uptime
       information. You can retrieve data in seconds, minutes, days, hours,
@@ -72,44 +114,35 @@ description: |2
 email: djberg96@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGES.rdoc
-- MANIFEST.rdoc
-- README.rdoc
+extra_rdoc_files: []
 files:
+- CHANGES.md
+- Gemfile
 - LICENSE
-- sys-uptime.gemspec
-- spec
-- spec/sys_uptime_spec.rb
+- MANIFEST.md
+- README.md
 - Rakefile
-- certs
 - certs/djberg96_pub.pem
-- examples
 - examples/uptime_test.rb
-- lib
 - lib/sys-uptime.rb
-- lib/sys
-- lib/sys/uptime.rb
-- lib/sys/unix
-- lib/sys/unix/sys
 - lib/sys/unix/sys/uptime.rb
-- lib/sys/windows
-- lib/sys/windows/sys
+- lib/sys/uptime.rb
 - lib/sys/windows/sys/uptime.rb
-- CHANGES.rdoc
-- MANIFEST.rdoc
-- README.rdoc
+- spec/sys_uptime_spec.rb
+- sys-uptime.gemspec
 homepage: https://github.com/djberg96/sys-uptime
 licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/djberg96/sys-uptime
   bug_tracker_uri: https://github.com/djberg96/sys-uptime/issues
-  changelog_uri: https://github.com/djberg96/sys-uptime/blob/ffi/CHANGES
+  changelog_uri: https://github.com/djberg96/sys-uptime/blob/main/CHANGES.md
   documentation_uri: https://github.com/djberg96/sys-uptime/wiki
   source_code_uri: https://github.com/djberg96/sys-uptime
   wiki_uri: https://github.com/djberg96/sys-uptime/wiki
-post_install_message: 
+  rubygems_mfa_required: 'true'
+  github_repo: https://github.com/djberg96/sys-uptime
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: A Ruby interface for getting system uptime information.
 test_files: