sys-host 0.6.0 → 0.6.1

data/CHANGES

@@ -1,3 +1,13 @@
+== 0.6.1 - 18-Nov-2008
+* Added the host_id method for Windows, which just returns the MAC address.
+* Fixed an issue in the Host.ip_addr method for MS Windows where multiple ip
+  addresses might not be handled properly. Thanks go to Murmansk Manny for the
+  spot and patch.
+* Updated the gemspec to include all .c and .h files now so that it should
+  successfully build and install on all Unix platforms.
+* Rakefile fix for MS Windows for the install task.
+* The test file is now "test_sys_host.rb".
+
 == 0.6.0 - 8-Jun-2007
 * Now supports OS X!
 * Added the Host.host_id class method.

data/MANIFEST

@@ -12,4 +12,4 @@
 * ext/linux/linux.c
 * ext/sunos/sunos.c
 * lib/sys/windows.rb
-* test/tc_host.rb
+* test/test_sys_host.rb

data/Rakefile

@@ -32,12 +32,13 @@ task :example => [:build] do
    ruby 'host_test.rb'
 end
 
-if RUBY_PLATFORM.match('mswin')
+if CONFIG['host_os'].match('mswin')
    desc "Install the sys-host package (non-gem)"
    task :install do
       install_dir = File.join(CONFIG['sitelibdir'], 'sys')
+      install_file = File.join(install_dir, 'host.rb')
       Dir.mkdir(install_dir) unless File.exists?(install_dir)
-      FileUtils.cp('lib/sys/windows.rb', install_dir, :verbose => true)
+      FileUtils.cp('lib/sys/windows.rb', install_file, :verbose => true)
    end
 else
    desc "Install the sys-host package (non-gem)"
@@ -58,7 +59,7 @@ end
 desc "Run the example sys-host program"
 task :example => [:build] do
    Dir.mkdir('sys') unless File.exists?('sys')
-   if RUBY_PLATFORM.match('mswin')
+   if CONFIG['host_os'].match('mswin')
       FileUtils.cp('lib/sys/windows.rb', 'lib/sys/host.rb')
       ruby '-Ilib examples/host_test.rb'
    else
@@ -67,13 +68,11 @@ task :example => [:build] do
 end
 
 Rake::TestTask.new do |t|
-   if RUBY_PLATFORM.match('mswin')
+   if CONFIG['host_os'].match('mswin')
       FileUtils.cp('lib/sys/windows.rb', 'lib/sys/host.rb')
-      t.libs << 'lib'
    else
       task :test => :build
       t.libs << 'ext'
       t.libs.delete('lib')
    end
-   t.test_files = FileList['test/tc_host.rb']
 end

data/doc/host.txt

@@ -15,7 +15,7 @@
 
 == Constants
 VERSION
-    Returns the current version number of this package (as a string)
+    Returns the current version number of this library (as a string)
     
 == Class Methods
 Host.hostname
@@ -35,7 +35,7 @@ Host.info(host=localhost){ |h| ... }
 == Exception Classes
 Host::Error < StandardError
    Raised in the event of a failure for any of the class methods provided
-   with this package.  Generally speaking, it means there was a failure in
+   with this library.  Generally speaking, it means there was a failure in
    the underlying gethostname() or gethostbyname() calls.
     
 == Future Plans
@@ -43,9 +43,9 @@ Host::Error < StandardError
    system on an IPV6 network.  Any help on this front appreciated.
     
 == Notes
-   The Windows version of this package uses OLE + WMI.  The Host.info method
+   The Windows version of this library uses OLE + WMI.  The Host.info method
    returns considerably more information than the *nix versions of this
-   package.
+   library.
    
 == Comments and Questions
    Please direct all comments and/or questions to one of the Forums on the
@@ -68,13 +68,13 @@ Host::Error < StandardError
    Ruby's
     
 == Copyright
-   Copyright 2002-2007, Daniel J. Berger, djberg96 at gmail dot com
+   Copyright 2002-2008, Daniel J. Berger, djberg96 at gmail dot com
 
    All Rights Reserved. This module is free software. It may be used,
    redistributed and/or modified under the same terms as Ruby itself.
     
 == Warranty
