sys-admin 1.6.0 → 1.6.1

data/lib/sys/admin/common.rb

@@ -34,7 +34,7 @@ module Sys
     public
 
     # The version of the sys-admin library.
-    VERSION = '1.6.0'
+    VERSION = '1.6.1'
 
     # Error typically raised if any of the Sys::Admin methods fail.
     class Error < StandardError; end

data/lib/windows/sys/admin.rb

@@ -297,7 +297,7 @@ module Sys
     extend FFI::Library
 
     # The version of the sys-admin library.
-    VERSION = '1.6.0'
+    VERSION = '1.6.1'
 
     # This is the error raised in the majority of cases if anything goes wrong
     # with any of the Sys::Admin methods.
@@ -379,7 +379,7 @@ module Sys
 
     # Used by the get_login method
     ffi_lib :advapi32
-    attach_function :GetUserNameW, [:buffer_out, :pointer], :bool
+    attach_function :GetUserNameW, [:pointer, :pointer], :bool
     private_class_method :GetUserNameW
 
     public
@@ -465,7 +465,7 @@ module Sys
     #  # Change the password
     #  Sys::Admin.configure_user(
     #     :name     => 'asmith',
-    #     :password => [old_pass, new_pass]
+    #     :password => 'new_password'
     #  )
     #
     #  # Configure a user on a specific domain
@@ -486,7 +486,7 @@ module Sys
 
         options.each{ |option, value|
           if option.to_s == 'password'
-            adsi.changepassword(value[0], value[1])
+            adsi.setpassword(value)
           else
             adsi.put(option.to_s, value)
           end
@@ -559,6 +559,28 @@ module Sys
       end
     end
 
+    # Adds +user+ to +group+ on the specified +domain+, or the localhost
+    # if no domain is specified.
+    #
+    def self.add_group_member(user, group, domain=nil)
+      domain ||= Socket.gethostname
+      adsi = WIN32OLE.connect("WinNT://#{domain}/#{group},group")
+      adsi.Add("WinNT://#{domain}/#{user}")
+    rescue WIN32OLERuntimeError => err
+      raise Error, err
+    end
+
+    # Removes +user+ from +group+ on the specified +domain+, or the localhost
+    # if no domain is specified.
+    #
+    def self.remove_group_member(user, group, domain=nil)
+      domain ||= Socket.gethostname
+      adsi = WIN32OLE.connect("WinNT://#{domain}/#{group},group")
+      adsi.Remove("WinNT://#{domain}/#{user}")
+    rescue WIN32OLERuntimeError => err
+      raise Error, err
+    end
+
     # Configures the +group+ using +options+. If no domain option is
     # specified then your local host is used, i.e. you are configuring
     # a local group.
@@ -614,7 +636,7 @@ module Sys
     # Returns the user name (only) of the current login.
     #
     def self.get_login
-      buffer = 0.chr * 256
+      buffer = FFI::MemoryPointer.new(:char, 256)
       nsize  = FFI::MemoryPointer.new(:ulong)
       nsize.write_ulong(buffer.size)
 
@@ -622,7 +644,7 @@ module Sys
         raise Error, 'GetUserName() call failed in get_login'
       end
 
-      buffer.strip.tr(0.chr, '')
+      buffer.read_string(nsize.read_ulong * 2).tr(0.chr, '')
     end
 
     # Returns a User object based on either +name+ or +uid+.

data/sys-admin.gemspec

@@ -4,7 +4,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'sys-admin'
-  spec.version   = '1.6.0'
+  spec.version   = '1.6.1'
   spec.author    = 'Daniel J. Berger'
   spec.license   = 'Artistic 2.0'
   spec.email     = 'djberg96@gmail.com'
@@ -17,7 +17,9 @@ Gem::Specification.new do |spec|
   spec.rubyforge_project = 'sysutils'
 	
   spec.add_dependency('ffi', '>= 1.1.0')
+
   spec.add_development_dependency('test-unit', '>= 2.5.0')
+  spec.add_development_dependency('rake')
 
   spec.description = <<-EOF
     The sys-admin library is a unified, cross platform replacement for the

data/test/test_sys_admin.rb

@@ -14,6 +14,6 @@ end
 
 class TC_Sys_Admin_All < Test::Unit::TestCase
   test "version is set to expected value" do
-    assert_equal('1.6.0', Sys::Admin::VERSION)
+    assert_equal('1.6.1', Sys::Admin::VERSION)
   end
 end

data/test/test_sys_admin_windows.rb

@@ -16,14 +16,7 @@ include Sys
 class TC_Sys_Admin_Win32 < Test::Unit::TestCase
   def self.startup
     @@host = Socket.gethostname
-    @@version = `ver`.scan(/\d/).first.to_i
-
-    # No elevated_security? method for XP yet.
-    if @@version < 6
-      @@elevated = true
-    else
-      @@elevated = Win32::Security.elevated_security?
-    end
+    @@elevated = Win32::Security.elevated_security?
   end
 
   def setup
@@ -53,12 +46,12 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
         :name        => 'foo',
         :description => 'delete me',
         :fullname    => 'fubar',
-        :password    => ['a1b2c3D4', 'd1c2b3A4']
+        :password    => 'd1c2b3A4'
       )
     }
   end
 
-  def test_03_delete_user
+  def test_06_delete_user
     omit_unless(@@elevated)
     assert_respond_to(Admin, :delete_user)
     assert_nothing_raised{ Admin.delete_user('foo') }
@@ -74,11 +67,23 @@ class TC_Sys_Admin_Win32 < Test::Unit::TestCase
     omit_unless(@@elevated)
     assert_respond_to(Admin, :configure_group)
     assert_nothing_raised{
-       Admin.configure_group(:name => 'bar', :description => 'delete me')
+      Admin.configure_group(:name => 'bar', :description => 'delete me')
     }
   end
 
-  def test_03_delete_group
+  def test_03_add_group_member
+    omit_unless(@@elevated)
+    assert_respond_to(Admin, :add_group_member)
+    assert_nothing_raised{ Admin.add_group_member('foo', 'bar') }
+  end
+
+  def test_04_remove_group_member
+    omit_unless(@@elevated)
+    assert_respond_to(Admin, :remove_group_member)
+    assert_nothing_raised{ Admin.remove_group_member('foo', 'bar') }
+  end
+
+  def test_05_delete_group
     omit_unless(@@elevated)
     assert_respond_to(Admin, :delete_group)
     assert_nothing_raised{ Admin.delete_group('bar') }

metadata

@@ -1,52 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: sys-admin
 version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+  version: 1.6.1
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
-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"
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      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.
 email: djberg96@gmail.com
 executables: []
 extensions: []
@@ -79,27 +90,26 @@ files:
 homepage: http://www.github.com/djberg96/sysutils
 licenses:
 - Artistic 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sysutils
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A unified, cross platform replacement for the "etc" library.
 test_files:
 - test/test_sys_admin.rb