sys-admin 1.4.3-x86-mswin32-60 → 1.4.4-x86-mswin32-60

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/lib/sys/admin.rb

@@ -1,6 +1,6 @@
-require "win32ole"
-require "Win32API"
-require "socket"
+require 'win32ole'
+require 'Win32API'
+require 'socket'
 
 module Sys
    class Group
@@ -142,6 +142,9 @@ module Sys
       # Current status for the user, such as "ok", "error", etc.
       attr_accessor :status
 
+      # The user's id (RID).
+      attr_accessor :uid
+
       # Used to set whether or not the account is disabled.
       attr_writer :disabled
       
@@ -279,14 +282,13 @@ module Sys
    end
    
    class Admin
-      VERSION = '1.4.3'
+      VERSION = '1.4.4'
 
       # This is the error raised in the majority of cases if anything goes wrong
       # with any of the Sys::Admin methods.
       #  
       class Error < StandardError; end
-   
-      
+
       SidTypeUser           = 1
       SidTypeGroup          = 2
       SidTypeDomain         = 3
@@ -296,10 +298,14 @@ module Sys
       SidTypeInvalid        = 7
       SidTypeUnknown        = 8
       SidTypeComputer       = 9
+
+      private
       
       # Used by the get_login method
       GetUserName = Win32API.new('advapi32', 'GetUserName', 'PP', 'L') # :nodoc:
-      
+
+      public
+
       # Configures the global +user+ on +domain+ using options.
       #
       # See http://tinyurl.com/3hjv9 for a list of valid options.
@@ -468,7 +474,7 @@ module Sys
             raise Error, 'GetUserName() call failed in get_login'
          end
 
-         length   = nsize.unpack("L")[0]
+         length = nsize.unpack('L')[0]
          username = buffer[0 ... length].chop
          username
       end
@@ -483,7 +489,7 @@ module Sys
       # default is the local machine.  You may also specify whether to
       # retrieve a local or global account.  The default is local.
       #
-      def self.get_user(uid, host=Socket.gethostname, local=true)
+      def self.get_user(usr, host=Socket.gethostname, local=true)
          host = Socket.gethostname if host.nil?
          cs = "winmgmts:{impersonationLevel=impersonate}!"
          cs << "//#{host}/root/cimv2"
@@ -497,29 +503,30 @@ module Sys
          query = "select * from win32_useraccount"
          query << " where localaccount = true" if local
          
-         if uid.kind_of?(Fixnum)
+         if usr.kind_of?(Fixnum)
             if local
-               query << " and sid like '%-#{uid}'"
+               query << " and sid like '%-#{usr}'"
             else
-               query << " where sid like '%-#{uid}'"
+               query << " where sid like '%-#{usr}'"
             end
          else
             if local
-               query << " and name = '#{uid}'"
+               query << " and name = '#{usr}'"
             else
-               query << " where name = '#{uid}'"
+               query << " where name = '#{usr}'"
             end
          end
          
          wmi.execquery(query).each{ |user|
+            uid = user.sid.split('-').last.to_i
+
             # Because our 'like' query isn't fulproof, let's parse
             # the SID again to make sure
-            if uid.kind_of?(Fixnum)
-               if user.sid.split("-").last.to_i != uid
-                  next
-               end
+            if usr.kind_of?(Fixnum)
+               next if usr != uid
             end
-            usr = User.new do |u|
+
+            user_object = User.new do |u|
                u.account_type = user.accounttype
                u.caption      = user.caption
                u.description  = user.description
@@ -536,9 +543,14 @@ module Sys
                u.sid      = user.sid
                u.sid_type = user.sidtype
                u.status   = user.status
+               u.uid      = uid
             end
-            return usr
+
+            return user_object
          }
+
+         # If we're here, it means it wasn't found.
+         raise Error, "no user found for '#{usr}'"
       end
       
       # In block form, yields a User object for each user on the system.  In
@@ -644,7 +656,7 @@ module Sys
                next if grp != gid
             end
             
-            grp = Group.new do |g|
+            group_object = Group.new do |g|
                g.caption      = group.caption
                g.description  = group.description              
                g.domain       = group.domain
@@ -656,8 +668,10 @@ module Sys
                g.sid_type     = group.sidtype
                g.status       = group.status
             end
