sys-admin 1.5.4 → 1.5.5

data/CHANGES

@@ -1,3 +1,11 @@
+== 1.5.5 - 5-Jul-2011
+* Modified lastlog handling, and ignore getpwent_r and getgrent_r, on AIX.
+  Thanks go to Rick Ohnemus for the spot and patches.
+* Explicitly set spec.cpu on Windows to 'universal' in the gem creation task.
+* Fixed a bug in the User.get_login and User.get_group methods where the query
+  being generated was incorrect if no options were passed. Thanks go to
+  Matthew Brown for the spot.
+
 == 1.5.4 - 7-Oct-2010
 * Prefer the getlastlogx() function over lastlog() where supported.
 

data/Rakefile

@@ -2,21 +2,19 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rbconfig'
+include Config
 
-WINDOWS = Config::CONFIG['host_os'] =~ /msdos|mswin|win32|mingw|cygwin/i
+WINDOWS = CONFIG['host_os'] =~ /msdos|mswin|win32|mingw|cygwin|windows/i
 
-desc "Clean the build files for the sys-admin source for UNIX systems"
-task :clean do
-  Dir['*.gem'].each{ |f| File.delete(f) } # Remove any .gem files
-  unless WINDOWS
-    Dir.chdir('ext') do
-      rm_rf('conftest.dSYM') if File.exists?('conftest.dSYM') # OS X
-      build_file = 'admin.' + Config::CONFIG['DLEXT']
-      sh 'make distclean' if File.exists?(build_file)
-      File.delete("sys/#{build_file}") if File.exists?("sys/#{build_file}")
-    end
-  end
-end
+CLEAN.include(
+  '**/*.gem',               # Gem files
+  '**/*.rbc',               # Rubinius
+  '**/*.o',                 # C object file
+  '**/*.log',               # Ruby extension build log
+  '**/Makefile',            # C Makefile
+  '**/conftest.dSYM',       # OS X build directory
+  "**/*.#{CONFIG['DLEXT']}" # C shared object
+)
 
 desc "Build the sys-admin library on UNIX systems (but don't install it)"
 task :build => [:clean] do
@@ -37,6 +35,7 @@ namespace :gem do
 
     if WINDOWS
       spec.platform = Gem::Platform::CURRENT
+      spec.platform.cpu = 'universal'
       spec.files = spec.files.reject{ |f| f.include?('ext') }
       spec.add_dependency('win32-security', '>= 0.1.2')
     else

data/ext/extconf.rb

@@ -1,60 +1,72 @@
 require "mkmf"
+require "rbconfig"
 
-if RUBY_PLATFORM.match('mswin')
-   STDERR.puts "Use the 'rake install' task to install on MS Windows."
-   STDERR.puts "Exiting. The sys-admin package was NOT installed."
-   exit
+AIX = Config::CONFIG['host_os'] =~ /aix/i
+
+# TODO: Just run the rake install task.
+if File::ALT_SEPARATOR
+  STDERR.puts "Use the 'rake install' task to install on MS Windows."
+  STDERR.puts "Exiting. The sys-admin package was NOT installed."
+  exit
 else
