Fixes for rubinius and tests.

Author: Adam Palmblad

HISTORY

@@ -1,3 +1,9 @@
+[2015/10/06]
+* Version 2.5.0
+  - fixes for compiling for rubinius, at long last
+  - TESTS
+  - add a few method aliases
+
 [2014/12/02]
 * Version 2.4.1
   - sp_loginclass support should NOT have been added to password implementation

README

@@ -26,21 +26,21 @@ make # use gmake on FreeBSD
  still present, but no promises about earlier versions of Ruby.
 
 3. Shadow::Passwd module's methods
-_________________________________________________________
- Method                 | Linux | Solaris | OS X  | *BSD
-_________________________________________________________
- getspent               |   *   |    *    |   *   |   *
- getspnam(name)         |   *   |    *    |   *   |   *
+________________________________________________________________________
+ Method                                | Linux | Solaris | OS X  | *BSD
+________________________________________________________________________
+ getspent                              |   *   |    *    |   *   |   *
+ getspnam(name)                        |   *   |    *    |   *   |   *
  from_user_name(name) (alias of above) |   *   |    *    |   *   |   *
- setspent               |   *   |    *    |   *   |   *
- endspent               |   *   |    *    |   *   |   *
- fgetspent(file)        |   *   |    *    |   N   |   N
- sgetspent(str)         |   *   |    N    |   N   |   N
- putspent(entry,file)   |   *   |    *    |   N   |   N
- add_password_entry (alias of above ) |   *   |    *    |   N   |   N
- lckpwdf,lock           |   *   |    *    |   N   |   N
- ulckpwdf,unlock        |   *   |    *    |   N   |   N
- lock?                  |   *   |    *    |   N   |   N
+ setspent                              |   *   |    *    |   *   |   *
+ endspent                              |   *   |    *    |   *   |   *
+ fgetspent(file)                       |   *   |    *    |   N   |   N
+ sgetspent(str)                        |   *   |    N    |   N   |   N
+ putspent(entry,file)                  |   *   |    *    |   N   |   N
+ add_password_entry (alias of above )  |   *   |    *    |   N   |   N
+ lckpwdf,lock                          |   *   |    *    |   N   |   N
+ ulckpwdf,unlock                       |   *   |    *    |   N   |   N
+ lock?                                 |   *   |    *    |   N   |   N
 
 Check the implementation in use via Shadow::IMPLEMENTATION.
 

ruby-shadow.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.name                  = 'ruby-shadow'
   spec.required_ruby_version = ['>= 1.8']
   spec.summary               = '*nix Shadow Password Module'
-  spec.version               = '2.4.1'
+  spec.version               = '2.5.0'
   spec.license  = "Public Domain License"
 end

shadow/shadow.c

@@ -144,21 +144,27 @@ rb_shadow_putspent(VALUE self, VALUE entry, VALUE file)
 
   if( TYPE(file) != T_FILE )
     rb_raise(rb_eTypeError,"argument must be a File.");
-
+    /*
   for(i=0; i<NUM_FIELDS; i++)
-    val[i] = RSTRUCT_PTR( entry )[i]; //val[i] = RSTRUCT(entry)->ptr[i];
+  {
+    val[i] = rb_ary_entry( entry, i ); //val[i] = RSTRUCT(entry)->ptr[i];
+    i//val[i] = rb_struct_aref( entry, i );
+  }
+  */
   cfile = file_ptr( RFILE(file)->fptr );
 
-
-  centry.sp_namp = StringValuePtr(val[0]);
-  centry.sp_pwdp = StringValuePtr(val[1]);
-  centry.sp_lstchg = FIX2INT(val[2]);
-  centry.sp_min = FIX2INT(val[3]);
-  centry.sp_max = FIX2INT(val[4]);
-  centry.sp_warn = FIX2INT(val[5]);
-  centry.sp_inact = FIX2INT(val[6]);
-  centry.sp_expire = FIX2INT(val[8]);
-  centry.sp_flag = FIX2INT(val[9]);
+  VALUE x = rb_ary_entry( entry, 0 );
+  centry.sp_namp = StringValuePtr( x );
+  x = rb_ary_entry( entry, 1 );
+  centry.sp_pwdp = StringValuePtr( x );
+  centry.sp_lstchg = FIX2INT( rb_ary_entry( entry, 2) );
+  centry.sp_min = FIX2INT( rb_ary_entry( entry, 3 ) );
+  centry.sp_max = FIX2INT( rb_ary_entry( entry, 4 ) );
+  centry.sp_warn = FIX2INT( rb_ary_entry( entry, 5 ));
+  centry.sp_inact = FIX2INT( rb_ary_entry( entry, 6 ) );
+  // missing 7 I think is put in to deal with beign similar to BSD returns, for the value pw_change.
+  centry.sp_expire = FIX2INT( rb_ary_entry( entry, 8 ) );
+  centry.sp_flag = FIX2INT( rb_ary_entry( entry, 9 ) );
 
   result = putspent(&centry,cfile);
 

test/basic_test.rb

@@ -1,17 +1,20 @@
 require 'test/unit'
 require 'rubygems'
 require 'shadow'
+require 'stringio'
 class RubyShadowTest < Test::Unit::TestCase
   STRUCT_METHODS = %w( sp_namp sp_pwdp sp_lstchg sp_min sp_max sp_warn sp_inact sp_expire sp_loginclass )
   # --------------------------------------------------- test_smoke_test_getspent
   def test_smoke_test_getspent
     x = Shadow::Passwd.getspent
+    assert( x, "ensure you have permissions to check this (sudo?)" )
     check_struct( x )
   end
   # ----------------------------------------------------- test_getspnam_for_user
   def test_getspnam_for_user
     user = `whoami`.strip
     x = Shadow::Passwd.getspnam( user )
+    assert( x, "ensure you have permissions to check this (sudo?)" )
     check_struct( x )
   end
   # ---------------------------------------- test_getspnam_for_non_existent_user
@@ -20,11 +23,12 @@ def test_getspnam_for_non_existent_user
   end
   # -------------------------------------------------------------- test_putspent
   def test_putspent
-    omit_if( Shadow::IMPLEMENTATION != 'SHADOW' )
-    result = StringIO.open( '', 'w' ) do |fh|
+    omit_if( Shadow::IMPLEMENTATION != 'SHADOW' ) if respond_to?( :omit_if )
+    #result = StringIO.open( '', 'w' ) do |fh|
+    File.open( 'test_password', 'w' ) do |fh|
       Shadow::Passwd.add_password_entry( sample_entry, fh )
     end
-    raise result.inspect
+    assert( File.read( 'test_password' ).match( sample_entry.first ) )
   end
   # --------------------------------------------------------------- check_struct
   def check_struct( s )
@@ -34,6 +38,17 @@ def check_struct( s )
   end
   # ----------------------------------------------------------------- test_entry
   def sample_entry( &block )
+    return ['test_user', # sp_namp
+            'new_pass', # sp_pwdp
+            0, #sp_lastchg
+            0, #sp_min
+            0, #sp_max
+            0, #sp_warn
+            0, #sp_inact
+            0, #????
+            0, #sp_expire
+            0  # sp_flag
+            ]
     e = Shadow::Passwd::Entry.new
     e.sp_namp = 'test_user'
     e.sp_pwdp = 'password'