sys-uname 0.9.0-x86-mingw32 → 0.9.1-x86-mingw32

data/CHANGES

@@ -1,3 +1,9 @@
+== 0.9.1 - 3-Jan-2013
+* Made FFI functions private.
+* Properly alias uname FFI function.
+* Fixed the QuantumLength and QuantumType bug again (see 0.8.4), which I
+  somehow accidentally reintroduced.
+
 == 0.9.0 - 8-Dec-2011
 * Conversion to FFI.
 * Added some additional methods and information for Solaris.

data/doc/uname.txt

@@ -109,10 +109,10 @@ Uname.id
    Add additional info for Linux, Solaris, BSD.
 
 == License
-   Ruby's
+   Artistic 2.0
 
 == Copyright
-   (C) 2002-2012 Daniel J. Berger
+   (C) 2002-2013 Daniel J. Berger
    All Rights Reserved
 
 == Warranty

data/lib/unix/sys/uname.rb

@@ -7,13 +7,13 @@ module Sys
   # The Uname class encapsulates information about the system.
   class Uname
     extend FFI::Library
-    ffi_lib('c')
+    ffi_lib FFI::Library::LIBC
 
     # Error raised if the uname() function fails.
     class Error < StandardError; end
 
     # The version of the sys-uname library
-    VERSION = '0.9.0'
+    VERSION = '0.9.1'
 
     # :stopdoc
 
@@ -29,10 +29,13 @@ module Sys
         BUFSIZE = 256
     end
 
-    attach_function :uname, [:pointer], :int
+    attach_function :uname_c, :uname, [:pointer], :int
+    private_class_method :uname_c
 
     begin
       attach_function :sysctl, [:pointer, :uint, :pointer, :pointer, :pointer, :size_t], :int
+      private_class_method :sysctl
+
       CTL_HW   = 6   # Generic hardware/cpu
       HW_MODEL = 2   # Specific machine model
     rescue FFI::NotFoundError
@@ -41,6 +44,8 @@ module Sys
 
     begin
       attach_function :sysinfo, [:int, :pointer, :long], :long
+      private_class_method :sysinfo
+
       SI_SYSNAME      = 1   # OS name
       SI_HOSTNAME     = 2   # Node name
       SI_RELEASE      = 3   # Operating system release
@@ -57,12 +62,6 @@ module Sys
       # Ignore. Not suppored.
     end
 
