sys-uname 0.7.3 → 0.7.4

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.7.4 - 19-Nov-2006
+* Internal layout changes, doc updates and gemspec improvements.
+* No code changes.
+
 == 0.7.3 - 30-Jul-2006
 * Bug fix for 64 bit platforms.
 * Minor modification of the extconf.rb file.

data/MANIFEST

@@ -1,16 +1,16 @@
-extconf.rb
 install.rb
 MANIFEST
 CHANGES
 README
 sys-uname.gemspec
 
-doc/uname.rd
 doc/uname.txt
 
 examples/uname_test.rb
 
-lib/os/unix.c
-lib/os/windows.rb
+ext/extconf.rb
+ext/uname.c
 
-test/tc_uname.rb
+lib/sys/uname.rb
+
+test/tc_uname.rb

data/README

@@ -1,30 +1,42 @@
-== Prerequisites
-   Unix: Ruby 1.8.0 or later
-   Windows: Ruby 1.8.2 or later (earlier versions segfault due to OLE bugs)
+= 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).
 
-== Installation: Unix
+= Installation
+=== Unix
    ruby extconf.rb
    make
    ruby test/tc_uname.rb (optional)
    make site-install
-
-== Installation: Win32
+=== MS Windows
    ruby test\tc_uname.rb (optional)
    ruby install.rb
-
-== Solaris Notes
+   
+= Synopsis
+   require 'sys/uname'
+   include Sys
+   
+   p Uname.uname
+   
+= Solaris Notes
    Folks building this package on SunOS get two extra methods: architecture()
    and platform()
 
-== OS X Notes
+= OS X Notes
    OS X users get the extra method "model()".
 
-== HP-UX Notes
+= HP-UX Notes
    HP-UX users get the extra method "id()".  This is actually a String, not
    a Fixnum, because that's how it's defined in the utsname struct.
 
-== MS Windows Notes
+= 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.
+
+= Documentation
+  For more details, see the 'uname.txt' file under the 'doc' directory. 

data/doc/uname.txt

@@ -1,122 +1,122 @@
 == Description
-	A Ruby interface to the 'uname' command.
+   A Ruby interface to the 'uname' command.
 
 == Synopsis
-	require 'sys/uname'
-	include Sys
-
-	puts Uname.nodename
-	puts Uname.version
-	puts Uname.sysname
-	puts Uname.machine
-	puts Uname.release
+   require 'sys/uname'
+   include Sys
+
+   puts Uname.nodename
+   puts Uname.version
+   puts Uname.sysname
+   puts Uname.machine
+   puts Uname.release
 	
-	p Uname.uname
+   p Uname.uname
 
 == Constants
 VERSION
-	The current version number of sys-uname.
+   The current version number of sys-uname.
 
 == Class Methods
 Uname.sysname
-    Returns the operating system name.  e.g. "SunOS"
+   Returns the operating system name.  e.g. "SunOS"
     
 Uname.nodename
-    Returns the nodename.  This is usually, but not necessarily, the 
-    same as the system's hostname.
+   Returns the nodename.  This is usually, but not necessarily, the 
+   same as the system's hostname.
 	
-    You cannot currently set the nodename (root or otherwise). This may
-    be added in a future release.
+   You cannot currently set the nodename (root or otherwise). This may
+   be added in a future release.
 
 Uname.machine
-    Returns the machine hardware type.  e.g. "i686"
+   Returns the machine hardware type.  e.g. "i686"
     
 Uname.version
-    Returns the operating system version. e.g. "5.8".  In the case of MS
-    Windows, it returns the version plus patch information, separated by
-    a hyphen, e.g. "2915-Service Pack 2".
+   Returns the operating system version. e.g. "5.8".  In the case of MS
+   Windows, it returns the version plus patch information, separated by
+   a hyphen, e.g. "2915-Service Pack 2".
     
 Uname.release
-    Returns the operating system release. e.g. "2.2.16-3"
+   Returns the operating system release. e.g. "2.2.16-3"
     
 Uname.uname
-    Returns a struct of type UnameStruct that contains sysname, nodename,
-    machine, version, and release.  On Solaris, it will also include 
-    architecture and platform.  On HP-UX, it will also include id.
+   Returns a struct of type UnameStruct that contains sysname, nodename,
+   machine, version, and release.  On Solaris, it will also include 
+   architecture and platform.  On HP-UX, it will also include id.
     