-   dir_config('admin')
-   
-   have_func("getlogin_r")
-   have_func("getlogin")
-   have_func("getenv")
-   
-   have_func("getpwuid_r")
-   have_func("getpwuid")
-   have_func("getpwnam_r")
-   have_func("getpwnam")
-   have_func("getpwent_r")
-   have_func("getpwent")
-   
-   have_func("getgrgid_r")
-   have_func("getgrgid")
-   have_func("getgrnam_r")
-   have_func("getgrnam")
-   have_func("getgrent_r")
-   have_func("getgrent")
-   
-   have_struct_member("struct passwd", "pw_gecos", "pwd.h")
-   have_struct_member("struct passwd", "pw_change", "pwd.h")
-   have_struct_member("struct passwd", "pw_quota", "pwd.h")
-   have_struct_member("struct passwd", "pw_age", "pwd.h")
-   have_struct_member("struct passwd", "pw_class", "pwd.h")
-   have_struct_member("struct passwd", "pw_comment", "pwd.h")
-   have_struct_member("struct passwd", "pw_expire", "pwd.h")
-   have_struct_member("struct passwd", "pw_passwd", "pwd.h")
-   
-   have_struct_member("struct group", "gr_passwd", "grp.h")
-
-   utmp    = have_header("utmp.h")
-   lastlog = have_header("lastlog.h")
-
-   if have_header("utmpx.h")
-     have_func("getlastlogx")
-   end 
-
-   if utmp || lastlog
-     have_struct_member(
-       "struct lastlog",
-       "ll_time",
-       ["utmp.h", "time.h", "lastlog.h"]
-     )
-   end
-
-   $CFLAGS += " -D_POSIX_PTHREAD_SEMANTICS"
-   if RUBY_PLATFORM =~ /linux|bsd/i
-      $CFLAGS += " -D_GNU_SOURCE -D_REENTRANT"
-   end
+  dir_config('admin')
+
+  # Some versions of AIX apparently have buggy implementations of certain
+  # re-entrant functions, so they're skipped for now.
+
+  have_func("getlogin_r")
+  have_func("getlogin")
+  have_func("getenv")
+
+  have_func("getpwuid_r")
+  have_func("getpwuid")
+  have_func("getpwnam_r")
+  have_func("getpwnam")
+  have_func("getpwent_r") unless AIX
+  have_func("getpwent")
+
+  have_func("getgrgid_r")
+  have_func("getgrgid")
+  have_func("getgrnam_r")
+  have_func("getgrnam")
+  have_func("getgrent_r") unless AIX
+  have_func("getgrent")
+
+  have_struct_member("struct passwd", "pw_gecos", "pwd.h")
+  have_struct_member("struct passwd", "pw_change", "pwd.h")
+  have_struct_member("struct passwd", "pw_quota", "pwd.h")
+  have_struct_member("struct passwd", "pw_age", "pwd.h")
+  have_struct_member("struct passwd", "pw_class", "pwd.h")
+  have_struct_member("struct passwd", "pw_comment", "pwd.h")
+  have_struct_member("struct passwd", "pw_expire", "pwd.h")
+  have_struct_member("struct passwd", "pw_passwd", "pwd.h")
+
+  have_struct_member("struct group", "gr_passwd", "grp.h")
+
+  if have_header("usersec.h") # AIX
+    have_func("getuserattr", "usersec.h")
+  else
+    utmp    = have_header("utmp.h")
+    lastlog = have_header("lastlog.h")
+
+    if have_header("utmpx.h")
+      have_func("getlastlogx")
+    end
+
+    if utmp || lastlog
+      have_struct_member(
+        "struct lastlog",
+        "ll_time",
+        ["utmp.h", "time.h", "lastlog.h"]
+      )
+    end
+  end
+
+  $CFLAGS += " -D_POSIX_PTHREAD_SEMANTICS"
+
+  if RUBY_PLATFORM =~ /linux|bsd/i
+    $CFLAGS += " -D_GNU_SOURCE -D_REENTRANT"
+  end
 end
 
 create_makefile('sys/admin', 'sys')

data/ext/sys/admin.c

@@ -414,6 +414,6 @@ void Init_admin(){
 
    /* Constants */
 
-   /* 1.5.2: The version of this library */
+   /* 1.5.5: The version of this library */
    rb_define_const(cAdmin, "VERSION", rb_str_new2(SYS_ADMIN_VERSION));
 }

data/ext/sys/admin.h

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define SYS_ADMIN_VERSION "1.5.4"
+#define SYS_ADMIN_VERSION "1.5.5"
 
 #if defined(__MACH__) || defined(__APPLE__)
 #define __BSD__
@@ -18,6 +18,9 @@
 #define __BSD__
 #endif
 
+#if defined(HAVE_USERSEC_H)
+#include <usersec.h>
+#else
 #if defined(HAVE_UTMPX_H) && defined(HAVE_GETLASTLOGX)
 #include <utmpx.h>
 #else
