sys-uptime 0.6.0 → 0.6.1

data/CHANGES

@@ -1,3 +1,8 @@
+== 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
 * Switched Unix code to use FFI.
 * Removed all of the C related tasks from the Rakefile and added the gem:build

data/README

@@ -2,11 +2,10 @@
   A Ruby interface for getting system uptime information.
 
 = Prerequisites
-  ffi 0.5.0 or later.
+  ffi 0.1.0 or later on Unixy platforms.
 
 = Installation
-  gem install sys-uptime                    # Unix platforms
-  gem install sys-uptime --platform mswin32 # MS Windows
+  gem install sys-uptime
 
 = Synopsis
   require 'sys/uptime'
@@ -35,7 +34,7 @@
 
 == 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.
+  website at https://github.com/djberg96/sys-uptime.
 
 == Questions
   "Doesn't Struct::Tms do this?" - No.
@@ -44,7 +43,7 @@
   Artistic 2.0
     
 == Copyright
-  Copyright 2002-2010, Daniel J. Berger
+  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.

data/Rakefile

@@ -23,7 +23,7 @@ namespace 'gem' do
   end
 
   desc 'Install the sys-uptime gem'
-  task :install => [:build] do
+  task :install => [:create] do
     file = Dir["*.gem"].first
     sh "gem install #{file}"
   end

data/lib/unix/sys/uptime.rb

@@ -13,7 +13,7 @@ module Sys
     class Error < StandardError; end
 
     # The version of the sys-uptime library
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
 
     private
 
@@ -93,7 +93,7 @@ module Sys
     #    Sys::Uptime.boot_time # => Mon Jul 13 06:08:25 -0600 2009
     #
     def self.boot_time
-      if Config::CONFIG['host_os'] =~ /linux/i
+      if RbConfig::CONFIG['host_os'] =~ /linux/i
         Time.now - self.seconds
       elsif respond_to?(:sysctl, true)
         tv = Timeval.new
@@ -128,7 +128,7 @@ module Sys
     #    Sys::Uptime.seconds => 118800
     #
     def self.seconds
-      if Config::CONFIG['host_os'] =~ /linux/i
+      if RbConfig::CONFIG['host_os'] =~ /linux/i
         begin
           IO.read('/proc/uptime').split.first.to_i
         rescue Exception => err

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.6.0'
+    VERSION = '0.6.1'
 
     # Returns the boot time as a Time object.
     #
@@ -139,24 +139,7 @@ module Sys
     # 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
+      (Time.now - boot_time).to_i
     end
 
     private_class_method :get_seconds

data/sys-uptime.gemspec

@@ -2,12 +2,11 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'sys-uptime'
-  spec.version   = '0.6.0'
+  spec.version   = '0.6.1'
   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') }

data/test/test_sys_uptime.rb

@@ -4,17 +4,14 @@
 # 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 'test-unit'
 require 'socket'
 include Sys
 
 class TC_Sys_Uptime < Test::Unit::TestCase
   test "version is set to expected value" do
-    assert_equal('0.6.0', Uptime::VERSION)
+    assert_equal('0.6.1', Uptime::VERSION)
   end
 
   test "seconds method basic functionality" do
@@ -103,7 +100,7 @@ class TC_Sys_Uptime < Test::Unit::TestCase
 
   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'))
+    assert_false(methods.include?('time'))
+    assert_false(methods.include?('times'))
   end
 end

metadata

@@ -1,49 +1,43 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sys-uptime
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.6.1
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         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"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+description: ! "    The sys-uptime library is a simple interface for gathering uptime\n
+  \   information. You can retrieve data in seconds, minutes, days, hours,\n    or
+  all of the above.\n"
 email: djberg96@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
-files: 
+files:
 - CHANGES
 - examples/uptime_test.rb
 - lib/unix/sys/uptime.rb
@@ -54,38 +48,30 @@ files:
 - sys-uptime.gemspec
 - test/test_sys_uptime.rb
 homepage: https://github.com/djberg96/sys-uptime
-licenses: 
+licenses:
 - Artistic 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - lib/unix
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sysutils
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Ruby interface for getting system uptime information.
-test_files: 
+test_files:
 - test/test_sys_uptime.rb