sys-admin 1.3.1 → 1.4.0

data/test/tc_admin.rb

@@ -8,7 +8,7 @@ $LOAD_PATH.unshift Dir.pwd
 $LOAD_PATH.unshift Dir.pwd + "/test"
 
 if File::ALT_SEPARATOR
-   require "tc_win32"
+   require "tc_windows"
 else
    require "tc_unix"
 end

data/test/tc_unix.rb

@@ -6,15 +6,15 @@
 base = File.basename(Dir.pwd)
 
 if base == "test" || base =~ /sys-admin.*/
-   require "ftools"
+   require "fileutils"
    Dir.chdir("..") if base == "test"
    Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("admin.so","sys") if File.exists?("admin.so")
+   FileUtils.cp("ext/admin.so", "sys") if File.exists?("ext/admin.so")
    $LOAD_PATH.unshift(Dir.pwd)
 end
 
-require "test/unit"
-require "sys/admin"
+require 'test/unit'
+require 'sys/admin'
 include Sys
 
 class TC_Sys_Admin_Unix < Test::Unit::TestCase
@@ -26,7 +26,7 @@ class TC_Sys_Admin_Unix < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.3.1", Admin::VERSION)
+      assert_equal("1.4.0", Admin::VERSION)
    end
 
    def test_get_login

data/test/{tc_win32.rb → tc_windows.rb}

@@ -1,7 +1,9 @@
 ###############################################################################
-# tc_win32.rb
+# tc_windows.rb
 #
-# Test suite for the Win32 version of sys-admin.
+# Test suite for the Win32 version of sys-admin.  Note that some of the tests
+# are numbered to ensure a certain order.  That way I can add test users
+# before configuring or deleting them.
 ###############################################################################
 base = File.basename(Dir.pwd)
 
@@ -9,8 +11,9 @@ if base == "test" || base =~ /sys-admin.*/
    require "ftools"
    Dir.chdir("..") if base == "test"
    Dir.mkdir("sys") unless File.exists?("sys")
-   File.copy("lib/sys/win32.rb","sys/admin.rb")
+   File.copy("lib/sys/admin.rb", "sys/admin.rb")
    $LOAD_PATH.unshift(Dir.pwd)
+   Dir.chdir("test") rescue nil
 end
 
 require "test/unit"
@@ -30,7 +33,68 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.3.1", Admin::VERSION)
+      assert_equal("1.4.0", Admin::VERSION)
+   end
+   
+   def test_01_add_local_user
+      assert_respond_to(Admin, :add_local_user)
+      assert_nothing_raised{ Admin.add_local_user("foo") }
+   end
+   
+   def test_add_global_user
+      assert_respond_to(Admin, :add_global_user)
+   end
+   
+   def test_02_config_local_user
+      assert_respond_to(Admin, :config_local_user)
+      assert_nothing_raised{
+         Admin.config_local_user("foo",{
+            :description => "delete me",
+            :fullname    => "fubar"
+         })
+      }
+   end
+   
+   def test_config_global_user
+      assert_respond_to(Admin, :config_global_user)
+   end
+   
+   def test_03_delete_local_user
+      assert_respond_to(Admin, :delete_local_user)
+      assert_nothing_raised{ Admin.delete_local_user("foo") }
+   end
+   
+   def test_delete_global_user
+      assert_respond_to(Admin, :delete_global_user)
+   end
+   
+   def test_01_add_local_group
+      assert_respond_to(Admin, :add_local_group)
+      assert_nothing_raised{ Admin.add_local_group("bar") }
+   end
+   
+   def test_add_global_group
+      assert_respond_to(Admin, :add_global_group)
+   end
+   
+   def test_02_config_local_group
+      assert_respond_to(Admin, :config_local_group)
+      assert_nothing_raised{
+         Admin.config_local_group("bar",{:description=>"delete me"})
+      }
+   end
+   
+   def test_config_global_group
+      assert_respond_to(Admin, :config_global_group)
+   end
+   
+   def test_03_delete_local_group
+      assert_respond_to(Admin, :delete_local_group)
+      assert_nothing_raised{ Admin.delete_local_group("bar") }
+   end
+   
+   def test_delete_global_group
+      assert_respond_to(Admin, :delete_global_group)
    end
 
    def test_get_login

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sys-admin
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
-date: 2006-08-01 00:00:00 -06:00
+  version: 1.4.0
+date: 2007-01-20 00:00:00 -07:00
 summary: A unified, cross platform replacement for the "etc" package.
 require_paths: 
 - lib
