sys-admin 1.4.3 → 1.4.4

data/CHANGES

@@ -1,3 +1,10 @@
+== 1.4.4 - 19-Nov-2008
+* Added the User#uid method for MS Windows (which is just the user's relative
+  identifier).
+* Now requires test-unit 2.x.
+* Some updates to the test suite to take advantage of test-unit 2.x features.
+* Some minor gemspec tweaks.
+
 == 1.4.3 - 2-Mar-2008
 * The block form of Admin.users now properly ensures that endpwent() is
   called. Likewise, the block form of Admin.groups now properly ensures

data/doc/sys-admin-unix.txt

@@ -148,13 +148,13 @@ User#uid
    Ruby's
 
 == Copyright
-   Copyright 2002-2007, Daniel J. Berger
+   Copyright 2002-2008, Daniel J. Berger
 
    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/doc/sys-admin-windows.txt

@@ -23,7 +23,7 @@ get information about users and groups.
 = Constants
 == Sys::Admin
 VERSION
-   The version of this package, returned as a String.
+   The version of this library, returned as a String.
 
 == Sys::Admin::User
 TEMP_DUPLICATE
@@ -314,13 +314,13 @@ User#status
    Ruby's
 
 == Copyright
-   Copyright 2002-2007, Daniel J. Berger
+   Copyright 2002-2008, Daniel J. Berger
 
    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/sys/admin.c

