win32-file 0.5.4 → 0.5.5

data/CHANGES

@@ -1,3 +1,10 @@
+== 0.5.5 - 22-Nov-2007
+* Fixed a bug in the File.dirname method with regards to relative paths.
+  Thanks go to an Laust Rud for the spot.
+* Removed the install.rb file. Use the 'rake install' task instead.
+* Added more tests to ensure the File.dirname method works properly and
+  did some test refactoring in general.
+
 == 0.5.4 - 8-Apr-2007
 * Now runs -w clean.
 * Added a Rakefile. Manual installation and testing should now be handled

data/MANIFEST

@@ -2,7 +2,6 @@
 * MANIFEST
 * Rakefile
 * README
-* install.rb
 * win32-file.gemspec
 * lib/win32/file.rb
 * test/sometestfile.txt
@@ -11,5 +10,4 @@
 * test/tc_file_encryption.rb
 * test/tc_file_path.rb
 * test/tc_file_security.rb
-* test/tc_file_stat.rb
-* test/ts_all.rb
+* test/tc_file_stat.rb

data/Rakefile

@@ -1,13 +1,20 @@
 require 'rake'
 require 'rake/testtask'
+require 'rbconfig'
+include Config
 
 task :clean do 
    rm 'sometestfile.txt' if File.exists? 'sometestfile.txt'
 end
 
 desc 'Install the win32-file package (non-gem)'
-task :install => [:clean] do
-   ruby 'install.rb'
+task :install do
+   sitelibdir = CONFIG['sitelibdir']
+   installdir = File.join(sitelibdir, 'win32')
+   file = 'lib\win32\file.rb'
+
+   Dir.mkdir(installdir) unless File.exists?(installdir)
+   FileUtils.cp(file, installdir, :verbose => true)
 end
 
 desc 'Install the win32-file package as a gem'
@@ -21,11 +28,10 @@ Rake::TestTask.new("test") do |t|
    t.libs << 'test'
    t.verbose = true
    t.warning = true
-   t.test_files = FileList['test/ts_all.rb']
+   t.test_files = FileList['test/tc*']
 end
 
 Rake::TestTask.new("test_attributes") do |t|
-   cp('test/sometestfile.txt', '.')
    t.verbose = true
    t.warning = true
    t.test_files = FileList['test/tc_file_attributes.rb']
@@ -38,28 +44,24 @@ Rake::TestTask.new("test_constants") do |t|
 end
 
 Rake::TestTask.new("test_encryption") do |t|
-   cp('test/sometestfile.txt', '.')
    t.verbose = true
    t.warning = true
    t.test_files = FileList['test/tc_file_encryption.rb']
 end
 
 Rake::TestTask.new("test_path") do |t|
-   cp('test/sometestfile.txt', '.')
    t.verbose = true
    t.warning = true
    t.test_files = FileList['test/tc_file_path.rb']
 end
 
 Rake::TestTask.new("test_security") do |t|
-   cp('test/sometestfile.txt', '.')
    t.verbose = true
    t.warning = true
    t.test_files = FileList['test/tc_file_security.rb']
 end
 
 Rake::TestTask.new("test_stat") do |t|
-   cp('test/sometestfile.txt', '.')
    t.verbose = true
    t.warning = true
    t.test_files = FileList['test/tc_file_stat.rb']

data/lib/win32/file.rb

@@ -16,7 +16,7 @@ class File
    extend Windows::MSVCRT::Buffer
    extend Windows::Limits
    
-   VERSION  = '0.5.4'
+   VERSION  = '0.5.5'
    MAX_PATH = 260
 
    # Abbreviated attribute constants for convenience
@@ -68,37 +68,37 @@ class File
       # permission constants as possible values.  The possible constant values
       # are:
       #
