sys-uptime 0.7.2-universal-mingw32 → 0.7.6-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2dd1832bebec9fd06b9481d0aeb067a2155e9b09c746814bb49bf4196e24d1
-  data.tar.gz: 33b1ddb693e56b58f864e9fe63b84f4c7db5ee7030463c0ba2c6f3bec0652d80
+  metadata.gz: 9247a0eb3e35003f1c6b6e071300ed2e7f0cdef474fc4a8ed825987007ff17d0
+  data.tar.gz: f4f2d7015290c9dbfc753ba34e42ccd55554b452da6f2ecb3b164923c1864b4b
 SHA512:
-  metadata.gz: 9e9a4994e293334e196804185fafd90ea1ea0a3ddfadf22e06942f04468bd59f11da60b89c10f414655ef4225b623259bbc13064218a687498976d3f270c5ae5
-  data.tar.gz: 329787a710fde14f5d9e5ca40afd503b579e8225a26681f15b6a8d3f36f8d6d73b03ce993c95c6c09afeb5da3f5e463daf4aff47f6466b2bf15e9e97f69205b0
+  metadata.gz: 70f96bb5f84578d3c270441180f28f188bd47db77a3a44ff364a7d94a56cd27ae8f79bbe60a65f3b4d3a04c464805f541d890d9e052fe49ae50ca8a576aa7750
+  data.tar.gz: 36f44196608a3940162263c88bfd9ca6e8542be152492cc51eed5d5669e2c2a0d0870de4309229ec29bac674705656d21f6a9f4c6509efc2cd7efade6506e9f8

data/{CHANGES → CHANGES.md}

@@ -1,45 +1,68 @@
-== 0.7.2 - 4-Nov-2018
+## 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
+  will display them nicely.
+* Switched from test-unit to rspec as the testing framework of choice.
+* Updated the gemspec to reflect the filename updates, as well as the
+  added development dependency.
+
+## 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.
@@ -48,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.
@@ -58,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.
@@ -83,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).
@@ -109,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
@@ -129,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
@@ -139,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)
@@ -148,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
@@ -156,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/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

data/{MANIFEST → MANIFEST.md}

@@ -1,11 +1,12 @@
-* CHANGES
-* MANIFEST
+* CHANGES.rdoc
+* LICENSE
+* MANIFEST.rdoc
 * Rakefile
-* README
+* README.rdoc
 * sys-uptime.gemspec
 * certs/djberg96_pub.pem
 * examples/test.rb
 * lib/sys-uptime.rb
 * lib/unix/sys/uptime.rb
 * lib/windows/sys/uptime.rb
-* test/test_sys_uptime.rb
+* spec/sys_uptime_spec.rb

data/README.md