@@ -31,15 +31,15 @@ authors:
 files: 
 - examples/groups.rb
 - examples/users.rb
-- lib/sys/unix.c
-- lib/sys/unix.h
-- lib/sys/win32.orig
 - test/tc_unix.rb
-- test/tc_win32.rb
+- test/tc_windows.rb
 - test/tc_admin.rb
 - README
 - CHANGES
 - MANIFEST
+- ext/extconf.rb
+- ext/admin.c
+- ext/admin.h
 test_files: 
 - test/tc_admin.rb
 rdoc_options: []
@@ -47,10 +47,12 @@ rdoc_options: []
 extra_rdoc_files: 
 - CHANGES
 - README
+- MANIFEST
+- ext/admin.c
 executables: []
 
 extensions: 
-- extconf.rb
+- ext/extconf.rb
 requirements: []
 
 dependencies: []

data/lib/sys/unix.h

@@ -1,411 +0,0 @@
-#include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-#define SYS_ADMIN_VERSION "1.3.1"
-
-#ifdef HAVE_LASTLOG_H
-#include <lastlog.h>
-#else
-#include <utmp.h>
-#endif
-
-#ifndef _POSIX_LOGIN_NAME_MAX
-#define _POSIX_LOGIN_NAME_MAX 9
-#endif
-
-#ifdef _SC_GETPW_R_SIZE_MAX
-#define USER_BUF_SIZE (sysconf(_SC_GETPW_R_SIZE_MAX))
-#else
-#define USER_BUF_SIZE 1024
-#endif
-
-#ifdef _SC_GETGR_R_SIZE_MAX
-#define GROUP_BUF_SIZE (sysconf(_SC_GETGR_R_SIZE_MAX))
-#else
-#define GROUP_BUF_SIZE 7296
-#endif
-
-#ifndef _PATH_LASTLOG
-#define _PATH_LASTLOG "/var/adm/lastlog"
-#endif
-
-/* Function prototypes */
-static VALUE get_user(struct passwd* p);
-static VALUE get_group(struct group* g);
-int get_lastlog_info(const char* n, VALUE rbVal);
-
-VALUE cUser, cGroup, cAdminError;
-
-/*
- * :no-doc:
- *
- * Helper function that returns a User object based on user ID.
- */
-static VALUE get_user_by_num(VALUE rbUID){
-   VALUE rbUser;
-   uid_t uid = NUM2INT(rbUID);
-
-#ifdef HAVE_GETPWUID_R
-   char buf[USER_BUF_SIZE];
-   struct passwd pwd;
-   struct passwd* pwdbuf;
-
-   if(getpwuid_r(uid, &pwd, buf, sizeof(buf), &pwdbuf) != 0)
-      rb_raise(cAdminError, "%s", strerror(errno));
-
-   if(!pwdbuf)
-      rb_raise(cAdminError, "no user found for %i:", uid);
-
-   rbUser = get_user(pwdbuf);
-#elif HAVE_GETPWUID
-   struct passwd* pwd;
-   if( (pwd = getpwuid(uid)) == NULL)
-      rb_raise(cAdminError, "no user found for: %i", uid);
-
-   rbUser = get_user(pwd);
-#else
-   rb_raise(rb_eNotImpError, "getting user by user ID not supported");
-#endif
-
-   return rbUser;
-}
-
-/*
- * :no-doc:
- *
- * Helper function that returns a User object based on name.
- */
-static VALUE get_user_by_name(VALUE rbName){
-   VALUE rbUser;
-   SafeStringValue(rbName);
-
-#ifdef HAVE_GETPWNAM_R
-   char buf[USER_BUF_SIZE];
-   struct passwd pwd;
-   struct passwd* pwdbuf;
-
-   if(getpwnam_r(RSTRING(rbName)->ptr, &pwd, buf, sizeof(buf), &pwdbuf) != 0)
-      rb_raise(cAdminError, "%s", strerror(errno));
-
-   if(!pwdbuf)
-      rb_raise(cAdminError, "no user found for %s", StringValuePtr(rbName));
-
-   rbUser = get_user(pwdbuf);
-#elif HAVE_GETPWNAM
-   struct passwd* pwd;
-   if( (pwd = getpwnam(RSTRING(rbName)->ptr)) == NULL)
-      rb_raise(cAdminError, "no user found for %s", StringValuePtr(rbName));
-
-   rbUser = get_user(pwd);
-#else
-   rb_raise(rb_eNotImpError, "getting user by name not supported"); 
-#endif
-
-   return rbUser;
-}
-
-/*
- * :no-doc:
- *
- * Helper function that returns a Group object based on group ID.
- */
-static VALUE get_group_by_num(VALUE rbGID){
-   VALUE rbGroup;
-   gid_t gid = NUM2INT(rbGID);
-
-#ifdef HAVE_GETGRGID_R
-   char buf[GROUP_BUF_SIZE];
-   struct group grp;
-   struct group* grpbuf;
-
-   if(getgrgid_r(gid, &grp, buf, sizeof(buf), &grpbuf) != 0)
-      rb_raise(cAdminError, "%s", strerror(errno));
-
-   if(!grpbuf)
-      rb_raise(cAdminError, "no group found for group ID: %i", gid);
-
-   rbGroup = get_group(grpbuf);
-#elif HAVE_GETGRGID
-   struct group* grp;
-   if( (grp = getgrgid(gid)) == NULL)
-      rb_raise(cAdminError, "no group found for group ID: %i", gid);
-      
-   rbGroup = get_group(grp);
-#else
-   rb_raise(rb_eNotImpError, "getting group by group ID not supported");
-#endif
-
-   return rbGroup;
-}
-
-/*
- * :no-doc:
- *
- * Helper function that returns a Group object based on group name.
- */
-static VALUE get_group_by_name(VALUE rbName){
-   VALUE rbGroup = Qnil;
-   SafeStringValue(rbName);
-#ifdef HAVE_GETGRNAM_R
-   char buf[GROUP_BUF_SIZE];
-   struct group grp;
-   struct group* grpbuf;
-
-   if(getgrnam_r(RSTRING(rbName)->ptr, &grp, buf, sizeof(buf), &grpbuf) != 0)
-      rb_raise(cAdminError, "%s", strerror(errno));
-
-   if(!grpbuf)
-      rb_raise(cAdminError, "no group found for: %s", StringValuePtr(rbName));
-
-   rbGroup = get_group(grpbuf);
-#elif HAVE_GETGRNAM
-   struct group* grp
-   if((grp = getgrnam(RSTRING(rbName)->ptr)) == NULL)
-      rb_raise(cAdminError, "no group found for: %s", StringValuePtr(rbName));
-
-   rbGroup = get_group(grp);
-#else
-   rb_raise(rb_eNotImpError,"get_group is not supported on this platform");
-#endif
-
-   return rbGroup;
-} 
-
-/*
- * :no-doc:
- *
- * Helper function that turns a struct passwd into a User object.
- */
-static VALUE get_user(struct passwd* p){
-   VALUE rbUser = rb_funcall(cUser,rb_intern("new"),0,0);
-
-   rb_iv_set(rbUser, "@name", rb_str_new2(p->pw_name));
-   rb_iv_set(rbUser, "@uid", INT2FIX(p->pw_uid));
-   rb_iv_set(rbUser, "@gid", INT2FIX(p->pw_gid));
-   rb_iv_set(rbUser, "@dir", rb_str_new2(p->pw_dir));
-   rb_iv_set(rbUser, "@shell", rb_str_new2(p->pw_shell));
-
-#ifdef HAVE_ST_PW_PASSWD
-   rb_iv_set(rbUser, "@passwd", rb_str_new2(p->pw_passwd));
-#endif
-
-#ifdef HAVE_ST_PW_AGE
-   rb_iv_set(rbUser, "@age", INT2FIX(p->pw_age));
-#endif
-
-#ifdef HAVE_ST_PW_COMMENT
-   rb_iv_set(rbUser, "@comment", rb_str_new2(p->pw_comment));
-#endif
-
-#ifdef HAVE_ST_PW_GECOS
-   rb_iv_set(rbUser, "@gecos", rb_str_new2(p->pw_gecos));
-#endif
-
-#ifdef HAVE_ST_PW_QUOTA
-   rb_iv_set(rbUser, "@quota", INT2FIX(p->pw_quota));
-#endif
-
-#ifdef HAVE_ST_PW_CLASS
-   rb_iv_set(rbUser, "@class", rb_str_new2(p->pw_class));
-#endif
-
-#ifdef HAVE_ST_PW_EXPIRE
-   rb_iv_set(rbUser, "@expire", INT2FIX(p->pw_expire));
-#endif
-
-   /* Get the lastlog info for the given user */
-   get_lastlog_info(p->pw_name, rbUser);
-
-   return rbUser;
-}
-
-/*
- * :no-doc:
- *
- * Helper function that turns a User object into a struct passwd.
- */
-void get_user_from_value(VALUE rbUser, struct passwd* pwd){
-
-   VALUE rbName  = rb_iv_get(rbUser, "@name");
-   VALUE rbUID   = rb_iv_get(rbUser, "@uid");
-   VALUE rbGID   = rb_iv_get(rbUser, "@gid");
-   VALUE rbDir   = rb_iv_get(rbUser, "@dir");
-   VALUE rbShell = rb_iv_get(rbUser, "@shell");
-
-   if(NIL_P(rbName))
-      rb_raise(cAdminError, "user name cannot be nil");
-
-   if(!NIL_P(rbUID))
-      pwd->pw_uid = NUM2INT(rbUID);
-
-   if(!NIL_P(rbGID))
-      pwd->pw_gid = NUM2INT(rbGID);
-
-   if(!NIL_P(rbDir)){
-      SafeStringValue(rbDir);
-      pwd->pw_dir = StringValuePtr(rbDir);
-   }
-
-   if(!NIL_P(rbShell)){
-      SafeStringValue(rbShell);
-      pwd->pw_shell = StringValuePtr(rbShell);
-   }
-
-#ifdef HAVE_ST_PW_PASSWD
-   VALUE rbPasswd = rb_iv_get(rbUser, "@passwd");
-   if(!NIL_P(rbPasswd)){
-      SafeStringValue(rbPasswd);
-      pwd->pw_passwd = StringValuePtr(rbPasswd);
-   }
-#endif
-
-#ifdef HAVE_ST_PW_AGE
-   VALUE rbAge = rb_iv_get(rbUser, "@age");
-   if(!NIL_P(rbAge))
-      pwd->pw_age = (char*)NUM2INT(rbAge);
-#endif
-
-#ifdef HAVE_ST_PW_COMMENT
-   VALUE rbComment = rb_iv_get(rbUser, "@comment");
-   if(!NIL_P(rbComment)){
-      SafeStringValue(rbComment);
-      pwd->pw_comment = StringValuePtr(rbComment);
-   }
-#endif
-
-#ifdef HAVE_ST_PW_GECOS
-   VALUE rbGecos = rb_iv_get(rbUser, "@gecos");
-   if(!NIL_P(rbGecos)){
-      SafeStringValue(rbGecos);
-      pwd->pw_gecos = StringValuePtr(rbGecos); 
-   }
-#endif
-
-#ifdef HAVE_ST_PW_QUOTA
-   VALUE rbQuota = rb_iv_get(rbUser, "@quota");
-   if(!NIL_P(rbQuota))
-      pwd->pw_quota = NUM2INT(rbQuota);
-#endif
-
-#ifdef HAVE_ST_PW_CLASS
-   VALUE rbClass = rb_iv_get(rbUser, "@class");
-   if(!NIL_P(rbClass)){
-      SafeStringValue(rbClass);
-      pwd->pw_class = StringValuePtr(rbClass);
-   }
-#endif
-
-#ifdef HAVE_ST_PW_EXPIRE
-   VALUE rbExpire = rb_iv_get(rbUser, "@expire");
-   if(!NIL_P(rbExpire))
-      pwd->pw_expire = NUM2INT(rbExpire);
-#endif
-
-}
-
-/*
- * :no-doc:
- *
- * Helper function that turns a struct grp into a Group object.
- */
-static VALUE get_group(struct group* g){
-   VALUE rbGroup = rb_funcall(cGroup,rb_intern("new"),0,0);
-   VALUE rbArray = rb_ary_new();
-
-   /* Return the members as an Array of Strings */
-   while(*g->gr_mem){
-      rb_ary_push(rbArray, rb_str_new2(*g->gr_mem));
-      g->gr_mem++;
-   }
-
-   rb_iv_set(rbGroup, "@name", rb_str_new2(g->gr_name));
-   rb_iv_set(rbGroup, "@gid", INT2FIX(g->gr_gid));
-   rb_iv_set(rbGroup, "@members", rbArray);
-#ifdef HAVE_ST_GR_PASSWD
-   rb_iv_set(rbGroup, "@passwd", rb_str_new2(g->gr_passwd));
-#endif
-
-   return rbGroup;
-}
-
-/*
- * :no-doc:
- *
- * Helper function that turns a Group object into a struct group.
- */
-void get_group_from_value(VALUE rbGroup, struct group* grp){
-   char** members = malloc(sizeof(char*));
-   VALUE rbName   = rb_iv_get(rbGroup, "@name");
-   VALUE rbGID    = rb_iv_get(rbGroup, "@gid");
-   VALUE rbMem    = rb_iv_get(rbGroup, "@members");
-   VALUE rbPasswd = rb_iv_get(rbGroup, "@passwd");
-   int i = 0;
-
-   if(NIL_P(rbName))
-      rb_raise(cAdminError, "group name must be set");
-
-   SafeStringValue(rbName);
-   grp->gr_name = StringValuePtr(rbName);
-
-   if(!NIL_P(rbGID))
-      grp->gr_gid = NUM2INT(rbGID);
-
-   if(!NIL_P(rbMem)){
-      VALUE rbVal;
-      while((rbVal = rb_ary_shift(rbMem)) != Qnil){
-         members[i] = StringValuePtr(rbVal);
-         i++;
-      }
-      members[i] = '\0';
-      grp->gr_mem = members;
-   }
-
-#ifdef HAVE_ST_GR_PASSWD
-   if(!NIL_P(rbPasswd)){
-      SafeStringValue(rbPasswd);
-      grp->gr_passwd = StringValuePtr(rbPasswd);
-   }
-#endif
-
-   free(members);
-}
-
-/*
- * :no-doc:
- *
- * Helper function that gets lastlog information for the User object.
- */
-int get_lastlog_info(const char* name, VALUE rbUser){
-   int fd;
-   struct lastlog log;
-   struct passwd* pwd;
-   int ll_size = sizeof(struct lastlog);
-
-   /* The lastlog information is not necessarily readable by all users, so
-    * ignore open() errors if they occur.
-    */
-   if((fd = open(_PATH_LASTLOG, O_RDONLY)) == -1)
-      return -1;
-
-   if((pwd = getpwnam(name)) == NULL)
-      rb_sys_fail(0);
-
-   pread(fd, &log, ll_size, pwd->pw_uid * ll_size);
-   close(fd);
-
-#ifdef HAVE_ST_LL_TIME
-   if(log.ll_time != 0)
-      rb_iv_set(rbUser, "@login_time", rb_time_new(log.ll_time, 0));
-#endif
-   rb_iv_set(rbUser, "@login_device", rb_str_new2(log.ll_line));
-   rb_iv_set(rbUser, "@login_host", rb_str_new2(log.ll_host));
-
-   return 0;
-}