-    MS Windows - there are many more, and different, fields in the struct.
-    Please see the MSDN documenation for a complete explanation of what
-    each of these members mean.
+   MS Windows - there are many more, and different, fields in the struct.
+   Please see the MSDN documenation for a complete explanation of what
+   each of these members mean.
     
 == Solaris Only
 Uname.architecture
-    Returns the instruction set architecture.  e.g. "sparc"
+   Returns the instruction set architecture.  e.g. "sparc"
     
 Uname.platform
-    Returns the platform identifier.  e.g. "SUNW,Sun-Blade-100"
+   Returns the platform identifier.  e.g. "SUNW,Sun-Blade-100"
     
 Uname.isa_list
-	 Returns a space separated string containing a list of all variant
-	 instruction set architectures executable on the current system.
+   Returns a space separated string containing a list of all variant
+   instruction set architectures executable on the current system.
 	 
-	 They are listed in order of performance, from best to worst.
+   They are listed in order of performance, from best to worst.
 
 Uname.hw_provider
-	 Returns the name of the hardware manufacturer.
+   Returns the name of the hardware manufacturer.
 
 Uname.hw_serial_number
-	 Returns the ASCII representation of the hardware-specific serial number
-	 of the machine that executes the function.
+   Returns the ASCII representation of the hardware-specific serial number
+   of the machine that executes the function.
 
 Uname.srpc_domain
-	 Returns the name of the Secure Remote Procedure Call domain, if any.
+   Returns the name of the Secure Remote Procedure Call domain, if any.
 
 Uname.dhcp_cache
-	 Returns a hexidecimal encoding, in String form, of the name of the
-	 interface configured by boot(1M) followed by the DHCPACK reply from
-	 the server.
+   Returns a hexidecimal encoding, in String form, of the name of the
+   interface configured by boot(1M) followed by the DHCPACK reply from
+   the server.
     
 == OS X Only
 Uname.model
-    Returns the model type,  e.g. "PowerBook5,1"
+   Returns the model type,  e.g. "PowerBook5,1"
     
 == HP-UX Only
 Uname.id
-	Returns the id number, e.g. 234233587.  This is a String, not a Fixnum.
+   Returns the id number, e.g. 234233587.  This is a String, not a Fixnum.
 
 == Notes
-	Not all of the information that you might be used to seeing with
-	a 'uname -a' is available.  This may be added in future releases,
-	but since different implementations provide different information
-	(via different header files) it will be a bit of a pain.
+   Not all of the information that you might be used to seeing with
+   a 'uname -a' is available.  This may be added in future releases,
+   but since different implementations provide different information
+   (via different header files) it will be a bit of a pain.
 
-	Windows users - please see the MSDN documentation for the
+   Windows users - please see the MSDN documentation for the
    Win32_OperatingSystem class for a complete list of what each of the
    UnameStruct members mean.
 
 == Known Bugs
-	None that I'm aware of.  Please log any bugs on the project page at
-	http://ruby-sysutils.sf.net.
+   None that I'm aware of.  Please log any bugs on the project page at
+   http://www.rubyforge.org/projects/sysutils.
 	
 == Future Plans
    Add additional info for Linux, Solaris, BSD.
 
 == License
-	Ruby's
+   Ruby's
 
 == Copyright
-	(C) 2002-2005 Daniel J. Berger
-	All Rights Reserved
+   (C) 2002-2006 Daniel J. Berger
+   All Rights Reserved
 
 == Warranty
-	This package 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.
+   This package 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.
 
 == Author
-	Daniel Berger
-	djberg96 at yahoo dot com
-	imperator/rubyhacker1 on IRC (Freenode)
+   Daniel Berger
+   djberg96 at gmail dot com
+   imperator on IRC (Freenode)
 	
 == See Also
-	uname(1) for unix, or WMI for MS Windows.
+   uname(1) for unix, or WMI for MS Windows.

data/ext/extconf.rb

@@ -0,0 +1,28 @@
+##########################
+# extconf.rb - sys-uname
+##########################
+require 'mkmf'
+
+if PLATFORM.match('mswin')
+   STDERR.puts "Run 'ruby install.rb' instead for Windows"
+   STDERR.puts "Exiting..."
+   exit
+end
+
+if RUBY_PLATFORM =~ /sunos|solaris/i
+   have_header('sys/systeminfo.h')
+end
+
+########################################################################
+# Move any ".rb" files under 'lib/sys/' to ".orig" to prevent mkmf from
+# installing them during the 'make install' phase.
+########################################################################
+if File.basename(Dir.pwd) == 'ext'
+   Dir.chdir('..'){
+      Dir["lib/sys/*.rb"].each{ |f|
+         File.rename(f, 'lib/sys/' + File.basename(f, '.rb')+ '.orig')
+      }
+   }
+end
+
+create_makefile('sys/uname')