-      # FILE_READ_DATA
-      # FILE_WRITE_DATA
-      # FILE_APPEND_DATA
-      # FILE_READ_EA
-      # FILE_WRITE_EA
-      # FILE_EXECUTE
-      # FILE_DELETE_CHILD
-      # FILE_READ_ATTRIBUTES
-      # FILE_WRITE_ATTRIBUTES
-      # STANDARD_RIGHTS_ALL
-      # FULL
-      # READ
-      # ADD
-      # CHANGE
-      # DELETE
-      # READ_CONTROL
-      # WRITE_DAC
-      # WRITE_OWNER
-      # SYNCHRONIZE
-      # STANDARD_RIGHTS_REQUIRED
-      # STANDARD_RIGHTS_READ
-      # STANDARD_RIGHTS_WRITE
-      # STANDARD_RIGHTS_EXECUTE
-      # STANDARD_RIGHTS_ALL
-      # SPECIFIC_RIGHTS_ALL
-      # ACCESS_SYSTEM_SECURITY
-      # MAXIMUM_ALLOWED
-      # GENERIC_READ
-      # GENERIC_WRITE
-      # GENERIC_EXECUTE
-      # GENERIC_ALL
+      # * FILE_READ_DATA
+      # * FILE_WRITE_DATA
+      # * FILE_APPEND_DATA
+      # * FILE_READ_EA
+      # * FILE_WRITE_EA
+      # * FILE_EXECUTE
+      # * FILE_DELETE_CHILD
+      # * FILE_READ_ATTRIBUTES
+      # * FILE_WRITE_ATTRIBUTES
+      # * STANDARD_RIGHTS_ALL
+      # * FULL
+      # * READ
+      # * ADD
+      # * CHANGE
+      # * DELETE
+      # * READ_CONTROL
+      # * WRITE_DAC
+      # * WRITE_OWNER
+      # * SYNCHRONIZE
+      # * STANDARD_RIGHTS_REQUIRED
+      # * STANDARD_RIGHTS_READ
+      # * STANDARD_RIGHTS_WRITE
+      # * STANDARD_RIGHTS_EXECUTE
+      # * STANDARD_RIGHTS_ALL
+      # * SPECIFIC_RIGHTS_ALL
+      # * ACCESS_SYSTEM_SECURITY
+      # * MAXIMUM_ALLOWED
+      # * GENERIC_READ
+      # * GENERIC_WRITE
+      # * GENERIC_EXECUTE
+      # * GENERIC_ALL
       #
       def set_permissions(file, perms)
          raise TypeError unless perms.kind_of?(Hash)
@@ -398,9 +398,11 @@ class File
       # paths properly, i.e. it should not return anything less than the root.
       # In all other respects it is identical to the current implementation.
       #
-      # File.basename("C:\\foo\\bar.txt")         -> "bar.txt"
-      # File.basename("C:\\foo\\bar.txt", ".txt") -> "bar"
-      # File.basename("\\\\foo\\bar")             -> "\\\\foo\\bar"
+      # Examples:
+      #
+      #    File.basename("C:\\foo\\bar.txt")         -> "bar.txt"
+      #    File.basename("C:\\foo\\bar.txt", ".txt") -> "bar"
+      #    File.basename("\\\\foo\\bar")             -> "\\\\foo\\bar"
       #
       def basename(file, suffix = nil)
          fpath = false
@@ -453,10 +455,12 @@ class File
       # paths properly, i.e. it should not return anything less than the root.
       # In all other respects it is identical to the current implementation.
       #
-      # File.dirname("C:\\foo\\bar\\baz.txt") -> "C:\\foo\\bar"
-      # File.dirname("\\\\foo\\bar")          -> "\\\\foo\\bar"
+      # Examples:
+      #
+      #    File.dirname("C:\\foo\\bar\\baz.txt") -> "C:\\foo\\bar"
+      #    File.dirname("\\\\foo\\bar")          -> "\\\\foo\\bar"
       #
-      def dirname(file)
+      def dirname(file)       
          fpath = false
          file = file.dup
          
@@ -465,10 +469,6 @@ class File
             fpath = true
          end
          
-         if PathIsRelative(file)
-            return '.'
-         end
-         
          if PathIsRoot(file)
             file.tr!("\\", '/') if fpath
             return file