-   This package is provided "as is" and without any express or
+   This library 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.
 	

data/ext/bsd/bsd.c

@@ -224,7 +224,7 @@ void Init_host()
    /* This error is raised if any of the Host methods fail. */
    cHostError = rb_define_class_under(cHost, "Error", rb_eStandardError);
 
-   /* 0.6.0: The version of this package. This is a string, not a number. */
+   /* 0.6.1: The version of this library. This is a string, not a number. */
    rb_define_const(cHost, "VERSION", rb_str_new2(SYS_HOST_VERSION));
    
    /* Structs */

data/ext/constants.h

@@ -1,5 +1,5 @@
 /* constants.h - one version to bind them all... */
-#define SYS_HOST_VERSION "0.6.0"
+#define SYS_HOST_VERSION "0.6.1"
 
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 256

data/ext/extconf.rb

@@ -1,32 +1,35 @@
-require "mkmf"
-require "fileutils"
+require 'mkmf'
+require 'fileutils'
 
-have_func("gethostid")
-have_func("inet_ntop")
+dir_config('host')
+
+have_func('gethostid')
+have_func('inet_ntop')
+Dir.mkdir('sys') unless File.exists?('sys')
 
 case RUBY_PLATFORM
    when /bsd|darwin|powerpc|mach/i
-      have_func("getipnodebyname")
-      FileUtils.cp("bsd/bsd.c", "host.c")
+      have_func('getipnodebyname')
+      FileUtils.cp('bsd/bsd.c', 'sys/host.c')
    when /sunos|solaris/i
-      have_library("nsl")
-      have_library("socket")
-      have_func("gethostbyname_r", "netdb.h")
-      have_func("gethostent_r", "netdb.h")
-      FileUtils.cp("sunos/sunos.c", "host.c")
+      have_library('nsl')
+      have_library('socket')
+      have_func('gethostbyname_r', 'netdb.h')
+      have_func('gethostent_r', 'netdb.h')
+      FileUtils.cp('sunos/sunos.c', 'sys/host.c')
    when /linux/i
-      have_func("gethostbyname_r", "netdb.h")
-      have_func("gethostent_r", "netdb.h")
-      FileUtils.cp("linux/linux.c", "host.c")
+      have_func('gethostbyname_r', 'netdb.h')
+      have_func('gethostent_r', 'netdb.h')
+      FileUtils.cp('linux/linux.c', 'sys/host.c')
    when /win32|windows|dos|mingw|cygwin/i
-      STDERR.puts "Run the 'rake install' task to install on Windows systems"
+      STDERR.puts 'Run the "rake install" task to install on MS Windows'
    else
-      FileUtils.cp("generic/generic.c", "host.c")
+      FileUtils.cp('generic/generic.c', 'sys/host.c')
 end
 
 # Already grabbed this from netdb.h on Solaris
 unless RUBY_PLATFORM =~ /sunos|solaris/i
-   have_func("gethostent_r")
+   have_func('gethostent_r')
 end
 
-create_makefile("sys/host")
+create_makefile('sys/host', 'sys')

data/ext/generic/generic.c