data/{lib/os/unix.c → ext/uname.c}

@@ -8,7 +8,7 @@
 #include "ruby.h"
 #include <sys/utsname.h>
 
-#define SYS_UNAME_VERSION "0.7.3"
+#define SYS_UNAME_VERSION "0.7.4"
 
 /* Solaris */
 #ifdef HAVE_SYS_SYSTEMINFO_H

data/test/tc_uname.rb

@@ -5,34 +5,28 @@
 ##############################################################################
 base = File.basename(Dir.pwd)
 
-if base == "test" || base =~ /sys-uname/
-   require "ftools"
-
-   Dir.chdir("..") if base == "test"
-   Dir.mkdir("sys") unless File.exists?("sys")
+if base == 'test' || base =~ /sys-uname/
+   Dir.chdir('..') if base == 'test'
    
-   extension = nil
-   case RUBY_PLATFORM
-      when /powerpc|darwin/i
-         extension = ".bundle"
-      when /hpux/i
-         extension = ".sl"
+   if RUBY_PLATFORM.match('mswin')
+      $LOAD_PATH.unshift(Dir.pwd + '/lib')
+   else
+      require 'ftools'
+      require 'rbconfig'
+      Dir.mkdir('sys') unless File.exists?('sys')
+      file = 'uname.' + Config::CONFIG['DLEXT']
+      if File.exists?(file)
+         File.copy(file, 'sys')
       else
-         extension = ".so"
+         File.copy('ext/' + file, 'sys')
+      end
    end
 
-   if File::ALT_SEPARATOR
-      file = "lib/os/windows.rb"
-      File.copy(file,"sys/uname.rb")
-   else
-      file = "uname" + extension
-      File.copy(file,"sys")
-   end
-   $LOAD_PATH.unshift Dir.pwd
+   $LOAD_PATH.unshift(Dir.pwd)
 end
 
-require "sys/uname"
-require "test/unit"
+require 'sys/uname'
+require 'test/unit'
 include Sys
 
 # For testing purposes only
@@ -45,11 +39,11 @@ class TC_Uname < Test::Unit::TestCase
       assert_not_nil(Uname::VERSION)
       assert_nothing_raised{ Uname::VERSION }
       assert_kind_of(String, Uname::VERSION)
-      assert_equal("0.7.3", Uname::VERSION, "Bad version")
+      assert_equal('0.7.4', Uname::VERSION)
    end
  
    def test_machine
-      assert_respond_to(Uname,:machine)
+      assert_respond_to(Uname, :machine)
       assert_nothing_raised{ Uname.machine }
       assert_kind_of(String, Uname.machine)
    end
@@ -75,7 +69,7 @@ class TC_Uname < Test::Unit::TestCase
    def test_sysname
       assert_respond_to(Uname, :sysname)
       assert_nothing_raised{ Uname.sysname }
-      assert_kind_of(String, Uname.sysname, "Invalid Type")
+      assert_kind_of(String, Uname.sysname, 'Invalid Type')
    end
    
    def test_architecture
@@ -84,7 +78,7 @@ class TC_Uname < Test::Unit::TestCase
          assert_nothing_raised{ Uname.architecture }
          assert_kind_of(String, Uname.architecture)
       else
-         puts "'architecture' test skipped on this platform"
+         puts '"architecture" test skipped on this platform'
       end
    end
    
@@ -94,7 +88,7 @@ class TC_Uname < Test::Unit::TestCase
          assert_nothing_raised{ Uname.platform }
          assert_kind_of(String, Uname.platform)
       else
-         puts "'platform' test skipped on this platform"
+         puts '"platform" test skipped on this platform'
       end
    end
 
@@ -104,7 +98,7 @@ class TC_Uname < Test::Unit::TestCase
          assert_nothing_raised{ Uname.isa_list }
          assert_kind_of(String, Uname.isa_list)
       else
-         puts "'isa_list' test skipped on this platform"
+         puts '"isa_list" test skipped on this platform'
       end
    end
 
