sys-uname 0.8.3 → 0.8.4

data/CHANGES

@@ -1,3 +1,12 @@
+== 0.8.4 - 29-Jan-2010
+* Bug fix for Windows 7, which appears to have removed the QuantumLength and
+  QuantumType members of the Win32_OperatingSystem class. Thanks go to Mark
+  Seymour for the spot. RubyForge bug # 27645.
+* Changed license to Artistic 2.0.
+* Refactored the Rakefile and gemspec considerably. The gem building code is
+  now all inlined within the Rakefile build task itself.
+* Minor doc updates and some code reformatting.
+
 == 0.8.3 - 26-Apr-2008
 * Added an explicit "require 'time'" in the Windows version because recent
   versions of Ruby now need it.

data/README

@@ -1,37 +1,36 @@
-= Prerequisites
-=== Unix
-   Ruby 1.8.0 or later.
-=== MS Windows
-   Ruby 1.8.2 or later.  Earlier versions segfault due to OLE bugs.
-   Active WMI service (normally on by default).
+= Description
+  A Ruby interface for getting operating system information. The name comes
+  from the Unix 'uname' command, but this library works on Windows as well.
 
 = Installation
-   rake test (optional)
-   rake install (non-gem) or rake install_gem (gems)
+  gem install sys-uname
+
+  # If that doesn't work and you're on Windows try this:
+  gem install sys-uname --platform x86-mingw32
    
 = Synopsis
-   require 'sys/uname'
-   include Sys
+  require 'sys/uname'
+  include Sys
    
-   p Uname.uname
+  p Uname.uname
    
 = Solaris Notes
-   Folks building this package on SunOS get two extra methods: architecture()
-   and platform()
+  Folks building this package on SunOS get two extra methods: architecture()
+  and platform()
 
 = BSD flavors, including OS X
-   Users on BSD platforms get the extra Uname.model method.
+  Users on BSD platforms get the extra Uname.model method.
 
 = HP-UX Notes
-   HP-UX users get the extra Uname.id_number method.  This is actually a
-   String, not a Fixnum, because that's how it's defined in the utsname
-   struct.
+  HP-UX users get the extra Uname.id_number method.  This is actually a
+  String, not a Fixnum, because that's how it's defined in the utsname
+  struct.
 
 = MS Windows Notes
-   The C version for Windows has been completely scrapped in favor of an OLE
-   plus WMI approach.  It is pure Ruby.  Please see the MSDN documentation for
-   the Win32_OperatingSystem class for a complete list of what each of the
-   UnameStruct members mean.
+  The C version for Windows has been completely scrapped in favor of an OLE
+  plus WMI approach.  It is pure Ruby.  Please see the MSDN documentation for
+  the Win32_OperatingSystem class for a complete list of what each of the
+  UnameStruct members mean.
 
 = Documentation
   For more details, see the 'uname.txt' file under the 'doc' directory. 

data/Rakefile

@@ -6,66 +6,80 @@ include Config
 
 desc "Clean the build files for the sys-uname source for UNIX systems"
 task :clean do
-   Dir.chdir('ext') do
-      unless CONFIG['host_os'] =~ /mswin|windows/i
-         build_file = 'uname.' + Config::CONFIG['DLEXT']
-         rm "sys/#{build_file}" if File.exists?("sys/#{build_file}")
-         sh 'make distclean' if File.exists?(build_file)
-      end
-   end
+  Dir.chdir('ext') do
+    unless CONFIG['host_os'] =~ /mswin|windows|mingw|cygwin|dos/i
+      build_file = 'uname.' + Config::CONFIG['DLEXT']
+      rm "sys/#{build_file}" if File.exists?("sys/#{build_file}")
+      sh 'make distclean' if File.exists?(build_file)
+    end
+  end
 end
 
-desc "Build the sys-uname package on UNIX systems (but don't install it)"
+desc "Build the sys-uname library on UNIX systems (but don't install it)"
 task :build => [:clean] do
