sys-admin 1.5.5 → 1.5.6

data/CHANGES

@@ -1,3 +1,9 @@
+== 1.5.6 - 30-Jul-2011
+* Fixed issue for non-gnu platforms where it would use the wrong function
+  prototype because the Ruby core team took it upon themselves to explicitly
+  defined _GNU_SOURCE in config.h in 1.8.7 and later for reasons that baffle me.
+* Some tests on Windows are now skipped unless run with elevated security.
+
 == 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.
@@ -39,7 +45,7 @@
 * Added the Group#members method. The returns an array of users that the
   group contains.
 * Changed User#class to User#access_class for UNIX flavors to avoid
-  conflicts with the Ruby core Object method. 
+  conflicts with the Ruby core Object method.
 * Added more tests and renamed the test files.
 * Removed an unnecessary function call where a platform might try to
   get lastlog information even if the lastlog.h or utmp.h headers couldn't

data/ext/sys/admin.c

@@ -167,7 +167,7 @@ static VALUE admin_groups_body(VALUE klass){
 #ifdef HAVE_GETGRENT_R
    struct group grp;
    char buf[GROUP_BUF_SIZE];
-#ifdef _GNU_SOURCE
+#if defined _GNU_SOURCE && !defined __sunos && !defined __SUNPRO_C && !defined __SUNPRO_CC
    struct group* grp_p;
 
    while(!getgrent_r(&grp, buf, GROUP_BUF_SIZE, &grp_p)){
@@ -233,7 +233,7 @@ static VALUE admin_users_body(VALUE klass){
    struct passwd pwd;
    char buf[USER_BUF_SIZE];
 
-#ifdef _GNU_SOURCE
+#if defined _GNU_SOURCE && !defined __sunos && !defined __SUNPRO_C && !defined __SUNPRO_CC
    struct passwd* pwd_p;
 
    while(!getpwent_r(&pwd, buf, USER_BUF_SIZE, &pwd_p)){

data/ext/sys/admin.h

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define SYS_ADMIN_VERSION "1.5.5"
+#define SYS_ADMIN_VERSION "1.5.6"
 
 #if defined(__MACH__) || defined(__APPLE__)
 #define __BSD__

data/sys-admin.gemspec

@@ -4,7 +4,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'sys-admin'
-  spec.version   = '1.5.5'
+  spec.version   = '1.5.6'
   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.5', Sys::Admin::VERSION)
+    assert_equal('1.5.6', Sys::Admin::VERSION)
   end
 end

data/test/test_sys_admin_windows.rb

@@ -4,7 +4,7 @@
 # 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.
-# 
+#
 # It is assumed that this test will be run via the 'rake test' task.
 ###############################################################################
 require 'rubygems'
@@ -12,6 +12,7 @@ gem 'test-unit'
 
 require 'test/unit'
 require 'sys/admin'
+require 'win32/security'
 require 'socket'
 require 'etc'
 include Sys
@@ -19,6 +20,7 @@ include Sys
 class TC_Sys_Admin_Win32 < Test::Unit::TestCase
   def self.startup
     @@host = Socket.gethostname
+    @@elev = Win32::Security.elevated_security?
   end
 
   def setup
@@ -33,6 +35,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
   # Admin singleton methods
 
   def test_01_add_user
+    omit_unless(@@elev, "insufficient privileges - skipping")
     assert_respond_to(Admin, :add_user)
     assert_nothing_raised{
       Admin.add_user(:name => 'foo', :password => 'a1b2c3D4')
@@ -40,6 +43,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
   end
 
   def test_02_config_user
+    omit_unless(@@elev, "insufficient privileges - skipping")
     assert_respond_to(Admin, :configure_user)
     assert_nothing_raised{
       Admin.configure_user(
@@ -50,29 +54,33 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
       )
     }
   end
- 
+
   def test_03_delete_user
+    omit_unless(@@elev, "insufficient privileges - skipping")
     assert_respond_to(Admin, :delete_user)
     assert_nothing_raised{ Admin.delete_user('foo') }
   end
 
   def test_01_add_group
+    omit_unless(@@elev, "insufficient privileges - skipping")
     assert_respond_to(Admin, :add_group)
     assert_nothing_raised{ Admin.add_group(:name => 'bar') }
   end
- 
+
   def test_02_configure_group
+    omit_unless(@@elev, "insufficient privileges - skipping")
     assert_respond_to(Admin, :configure_group)
     assert_nothing_raised{
        Admin.configure_group(:name => 'bar', :description => 'delete me')
     }
   end
- 
+
   def test_03_delete_group
+    omit_unless(@@elev, "insufficient privileges - skipping")
     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 }
@@ -85,13 +93,13 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
   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_nothing_raised{ Admin.get_user(@user_name, :localaccount => true) }
     assert_kind_of(User, Admin.get_user(@user_name, :localaccount => true))
   end
 
@@ -99,7 +107,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
     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) }
@@ -120,7 +128,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
   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) }
@@ -142,7 +150,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
   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))
@@ -152,7 +160,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
     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))
@@ -166,7 +174,7 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
   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) }
@@ -186,77 +194,77 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
   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=)
@@ -266,64 +274,64 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
     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=)    
+    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=)

metadata

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