@@ -0,0 +1,71 @@
+[![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
+ffi 0.1.0 or later on Unixy platforms.
+
+## Installation
+
+`gem install sys-uptime`
+
+## Synopsis
+```ruby
+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 https://github.com/djberg96/sys-uptime.
+
+## Questions
+"Doesn't Struct::Tms do this?" - No.
+    
+## License
+Apache-2.0
+    
+## 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
+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,23 +1,18 @@
 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'
@@ -27,16 +22,9 @@ namespace 'gem' do
   end
 end
 
-desc "Run the test suite"
-Rake::TestTask.new do |t|
-  if File::ALT_SEPARATOR
-    t.libs << 'lib/windows'
-  else
-    t.libs << 'lib/unix'
-  end
+RuboCop::RakeTask.new
 
-  t.warning = true
-  t.verbose = true
-end
+desc "Run the test suite"
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task :default => :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)
@@ -26,10 +25,10 @@ module Sys
     attach_function :time,     [:pointer], :time_t
     attach_function :times,    [:pointer], :clock_t
 
-    private_class_method :strerror, :sysconf, :time, :times
+    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.2'.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,14 +7,15 @@ 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
 
+    # You cannot instantiate an instance of Sys::Uptime.
+    private_class_method :new
+
     # Returns the boot time as a Time object.
     #
     # Example:
@@ -23,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
 
@@ -78,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
 
@@ -89,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
 
@@ -100,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
 
@@ -111,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
@@ -136,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

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+#####################################################################
+# sys_uptime_spec.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 'rspec'
+require 'socket'
+
+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 '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(described_class.seconds).to be_a(Integer)
+    expect(described_class.seconds).to be > plausible_seconds
+  end
+
+  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', :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(described_class).to respond_to(:hours)
+    expect{ described_class.hours }.not_to raise_error
+  end
+
+  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(described_class).to respond_to(:days)
+    expect{ described_class.days }.not_to raise_error
+  end
+
+  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(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(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{ described_class.uptime(1) }.to raise_error(ArgumentError)
+  end
+
+  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(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(described_class.dhms).not_to be_empty
+    expect(described_class.dhms.length).to eq(4)
+  end
+
+  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(described_class.boot_time).to be_a(Time)
+  end
+
+  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 = described_class.methods(false).map(&:to_s)
+    expect(methods).not_to include('time', 'times')
+  end
+end

data/sys-uptime.gemspec

@@ -2,25 +2,36 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-uptime'
-  spec.version    = '0.7.2'
+  spec.version    = '0.7.6'
   spec.author     = 'Daniel J. Berger'
-  spec.license    = 'Apache 2.0'
+  spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'https://github.com/djberg96/sys-uptime'
   spec.summary    = 'A Ruby interface for getting system uptime information.'
-  spec.test_file  = 'test/test_sys_uptime.rb'
+  spec.test_file  = 'spec/sys_uptime_spec.rb'
   spec.files      = Dir["**/*"].reject{ |f| f.include?('git') }
   spec.cert_chain = ['certs/djberg96_pub.pem']
 
-  spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST']
+  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.2
+  version: 0.7.6
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,8 +35,64 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2018-11-04 00:00:00.000000000 Z
-dependencies: []
+date: 2023-04-10 00:00:00.000000000 Z
+dependencies:
+- !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.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: 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: '0'
 description: |2
       The sys-uptime library is a simple interface for gathering uptime
       information. You can retrieve data in seconds, minutes, days, hours,
@@ -44,43 +100,35 @@ description: |2
 email: djberg96@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGES
-- README
-- MANIFEST
+extra_rdoc_files: []
 files:
-- certs
+- CHANGES.md
+- Gemfile
+- LICENSE
+- MANIFEST.md
+- README.md
+- Rakefile
 - certs/djberg96_pub.pem
-- CHANGES
-- examples
 - examples/uptime_test.rb
-- lib
-- lib/sys
-- lib/sys/unix
-- lib/sys/unix/sys
+- lib/sys-uptime.rb
 - lib/sys/unix/sys/uptime.rb
 - lib/sys/uptime.rb
-- lib/sys/windows
-- lib/sys/windows/sys
 - lib/sys/windows/sys/uptime.rb
-- lib/sys-uptime.rb
-- MANIFEST
-- Rakefile
-- README
+- spec/sys_uptime_spec.rb
 - sys-uptime.gemspec
-- test
-- test/test_sys_uptime.rb
 homepage: https://github.com/djberg96/sys-uptime
 licenses:
-- Apache 2.0
+- 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
@@ -95,10 +143,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.19
+signing_key:
 specification_version: 4
 summary: A Ruby interface for getting system uptime information.
 test_files:
-- test/test_sys_uptime.rb
+- spec/sys_uptime_spec.rb

data/README

@@ -1,66 +0,0 @@
-= Description
-  A Ruby interface for getting system uptime information.
-
-= Prerequisites
-  ffi 0.1.0 or later on Unixy platforms.
-
-= Installation
-  gem install sys-uptime
-
-= 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 https://github.com/djberg96/sys-uptime.
-
-== Questions
-  "Doesn't Struct::Tms do this?" - No.
-    
-== License
-  Apache 2.0
-    
-== Copyright
-  Copyright 2002-2018, 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/test/test_sys_uptime.rb

@@ -1,107 +0,0 @@
-#####################################################################
-# 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'
-require 'socket'
-include Sys
-
-class TC_Sys_Uptime < Test::Unit::TestCase
-  test "version is set to expected value" do
-    assert_equal('0.7.2', Uptime::VERSION)
-    assert_true(Uptime::VERSION.frozen?)
-  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(Integer, 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(methods.include?('time'))
-    assert_false(methods.include?('times'))
-  end
-end