@@ -27,6 +30,7 @@
 #include <utmp.h>
 #endif
 #endif
+#endif
 
 #ifndef _POSIX_LOGIN_NAME_MAX
 #define _POSIX_LOGIN_NAME_MAX 9
@@ -249,7 +253,7 @@ static VALUE get_user(struct passwd* pwd){
    rb_iv_set(v_user, "@change", rb_time_new(pwd->pw_change, 0));
 #endif
 
-#if defined(HAVE_LASTLOG_H) || defined(HAVE_UTMP_H)
+#if defined(HAVE_LASTLOG_H) || defined(HAVE_UTMP_H) || defined(HAVE_USERSEC_H)
    get_lastlog_info(pwd, v_user);
 #endif
 
@@ -426,6 +430,27 @@ void get_group_from_value(VALUE v_group, struct group* grp){
  * still be empty or nil.
  */
 int get_lastlog_info(struct passwd* pwd, VALUE v_user){
+#ifdef HAVE_USERSEC_H
+  char *lasthost;
+  int lasttime;
+  char *lasttty;
+
+  if (setuserdb(S_READ) == -1) {
+    return -1;
+  }
+
+  if (getuserattr(pwd->pw_name, S_LASTTIME, &lasttime, SEC_INT) == -1
+      || getuserattr(pwd->pw_name, S_LASTTTY, &lasttty, SEC_CHAR) == -1
+      || getuserattr(pwd->pw_name, S_LASTHOST, &lasthost, SEC_CHAR) == -1) {
+    enduserdb();
+    return -1;
+  }
+
+  rb_iv_set(v_user, "@login_time", rb_time_new(lasttime, 0));
+  rb_iv_set(v_user, "@login_device", rb_str_new2(lasttty));
+  rb_iv_set(v_user, "@login_host", rb_str_new2(lasthost));
+  enduserdb();
+#else
 #ifdef HAVE_GETLASTLOGX
   struct lastlogx log;
 
@@ -461,6 +486,7 @@ int get_lastlog_info(struct passwd* pwd, VALUE v_user){
     rb_iv_set(v_user, "@login_device", rb_str_new2(log.ll_line));
     rb_iv_set(v_user, "@login_host", rb_str_new2(log.ll_host));
   }
+#endif
 #endif
 
   return 0;

data/sys-admin.gemspec

@@ -4,7 +4,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'sys-admin'
-  spec.version   = '1.5.4'
+  spec.version   = '1.5.5'
   spec.author    = 'Daniel J. Berger'
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'

data/test/test_sys_admin.rb

@@ -16,6 +16,6 @@ end
 
 class TC_Sys_Admin_All < Test::Unit::TestCase
   def test_version
-    assert_equal('1.5.4', Sys::Admin::VERSION)
+    assert_equal('1.5.5', Sys::Admin::VERSION)
   end
 end

data/test/test_sys_admin_windows.rb

@@ -13,321 +13,332 @@ gem 'test-unit'
 require 'test/unit'
 require 'sys/admin'
 require 'socket'
+require 'etc'
 include Sys
 
 class TC_Sys_Admin_Win32 < Test::Unit::TestCase
-   def self.startup
-      @@host = Socket.gethostname
-   end
+  def self.startup
+    @@host = Socket.gethostname
+  end
 
-   def setup
-      @user       = User.new
-      @user_name  = 'Guest'
-      @user_id    = 501        # best guess, may fail
-      @group      = Group.new
-      @group_name = 'Guests'
-      @group_id   = 546        # best guess, may fail
-   end
+  def setup
+    @user       = User.new
+    @user_name  = 'Guest'
+    @user_id    = 501        # best guess, may fail
+    @group      = Group.new
+    @group_name = 'Guests'
+    @group_id   = 546        # best guess, may fail
+  end
 
-   # Admin singleton methods
+  # Admin singleton methods
 
-   def test_01_add_user
-      assert_respond_to(Admin, :add_user)
-      assert_nothing_raised{
-         Admin.add_user(:name => 'foo', :password => 'a1b2c3D4')
-      }
-   end
+  def test_01_add_user
+    assert_respond_to(Admin, :add_user)
+    assert_nothing_raised{
+      Admin.add_user(:name => 'foo', :password => 'a1b2c3D4')
+    }
+  end
 
-   def test_02_config_user
-      assert_respond_to(Admin, :configure_user)
-      assert_nothing_raised{
-         Admin.configure_user(
-            :name        => 'foo',
-            :description => 'delete me',
-            :fullname    => 'fubar',
-            :password    => ['a1b2c3D4', 'd1c2b3A4']
-         )
-      }
-   end
-   
-   def test_03_delete_user
-      assert_respond_to(Admin, :delete_user)
-      assert_nothing_raised{ Admin.delete_user('foo') }
-   end
-  
-   def test_01_add_group
-      assert_respond_to(Admin, :add_group)
-      assert_nothing_raised{ Admin.add_group(:name => 'bar') }
-   end
-   
-   def test_02_configure_group
-      assert_respond_to(Admin, :configure_group)
-      assert_nothing_raised{
-         Admin.configure_group(:name => 'bar', :description => 'delete me')
-      }
-   end
-   
-   def test_03_delete_group
-      assert_respond_to(Admin, :delete_group)
-      assert_nothing_raised{ Admin.delete_group('bar') }
-   end
-   
-   def test_get_login_basic
-      assert_respond_to(Admin, :get_login)
-      assert_nothing_raised{ Admin.get_login }
-   end
+  def test_02_config_user
+    assert_respond_to(Admin, :configure_user)
+    assert_nothing_raised{
+      Admin.configure_user(
+        :name        => 'foo',
+        :description => 'delete me',
+        :fullname    => 'fubar',
+        :password    => ['a1b2c3D4', 'd1c2b3A4']
+      )
+    }
+  end
+ 
+  def test_03_delete_user
+    assert_respond_to(Admin, :delete_user)
+    assert_nothing_raised{ Admin.delete_user('foo') }
+  end
 
-   def test_get_login
-      assert_kind_of(String, Admin.get_login)
-   end
+  def test_01_add_group
+    assert_respond_to(Admin, :add_group)
+    assert_nothing_raised{ Admin.add_group(:name => 'bar') }
+  end
+ 
+  def test_02_configure_group
+    assert_respond_to(Admin, :configure_group)
+    assert_nothing_raised{
+       Admin.configure_group(:name => 'bar', :description => 'delete me')
+    }
+  end
+ 
+  def test_03_delete_group
+    assert_respond_to(Admin, :delete_group)
+    assert_nothing_raised{ Admin.delete_group('bar') }
+  end
+ 
+  def test_get_login_basic
+    assert_respond_to(Admin, :get_login)
+    assert_nothing_raised{ Admin.get_login }
+  end
 
-   def test_get_login_expected_errors
-      assert_raise(ArgumentError){ Admin.get_login('foo') }
-   end
-   
-   def test_get_user_basic
-      assert_respond_to(Admin, :get_user)
-   end
-  
-   def test_get_user_by_string
-      assert_nothing_raised{ Admin.get_user(@user_name, :localaccount => true) }     
-      assert_kind_of(User, Admin.get_user(@user_name, :localaccount => true))
-   end
+  def test_get_login
+    assert_kind_of(String, Admin.get_login)
+  end
 
-   def test_get_user_by_uid
-      assert_nothing_raised{ Admin.get_user(@user_id, :localaccount => true) }
-      assert_kind_of(User, Admin.get_user(@user_id, :localaccount => true))
-   end
-   
-   def test_get_user_by_string_with_options
-      options = {:host => @@host, :localaccount => true}
-      assert_nothing_raised{ Admin.get_user(@user_name, options) }
-      assert_kind_of(User, Admin.get_user(@user_name, options))
-   end
+  def test_get_login_expected_errors
+    assert_raise(ArgumentError){ Admin.get_login('foo') }
+  end
+ 
+  def test_get_user_basic
+    assert_respond_to(Admin, :get_user)
+  end
 
-   def test_get_user_by_uid_with_options
-      options = {:host => @@host, :localaccount => true}
-      assert_nothing_raised{ Admin.get_user(@user_id, options) }
-      assert_kind_of(User, Admin.get_user(@user_id, options))
-   end
+  def test_get_user_by_string
+    assert_nothing_raised{ Admin.get_user(@user_name, :localaccount => true) }     
+    assert_kind_of(User, Admin.get_user(@user_name, :localaccount => true))
+  end
 
-   def test_get_user_expected_errors
-      assert_raises(ArgumentError){ Admin.get_user }
-   end
-   
-   def test_users_basic
-      assert_respond_to(Admin, :users)
-      assert_nothing_raised{ Admin.users(:localaccount => true) }
-   end
+  def test_get_user_by_uid
+    assert_nothing_raised{ Admin.get_user(@user_id, :localaccount => true) }
+    assert_kind_of(User, Admin.get_user(@user_id, :localaccount => true))
+  end
+ 
+  def test_get_user_by_string_with_options
+    options = {:host => @@host, :localaccount => true}
+    assert_nothing_raised{ Admin.get_user(@user_name, options) }
+    assert_kind_of(User, Admin.get_user(@user_name, options))
+  end
 
-   def test_users
-      assert_kind_of(Array, Admin.users(:localaccount => true))
-      assert_kind_of(User, Admin.users(:localaccount => true).first)
-   end
+  def test_get_user_by_uid_with_options
+    options = {:host => @@host, :localaccount => true}
+    assert_nothing_raised{ Admin.get_user(@user_id, options) }
+    assert_kind_of(User, Admin.get_user(@user_id, options))
+  end
 
-   def test_users_with_block
-      array = []
-      assert_nothing_raised{
-         Admin.users(:localaccount => true){ |u| array << u }
-      }
-      assert_kind_of(User, array[0])
-   end
+  def test_get_user_with_no_options
+    assert_nothing_raised{ Admin.get_user(Etc.getlogin) }
+    assert_kind_of(User, Admin.get_user(Etc.getlogin))
+  end
 
-   def test_get_group_basic
-      assert_respond_to(Admin, :get_group)
-   end
-     
-   def test_get_group_by_name
-      assert_nothing_raised{ Admin.get_group(@group_name, :localaccount => true) }
-      assert_kind_of(Group, Admin.get_group(@group_name, :localaccount => true))
-   end
+  def test_get_user_expected_errors
+    assert_raises(ArgumentError){ Admin.get_user }
+  end
+ 
+  def test_users_basic
+    assert_respond_to(Admin, :users)
+    assert_nothing_raised{ Admin.users(:localaccount => true) }
+  end
 
-   def test_get_group_by_gid
-      assert_nothing_raised{ Admin.get_group(@group_id, :localaccount => true) }
-      assert_kind_of(Group, Admin.get_group(@group_id, :localaccount => true))
-   end
-   
-   def test_get_group_with_options
-      assert_nothing_raised{ Admin.get_group(@group_name, :localaccount => true) }
-      assert_kind_of(Group, Admin.get_group(@group_name, :localaccount => true))
-   end
+  def test_users
+    assert_kind_of(Array, Admin.users(:localaccount => true))
+    assert_kind_of(User, Admin.users(:localaccount => true).first)
+  end
 
-   def test_get_group_expected_errors
-      assert_raise(ArgumentError){ Admin.get_group }
-   end
-   
-   def test_groups_basic
-      assert_respond_to(Admin, :groups)
-      assert_nothing_raised{ Admin.groups(:localaccount => true) }
-   end
+  def test_users_with_block
+    array = []
+    assert_nothing_raised{
+       Admin.users(:localaccount => true){ |u| array << u }
+    }
+    assert_kind_of(User, array[0])
+  end
 
-   def test_groups
-      assert_kind_of(Array, Admin.groups(:localaccount => true))
-      assert_kind_of(Group, Admin.groups(:localaccount => true).first)
-   end
-  
-   def test_groups_with_block
-      array = []
-      assert_nothing_raised{
-         Admin.groups(:localaccount => true){ |g| array << g }
-      }
-      assert_kind_of(Group, array[0])
-   end
+  def test_get_group_basic
+    assert_respond_to(Admin, :get_group)
+  end
+   
+  def test_get_group_by_name
+    assert_nothing_raised{ Admin.get_group(@group_name, :localaccount => true) }
+    assert_kind_of(Group, Admin.get_group(@group_name, :localaccount => true))
+  end
 
-   # User class
-   
-   def test_user_instance_caption
-      assert_respond_to(@user, :caption)
-      assert_respond_to(@user, :caption=)
-   end
-   
-   def test_user_instance_description
-      assert_respond_to(@user, :description)
-      assert_respond_to(@user, :description=)
-   end
-   
-   def test_user_instance_domain
-      assert_respond_to(@user, :domain)
-      assert_respond_to(@user, :domain=)
-   end
-   
-   def test_user_instance_password
-      assert_respond_to(@user, :password)
-      assert_respond_to(@user, :password=)
-   end
-   
-   def test_user_instance_full_name
-      assert_respond_to(@user, :full_name)
-      assert_respond_to(@user, :full_name=)
-   end
-   
-   def test_user_instance_name
-      assert_respond_to(@user, :name)
-      assert_respond_to(@user, :name=)
-   end
-   
-   def test_user_instance_sid
-      assert_respond_to(@user, :sid)
-      assert_respond_to(@user, :sid=)
-   end
-   
-   def test_user_instance_status
-      assert_respond_to(@user, :status)
-      assert_respond_to(@user, :status=)
-   end
-   
-   def test_user_instance_disabled
-      assert_respond_to(@user, :disabled?)
-      assert_respond_to(@user, :disabled=)
-   end
-   
-   def test_user_instance_local
-      assert_respond_to(@user, :local?)
-      assert_respond_to(@user, :local=)
-   end
-   
-   def test_user_instance_lockout
-      assert_respond_to(@user, :lockout?)
-      assert_respond_to(@user, :lockout=)
-   end
-   
-   def test_user_instance_password_changeable
-      assert_respond_to(@user, :password_changeable?)
-      assert_respond_to(@user, :password_changeable=)
-   end
-   
-   def test_user_instance_password_expires
-      assert_respond_to(@user, :password_expires?)
-      assert_respond_to(@user, :password_expires=)
-   end
-   
-   def test_user_instance_password_required
-      assert_respond_to(@user, :password_required?)
-      assert_respond_to(@user, :password_required=)
-   end
-   
-   def test_user_instance_account_type
-      assert_respond_to(@user, :account_type)
-      assert_respond_to(@user, :account_type=)
-   end
+  def test_get_group_by_gid
+    assert_nothing_raised{ Admin.get_group(@group_id, :localaccount => true) }
+    assert_kind_of(Group, Admin.get_group(@group_id, :localaccount => true))
+  end
+ 
+  def test_get_group_with_options
+    assert_nothing_raised{ Admin.get_group(@group_name, :localaccount => true) }
+    assert_kind_of(Group, Admin.get_group(@group_name, :localaccount => true))
+  end
 
-   def test_user_instance_uid
-      assert_respond_to(@user, :uid)
-      assert_respond_to(@user, :uid=)
-   end
-   
-   def test_user_dir_basic
-      assert_respond_to(@user, :dir)
-      assert_respond_to(@user, :dir=)    
-   end
-   
-   def test_user_dir
-      assert_nothing_raised{ @user = Admin.get_user(@user_name, :localaccount => true) }
-      assert_kind_of([String, NilClass], @user.dir)
-   end
-   
-   # Group class
-   
-   def test_group_instance_caption
-      assert_respond_to(@group, :caption)
-      assert_respond_to(@group, :caption=)
-   end
-   
-   def test_group_instance_description
-      assert_respond_to(@group, :description)
-      assert_respond_to(@group, :description=)
-   end
-   
-   def test_group_instance_domain
-      assert_respond_to(@group, :domain)
-      assert_respond_to(@group, :domain=)
-   end
-   
-   def test_group_instance_install_date
-      assert_respond_to(@group, :install_date)
-      assert_respond_to(@group, :install_date=)
-   end
-   
-   def test_group_instance_name
-      assert_respond_to(@group, :name)
-      assert_respond_to(@group, :name)
-   end
-   
-   def test_group_instance_gid
-      assert_respond_to(@group, :gid)
-      assert_respond_to(@group, :gid=)
-   end
-   
-   def test_group_instance_status
-      assert_respond_to(@group, :status)
-      assert_respond_to(@group, :status=)
-   end
-   
-   def test_group_instance_sid
-      assert_respond_to(@group, :sid)
-      assert_respond_to(@group, :sid=)
-   end
-   
-   def test_group_instance_sid_type
-      assert_respond_to(@group, :sid_type)
-      assert_respond_to(@group, :sid_type=)
-   end
-   
-   def test_group_instance_local
-      assert_respond_to(@group, :local?)
-      assert_respond_to(@group, :local=)
-   end
+  def test_get_group_with_no_options
+    assert_nothing_raised{ Admin.get_group("Administrators") }
+    assert_kind_of(Group, Admin.get_group("Administrators"))
+  end
+
+  def test_get_group_expected_errors
+    assert_raise(ArgumentError){ Admin.get_group }
+  end
+ 
+  def test_groups_basic
+    assert_respond_to(Admin, :groups)
+    assert_nothing_raised{ Admin.groups(:localaccount => true) }
+  end
+
+  def test_groups
+    assert_kind_of(Array, Admin.groups(:localaccount => true))
+    assert_kind_of(Group, Admin.groups(:localaccount => true).first)
+  end
+
+  def test_groups_with_block
+    array = []
+    assert_nothing_raised{
+       Admin.groups(:localaccount => true){ |g| array << g }
+    }
+    assert_kind_of(Group, array[0])
+  end
+
+  # User class
+ 
+  def test_user_instance_caption
+    assert_respond_to(@user, :caption)
+    assert_respond_to(@user, :caption=)
+  end
+ 
+  def test_user_instance_description
+    assert_respond_to(@user, :description)
+    assert_respond_to(@user, :description=)
+  end
+ 
+  def test_user_instance_domain
+    assert_respond_to(@user, :domain)
+    assert_respond_to(@user, :domain=)
+  end
+ 
+  def test_user_instance_password
+    assert_respond_to(@user, :password)
+    assert_respond_to(@user, :password=)
+  end
+ 
+  def test_user_instance_full_name
+    assert_respond_to(@user, :full_name)
+    assert_respond_to(@user, :full_name=)
+  end
+ 
+  def test_user_instance_name
+    assert_respond_to(@user, :name)
+    assert_respond_to(@user, :name=)
+  end
+ 
+  def test_user_instance_sid
+    assert_respond_to(@user, :sid)
+    assert_respond_to(@user, :sid=)
+  end
+ 
+  def test_user_instance_status
+    assert_respond_to(@user, :status)
+    assert_respond_to(@user, :status=)
+  end
+ 
+  def test_user_instance_disabled
+    assert_respond_to(@user, :disabled?)
+    assert_respond_to(@user, :disabled=)
+  end
+ 
+  def test_user_instance_local
+    assert_respond_to(@user, :local?)
+    assert_respond_to(@user, :local=)
+  end
+ 
+  def test_user_instance_lockout
+    assert_respond_to(@user, :lockout?)
+    assert_respond_to(@user, :lockout=)
+  end
+ 
+  def test_user_instance_password_changeable
+    assert_respond_to(@user, :password_changeable?)
+    assert_respond_to(@user, :password_changeable=)
+  end
+ 
+  def test_user_instance_password_expires
+    assert_respond_to(@user, :password_expires?)
+    assert_respond_to(@user, :password_expires=)
+  end
+ 
+  def test_user_instance_password_required
+    assert_respond_to(@user, :password_required?)
+    assert_respond_to(@user, :password_required=)
+  end
+ 
+  def test_user_instance_account_type
+    assert_respond_to(@user, :account_type)
+    assert_respond_to(@user, :account_type=)
+  end
+
+  def test_user_instance_uid
+    assert_respond_to(@user, :uid)
+    assert_respond_to(@user, :uid=)
+  end
+ 
+  def test_user_dir_basic
+    assert_respond_to(@user, :dir)
+    assert_respond_to(@user, :dir=)    
+  end
+ 
+  def test_user_dir
+    assert_nothing_raised{ @user = Admin.get_user(@user_name, :localaccount => true) }
+    assert_kind_of([String, NilClass], @user.dir)
+  end
+ 
+  # Group class
+ 
+  def test_group_instance_caption
+    assert_respond_to(@group, :caption)
+    assert_respond_to(@group, :caption=)
+  end
+ 
+  def test_group_instance_description
+    assert_respond_to(@group, :description)
+    assert_respond_to(@group, :description=)
+  end
+ 
+  def test_group_instance_domain
+    assert_respond_to(@group, :domain)
+    assert_respond_to(@group, :domain=)
+  end
+ 
+  def test_group_instance_install_date
+    assert_respond_to(@group, :install_date)
+    assert_respond_to(@group, :install_date=)
+  end
+ 
+  def test_group_instance_name
+    assert_respond_to(@group, :name)
+    assert_respond_to(@group, :name)
+  end
+ 
+  def test_group_instance_gid
+    assert_respond_to(@group, :gid)
+    assert_respond_to(@group, :gid=)
+  end
+ 
+  def test_group_instance_status
+    assert_respond_to(@group, :status)
+    assert_respond_to(@group, :status=)
+  end
+ 
+  def test_group_instance_sid
+    assert_respond_to(@group, :sid)
+    assert_respond_to(@group, :sid=)
+  end
+ 
+  def test_group_instance_sid_type
+    assert_respond_to(@group, :sid_type)
+    assert_respond_to(@group, :sid_type=)
+  end
+ 
+  def test_group_instance_local
+    assert_respond_to(@group, :local?)
+    assert_respond_to(@group, :local=)
+  end
 
-   def teardown
-      @user       = nil
-      @user_name  = nil
-      @user_id    = nil
-      @group      = nil
-      @group_name = nil
-      @group_id   = nil
-   end
+  def teardown
+    @user       = nil
+    @user_name  = nil
+    @user_id    = nil
+    @group      = nil
+    @group_name = nil
+    @group_id   = nil
+  end
 
-   def self.shutdown
-      @@host = nil
-   end
+  def self.shutdown
+    @@host = nil
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sys-admin
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 1
   - 5
-  - 4
-  version: 1.5.4
+  - 5
+  version: 1.5.5
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -06:00
-default_executable: 
+date: 2011-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
@@ -46,25 +45,26 @@ extra_rdoc_files:
 - MANIFEST
 - ext/sys/admin.c
 files: 
-- CHANGES
-- doc/sys-admin-unix.txt
-- doc/sys-admin-windows.txt
-- examples/groups.rb
-- examples/users.rb
-- ext/extconf.rb
-- ext/sys/admin.c
+- sys-admin.gemspec
 - ext/sys/admin.h
-- MANIFEST
-- Rakefile
+- ext/sys/admin.c
+- ext/extconf.rb
 - README
-- sys-admin.gemspec
-- test/test_sys_admin.rb
+- Rakefile
 - test/test_sys_admin_unix.rb
+- test/test_sys_admin.rb
 - test/test_sys_admin_windows.rb
-has_rdoc: true
+- MANIFEST
+- doc/sys-admin-unix.txt
+- doc/sys-admin-windows.txt
+- CHANGES
+- examples/groups.rb
+- examples/users.rb
 homepage: http://www.github.com/djberg96/sysutils
 licenses: 
 - Artistic 2.0
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
@@ -91,9 +91,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sysutils
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A unified, cross platform replacement for the "etc" library.
 test_files: 
 - test/test_sys_admin.rb