-            return grp
+
+            return group_object
          }
+
          # If we're here, it means it wasn't found.
          raise Error, "no group found for '#{grp}'"
       end

data/sys-admin.gemspec

@@ -2,27 +2,27 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |gem|
    gem.name         = 'sys-admin'
-   gem.version      = '1.4.3'
+   gem.version      = '1.4.4'
    gem.author       = 'Daniel J. Berger'
    gem.email        = 'djberg96@gmail.com'
    gem.homepage     = 'http://www.rubyforge.org/projects/sysutils'
-   gem.platform     = Gem::Platform::CURRENT
+   gem.platform     = Gem::Platform::RUBY
    gem.summary      = 'A unified, cross platform replacement for the "etc" package.'
    gem.description  = 'A unified, cross platform replacement for the "etc" package.'
    gem.test_file    = 'test/tc_admin.rb'
    gem.has_rdoc     = true
    gem.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST']
    gem.rubyforge_project = 'sysutils'
+   gem.required_ruby_version = '>= 1.8.2'
 	
    files = Dir["doc/*"] + Dir["examples/*"]
    files += Dir["test/*"] + Dir["[A-Z]*"]
 
-   if RUBY_PLATFORM.match('mswin')
+   if Config::CONFIG['host_os'].match('mswin')
       files += Dir["lib/sys/admin.rb"]
-      gem.required_ruby_version = '>= 1.8.2'
+      gem.platform = Gem::Platform::CURRENT
    else
-      files += Dir["ext/**/*"]
-      gem.required_ruby_version = '>= 1.8.0'
+      files += Dir["ext/**/*.{c,h}"]
       gem.extensions = ['ext/extconf.rb']
       gem.extra_rdoc_files << 'ext/sys/admin.c'
       gem.require_path = 'lib'
@@ -34,6 +34,5 @@ spec = Gem::Specification.new do |gem|
 end
 
 if $PROGRAM_NAME == __FILE__
-   Gem.manage_gems
    Gem::Builder.new(spec).build
 end

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: x86-mswin32-60
 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: []
 
@@ -39,10 +39,7 @@ files:
 - MANIFEST
 - Rakefile
 - README
-- sys-admin-1.4.0-x86-mswin32-60.gem
-- sys-admin-1.4.3.gem
 - sys-admin.gemspec
-- sys-admin.gemspec~
 - test
 - lib/sys/admin.rb
 has_rdoc: true
@@ -67,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sysutils
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A unified, cross platform replacement for the "etc" package.

data/sys-admin.gemspec~

@@ -1,39 +0,0 @@
-require 'rubygems'
-
-spec = Gem::Specification.new do |gem|
-   gem.name         = 'sys-admin'
-   gem.version      = '1.4.3'
-   gem.author       = 'Daniel J. Berger'
-   gem.email        = 'djberg96@gmail.com'
-   gem.homepage     = 'http://www.rubyforge.org/projects/sysutils'
-   gem.platform     = Gem::Platform::RUBY
-   gem.summary      = 'A unified, cross platform replacement for the "etc" package.'
-   gem.description  = 'A unified, cross platform replacement for the "etc" package.'
-   gem.test_file    = 'test/tc_admin.rb'
-   gem.has_rdoc     = true
-   gem.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST']
-   gem.rubyforge_project = 'sysutils'
-	
-   files = Dir["doc/*"] + Dir["examples/*"]
-   files += Dir["test/*"] + Dir["[A-Z]*"]
-
-   if RUBY_PLATFORM.match('mswin')
-      files += Dir["lib/sys/admin.rb"]
-      gem.required_ruby_version = '>= 1.8.2'
-   else
-      files += Dir["ext/**/*"]
-      gem.required_ruby_version = '>= 1.8.0'
-      gem.extensions = ['ext/extconf.rb']
-      gem.extra_rdoc_files << 'ext/sys/admin.c'
-      gem.require_path = 'lib'
-   end
-
-   files.delete_if{ |item| item.include?('CVS') }
-
-   gem.files = files
-end
-
-if $PROGRAM_NAME == __FILE__
-   Gem.manage_gems
-   Gem::Builder.new(spec).build
-end