sys-admin 1.5.0-x86-mswin32-60 → 1.5.1-x86-mswin32-60

data/CHANGES

@@ -1,3 +1,11 @@
+== 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.
+* User objects returned by the Admin.users method now include the uid.
+  Previously only the Admin.get_user method set it.
+* Added win32-security as a dependency.
+* Changed license to Artistic 2.0.
+
 == 1.5.0 - 29-Mar-2009
 * INTERFACE CHANGE (WINDOWS ONLY): The interface for MS Windows has undergone
   a radical change. Most methods now accept a hash of options that are

data/MANIFEST

@@ -9,6 +9,6 @@
 * ext/admin.h
 * ext/extconf.rb
 * lib/sys/admin.rb
-* test/tc_admin.rb
-* test/tc_unix.rb
-* test/tc_windows.rb
+* test/test_sys_admin.rb
+* test/test_sys_admin_unix.rb
+* test/test_sys_admin_windows.rb

data/README

@@ -151,7 +151,7 @@ Admin::Error < StandardError
    page at http://www.rubyforge.org/projects/sysutils.
 
 == License
-   Ruby's
+   Artistic 2.0
 
 == Copyright
    (C) 2005-2009, Daniel J. Berger

data/doc/sys-admin-unix.txt

@@ -145,10 +145,10 @@ User#uid
    website at http://www.rubyforge.org/projects/sysutils.
 
 == License
-   Ruby's
+   Artistic 2.0
 
 == Copyright
-   Copyright 2002-2008, Daniel J. Berger
+   Copyright 2002-2009, 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.

data/doc/sys-admin-windows.txt

@@ -226,6 +226,12 @@ User#description
 
 User#description=
    Sets the description of the account.
+   
+User#dir
+   Returns the user's home directory.
+   
+User#dir=
+   Sets the user's home directory.
 
 User#disabled?
    Returns whether or not the account is disabled.
@@ -311,10 +317,10 @@ User#status
    website at http://www.rubyforge.org/projects/sysutils.
 
 == License
-   Ruby's
+   Artistic 2.0
 
 == Copyright
-   Copyright 2002-2008, Daniel J. Berger
+   Copyright 2002-2009, 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.

data/lib/sys/admin.rb

@@ -1,5 +1,6 @@
 require 'win32ole'
-require 'Win32API'
+require 'win32/security'
+require 'win32/registry'
 require 'socket'
 
 module Sys
@@ -151,6 +152,9 @@ module Sys
       # The user's id (RID).
       attr_accessor :uid
 
+      # The user's home directory
+      attr_accessor :dir
+
       # Used to set whether or not the account is disabled.
       attr_writer :disabled
       
@@ -192,17 +196,17 @@ module Sys
       def account_type=(type)
          case type
             when TEMP_DUPLICATE
-               @account_type = "duplicate"
+               @account_type = 'duplicate'
             when NORMAL
-               @account_type = "normal"
+               @account_type = 'normal'
             when INTERDOMAIN_TRUST
-               @account_type = "interdomain_trust"
+               @account_type = 'interdomain_trust'
             when WORKSTATION_TRUST
-               @account_type = "workstation_trust"
+               @account_type = 'workstation_trust'
             when SERVER_TRUST
-               @account_type = "server_trust"
+               @account_type = 'server_trust'
             else
-               @account_type = "unknown"
+               @account_type = 'unknown'
          end
       end
      
@@ -228,25 +232,25 @@ module Sys
       def sid_type=(stype)
          case stype
             when Admin::SidTypeUser
-               @sid_type = "user"
+               @sid_type = 'user'
             when Admin::SidTypeGroup
-               @sid_type = "group"
+               @sid_type = 'group'
             when Admin::SidTypeDomain
-               @sid_type = "domain"
+               @sid_type = 'domain'
             when Admin::SidTypeAlias
-               @sid_type = "alias"
+               @sid_type = 'alias'
             when Admin::SidTypeWellKnownGroup
-               @sid_type = "well_known_group"
+               @sid_type = 'well_known_group'
             when Admin::SidTypeDeletedAccount
-               @sid_type = "deleted_account"
+               @sid_type = 'deleted_account'
             when Admin::SidTypeInvalid
-               @sid_type = "invalid"
+               @sid_type = 'invalid'
             when Admin::SidTypeUnknown
-               @sid_type = "unknown"
+               @sid_type = 'unknown'
             when Admin::SidTypeComputer
-               @sid_type = "computer"
+               @sid_type = 'computer'
             else
-               @sid_type = "unknown"
+               @sid_type = 'unknown'
          end
       end
       
@@ -288,7 +292,7 @@ module Sys
    end
    
    class Admin
-      VERSION = '1.5.0'
+      VERSION = '1.5.1'
 
       # This is the error raised in the majority of cases if anything goes wrong
       # with any of the Sys::Admin methods.
@@ -307,6 +311,33 @@ module Sys
 
       private
 