-   Dir.chdir('ext') do
-      unless CONFIG['host_os'] =~ /mswin|windows/i
-         ruby 'extconf.rb'
-         sh 'make'
-         build_file = 'uname.' + Config::CONFIG['DLEXT']
-         cp build_file, 'sys' # For testing
-      end
-   end
+  Dir.chdir('ext') do
+    unless CONFIG['host_os'] =~ /mswin|windows|mingw|cygwin|dos/i
+      ruby 'extconf.rb'
+      sh 'make'
+      build_file = 'uname.' + Config::CONFIG['DLEXT']
+      cp build_file, 'sys' # For testing
+    end
+  end
 end
 
 desc "Run the example program"
 task :example => [:build] do
-   if CONFIG['host_os'] =~ /mswin|windows/i
-      sh 'ruby -Ilib examples/uname_test.rb'
-   else
-      sh 'ruby -Iext examples/uname_test.rb'
-   end
+  if CONFIG['host_os'] =~ /mswin|windows|mingw|cygwin|dos/i
+    sh 'ruby -Ilib examples/uname_test.rb'
+  else
+    sh 'ruby -Iext examples/uname_test.rb'
+  end
 end
 
-if CONFIG['host_os'] =~ /mswin|windows/i
-   desc "Install the sys-uname package (non-gem)"
-   task :install do
+namespace 'sys' do
+  desc "Install the sys-uname library (system)"
+  task :install do
+    if CONFIG['host_os'] =~ /mswin|windows|mingw|cygwin|dos/i
+      dir = File.join(CONFIG['sitelibdir'], 'sys')
       Dir.mkdir(dir) unless File.exists?(dir)
       FileUtils.cp('lib/sys/uname.rb', dir, :verbose => true)
-   end
-else
-   desc "Install the sys-uname package"
-   task :install => [:build] do
+    else
       Dir.chdir('ext') do
-         sh 'make install'
+        sh 'make install'
       end
-   end
+    end
+  end
 end
 
-desc "Install the sys-uname package as a gem"
-task :install_gem do
-   ruby 'sys-uname.gemspec'
-   file = Dir['sys-uname*.gem'].first
-   sh "gem install #{file}"
+namespace 'gem' do
+  desc "Build the sys-uname gem"
+  task :build do
+    spec = eval(IO.read('sys-uname.gemspec'))
+    if CONFIG['host_os'] =~ /windows|dos|mswin|mingw|cygwin/i
+      spec.files = spec.files.reject{ |f| f.include?('ext') }
+      spec.platform = Gem::Platform::CURRENT
+    else
+      spec.files = spec.files.reject{ |f| f.include?('lib') }
+      spec.extensions = ['ext/extconf.rb']
+      spec.extra_rdoc_files += ['ext/sys/uname.c']
+    end
+    Gem::Builder.new(spec).build
+  end
+
+  desc "Install the sys-uname gem"
+  task :install => [:build] do
+    file = Dir['sys-uname*.gem'].first
+    sh "gem install #{file}"
+  end
 end
 
 desc "Run the test suite"
 Rake::TestTask.new("test") do |t|
-   if CONFIG['host_os'] =~ /mswin|windows/i
-      t.libs << 'lib'
-   else
-      task :test => :build
-      t.libs << 'ext'
-      t.libs.delete('lib')
-   end
-   t.test_files = FileList['test/tc_uname.rb']
+  if CONFIG['host_os'] =~ /mswin|windows|mingw|cygwin|dos/i
+    t.libs << 'lib'
+  else
+    task :test => :build
+    t.libs << 'ext'
+    t.libs.delete('lib')
+  end
 end

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-2008 Daniel J. Berger
+   (C) 2002-2010 Daniel J. Berger
    All Rights Reserved
 
 == Warranty

data/examples/uname_test.rb