@@ -0,0 +1,189 @@
+/******************************************************************************
+ * generic.c (host.c) - Ruby Extension
+ *
+ * Author: Daniel Berger
+ *
+ * This source is mostly borrowed from the linux source for sys-host, except
+ * that it does not support the gethostbyname_r() method.
+ *****************************************************************************/
+#include <ruby.h>
+#include <constants.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+VALUE cHostError, sHostInfo;
+
+/*
+ * Sys::Host.hostname
+ *
+ * Returns the hostname of the current machine.
+ */
+static VALUE host_hostname()
+{
+   char host_name[MAXHOSTNAMELEN];
+
+   /* If you get this exception, you've got big problems */
+   if(gethostname(host_name, MAXHOSTNAMELEN) != 0)
+      rb_raise(cHostError,"gethostname() call failed");
+
+   return rb_str_new2(host_name);
+}
+
+/*
+ * Sys::Host.ip_addr
+ *
+ * Returns an array of IP addresses associated with the current hostname.
+ */
+static VALUE host_ip_addr()
+{
+   char host_name[MAXHOSTNAMELEN];
+   char str[INET_ADDRSTRLEN];
+   char **pptr;
+   struct hostent* hp;
+   VALUE v_results = rb_ary_new();
+#ifndef HAVE_INET_NTOP
+   struct in_addr ipa;
+   int n;
+#endif
+
+   if(gethostname(host_name, MAXHOSTNAMELEN) != 0)
+      rb_raise(cHostError, "gethostname() call failed");
+
+   hp = gethostbyname(host_name);
+
+   if(!hp)
+      rb_raise(cHostError, "gethostbyname() call failed");
+
+   pptr = hp->h_addr_list;
+
+#ifdef HAVE_INET_NTOP
+   for( ; *pptr != NULL; pptr++) {
+      rb_ary_push(v_results,
+         rb_str_new2(inet_ntop(hp->h_addrtype, *pptr, str, sizeof(str))));
+   }
+#else
+   for(n = 0; hp->h_addr_list[n] != NULL; n++) {
+      memcpy(&ipa.s_addr, hp->h_addr_list[n], hp->h_length);
+      rb_ary_push(v_results, rb_str_new2(inet_ntoa(ipa)));
+   }
+#endif
+   return v_results;
+   
+}
+
+#ifdef HAVE_GETHOSTID
+/*
+ * Sys::Host.host_id
+ *
+ * Returns the host id of the current machine.
+ */
+static VALUE host_host_id(){
+   return ULL2NUM(gethostid());
+}
+#endif
+
+/*
+ * Sys::Host.info
+ * Sys::Host.info{ |i| ... }
+ *
+ * Yields a HostInfo struct containing various bits of information about
+ * the local machine for each entry in the hosts table.  In non-block form,
+ * returns an array of HostInfo structs.
+ *
+ * The Struct::HostInfo struct contains 5 fields:
+ *
+ * * name      (String)
+ * * aliases   (Array)
+ * * addr_type (Integer)
+ * * length    (Integer)
+ * * addr_list (Array)
+ */
+static VALUE host_info(VALUE klass){
+   struct hostent* host;
+   char buf[INET_ADDRSTRLEN];
+   VALUE v_hostinfo;
+   VALUE v_addr    = rb_ary_new();
+   VALUE v_array   = rb_ary_new();
+   VALUE v_aliases = rb_ary_new();
+
+   sethostent(0);
+
+   while((host = gethostent())){
+      while(*host->h_aliases){
+         rb_ary_push(v_aliases, rb_str_new2(*host->h_aliases));
+         *host->h_aliases++;
+      }
+
+      while(*host->h_addr_list){
+         inet_ntop(host->h_addrtype, *host->h_addr_list, buf, sizeof(buf));
+         rb_ary_push(v_addr, rb_str_new2(buf));
+         *host->h_addr_list++;
+      }
+
+      v_hostinfo = rb_struct_new(sHostInfo,
+         rb_str_new2(host->h_name),
+         v_aliases,
+         INT2FIX(host->h_addrtype),
+         INT2FIX(host->h_length),
+         v_addr
+      );
+
+      if(rb_block_given_p())
+         rb_yield(v_hostinfo);
+      else
+         rb_ary_push(v_array, v_hostinfo);
+
+      rb_ary_clear(v_aliases);   
+      rb_ary_clear(v_addr);
+   }
+
+   endhostent();
+
+   if(rb_block_given_p())
+      return Qnil;
+
+   return v_array;
+}
+
+void Init_host()
+{
+   VALUE mSys, cHost;
+
+   /* The Sys module serves as a toplevel namespace, nothing more. */ 
+   mSys = rb_define_module("Sys");
+
+   /* The Host class encapsulates information about your machine, such as
+    * the host name and IP address.
+    */
+   cHost = rb_define_class_under(mSys, "Host", rb_cObject);
+
+   /* This error is raised if any of the Host methods fail. */
+   cHostError = rb_define_class_under(cHost, "Error", rb_eStandardError);
+
+   /* 0.6.1: The version of this library. This is a string, not a number. */
+   rb_define_const(cHost,"VERSION",rb_str_new2(SYS_HOST_VERSION));
+
+   /* Class Methods */
+   rb_define_singleton_method(cHost, "hostname", host_hostname, 0);
+   rb_define_singleton_method(cHost, "ip_addr", host_ip_addr, 0);
+   rb_define_singleton_method(cHost, "info", host_info, 0);
+
+#ifdef HAVE_GETHOSTID
+   rb_define_singleton_method(cHost, "host_id", host_host_id, 0);
+#endif
+
+   /* Structs */
+   sHostInfo = rb_struct_define("HostInfo", "name", "aliases", "addr_type",
+      "length", "addr_list", 0
+   );
+}
+
+#ifdef __cplusplus
+}
+#endif