@@ -364,6 +364,6 @@ void Init_admin(){
 
    /* Constants */
 
-   /* 1.4.3: The version of this library */
+   /* 1.4.4: 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.4.3"
+#define SYS_ADMIN_VERSION "1.4.4"
 
 #ifdef HAVE_LASTLOG_H
 #include <lastlog.h>
@@ -117,7 +117,7 @@ static VALUE get_user_by_name(VALUE v_name){
 
    v_user = get_user(pwd);
 #else
-   rb_raise(rb_eNotImpError, "getting user by name not supported"); 
+   rb_raise(rb_eNotImpError, "getting user by name not supported");
 #endif
 
    return v_user;
@@ -148,7 +148,7 @@ static VALUE get_group_by_num(VALUE v_gid){
    struct group* grp;
    if( (grp = getgrgid(gid)) == NULL)
       rb_raise(cAdminError, "no group found for group ID: %i", gid);
-      
+
    v_group = get_group(grp);
 #else
    rb_raise(rb_eNotImpError, "getting group by group ID not supported");
@@ -188,7 +188,7 @@ static VALUE get_group_by_name(VALUE v_name){
 #endif
 
    return v_group;
-} 
+}
 
 /*
  * :no-doc:
@@ -302,7 +302,7 @@ void get_user_from_value(VALUE v_user, struct passwd* pwd){
    VALUE v_gecos = rb_iv_get(v_user, "@gecos");
    if(!NIL_P(v_gecos)){
       SafeStringValue(v_gecos);
-      pwd->pw_gecos = StringValuePtr(v_gecos); 
+      pwd->pw_gecos = StringValuePtr(v_gecos);
    }
 #endif
 
@@ -409,7 +409,7 @@ void get_group_from_value(VALUE v_group, struct group* grp){
  *
  * Helper function that gets lastlog information for the User object.
  */
-int get_lastlog_info(struct passwd* pwd, VALUE v_user){ 
+int get_lastlog_info(struct passwd* pwd, VALUE v_user){
    int fd;
    ssize_t bytes_read;
    struct lastlog log;

data/test/tc_admin.rb

@@ -5,10 +5,10 @@
 # test suite based on the platform.
 ###############################################################################
 $LOAD_PATH.unshift Dir.pwd
-$LOAD_PATH.unshift Dir.pwd + "/test"
+$LOAD_PATH.unshift File.join(Dir.pwd, 'test')
 
 if File::ALT_SEPARATOR
-   require "tc_windows"
+   require 'tc_windows'
 else
-   require "tc_unix"
+   require 'tc_unix'
 end

data/test/tc_unix.rb

@@ -17,7 +17,7 @@ class TC_Sys_Admin_Unix < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.4.3', Admin::VERSION)
+      assert_equal('1.4.4', Admin::VERSION)
    end
 
    def test_get_login

data/test/tc_windows.rb

@@ -7,29 +7,35 @@
 # 
 # It is assumed that this test will be run via the 'rake test' task.
 ###############################################################################
-require "test/unit"
-require "sys/admin"
-require "socket"
+require 'rubygems'
+gem 'test-unit'
+
+require 'test/unit'
+require 'sys/admin'
+require 'socket'
 include Sys
 
 class TC_Sys_Admin_Win32 < Test::Unit::TestCase
+   def self.startup
+      @@host = Socket.gethostname
+   end
+
    def setup
-      @host        = Socket.gethostname
-      @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
+      @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 test_version
-      assert_equal('1.4.3', Admin::VERSION)
+      assert_equal('1.4.4', Admin::VERSION)
    end
    
    def test_01_add_local_user
       assert_respond_to(Admin, :add_local_user)
-      assert_nothing_raised{ Admin.add_local_user("foo") }
+      assert_nothing_raised{ Admin.add_local_user('foo') }
    end
    
    def test_add_global_user
@@ -39,7 +45,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    def test_02_config_local_user
       assert_respond_to(Admin, :config_local_user)
       assert_nothing_raised{
-         Admin.config_local_user("foo",{
+         Admin.config_local_user("foo", {
             :description => "delete me",
             :fullname    => "fubar"
          })
@@ -71,7 +77,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    def test_02_config_local_group
       assert_respond_to(Admin, :config_local_group)
       assert_nothing_raised{
-         Admin.config_local_group("bar",{:description=>"delete me"})
+         Admin.config_local_group('bar', {:description => 'delete me'})
       }
    end
    
@@ -107,10 +113,10 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    end
    
    def test_get_user_remote
-      assert_nothing_raised{ Admin.get_user(@user_name, @host) }
-      assert_nothing_raised{ Admin.get_user(@user_id, @host) }
-      assert_kind_of(User, Admin.get_user(@user_name, @host))
-      assert_kind_of(User, Admin.get_user(@user_id, @host))
+      assert_nothing_raised{ Admin.get_user(@user_name, @@host) }
+      assert_nothing_raised{ Admin.get_user(@user_id, @@host) }
+      assert_kind_of(User, Admin.get_user(@user_name, @@host))
+      assert_kind_of(User, Admin.get_user(@user_id, @@host))
    end
    
    def test_users
@@ -127,8 +133,8 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    end
    
    def test_users_remote
-      assert_nothing_raised{ Admin.users(@host) }
-      assert_nothing_raised{ Admin.users(@host){ |u| } }
+      assert_nothing_raised{ Admin.users(@@host) }
+      assert_nothing_raised{ Admin.users(@@host){ |u| } }
    end
    
    def test_user_instance_caption
@@ -205,6 +211,11 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
       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_get_group
       assert_respond_to(Admin, :get_group)
@@ -219,8 +230,8 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    end
    
    def test_get_group_remote
-      assert_nothing_raised{ Admin.get_group(@group_name, @host) }
-      assert_kind_of(Group, Admin.get_group(@group_name, @host))
+      assert_nothing_raised{ Admin.get_group(@group_name, @@host) }
+      assert_kind_of(Group, Admin.get_group(@group_name, @@host))
    end
    
    def test_groups
@@ -235,10 +246,10 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    end
    
    def test_groups_remote
-      assert_nothing_raised{ Admin.groups(@host) }
-      assert_nothing_raised{ Admin.groups(@host){ |g| } }
-      assert_kind_of(Array, Admin.groups(@host))
-      assert_kind_of(Group, Admin.groups(@host).first)
+      assert_nothing_raised{ Admin.groups(@@host) }
+      assert_nothing_raised{ Admin.groups(@@host){ |g| } }
+      assert_kind_of(Array, Admin.groups(@@host))
+      assert_kind_of(Group, Admin.groups(@@host).first)
    end
    
    def test_group_instance_caption
@@ -292,7 +303,6 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    end
 
    def teardown
-      @host       = nil
       @user       = nil
       @user_name  = nil
       @user_id    = nil
@@ -300,4 +310,8 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
       @group_name = nil
       @group_id   = nil
    end
+
+   def self.shutdown
+      @@host = nil
+   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sys-admin
 version: !ruby/object:Gem::Version 
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-02 00:00:00 -07:00
+date: 2008-11-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,8 +36,6 @@ files:
 - MANIFEST
 - Rakefile
 - README
-- ext/extconf.rb
-- ext/sys
 - ext/sys/admin.c
 - ext/sys/admin.h
 has_rdoc: true
@@ -51,7 +49,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.0
+      version: 1.8.2
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -62,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sysutils
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A unified, cross platform replacement for the "etc" package.