@@ -0,0 +1,41 @@
+########################################################################
+# uname_test.rb
+#
+# Generic test script for general futzing. Modify as you see fit. This
+# should generally be run via the 'rake example' task.
+########################################################################
+require 'sys/uname'
+include Sys
+
+puts "VERSION: " + Uname::VERSION
+puts 'Nodename: ' + Uname.nodename
+puts 'Sysname: ' + Uname.sysname
+puts 'Version: ' + Uname.version
+puts 'Release: ' + Uname.release
+puts 'Machine: ' + Uname.machine # May be "unknown" on Win32
+
+if RUBY_PLATFORM =~ /sun|solaris/i
+   print "\nSolaris specific tests\n" 
+   puts "==========================="
+   puts 'Architecture: ' + Uname.architecture
+   puts 'Platform: ' + Uname.platform
+   puts 'Instruction Set List: ' + Uname.isa_list.split.join(", ")
+   puts 'Hardware Provider: ' + Uname.hw_provider
+   puts 'Serial Number: ' + Uname.hw_serial_number.to_s
+   puts 'SRPC Domain: ' + Uname.srpc_domain # might be empty
+   puts 'DHCP Cache: ' + Uname.dhcp_cache # might be empty
+end
+
+if RUBY_PLATFORM =~ /powerpc|darwin|bsd|mach/i
+   print "\nBSD/OS X specific tests\n" 
+   puts "======================="
+   puts 'Model: ' + Uname.model
+end
+
+if RUBY_PLATFORM =~ /hpux/i
+   print "\nHP-UX specific tests\n"
+   puts "========================"
+   puts "ID: " + Uname.id
+end
+
+print "\nTest finished successfully\n"

data/ext/sys/uname.c

@@ -6,7 +6,7 @@
 #include <ruby.h>
 #include <sys/utsname.h>
 
-#define SYS_UNAME_VERSION "0.8.3"
+#define SYS_UNAME_VERSION "0.8.4"
 
 /* Solaris */
 #ifdef HAVE_SYS_SYSTEMINFO_H
@@ -298,7 +298,7 @@ void Init_uname()
 #endif
    NULL);
 
-   /* 0.8.3: The version of this library */
+   /* 0.8.4: The version of this library */
    rb_define_const(cUname, "VERSION", rb_str_new2(SYS_UNAME_VERSION));
 }
 

data/sys-uname.gemspec

@@ -0,0 +1,27 @@
+require 'rubygems'
+
+Gem::Specification.new do |spec|
+  spec.name      = 'sys-uname'
+  spec.version   = '0.8.4'
+  spec.license   = 'Artistic 2.0'
+  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 system platform information'
+  spec.test_file = 'test/test_sys_uname.rb'
+  spec.files     = Dir['**/*'].reject{ |f| f.include?('git') }
+
+  spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST', 'doc/uname.txt']
+  spec.rubyforge_project = 'sysutils'
+
+  spec.add_development_dependency('test-unit', '>= 2.0.6')
+   
+  spec.description = <<-EOF
+    The sys-uname library provides an interface for gathering information
+    about your current platform. The library is named after the Unix 'uname'
+    command but also works on MS Windows. Available information includes
+    OS name, OS version, system name and so on. Additional information is
+    available for certain platforms.
+  EOF
+end

data/test/{tc_uname.rb → test_sys_uname.rb}

@@ -1,26 +1,27 @@
 ##############################################################################
-# tc_uname.rb
+# test_sys_uname.rb
 #
 # Test suite for the sys-uname package. This test suite should be run via
 # the 'rake test' task.
 ##############################################################################
-require 'sys/uname'
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
+require 'sys/uname'
 require 'rbconfig'
 include Sys
-include Config
-
-# For testing purposes only
-module Boolean; end
-class  TrueClass; include Boolean; end
-class  FalseClass; include Boolean; end
 
-class TC_Uname < Test::Unit::TestCase
+class TC_Sys_Uname < Test::Unit::TestCase
+   def self.startup
+      @@host_os = Config::CONFIG['host_os']      
+   end
+   
    def test_version_constant
       assert_not_nil(Uname::VERSION)
       assert_nothing_raised{ Uname::VERSION }
       assert_kind_of(String, Uname::VERSION)
-      assert_equal('0.8.3', Uname::VERSION)
+      assert_equal('0.8.4', Uname::VERSION)
    end
  
    def test_machine
@@ -54,98 +55,71 @@ class TC_Uname < Test::Unit::TestCase
    end
    
    def test_architecture
-      if CONFIG['host_os'] =~ /sunos|solaris/i
-         assert_respond_to(Uname, :architecture)
-         assert_nothing_raised{ Uname.architecture }
-         assert_kind_of(String, Uname.architecture)
-      else
-         puts '"architecture" test skipped on this platform'
-      end
+      omit_unless(@@host_os =~ /sunos|solaris/i, "Solaris only")
+      assert_respond_to(Uname, :architecture)
+      assert_nothing_raised{ Uname.architecture }
+      assert_kind_of(String, Uname.architecture)
    end
    
    def test_platform