data/ext/linux/linux.c

@@ -0,0 +1,228 @@
+/******************************************************************************
+ * linux.c (host.c) - Linux specific version for sys-host
+ *
+ * Author: Daniel Berger
+ *****************************************************************************/
+#include <ruby.h>
+#include <constants.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+VALUE cHostError, sHostInfo;
+
+/* Returns the hostname of the current host.  This may or not return the
+ * FQDN, depending on your system.
+ */
+static VALUE host_hostname()
+{
+   char host_name[MAXHOSTNAMELEN];
+   int rv;
+   rv = gethostname(host_name, sizeof(host_name));
+
+   /* If you get this exception, you've got big problems */
+   if(rv != 0)
+      rb_raise(cHostError, "gethostname() call failed");
+
+   return rb_str_new2(host_name);
+}
+
+/* Returns a list of IP addresses for the current host (yes, it is
+ * possible to have more than one).
+ */
+static VALUE host_ip_addr()
+{
+   char host_name[MAXHOSTNAMELEN];
+   char str[INET_ADDRSTRLEN];
+   char **pptr;
+   struct hostent* hp;
+   int rv;
+   VALUE rbResults = rb_ary_new();
+#ifndef HAVE_INET_NTOP
+   struct in_addr ipa;
+   int n;
+#endif
+
+   rv = gethostname(host_name, sizeof(host_name));
+
+   if(rv != 0)
+      rb_raise(cHostError, "gethostname() call failed");
+
+#ifdef HAVE_GETHOSTBYNAME_R
+{
+   struct hostent hpbuf;
+   char strbuf[HOSTENT_BUF];
+   int err;
+   size_t no_op = HOSTENT_BUF;
+   gethostbyname_r(host_name, &hpbuf, strbuf, no_op, &hp, &err);
+}
+#else
+   hp = gethostbyname(host_name);
+#endif
+
+   if(!hp)
+      rb_raise(cHostError,"gethostbyname() call failed");
+
+   pptr = hp->h_addr_list;
+
+#ifdef HAVE_INET_NTOP
+   for( ; *pptr != NULL; pptr++){
+      rb_ary_push(rbResults,
+         rb_str_new2(inet_ntop(hp->h_addrtype, *pptr, str, sizeof(str))));
+   }
+#else
+   for(n = 0; hp->h_addr_list[n] != NULL; n++){
+      memcpy(&ipa.s_addr, hp->h_addr_list[n], hp->h_length);
+      rb_ary_push(rbResults, rb_str_new2(inet_ntoa(ipa)));
+   }
+#endif
+
+   return rbResults;
+}
+
+/* :call-seq:
+ *    Sys::Host.info
+ *    Sys::Host.info{ |i| ... }
+ *
+ * Yields a HostInfo struct containing various bits of information about
+ * the local machine for each entry in the hosts table.  In non-block form,
+ * returns an array of HostInfo structs.
+ *
+ * The Struct::HostInfo struct contains 5 fields:
+ *
+ * * name      (String)
+ * * aliases   (Array)
+ * * addr_type (Integer)
+ * * length    (Integer)
+ * * addr_list (Array)
+ */
+static VALUE host_info(VALUE klass){
+   VALUE v_hostinfo = Qnil;
+   VALUE v_addr     = rb_ary_new();
+   VALUE v_array    = rb_ary_new();
+   VALUE v_aliases  = rb_ary_new();
+
+   sethostent(0);
+
+#ifdef HAVE_GETHOSTENT_R
+   struct hostent host;
+   struct hostent* result;
+   char buf[HOSTENT_BUF];
+   int err;
+
+   while(!gethostent_r(&host, buf, sizeof(buf), &result, &err)){
+      while(*result->h_aliases){
+         rb_ary_push(v_aliases, rb_str_new2(*result->h_aliases));
+         *result->h_aliases++;
+      }
+
+      while(*result->h_addr_list){
+         inet_ntop(result->h_addrtype, *result->h_addr_list, buf, sizeof(buf));
+         rb_ary_push(v_addr, rb_str_new2(buf));
+         *result->h_addr_list++;
+      }
+
+      /* We need to dup the arrays because Ruby is holding onto the same
+       * reference.
+       */
+      v_hostinfo = rb_struct_new(sHostInfo,
+         rb_str_new2(result->h_name),
+         rb_ary_dup(v_aliases),
+         INT2FIX(result->h_addrtype),
+         INT2FIX(result->h_length),
+         rb_ary_dup(v_addr)
+      );         
+#else
+   struct hostent* host;
+   char buf[INET_ADDRSTRLEN];
+
+   while((host = gethostent())){
+      while(*host->h_aliases){
+         rb_ary_push(v_aliases, rb_str_new2(*host->h_aliases));
+         *host->h_aliases++;
+      }
+
+      while(*host->h_addr_list){
+         inet_ntop(host->h_addrtype, *host->h_addr_list, buf, sizeof(buf));
+         rb_ary_push(v_addr, rb_str_new2(buf));
+         *host->h_addr_list++;
+      }
+
+      v_hostinfo = rb_struct_new(sHostInfo,
+         rb_str_new2(host->h_name),
+         rb_ary_dup(v_aliases),
+         INT2FIX(host->h_addrtype),
+         INT2FIX(host->h_length),
+         rb_ary_dup(v_addr)
+      );         
+#endif
+
+      if(rb_block_given_p())
+         rb_yield(v_hostinfo);
+      else
+         rb_ary_push(v_array, v_hostinfo);
+
+      rb_ary_clear(v_aliases);   
+      rb_ary_clear(v_addr);
+   }      
+
+   endhostent();
+
+   if(rb_block_given_p())
+      return Qnil;
+
+   return v_array;
+}
+
+#ifdef HAVE_GETHOSTID
+/*
+ * Sys::Host.host_id
+ *
+ * Returns the host id of the current machine.
+ */
+static VALUE host_host_id(){
+   return ULL2NUM(gethostid());
+}
+#endif
+
+void Init_host()
+{
+   VALUE mSys, cHost;
+
+   /* The Sys module serves as a toplevel namespace, nothing more. */
+   mSys  = rb_define_module("Sys");
+
+   /* The Host class encapsulates information about your machine, such as
+    * the host name and IP address.
+    */
+   cHost = rb_define_class_under(mSys, "Host", rb_cObject);
+
+   /* This error is raised if any of the Host methods fail. */
+   cHostError = rb_define_class_under(cHost, "Error", rb_eStandardError);
+
+   /* 0.6.1: The version of this library. This is a string, not a number. */
+   rb_define_const(cHost, "VERSION", rb_str_new2(SYS_HOST_VERSION));
+
+   /* Structs */
+   sHostInfo = rb_struct_define("HostInfo", "name", "aliases", "addr_type",
+      "length", "addr_list", NULL
+   );
+
+   /* Class Methods */
+   rb_define_singleton_method(cHost, "hostname", host_hostname, 0);
+   rb_define_singleton_method(cHost, "ip_addr", host_ip_addr, 0);
+   rb_define_singleton_method(cHost, "info", host_info, 0);
+
+#ifdef HAVE_GETHOSTID
+   rb_define_singleton_method(cHost, "host_id", host_host_id, 0);
+#endif
+}
+
+#ifdef __cplusplus
+}
+#endif