@@ -114,7 +108,7 @@ class TC_Uname < Test::Unit::TestCase
          assert_nothing_raised{ Uname.hw_provider }
          assert_kind_of(String, Uname.hw_provider)
       else
-         puts "'hw_provider' test skipped on this platform"
+         puts '"hw_provider" test skipped on this platform'
       end
    end
 
@@ -124,7 +118,7 @@ class TC_Uname < Test::Unit::TestCase
          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"
+         puts '"hw_serial_number" test skipped on this platform'
       end
    end
 
@@ -134,7 +128,7 @@ class TC_Uname < Test::Unit::TestCase
          assert_nothing_raised{ Uname.srpc_domain }
          assert_kind_of(String, Uname.srpc_domain)
       else
-         puts "'srpc_domain' test skipped on this platform"
+         puts '"srpc_domain" test skipped on this platform'
       end
    end
 
@@ -144,7 +138,7 @@ class TC_Uname < Test::Unit::TestCase
          assert_nothing_raised{ Uname.dhcp_cache }
          assert_kind_of(String, Uname.dhcp_cache)
       else
-         puts "'srpc_domain' test skipped on this platform"
+         puts '"srpc_domain" test skipped on this platform'
       end
    end
    
@@ -154,7 +148,7 @@ class TC_Uname < Test::Unit::TestCase
          assert_nothing_raised{ Uname.model }
          assert_kind_of(String, Uname.model)
       else
-         puts "'model' test skipped on this platform"
+         puts '"model" test skipped on this platform'
       end
    end
    
@@ -164,7 +158,7 @@ class TC_Uname < Test::Unit::TestCase
          assert_nothing_raised{ Uname.id }
          assert_kind_of(String, Uname.id)
       else
-         puts "'id' test skipped on this platform"
+         puts '"id" test skipped on this platform'
       end
    end
 
@@ -172,11 +166,11 @@ class TC_Uname < Test::Unit::TestCase
       members = %w/sysname nodename machine version release/
       case RUBY_PLATFORM
          when /sunos|solaris/i
-            members.push("architecture","platform")
+            members.push('architecture','platform')
          when /powerpc|darwin/i
-            members.push("model")
+            members.push('model')
          when /hpux/i
-            members.push("id")
+            members.push('id')
          when /win32|mingw|cygwin|dos/i
             members = %w/
                boot_device build_number build_type caption code_set country_code
@@ -198,8 +192,8 @@ class TC_Uname < Test::Unit::TestCase
             /
       end
       assert_nothing_raised{ Uname.uname }
-      assert_kind_of(Struct, Uname.uname, "Invalid Type")
-      assert_equal(members, Uname.uname.members, "Bad struct members")
+      assert_kind_of(Struct, Uname.uname)
+      assert_equal(members, Uname.uname.members)
    end
    
    # The following tests are win32 only

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sys-uname
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
-date: 2006-07-30 00:00:00 -06:00
+  version: 0.7.4
+date: 2006-11-19 00:00:00 -07:00
 summary: An interface for returning uname (platform) information
 require_paths: 
 - lib
@@ -34,8 +34,8 @@ files:
 - README
 - CHANGES
 - MANIFEST
-- extconf.rb
-- lib/os/unix.c
+- ext/extconf.rb
+- ext/uname.c
 test_files: 
 - test/tc_uname.rb
 rdoc_options: []
@@ -44,10 +44,11 @@ extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
+- doc/uname.txt
 executables: []
 
 extensions: 
-- extconf.rb
+- ext/extconf.rb
 requirements: []
 
 dependencies: []

data/extconf.rb

@@ -1,28 +0,0 @@
-##########################
-# extconf.rb - sys-uname
-##########################
-require "mkmf"
-require "ftools"
-
-if PLATFORM.match('mswin')
-   STDERR.puts "Run 'ruby install.rb' instead for Windows"
-   STDERR.puts "Exiting..."
-   exit
-else
-   File.delete("uname.c") if File.exists?("uname.c")
-   File.symlink("lib/os/unix.c","uname.c")
-end
-
-if RUBY_PLATFORM =~ /sunos|solaris/i
-   have_header("sys/systeminfo.h")
-end
-
-########################################################################
-# Move any ".rb" files under 'lib/os/' to ".orig" to prevent mkmf from
-# installing them during the 'make site-install' phase.
-########################################################################
-Dir["lib/os/*.rb"].each{ |f|
-   File.rename(f,"lib/os/" + File.basename(f,".rb")+".orig")
-}
-
-create_makefile("sys/uname")