+      HKEY = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"
+
+      # Retrieves the user's home directory. For local accounts query the
+      # registry. For domain accounts use ADSI and use the HomeDirectory.
+      #
+      def self.get_home_dir(user, local = false, domain = nil)
+         if local
+            sec = Win32::Security::SID.open(user)
+            key = HKEY + sec.to_s
+            dir = nil
+
+            begin
+               Win32::Registry::HKEY_LOCAL_MACHINE.open(key) do |reg|
+                  dir = reg['ProfileImagePath']
+               end
+            rescue Win32::Registry::Error
+               # Not every local user has a home directory
+            end
+         else
+            domain ||= Socket.gethostname
+            adsi = WIN32OLE.connect("WinNT://#{domain}/#{user},user")
+            dir = adsi.get('HomeDirectory')
+         end
+         
+         dir
+      end
+
       # A private method that lower cases all keys, and converts them
       # all to symbols.
       #
@@ -342,7 +373,7 @@ module Sys
       end
       
       # Used by the get_login method
-      GetUserName = Win32API.new('advapi32', 'GetUserName', 'PP', 'L') # :nodoc:
+      GetUserName = Win32::API.new('GetUserName', 'PP', 'L', 'advapi32') # :nodoc:
 
       public
 
@@ -677,6 +708,7 @@ module Sys
                u.status              = user.status
                u.uid                 = uid
                u.groups              = get_groups(domain, user.name)
+               u.dir                 = get_home_dir(user.name, options[:localaccount], domain)
             end
 
             return user_object
@@ -740,6 +772,8 @@ module Sys
          domain = options[:domain] || host
          
          wmi.execquery(query).each{ |user|
+            uid = user.sid.split('-').last.to_i
+
             usr = User.new do |u|
                u.account_type        = user.accounttype
                u.caption             = user.caption
@@ -758,6 +792,8 @@ module Sys
                u.sid_type            = user.sidtype
                u.status              = user.status
                u.groups              = get_groups(domain, user.name)
+               u.uid                 = uid
+               u.dir                 = get_home_dir(user.name, options[:localaccount], host)
             end
             
             if block_given?

data/sys-admin.gemspec

@@ -1,16 +1,17 @@
 require 'rubygems'
 
 spec = Gem::Specification.new do |gem|
-   gem.name         = 'sys-admin'
-   gem.version      = '1.5.0'
-   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" library.'
-   gem.description  = 'A unified, cross platform replacement for the "etc" library.'
-   gem.test_file    = 'test/test_sys_admin.rb'
-   gem.has_rdoc     = true
+   gem.name      = 'sys-admin'
+   gem.version   = '1.5.1'
+   gem.author    = 'Daniel J. Berger'
+   gem.license   = 'Artistic 2.0'
+   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" library.'
+   gem.test_file = 'test/test_sys_admin.rb'
+   gem.has_rdoc  = true
+
    gem.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST']
    gem.rubyforge_project = 'sysutils'
    gem.required_ruby_version = '>= 1.8.2'
@@ -31,8 +32,15 @@ spec = Gem::Specification.new do |gem|
    files.delete_if{ |item| item.include?('CVS') }
 
    gem.files = files
-end
 
-if $PROGRAM_NAME == __FILE__
-   Gem::Builder.new(spec).build
+   gem.description = <<-EOF
+      The sys-admin library is a unified, cross platform replacement for the
+      'etc' library that ships as part of the Ruby standard library. It
+      provides a common interface for all platforms, including MS Windows. In
+      addition, it provides an interface for adding, deleting and configuring
+      users on MS Windows.
+   EOF
 end
+
+Gem.manage_gems if Gem::RubyGemsVersion.to_f < 1.0
+Gem::Builder.new(spec).build

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

data/test/test_sys_admin_windows.rb

@@ -256,6 +256,16 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
       assert_respond_to(@user, :uid=)
    end
    
+   def test_user_dir_basic
+      assert_respond_to(@user, :dir)
+      assert_respond_to(@user, :dir=)    
+   end
+   
+   def test_user_dir
+      assert_nothing_raised{ Admin.get_user(@user_name, :localaccount => true) }
+      assert_kind_of(String, @user_name.dir)
+   end
+   
    # Group class
    
    def test_group_instance_caption

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sys-admin
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.5.1
 platform: x86-mswin32-60
 authors: 
 - Daniel J. Berger
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -06:00
+date: 2009-07-23 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
-description: A unified, cross platform replacement for the "etc" library.
+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: []
 
@@ -32,20 +32,15 @@ files:
 - test/test_sys_admin_unix.rb
 - test/test_sys_admin_windows.rb
 - CHANGES
-- doc
-- examples
-- ext
-- lib
 - MANIFEST
 - Rakefile
 - README
 - sys-admin.gemspec
-- test
 - lib/sys/admin.rb
 has_rdoc: true
 homepage: http://www.rubyforge.org/projects/sysutils
-licenses: []
-
+licenses: 
+- Artistic 2.0
 post_install_message: 
 rdoc_options: []
 
@@ -66,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sysutils
-rubygems_version: 1.3.1.2403
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: A unified, cross platform replacement for the "etc" library.