data/ext/sunos/sunos.c

@@ -0,0 +1,242 @@
+/*****************************************************************
+ * sunos.c (host.c) - Solaris specific version
+ *
+ * Author: Daniel Berger
+ *****************************************************************/
+#include "ruby.h"
+#include "constants.h"
+#include <unistd.h>
+#include <netdb.h>
+
+#ifndef HAVE_INET_NTOP
+
+#ifndef _SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifndef _SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifndef _NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#endif
+
+#include <arpa/inet.h>
+
+#define MAXBUF 2048
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+VALUE cHostError, sHostInfo;
+
+/*
+ * Sys::Host.hostname
+ *
+ * Returns the hostname of the current machine.
+ */
+static VALUE host_hostname()
+{
+   char host_name[MAXHOSTNAMELEN];
+
+   if(gethostname(host_name, MAXHOSTNAMELEN) != 0)
+      rb_raise(cHostError, "gethostname() call failed");
+
+   return rb_str_new2(host_name);
+}
+
+#ifdef HAVE_GETHOSTID
+/*
+ * Sys::Host.host_id
+ *
+ * Returns the host id of the current machine.
+ */
+static VALUE host_host_id(){
+   return ULL2NUM(gethostid());
+}
+#endif
+
+/*
+ * Sys::Host.ip_addr
+ *
+ * Returns an array of IP addresses associated with the current hostname.
+ */
+static VALUE host_ip_addr()
+{
+   char host_name[MAXHOSTNAMELEN];
+   struct hostent* hp;
+   VALUE v_addr = rb_ary_new();
+#ifndef HAVE_INET_NTOP
+   struct in_addr ipa;
+#endif
+
+   if(gethostname(host_name, MAXHOSTNAMELEN) != 0)
+      rb_raise(cHostError, "gethostname() call failed");
+
+#ifdef HAVE_GETHOSTBYNAME_R
+{
+   char buf[HOSTENT_BUF];
+   struct hostent hp_buf;
+   int err;
+   hp = gethostbyname_r(host_name, &hp_buf, buf, HOSTENT_BUF, &err);
+}
+#else
+   hp = gethostbyname(host_name);
+#endif
+
+   if(!hp)
+      rb_raise(cHostError, "gethostbyname() call failed");
+
+#ifdef HAVE_INET_NTOP
+   char str[INET_ADDRSTRLEN];
+   while(*hp->h_addr_list){
+      rb_ary_push(
+         v_addr,
+         rb_str_new2(
+            inet_ntop(hp->h_addrtype, *hp->h_addr_list, str, INET_ADDRSTRLEN)
+         )
+      );
+      *hp->h_addr_list++;
+   }
+#else
+   int n;
+   for(n = 0; hp->h_addr_list[n] != NULL; n++){
+      memcpy(&ipa.s_addr, hp->h_addr_list[n], hp->h_length);
+      rb_ary_push(v_addr, rb_str_new2(inet_ntoa(ipa)));
+   }
+#endif
+
+   return v_addr;
+}
+
+/*
+ * Sys::Host.info
+ * Sys::Host.info{ |i| ... }
+ *
+ * Yields a HostInfo struct containing various bits of information about
+ * the local machine for each entry in the hosts table.  In non-block form,
+ * returns an array of HostInfo structs.
+ *
+ * The Struct::HostInfo struct contains 5 fields:
+ *
+ * * name      (String)
+ * * aliases   (Array)
+ * * addr_type (Integer)
+ * * length    (Integer)
+ * * addr_list (Array)
+ */
+static VALUE host_info(VALUE klass){
+   VALUE v_hostinfo;
+   VALUE v_addr    = rb_ary_new();
+   VALUE v_array   = rb_ary_new();
+   VALUE v_aliases = rb_ary_new();
+
+   sethostent(0);
+
+#ifdef HAVE_GETHOSTENT_R
+   struct hostent host;
+   char buf[MAXBUF];
+   int err;
+
+   while(gethostent_r(&host, buf, MAXBUF, &err)){
+      while(*host.h_aliases){
+         rb_ary_push(v_aliases, rb_str_new2(*host.h_aliases));
+         *host.h_aliases++;
+      }
+
+      while(*host.h_addr_list){
+         inet_ntop(host.h_addrtype, *host.h_addr_list, buf, MAXBUF);
+         rb_ary_push(v_addr, rb_str_new2(buf));
+         *host.h_addr_list++;
+      }
+
+      v_hostinfo = rb_struct_new(sHostInfo,
+         rb_str_new2(host.h_name),
+         v_aliases,
+         INT2FIX(host.h_addrtype),
+         INT2FIX(host.h_length),
+         v_addr
+      );         
+#else
+   struct hostent* host;
+   char buf[INET_ADDRSTRLEN];
+
+   while((host = gethostent())){
+      while(*host->h_aliases){
+         rb_ary_push(v_aliases, rb_str_new2(*host->h_aliases));
+         *host->h_aliases++;
+      }
+
+      while(*host->h_addr_list){
+         inet_ntop(host->h_addrtype, *host->h_addr_list, buf, INET_ADDRSTRLEN);
+         rb_ary_push(v_addr, rb_str_new2(buf));
+         *host->h_addr_list++;
+      }
+
+      v_hostinfo = rb_struct_new(sHostInfo,
+         rb_str_new2(host->h_name),
+         v_aliases,
+         INT2FIX(host->h_addrtype),
+         INT2FIX(host->h_length),
+         v_addr
+      );         
+#endif
+
+      if(rb_block_given_p())
+         rb_yield(v_hostinfo);
+      else
+         rb_ary_push(v_array, v_hostinfo);
+
+      rb_ary_clear(v_aliases);   
+      rb_ary_clear(v_addr);
+   }      
+
+   endhostent();
+
+   if(rb_block_given_p())
+      return Qnil;
+
+   return v_array;
+}
+
+void Init_host()
+{
+   VALUE mSys, cHost;
+
+   /* The Sys module serves as a toplevel namespace, nothing more. */
+   mSys  = rb_define_module("Sys");
+
+   /* The Host class encapsulates information about your machine, such as
+    * the host name and IP address.
+    */
+   cHost = rb_define_class_under(mSys, "Host", rb_cObject);
+
+   /* This error is raised if any of the Host methods fail. */
+   cHostError = rb_define_class_under(cHost, "Error", rb_eStandardError);
+
+   /* 0.6.1: The version of this library. This is a string, not a number. */
+   rb_define_const(cHost, "VERSION", rb_str_new2(SYS_HOST_VERSION));
+
+   /* Structs */
+   sHostInfo = rb_struct_define("HostInfo", "name", "aliases", "addr_type",
+      "length", "addr_list", 0
+   );
+
+   /* Class Methods */
+   rb_define_singleton_method(cHost, "hostname", host_hostname, 0);
+   rb_define_singleton_method(cHost, "ip_addr", host_ip_addr, 0);
+   rb_define_singleton_method(cHost, "info", host_info, 0);
+
+#ifdef HAVE_GETHOSTID
+   rb_define_singleton_method(cHost, "host_id", host_host_id, 0);
+#endif
+}
+
+#ifdef __cplusplus
+}
+#endif