-    # Temporarily remove the uname method to avoid function name conflict
-    class << self
-      alias :uname_c :uname
-      remove_method :uname
-    end
-
     class UnameFFIStruct < FFI::Struct
       members = [
         :sysname,  [:char, BUFSIZE],
@@ -316,6 +315,8 @@ module Sys
       buf.strip
     end
 
+    private_class_method :get_model
+
     # Returns the various sysinfo information based on +flag+.
     #
     def self.get_si(flag)
@@ -323,5 +324,7 @@ module Sys
       sysinfo(flag, buf, BUFSIZE)
       buf.strip
     end
+
+    private_class_method :get_si
   end
 end

data/lib/windows/sys/uname.rb

@@ -11,7 +11,8 @@ module Sys
     # This is the error raised if any of the Sys::Uname methods should fail.
     class Error < StandardError; end
 
-    VERSION = '0.9.0'
+    # The version of the sys-uname library.
+    VERSION = '0.9.1'
 
     fields = %w[
       boot_device
@@ -85,7 +86,6 @@ module Sys
       rescue WIN32OLERuntimeError => e
         raise Error, e
       else
-        query = "select * from Win32_OperatingSystem"
         wmi.InstancesOf("Win32_OperatingSystem").each{ |ole|
           str = "#{ole.Version} #{ole.BuildNumber}-"
           str << "#{ole.ServicePackMajorVersion}"
@@ -104,7 +104,6 @@ module Sys
       rescue WIN32OLERuntimeError => e
         raise Error, e
       else
-        query = "select * from Win32_OperatingSystem"
         wmi.InstancesOf("Win32_OperatingSystem").each{ |ole|
           return ole.Caption
         }
@@ -122,7 +121,6 @@ module Sys
       rescue WIN32OLERuntimeError => e
         raise Error, e
       else
-        query = "select * from Win32_OperatingSystem"
         wmi.InstancesOf("Win32_OperatingSystem").each{ |ole|
           return ole.CSName
         }
@@ -366,7 +364,6 @@ module Sys
       rescue WIN32OLERuntimeError => e
         raise Error, e
       else
-        query = "select * from Win32_OperatingSystem"
         wmi.InstancesOf("Win32_OperatingSystem").each{ |ole|
           return ole.Version
         }
@@ -384,7 +381,6 @@ module Sys
       rescue WIN32OLERuntimeError => e
         raise Error, e
       else
-        query = "select * from Win32_OperatingSystem"
         wmi.InstancesOf("Win32_OperatingSystem").each{ |os|
           return UnameStruct.new(
             os.BootDevice,
@@ -424,8 +420,8 @@ module Sys
             os.PlusProductID,
             os.PlusVersionNumber,
             os.Primary,
-            os.QuantumLength,
-            os.QuantumType,
+            os.respond_to?(:QuantumLength) ? os.QuantumLength : nil,
+            os.respond_to?(:QuantumType) ? os.QuantumType : nil,
             os.RegisteredUser,
             os.SerialNumber,
             os.ServicePackMajorVersion,

data/sys-uname.gemspec

@@ -2,19 +2,19 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'sys-uname'
-  spec.version   = '0.9.0'
+  spec.version   = '0.9.1'
   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   = 'An interface for returning uname (platform) information'
   spec.test_file = 'test/test_sys_uname.rb'
+  spec.license   = 'Artistic 2.0'
   spec.files     = Dir['**/*'].reject{ |f| f.include?('git') } 
 
   spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/uname.txt']
   spec.rubyforge_project = 'sysutils'
 
-  if Config::CONFIG['host_os'] =~ /mswin|windows|dos|mingw|cygwin/i
+  if File::ALT_SEPARATOR
     spec.require_paths = ['lib', 'lib/windows']
   else
     spec.require_paths = ['lib', 'lib/unix']

data/test/test_sys_uname.rb

@@ -1,23 +1,20 @@
 ##############################################################################
 # test_sys_uname.rb
 #
-# Test suite for the sys-uname package. This test suite should be run via
-# the 'rake test' task.
+# Test suite for the sys-uname library. Run 'rake test' to execute tests.
 ##############################################################################
-gem 'test-unit'
-require 'test/unit'
-
+require 'test-unit'
 require 'sys/uname'
 require 'rbconfig'
 include Sys
 
-class TC_Uname < Test::Unit::TestCase
+class TC_Sys_Uname < Test::Unit::TestCase
   def self.startup
     @@host_os = RbConfig::CONFIG['host_os']
   end
 
   test "version constant is set to expected value" do
-    assert_equal('0.9.0', Uname::VERSION)
+    assert_equal('0.9.1', Uname::VERSION)
   end
 
   test "machine singleton method works as expected" do
@@ -160,6 +157,15 @@ class TC_Uname < Test::Unit::TestCase
     assert_equal(members.sort, Uname.uname.members.sort)
   end
 
+  test "ffi and internal functions are not public" do
+    methods = Uname.methods(false).map{ |e| e.to_s }
+    assert_false(methods.include?('get_model'))
+    assert_false(methods.include?('get_si'))
+    assert_false(methods.include?('uname_c'))
+    assert_false(methods.include?('sysctl'))
+    assert_false(methods.include?('sysinfo'))
+  end
+
   # The following tests are win32 only
   if File::ALT_SEPARATOR
     def test_boot_device
@@ -371,12 +377,12 @@ class TC_Uname < Test::Unit::TestCase
 
     def test_quantum_length
       assert_nothing_raised{ Uname.uname.quantum_length}
-      assert_kind_of(Fixnum, Uname.uname.quantum_length)
+      assert_kind_of([Fixnum, NilClass], Uname.uname.quantum_length)
     end
 
     def test_quantum_type
       assert_nothing_raised{ Uname.uname.quantum_type}
-      assert_kind_of(Fixnum, Uname.uname.quantum_type)
+      assert_kind_of([Fixnum, NilClass], Uname.uname.quantum_type)
     end
 
     def test_registered_user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys-uname
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies: []
 description: ! "    The sys-uname library provides an interface for gathering information\n
   \   about your current platform. The library is named after the Unix 'uname'\n    command
@@ -35,7 +35,8 @@ files:
 - sys-uname.gemspec
 - test/test_sys_uname.rb
 homepage: http://www.rubyforge.org/projects/sysutils
-licenses: []
+licenses:
+- Artistic 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sysutils
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An interface for returning uname (platform) information