-      if CONFIG['host_os'] =~ /sunos|solaris/i
-         assert_respond_to(Uname, :platform)
-         assert_nothing_raised{ Uname.platform }
-         assert_kind_of(String, Uname.platform)
-      else
-         puts '"platform" test skipped on this platform'
-      end
+      omit_unless(@@host_os =~ /sunos|solaris/i, "Solaris only")
+      assert_respond_to(Uname, :platform)
+      assert_nothing_raised{ Uname.platform }
+      assert_kind_of(String, Uname.platform)
    end
 
    def test_isa_list
-      if CONFIG['host_os'] =~ /sunos|solaris/i
-         assert_respond_to(Uname, :isa_list)
-         assert_nothing_raised{ Uname.isa_list }
-         assert_kind_of(String, Uname.isa_list)
-      else
-         puts '"isa_list" test skipped on this platform'
-      end
+      omit_unless(@@host_os =~ /sunos|solaris/i, "Solaris only")
+      assert_respond_to(Uname, :isa_list)
+      assert_nothing_raised{ Uname.isa_list }
+      assert_kind_of(String, Uname.isa_list)
    end
 
    def test_hw_provider
-      if CONFIG['host_os'] =~ /sunos|solaris/i
-         assert_respond_to(Uname,:hw_provider)
-         assert_nothing_raised{ Uname.hw_provider }
-         assert_kind_of(String, Uname.hw_provider)
-      else
-         puts '"hw_provider" test skipped on this platform'
-      end
+      omit_unless(@@host_os =~ /sunos|solaris/i, "Solaris only")
+      assert_respond_to(Uname,:hw_provider)
+      assert_nothing_raised{ Uname.hw_provider }
+      assert_kind_of(String, Uname.hw_provider)
    end
 
    def test_hw_serial_number
-      if CONFIG['host_os'] =~ /sunos|solaris/i
-         assert_respond_to(Uname, :hw_serial_number)
-         assert_nothing_raised{ Uname.hw_serial_number }
-         assert_kind_of(Integer, Uname.hw_serial_number)
-      else
-         puts '"hw_serial_number" test skipped on this platform'
-      end
+      omit_unless(@@host_os =~ /sunos|solaris/i, "Solaris only")
+      assert_respond_to(Uname, :hw_serial_number)
+      assert_nothing_raised{ Uname.hw_serial_number }
+      assert_kind_of(Integer, Uname.hw_serial_number)
    end
 
    def test_srpc_domain
-      if CONFIG['host_os'] =~ /sunos|solaris/i
-         assert_respond_to(Uname, :srpc_domain)
-         assert_nothing_raised{ Uname.srpc_domain }
-         assert_kind_of(String, Uname.srpc_domain)
-      else
-         puts '"srpc_domain" test skipped on this platform'
-      end
+      omit_unless(@@host_os =~ /sunos|solaris/i, "Solaris only")
+      assert_respond_to(Uname, :srpc_domain)
+      assert_nothing_raised{ Uname.srpc_domain }
+      assert_kind_of(String, Uname.srpc_domain)
    end
 
    def test_dhcp_cache
-      if CONFIG['host_os'] =~ /sunos|solaris/i
-         assert_respond_to(Uname, :dhcp_cache)
-         assert_nothing_raised{ Uname.dhcp_cache }
-         assert_kind_of(String, Uname.dhcp_cache)
-      else
-         puts '"srpc_domain" test skipped on this platform'
-      end
+      omit_unless(@@host_os =~ /sunos|solaris/i, "Solaris only")
+      assert_respond_to(Uname, :dhcp_cache)
+      assert_nothing_raised{ Uname.dhcp_cache }
+      assert_kind_of(String, Uname.dhcp_cache)
    end
    
    def test_model