data/test/test_sys_host.rb

@@ -0,0 +1,95 @@
+###########################################################################
+# test_sys_host.rb
+#
+# Test suite for sys-host, all platforms. You should run these tests via
+# the 'rake test' task.
+###########################################################################
+require 'rubygems'
+gem 'test-unit'
+
+require 'sys/host'
+require 'test/unit'
+require 'rbconfig'
+include Config
+include Sys
+
+class TC_Sys_Host < Test::Unit::TestCase
+   def self.startup
+      if CONFIG['host_os'] =~ /mswin|solaris|linux|bsd|mach|darwin|osx/i
+         @@info_supported = true
+      else
+         @@info_supported = false
+      end
+
+      @@windows = CONFIG['host_os'].match('mswin')
+   end
+
+   def test_version
+      assert_equal('0.6.1', Host::VERSION)
+   end
+
+   def test_hostname_basic
+      assert_respond_to(Host, :hostname)
+      assert_nothing_raised{ Host.hostname }
+   end
+
+   def test_hostname
+      assert_kind_of(String, Host.hostname)
+      assert_equal(`hostname`.chomp, Host.hostname) # sanity check
+   end
+
+   def test_hostname_expected_errors
+      assert_raise(ArgumentError){ Host.hostname(true) }
+   end
+
+   def test_ip_addr_basic
+      assert_respond_to(Host, :ip_addr)
+      assert_nothing_raised{ Host.ip_addr }
+   end
+
+   def test_ip_addr
+      assert_kind_of(Array, Host.ip_addr)
+      assert_kind_of(String, Host.ip_addr.first)
+   end
+
+   def test_ip_addr_expected_errors
+      assert_raise(ArgumentError){ Host.ip_addr(true) }
+   end
+
+   def test_host_id_basic
+      assert_respond_to(Host, :host_id)
+      assert_nothing_raised{ Host.host_id }
+   end
+
+   def test_host_id
+      type = @@windows ? String : Integer
+      assert_kind_of(type, Host.host_id)
+   end
+
+   def test_host_id_expected_errors
+      assert_raise(ArgumentError){ Host.host_id(true) }
+   end
+
+   def test_info_basic
+      omit_unless(@@info_supported, 'info test skipped on this platform')
+      assert_respond_to(Host, :info)
+      assert_nothing_raised{ Host.info }
+   end
+
+   def test_info
+      omit_unless(@@info_supported, 'info test skipped on this platform')
+      assert_kind_of(Array, Host.info)
+      assert_kind_of(Struct::HostInfo, Host.info.first)
+      assert_nil(Host.info{ })
+   end
+
+   def test_info_high_iteration
+      omit_unless(@@info_supported, 'info test skipped on this platform')
+      assert_nothing_raised{ 100.times{ Host.info } }
+   end
+
+   def self.shutdown
+      @@info_supported = nil
+      @@windows = nil
+   end
+end