@@ -476,6 +476,12 @@ class File
          
          PathRemoveFileSpec(file)
          file = file.split(0.chr).first
+         
+         # Empty paths, short relative paths
+         if file.nil? || (file && file.empty?)
+            return '.'
+         end
+         
          PathRemoveBackslash(file)
          
          file.tr!("\\", '/') if fpath

data/test/tc_file_attributes.rb

@@ -10,13 +10,14 @@ require 'win32/file'
 class TC_Win32_File_Attributes < Test::Unit::TestCase
    include Windows::File
    def setup
-      @file = 'sometestfile.txt'
+      @dir  = File.dirname(File.expand_path(__FILE__))
+      @file = File.join(@dir, 'sometestfile.txt')
       @fh   = File.open(@file)
       @attr = GetFileAttributes(@file)
    end
 
    def test_version
-      assert_equal('0.5.4', File::VERSION)
+      assert_equal('0.5.5', File::VERSION)
    end
    
    def test_temporary
@@ -241,6 +242,7 @@ class TC_Win32_File_Attributes < Test::Unit::TestCase
    def teardown
       SetFileAttributes(@file, @attr)
       @file = nil
+      @dir  = nil
       @fh.close
    end
 end

data/test/tc_file_encryption.rb

@@ -11,8 +11,9 @@ require 'win32/file'
 
 class TC_Win32_File_Encryption < Test::Unit::TestCase
    def setup
-      @file  = 'sometestfile.txt'
-      @msg   = 'IGNORE - may not work due to security setup of your system'
+      @dir  = File.dirname(File.expand_path(__FILE__))
+      @file = File.join(@dir, 'sometestfile.txt')      
+      @msg   = '=> Ignore. May not work due to security setup of your system.'
    end
    
    def test_encrypt
@@ -27,5 +28,6 @@ class TC_Win32_File_Encryption < Test::Unit::TestCase
    
    def teardown
       @file = nil
+      @dir  = nil
    end
 end

data/test/tc_file_path.rb

@@ -9,8 +9,9 @@ require 'win32/file'
 
 class TC_Win32_File_Path < Test::Unit::TestCase
    def setup
-      @short_file = 'SOMETE~1.TXT'
-      @long_file  = 'sometestfile.txt'
+      @dir  = File.dirname(File.expand_path(__FILE__))
+      @long_file  = File.join(@dir, 'sometestfile.txt')      
+      @short_file = File.join(@dir, 'SOMETE~1.TXT')
    end
    
    def test_basename
@@ -98,11 +99,14 @@ class TC_Win32_File_Path < Test::Unit::TestCase
       assert_equal("//foo/bar", File.dirname("//foo/bar"))
       assert_equal("//foo", File.dirname("//foo"))
       assert_equal("//", File.dirname("//"))
+      assert_equal(".", File.dirname("./foo"))
+      assert_equal("./foo", File.dirname("./foo/bar"))
       
       # Edge cases
       assert_equal(".", File.dirname(""))
       assert_equal(".", File.dirname("."))
       assert_equal(".", File.dirname("."))
+      assert_equal(".", File.dirname("./"))
       assert_raises(TypeError){ File.dirname(nil) }
       
       # Ensure original path not modified
@@ -148,17 +152,18 @@ class TC_Win32_File_Path < Test::Unit::TestCase
    def test_long_path
       assert_respond_to(File, :long_path)
       assert_equal('sometestfile.txt', File.long_path(@short_file))
-      assert_equal('SOMETE~1.TXT', @short_file)
+      assert_equal('SOMETE~1.TXT', File.basename(@short_file))
    end
    
    def test_short_path
       assert_respond_to(File, :short_path)
       assert_equal('SOMETE~1.TXT', File.short_path(@long_file))
-      assert_equal('sometestfile.txt', @long_file)
+      assert_equal('sometestfile.txt', File.basename(@long_file))
    end
    
    def teardown
       @short_file = nil
       @long_file  = nil
+      @dir        = nil
    end
 end

data/test/tc_file_security.rb