-      if CONFIG['host_os'] =~ /darwin|powerpc|bsd|mach/i
-         assert_respond_to(Uname, :model)
-         assert_nothing_raised{ Uname.model }
-         assert_kind_of(String, Uname.model)
-      else
-         puts '"model" test skipped on this platform'
-      end
+      omit_unless(@@host_os =~ /darwin|powerpc|bsd|mach/i, "BSD/Darwin only")
+      assert_respond_to(Uname, :model)
+      assert_nothing_raised{ Uname.model }
+      assert_kind_of(String, Uname.model)
    end
    
    def test_id_number
-      if CONFIG['host_os'] =~ /hpux/i
-         assert_respond_to(Uname, :id_number)
-         assert_nothing_raised{ Uname.id_number }
-         assert_kind_of(String, Uname.id_number)
-      else
-         puts '"test_id_number" test skipped on this platform'
-      end
+      omit_unless(@@host_os =~ /hpux/i, "HP-UX only")
+      assert_respond_to(Uname, :id_number)
+      assert_nothing_raised{ Uname.id_number }
+      assert_kind_of(String, Uname.id_number)
    end
 
    def test_uname_struct
       members = %w/sysname nodename machine version release/
-      case CONFIG['host_os']
+      case Config::CONFIG['host_os']
          when /sunos|solaris/i
             members.push('architecture','platform')
          when /powerpc|darwin/i
@@ -178,7 +152,7 @@ class TC_Uname < Test::Unit::TestCase
    end
    
    # The following tests are win32 only
-   if CONFIG['host_os'] =~ /mswin|windows/i
+   if Config::CONFIG['host_os'] =~ /mswin|windows/i
       def test_boot_device
          assert_nothing_raised{ Uname.uname.boot_device }
          assert_kind_of(String, Uname.uname.boot_device)
@@ -236,7 +210,7 @@ class TC_Uname < Test::Unit::TestCase
       
       def test_debug
          assert_nothing_raised{ Uname.uname.debug }
-         assert_kind_of(Boolean, Uname.uname.debug)
+         assert_boolean(Uname.uname.debug)
       end
       
       def test_description
@@ -246,7 +220,7 @@ class TC_Uname < Test::Unit::TestCase
       
       def test_distributed
          assert_nothing_raised{ Uname.uname.distributed }
-         assert_kind_of(Boolean, Uname.uname.distributed)
+         assert_boolean(Uname.uname.distributed)
       end
       
       # Not yet supported - WinXP or later only
@@ -313,7 +287,7 @@ class TC_Uname < Test::Unit::TestCase
       
       def test_max_process_memory_size
          assert_nothing_raised{ Uname.uname.max_process_memory_size}
-         assert_kind_of(Fixnum, Uname.uname.max_process_memory_size)
+         assert_kind_of(Integer, Uname.uname.max_process_memory_size)
       end
       
       def test_name
@@ -377,7 +351,7 @@ class TC_Uname < Test::Unit::TestCase
       
       def test_primary
          assert_nothing_raised{ Uname.uname.primary}
-         assert_kind_of(Boolean, Uname.uname.primary)
+         assert_boolean(Uname.uname.primary)
       end
       
       # Not yet supported - WinXP or later only

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sys-uname
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,11 +9,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-26 00:00:00 -06:00
+date: 2010-01-29 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: An interface for returning uname (platform) information
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.6
+    version: 
+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 but also works on MS Windows. Available information includes\n    OS name, OS version, system name and so on. Additional information is\n    available for certain platforms.\n"
 email: djberg96@gmail.com
 executables: []
 
@@ -26,16 +35,20 @@ extra_rdoc_files:
 - doc/uname.txt
 - ext/sys/uname.c
 files: 
-- doc/uname.txt
-- test/tc_uname.rb
 - CHANGES
+- doc/uname.txt
+- examples/uname_test.rb
+- ext/extconf.rb
+- ext/sys/uname.c
 - MANIFEST
 - Rakefile
 - README
-- ext/extconf.rb
-- ext/sys/uname.c
+- sys-uname.gemspec
+- test/test_sys_uname.rb
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/sysutils
+licenses: 
+- Artistic 2.0
 post_install_message: 
 rdoc_options: []
 
@@ -45,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.0
+      version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -56,9 +69,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sysutils
-rubygems_version: 1.0.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: An interface for returning uname (platform) information
+specification_version: 3
+summary: An interface for returning system platform information
 test_files: 
-- test/tc_uname.rb
+- test/test_sys_uname.rb