metadata

@@ -1,56 +1,78 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: sys-host
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2007-06-08 00:00:00 -06:00
-summary: Provides hostname and ip address info for a given host
-require_paths: 
-- lib
-email: djberg96@gmail.com
-homepage: http://www.rubyforge.org/projects/sysutils
-rubyforge_project: sysutils
-description: Provides hostname and ip address info for a given host
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.0
-  version: 
+  version: 0.6.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel J. Berger
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-11-18 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
+description: Provides hostname and ip address info for a given host
+email: djberg96@gmail.com
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: 
+- CHANGES
+- README
+- MANIFEST
+- ext/bsd/bsd.c
+- ext/generic/generic.c
+- ext/linux/linux.c
+- ext/sunos/sunos.c
 files: 
 - doc/host.txt
-- test/tc_host.rb
+- test/test_sys_host.rb
 - CHANGES
 - MANIFEST
-- Rakefile
 - README
-- ext/extconf.rb
-- ext/constants.h
+- Rakefile
 - ext/bsd/bsd.c
-test_files: 
-- test/tc_host.rb
+- ext/generic/generic.c
+- ext/linux/linux.c
+- ext/sunos/sunos.c
+- ext/constants.h
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/sysutils
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- CHANGES
-- README
-- MANIFEST
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.0
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: sysutils
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: Provides hostname and ip address info for a given host
+test_files: 
+- test/test_sys_host.rb