@@ -11,7 +11,8 @@ require 'socket'
 class TC_Win32_File_Security < Test::Unit::TestCase
    def setup
       @host  = Socket.gethostname
-      @file  = 'sometestfile.txt'
+      @dir   = File.dirname(File.expand_path(__FILE__))
+      @file  = File.join(@dir, 'sometestfile.txt')      
       @perms = nil
    end
 
@@ -45,5 +46,6 @@ class TC_Win32_File_Security < Test::Unit::TestCase
       @file  = nil
       @host  = nil
       @perms = nil
+      @dir   = nil
    end
 end

data/test/tc_file_stat.rb

@@ -9,7 +9,8 @@ require 'win32/file'
 
 class TC_Win32_File_Stat < Test::Unit::TestCase
    def setup
-      @file = 'sometestfile.txt'
+      @dir  = File.dirname(File.expand_path(__FILE__))
+      @file = File.join(@dir, 'sometestfile.txt')      
    end
    
    # Although I don't perform a test against a file > 2gb here (since I
@@ -86,5 +87,6 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
    
    def teardown
       @file = nil
+      @dir  = nil
    end
 end

data/win32-file.gemspec

@@ -2,14 +2,14 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "win32-file"
-   gem.version     = "0.5.4"
+   gem.version     = "0.5.5"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
    gem.platform    = Gem::Platform::RUBY
    gem.summary     = "Extra or redefined methods for the File class on Windows."
    gem.description = "Extra or redefined methods for the File class on Windows."
-   gem.test_file   = "test/ts_all.rb"
+   gem.test_files  = Dir["test/tc*"]
    gem.has_rdoc    = true
    gem.files       = Dir["lib/win32/*.rb"] + Dir["test/*"] + Dir["[A-Z]*"]
    gem.files.reject! { |fn| fn.include? "CVS" }

metadata

@@ -1,33 +1,35 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.8
-specification_version: 1
 name: win32-file
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
-date: 2007-04-08 00:00:00 -06:00
-summary: Extra or redefined methods for the File class on Windows.
-require_paths: 
-- lib
-email: djberg96@gmail.com
-homepage: http://www.rubyforge.org/projects/win32utils
-rubyforge_project: 
-description: Extra or redefined methods for the File class on Windows.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.5.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Daniel J. Berger
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-11-22 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: win32-file-stat
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
+    version: 
+description: Extra or redefined methods for the File class on Windows.
+email: djberg96@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGES
 files: 
 - lib/win32/file.rb
 - test/CVS
@@ -38,36 +40,44 @@ files:
 - test/tc_file_path.rb
 - test/tc_file_security.rb
 - test/tc_file_stat.rb
-- test/ts_all.rb
 - CHANGES
 - CVS
-- install.rb
 - lib
 - MANIFEST
 - Rakefile
 - README
 - test
 - win32-file.gemspec
-test_files: 
-- test/ts_all.rb
+has_rdoc: true
+homepage: http://www.rubyforge.org/projects/win32utils
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- CHANGES
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: win32-file-stat
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.0
-    version: 
+rubyforge_project: 
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: Extra or redefined methods for the File class on Windows.
+test_files: 
+- test/tc_file_attributes.rb
+- test/tc_file_constants.rb
+- test/tc_file_encryption.rb
+- test/tc_file_path.rb
+- test/tc_file_security.rb
+- test/tc_file_stat.rb

data/install.rb

@@ -1,11 +0,0 @@
-# For those who don't like gems...
-require 'rbconfig'
-require 'ftools'
-include Config
-
-sitelibdir = CONFIG['sitelibdir']
-installdir = sitelibdir + '/win32'
-file = 'lib\win32\file.rb'
-
-Dir.mkdir(installdir) unless File.exists?(installdir)
-File.copy(file, installdir, true)

data/test/ts_all.rb

@@ -1,6 +0,0 @@
-require 'tc_file_encryption'
-require 'tc_file_path'
-require 'tc_file_stat'
-require 'tc_file_attributes'
-require 'tc_file_security'
-require 'tc_file_constants'