sys-admin 1.5.1 → 1.5.2

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.5.2 - 2-Aug-2009
+* Now compatible with Ruby 1.9.x.
+* Added test-unit as a development dependency.
+
 == 1.5.1 - 23-Jul-2009
 * Added the User#dir attribute. This attribute contains a user's home
   directory if set, or nil if it isn't.

data/README

@@ -159,5 +159,3 @@ Admin::Error < StandardError
 
 == Author
    Daniel J. Berger
-   djberg96 at nospam at gmail dot com
-   IRC nickname: imperator/mok/rubyhacker1 (freenode)

data/ext/sys/admin.c

@@ -1,6 +1,16 @@
 #include "ruby.h"
 #include "admin.h"
 
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(v) (RSTRING(v)->ptr)
+#define RSTRING_LEN(v) (RSTRING(v)->len)
+#endif
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(v) (RARRAY(v)->ptr)
+#define RARRAY_LEN(v) (RARRAY(v)->len)
+#endif
+
 /*
  * call-seq:
  *    User.new
@@ -290,8 +300,8 @@ static VALUE user_groups(VALUE self){
     * the user name, we have a match.
     */
    if(!NIL_P(v_groups)){
-      for(i = 0; i < RARRAY(v_groups)->len; i++){
-         v_group = RARRAY(v_groups)->ptr[i];
+      for(i = 0; i < RARRAY_LEN(v_groups); i++){
+         v_group = RARRAY_PTR(v_groups)[i];
          v_users = rb_funcall(v_group, rb_intern("members"), 0, 0);
 
          if(RTEST(rb_funcall(v_users, rb_intern("include?"), 1, v_name))){
@@ -404,6 +414,6 @@ void Init_admin(){
 
    /* Constants */
 
-   /* 1.5.1: The version of this library */
+   /* 1.5.2: 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.1"
+#define SYS_ADMIN_VERSION "1.5.2"
 
 #if defined(__MACH__) || defined(__APPLE__)
 #define __BSD__
@@ -111,7 +111,7 @@ static VALUE get_user_by_name(VALUE v_name){
    struct passwd pwd;
    struct passwd* pwdbuf;
 
-   if(getpwnam_r(RSTRING(v_name)->ptr, &pwd, buf, sizeof(buf), &pwdbuf) != 0)
+   if(getpwnam_r(RSTRING_PTR(v_name), &pwd, buf, sizeof(buf), &pwdbuf) != 0)
       rb_raise(cAdminError, "%s", strerror(errno));
 
    if(!pwdbuf)
@@ -178,7 +178,7 @@ static VALUE get_group_by_name(VALUE v_name){
    struct group grp;
    struct group* grpbuf;
 
-   if(getgrnam_r(RSTRING(v_name)->ptr, &grp, buf, sizeof(buf), &grpbuf) != 0)
+   if(getgrnam_r(RSTRING_PTR(v_name), &grp, buf, sizeof(buf), &grpbuf) != 0)
       rb_raise(cAdminError, "%s", strerror(errno));
 
    if(!grpbuf)

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.1', Sys::Admin::VERSION)
+      assert_equal('1.5.2', Sys::Admin::VERSION)
    end
 end

data/test/test_sys_admin_windows.rb

@@ -262,8 +262,8 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
    end
    
    def test_user_dir
-      assert_nothing_raised{ Admin.get_user(@user_name, :localaccount => true) }
-      assert_kind_of(String, @user_name.dir)
+      assert_nothing_raised{ @user = Admin.get_user(@user_name, :localaccount => true) }
+      assert_kind_of([String, NilClass], @user.dir)
    end
    
    # Group class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sys-admin
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 -06:00
+date: 2009-08-02 00:00:00 -06:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
 description: "      The sys-admin library is a unified, cross platform replacement for the\n      'etc' library that ships as part of the Ruby standard library. It\n      provides a common interface for all platforms, including MS Windows. In\n      addition, it provides an interface for adding, deleting and configuring\n      users on MS Windows.\n"
 email: djberg96@gmail.com
 executables: []
@@ -62,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sysutils
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A unified, cross platform replacement for the "etc" library.