data/test/tc_host.rb

@@ -1,46 +0,0 @@
-#################################################
-# tc_host.rb
-#
-# Test suite for sys-host, all platforms.
-#################################################
-require 'sys/host'
-require 'test/unit'
-include Sys
-
-class TC_Host < Test::Unit::TestCase
-   def test_version
-      assert_equal('0.6.0', Host::VERSION)
-   end
-
-   def test_hostname
-      assert_respond_to(Host, :hostname)
-      assert_nothing_raised{ Host.hostname }
-      assert_kind_of(String, Host.hostname)
-      assert_equal(`hostname`.chomp, Host.hostname) # sanity check
-   end
-
-   def test_ip_addr
-      assert_respond_to(Host, :ip_addr)
-      assert_nothing_raised{ Host.ip_addr }
-      assert_kind_of(Array, Host.ip_addr)
-   end
-
-   def test_host_id
-      assert_respond_to(Host, :host_id)
-      assert_nothing_raised{ Host.host_id }
-      assert_kind_of(Integer, Host.host_id)
-   end
-
-   def test_info
-      if RUBY_PLATFORM =~ /mswin|solaris|linux|bsd|mach|darwin|osx/i
-         assert_respond_to(Host, :info)
-         assert_nothing_raised{ Host.info }
-         assert_kind_of(Array, Host.info)
-         assert_kind_of(Struct::HostInfo, Host.info.first)
-         assert_nil(Host.info{ })
-         assert_nothing_raised{ 100.times{ Host.info } }
-      else
-         puts "The 'test_info' test was skipped on this platform"
-      end
-   end
-end