sys-uname 0.7.4-mswin32 → 0.8.0-mswin32

data/CHANGES

@@ -1,3 +1,15 @@
+== 0.8.0 - 10-Apr-2007
+* The Uname.model method should now work on most BSD platforms, not just OS X,
+  since it uses the sysctl() function behind the scenes.
+* The 'id' method was changed to 'id_number' on HP-UX to avoid confusion with
+  the Object.id method.
+* The UnameError class is now Uname::Error.
+* Added a Rakefile. There are now tasks for building, testing and installing
+  this package.
+* Removed some pre-setup code from the test suite that was no longer necessary
+  as a result of the Rake test task.
+* No code changes.
+
 == 0.7.4 - 19-Nov-2006
 * Internal layout changes, doc updates and gemspec improvements.
 * No code changes.

data/MANIFEST

@@ -1,16 +1,12 @@
-install.rb
-MANIFEST
-CHANGES
-README
-sys-uname.gemspec
-
-doc/uname.txt
-
-examples/uname_test.rb
-
-ext/extconf.rb
-ext/uname.c
-
-lib/sys/uname.rb
-
-test/tc_uname.rb
+* install.rb
+* MANIFEST
+* CHANGES
+* Rakefile
+* README
+* sys-uname.gemspec
+* doc/uname.txt
+* examples/uname_test.rb
+* ext/extconf.rb
+* ext/uname.c
+* lib/sys/uname.rb
+* test/tc_uname.rb

data/README

@@ -6,14 +6,8 @@
    Active WMI service (normally on by default).
 
 = Installation
-=== Unix
-   ruby extconf.rb
-   make
-   ruby test/tc_uname.rb (optional)
-   make site-install
-=== MS Windows
-   ruby test\tc_uname.rb (optional)
-   ruby install.rb
+   rake test (optional)
+   rake install (non-gem) or rake install_gem (gems)
    
 = Synopsis
    require 'sys/uname'
@@ -25,12 +19,13 @@
    Folks building this package on SunOS get two extra methods: architecture()
    and platform()
 
-= OS X Notes
-   OS X users get the extra method "model()".
+= BSD flavors, including OS X
+   Users on BSD platforms get the extra Uname.model method.
 
 = 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.
+   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
@@ -39,4 +34,4 @@
    UnameStruct members mean.
 
 = Documentation
-  For more details, see the 'uname.txt' file under the 'doc' directory. 
+  For more details, see the 'uname.txt' file under the 'doc' directory. 

data/Rakefile

@@ -0,0 +1,72 @@
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+
+desc "Clean the build files for the sys-uname source for UNIX systems"
+task :clean do
+   FileUtils.rm_rf('sys') if File.exists?('sys')
+
+   Dir.chdir('ext') do
+      unless RUBY_PLATFORM.match('mswin')
+         FileUtils.rm_rf('sys') if File.exists?('sys')
+         build_file = 'uname.' + Config::CONFIG['DLEXT']
+         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)"
+task :build => [:clean] do
+   Dir.chdir('ext') do
+      unless RUBY_PLATFORM.match('mswin')
+         ruby 'extconf.rb'
+         sh 'make'
+         build_file = 'uname.' + Config::CONFIG['DLEXT']
+         Dir.mkdir('sys') unless File.exists?('sys')
+         FileUtils.cp(build_file, 'sys')
+      end
+   end
+end
+
+desc "Run the example program"
+task :example => [:build] do
+   Dir.mkdir('sys') unless File.exists?('sys')
+   if RUBY_PLATFORM.match('mswin')
+      sh 'ruby -Ilib examples/uname_test.rb'
+   else
+      sh 'ruby -Iext examples/uname_test.rb'
+   end
+end
+
+if RUBY_PLATFORM.match('mswin')
+   desc "Install the sys-uname package (non-gem)"
+   task :install do
+      sh 'ruby install.rb'
+   end
+else
+   desc "Install the sys-uname package"
+   task :install => [:build] do
+      Dir.chdir('ext') do
+         sh 'make install'
+      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}"
+end
+
+desc "Run the test suite"
+Rake::TestTask.new("test") do |t|
+   if RUBY_PLATFORM.match('mswin')
+      t.libs << 'lib'
+   else
+      task :test => :build
+      t.libs << 'ext'
+      t.libs.delete('lib')
+   end
+   t.test_files = FileList['test/tc_uname.rb']
+end

data/doc/uname.txt

@@ -76,7 +76,7 @@ Uname.dhcp_cache
    interface configured by boot(1M) followed by the DHCPACK reply from
    the server.
     
-== OS X Only
+== BSD Platforms Only (including OS X)
 Uname.model
    Returns the model type,  e.g. "PowerBook5,1"
     
@@ -105,7 +105,7 @@ Uname.id
    Ruby's
 
 == Copyright
-   (C) 2002-2006 Daniel J. Berger
+   (C) 2002-2007 Daniel J. Berger
    All Rights Reserved
 
 == Warranty
@@ -115,8 +115,8 @@ Uname.id
 
 == Author
    Daniel Berger
