win32-file 0.6.0 → 0.6.1

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.6.1 - 9-Feb-2009
+* Fixed a bug in the custom File.directory? method with regards to
+  non-existent directories.
+
 == 0.6.0 - 14-Nov-2008
 * Converted methods to use wide character handling.
 * Added working implementations for the File.readlink, File.symlink and

data/lib/win32/file.rb

@@ -19,7 +19,7 @@ class File
    extend Windows::Handle
    
    # The version of the win32-file library
-   WIN32_FILE_VERSION  = '0.6.0'
+   WIN32_FILE_VERSION  = '0.6.1'
 
    # Abbreviated attribute constants for convenience
 
@@ -455,7 +455,8 @@ class File
       #
       def directory?(file)
          file = multi_to_wide(file)
-         GetFileAttributesW(file) & FILE_ATTRIBUTE_DIRECTORY > 0
+         attributes = GetFileAttributesW(file)
+         (attributes != -1) && (attributes & FILE_ATTRIBUTE_DIRECTORY > 0)
       end
 
       # Returns all components of the filename given in +filename+ except the
@@ -1160,4 +1161,69 @@ class File
       alias :set_attr :set_attributes
       alias :unset_attr :remove_attributes
    end
+
+   private
+
+   # Get the owner of a given file by name.
+   #
+   def get_owner(file)
+      handle = CreateFile(
+         file,
+         GENERIC_READ,
+         FILE_SHARE_READ,
+         0,
+         OPEN_EXISTING,
+         0,
+         0
+      )
+
+      if handle == INVALID_HANDLE_VALUE
+         raise ArgumentError, get_last_error
+      end
+
+      sid     = 0.chr * 28
+      sid_ptr = [0].pack('L')
+
+      begin
+         rv = GetSecurityInfo(
+            handle,
+            SE_FILE_OBJECT,
+            OWNER_SECURITY_INFORMATION,
+            sid_ptr,
+            nil,
+            nil,
+            nil,
+            nil
+         )
+
+         if rv != 0
+            raise get_last_error
+         end
+
+         name_buf = 0.chr * 80
+         name_cch = [name_buf.size].pack('L')
+
+         domain_buf = 0.chr * 80
+         domain_cch = [domain_buf.size].pack('L')
+         sid_name   = 0.chr * 4
+
+         bool = LookupAccountSid(
+            nil,
+            sid_ptr.unpack('L').first,
+            name_buf,
+            name_cch,
+            domain_buf,
+            domain_cch,
+            sid_name
+         )
+
+         unless bool
+            raise get_last_error
+         end
+      ensure
+         CloseHandle(handle)
+      end
+      
+      name_buf.strip
+   end
 end

data/test/test_win32_file_attributes.rb

@@ -26,7 +26,13 @@ class TC_Win32_File_Attributes < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('0.6.0', File::WIN32_FILE_VERSION)
+      assert_equal('0.6.1', File::WIN32_FILE_VERSION)
+   end
+   
+   def test_is_directory
+      assert_true(File.directory?(Dir.pwd))
+      assert_false(File.directory?(@@file))
+      assert_false(File.directory?('C:/aaabbbccc'))      
    end
    
    def test_temporary

data/win32-file.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "win32-file"
-   gem.version     = "0.6.0"
+   gem.version     = "0.6.1"
    gem.authors     = ["Daniel J. Berger", "Park Heesob"]
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
@@ -17,12 +17,12 @@ spec = Gem::Specification.new do |gem|
    gem.extra_rdoc_files = ["README", "CHANGES"]
    gem.add_dependency("win32-api", ">= 1.2.1")
    gem.add_dependency("win32-file-stat", ">= 1.3.2")
-   gem.add_dependency("test-unit", ">= 2.0.0")
-   gem.add_dependency("windows-pr", ">= 0.9.6")
+   gem.add_dependency("test-unit", ">= 2.0.1")
+   gem.add_dependency("windows-pr", ">= 0.9.7")
    gem.rubyforge_project = "win32utils"
 end
 
 if $0 == __FILE__
-   Gem.manage_gems if Gem::RubyGemsVersion.to_f < 1.3
+   Gem.manage_gems if Gem::RubyGemsVersion.to_f < 1.0
    Gem::Builder.new(spec).build
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-file
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-14 00:00:00 -07:00
+date: 2009-02-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.0.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: windows-pr
@@ -51,7 +51,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.6
+        version: 0.9.7
     version: 
 description: Extra or redefined methods for the File class on Windows.
 email: djberg96@gmail.com