-   djberg96 at gmail dot com
+   djberg96 at nospam 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/lib/sys/uname.rb

@@ -3,12 +3,13 @@ require 'socket'
 require 'parsedate'
 
 module Sys
-   # This is the error raised if any of the Sys::Uname methods should fail.
-   class UnameError < StandardError; end
 
    # An interface for returning uname (platform) information.
    class Uname
-      VERSION = '0.7.4'
+      # This is the error raised if any of the Sys::Uname methods should fail.
+      class Error < StandardError; end
+
+      VERSION = '0.8.0'
 
       fields = %w/
          boot_device
@@ -81,7 +82,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise UnameError, e
+            raise Error, e
          else
             query = "select * from Win32_OperatingSystem"
             wmi.InstancesOf("Win32_OperatingSystem").each{ |ole|
@@ -100,7 +101,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise UnameError, e
+            raise Error, e
          else
             query = "select * from Win32_OperatingSystem"
             wmi.InstancesOf("Win32_OperatingSystem").each{ |ole|
@@ -118,7 +119,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise UnameError, e
+            raise Error, e
          else
             query = "select * from Win32_OperatingSystem"
             wmi.InstancesOf("Win32_OperatingSystem").each{ |ole|
@@ -139,7 +140,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise UnameError, e
+            raise Error, e
          else
             # Convert a family number into the equivalent string
 	        case wmi.Family
@@ -362,7 +363,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise UnameError, e
+            raise Error, e
          else
             query = "select * from Win32_OperatingSystem"
             wmi.InstancesOf("Win32_OperatingSystem").each{ |ole|
@@ -380,7 +381,7 @@ module Sys
          begin
             wmi = WIN32OLE.connect(cs)
          rescue WIN32OLERuntimeError => e
-            raise UnameError, e
+            raise Error, e
          else
             query = "select * from Win32_OperatingSystem"
             wmi.InstancesOf("Win32_OperatingSystem").each{ |os|

data/sys-uname.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |gem|
    gem.name         = 'sys-uname'
-   gem.version      = '0.7.4'
+   gem.version      = '0.8.0'
    gem.author       = 'Daniel J. Berger'
    gem.email        = 'djberg96@gmail.com'
    gem.homepage     = 'http://www.rubyforge.org/projects/sysutils'
@@ -27,6 +27,7 @@ if $PROGRAM_NAME == __FILE__
       spec.required_ruby_version = '>= 1.8.0'
       spec.extensions = ['ext/extconf.rb']
       spec.files += ['ext/uname.c']
+      spec.extra_rdoc_files += ['ext/uname.c']
    end
 	
    Gem.manage_gems

data/test/tc_uname.rb

@@ -1,30 +1,9 @@
 ##############################################################################
 # tc_uname.rb
 #
-# Test suite for the sys-uname package.
+# Test suite for the sys-uname package. This test suite should be run via
+# the 'rake test' task.
 ##############################################################################
-base = File.basename(Dir.pwd)
-
-if base == 'test' || base =~ /sys-uname/
-   Dir.chdir('..') if base == 'test'
-   
-   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
-         File.copy('ext/' + file, 'sys')
-      end
-   end
-
-   $LOAD_PATH.unshift(Dir.pwd)
-end
-
 require 'sys/uname'
 require 'test/unit'
 include Sys
@@ -39,7 +18,7 @@ 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.4', Uname::VERSION)
+      assert_equal('0.8.0', Uname::VERSION)
    end
  
    def test_machine
@@ -143,7 +122,7 @@ class TC_Uname < Test::Unit::TestCase
    end
    
    def test_model
-      if RUBY_PLATFORM =~ /darwin|powerpc/i
+      if RUBY_PLATFORM =~ /darwin|powerpc|bsd|mach/i
          assert_respond_to(Uname, :model)
          assert_nothing_raised{ Uname.model }
          assert_kind_of(String, Uname.model)
@@ -152,13 +131,13 @@ class TC_Uname < Test::Unit::TestCase
       end
    end
    
-   def test_id
+   def test_id_number
       if RUBY_PLATFORM =~ /hpux/i
-         assert_respond_to(Uname, :id)
-         assert_nothing_raised{ Uname.id }
-         assert_kind_of(String, Uname.id)
+         assert_respond_to(Uname, :id_number)
+         assert_nothing_raised{ Uname.id_number }
+         assert_kind_of(String, Uname.id_number)
       else
-         puts '"id" test skipped on this platform'
+         puts '"test_id_number" test skipped on this platform'
       end
    end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: sys-uname
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
-date: 2006-11-19 00:00:00 -07:00
+  version: 0.8.0
+date: 2007-04-11 00:00:00 -06:00
 summary: An interface for returning uname (platform) information
 require_paths: 
 - lib
@@ -38,8 +38,8 @@ files:
 - install.rb
 - lib
 - MANIFEST
+- Rakefile
 - README
-- sys-uname-0.7.4-mswin32.gem
 - sys-uname.gemspec
 - test
 - lib/sys/uname.rb