clutil 2010.129.0 → 2010.132.1

data/cl/util/file.rb

@@ -62,8 +62,7 @@ this Software without prior written authorization of the copyright holder.
 (X11 license)
 =end
 
-require 'ftools'
-#require 'cl/util/win'
+require 'fileutils'
 
 class Dir
   def Dir.empty?(dirname)
@@ -82,7 +81,7 @@ end
 
 class << File
   def extension(filename)
-    res = filename.scan(/\.[^.]*$/).to_s
+    res = filename.scan(/\.[^.]*$/)[0].to_s
     res.gsub!(/\./, '')
     res = nil if res.empty?
     res
@@ -96,8 +95,11 @@ class << File
       File.delete(file)
     end
   end
-  
+
+  # returns false if up-to-date check passed and the file was not copied.
+  # returns true if up-to-date check failed and the file was copied.
   def backup(src, dst, bincompare=false)
+    installed = false
     if (
          File.exists?(dst) &&
          (
@@ -105,7 +107,8 @@ class << File
            (File.stat(src).size != File.stat(dst).size)
          )
        ) || !File.exists?(dst) || bincompare
-      File.install src, dst, nil, true
+      FileUtils.install src, dst, :verbose => true
+      installed = true
     end
     
     if !File.stat(dst).writable?
@@ -117,6 +120,7 @@ class << File
     new_atime = Time.now
     File.utime(new_atime, File.stat(src).mtime, dst)
     File.chmod(0444, dst) if set_ro
+    return installed
   end
 
   # human readable size
@@ -208,3 +212,91 @@ module ClUtilFile
   end
 =end
 end
+
+
+class Dir
+  # Dir.mktmpdir creates a temporary directory.
+  #
+  # [Copied from Ruby 1.9]
+  #
+  # The directory is created with 0700 permission.
+  #
+  # The prefix and suffix of the name of the directory is specified by
+  # the optional first argument, <i>prefix_suffix</i>.
+  # - If it is not specified or nil, "d" is used as the prefix and no suffix is used.
+  # - If it is a string, it is used as the prefix and no suffix is used.
+  # - If it is an array, first element is used as the prefix and second element is used as a suffix.
+  #
+  #  Dir.mktmpdir {|dir| dir is ".../d..." }
+  #  Dir.mktmpdir("foo") {|dir| dir is ".../foo..." }
+  #  Dir.mktmpdir(["foo", "bar"]) {|dir| dir is ".../foo...bar" }
+  #
+  # The directory is created under Dir.tmpdir or
+  # the optional second argument <i>tmpdir</i> if non-nil value is given.
+  #
+  #  Dir.mktmpdir {|dir| dir is "#{Dir.tmpdir}/d..." }
+  #  Dir.mktmpdir(nil, "/var/tmp") {|dir| dir is "/var/tmp/d..." }
+  #
+  # If a block is given,
+  # it is yielded with the path of the directory.
+  # The directory and its contents are removed
+  # using FileUtils.remove_entry_secure before Dir.mktmpdir returns.
+  # The value of the block is returned.
+  #
+  #  Dir.mktmpdir {|dir|
+  #    # use the directory...
+  #    open("#{dir}/foo", "w") { ... }
+  #  }
+  #
+  # If a block is not given,
+  # The path of the directory is returned.
+  # In this case, Dir.mktmpdir doesn't remove the directory.
+  #
+  #  dir = Dir.mktmpdir
+  #  begin
+  #    # use the directory...
+  #    open("#{dir}/foo", "w") { ... }
+  #  ensure
+  #    # remove the directory.
+  #    FileUtils.remove_entry_secure dir
+  #  end
+  #
+  def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
+    case prefix_suffix
+    when nil
+      prefix = "d"
+      suffix = ""
+    when String
+      prefix = prefix_suffix
+      suffix = ""
+    when Array
+      prefix = prefix_suffix[0]
+      suffix = prefix_suffix[1]
+    else
+      raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+    end
+    tmpdir ||= Dir.tmpdir
+    t = Time.now.strftime("%Y%m%d")
+    n = nil
+    begin
+      path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+      path << "-#{n}" if n
+      path << suffix
+      Dir.mkdir(path, 0700)
+    rescue Errno::EEXIST
+      n ||= 0
+      n += 1
+      retry
+    end
+
+    if block_given?
+      begin
+        yield path
+      ensure
+        FileUtils.remove_entry_secure path
+      end
+    else
+      path
+    end
+  end
+end

data/cl/util/install.rb

@@ -33,7 +33,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 require 'rbconfig'
 require 'find'
-require 'ftools'
+require 'fileutils'
 require "#{File.dirname(__FILE__)}/console"
 
 include Config

data/cl/util/net.rb

@@ -4,6 +4,26 @@ module ClUtilNet
   end
 end
 
+class NetUse
+  def initialize(unc, user='', password='')
+    @unc = unc
+    @user = user
+    @password = password
+  end
+
+  def attached?
+
+  end
+
+  def attach(drive='')
+
+  end
+
+  def detach
+    
+  end
+end
+
 if __FILE__ == $0
   include ClUtilNet
   

data/cl/util/string.rb

@@ -35,7 +35,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 class String
   def get_indent
-    scan(/^(\s*)/).to_s
+    scan(/^(\s*)/).flatten[0].to_s
   end
 end
 
@@ -61,5 +61,5 @@ end
 def here_ltrim(s, add_indent_amt=0)
   a = s.split("\n", -1)
   trim_indent_amt = a[0].get_indent.length
-  s = indent(s, add_indent_amt - trim_indent_amt)
+  indent(s, add_indent_amt - trim_indent_amt)
 end

data/cl/util/test/dirsizetest.rb

@@ -30,9 +30,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --------------------------------------------------------------------------------
 =end
 
-$LOAD_PATH << '..'
-require 'test'
-require 'dirsize'
+require File.dirname(__FILE__) + '/../test'
+require File.dirname(__FILE__) + '/../dirsize'
 require 'test/unit'
 
 TestData = Struct.new("TestData",
@@ -54,7 +53,7 @@ class TestDirSize < TempDirTest
   end
 
   def test_larger_singleton
-    makeSampleTextFile('', 5000)
+    make_sample_text_file('', 5000)
     @test_data.clusterSize = 4096
     @test_data.expectedFileSize = 5000
     @test_data.expectedDiskSpace = (4096 * 2)
@@ -69,7 +68,7 @@ class TestDirSize < TempDirTest
 
   def do_test_dir_size(test_data)
     dir_size = DirSize.new
-    dir_size.directory = @tempDir
+    dir_size.directory = @temp_dir
     dir_size.clusterSize = test_data.clusterSize
     dir_size.getSize
     assert_equal(test_data.expectedFileSize, dir_size.fileSize(false))
@@ -91,7 +90,7 @@ class TestDirSize < TempDirTest
   end
 
   def test_small_singleton
-    makeSampleTextFile('', 1000)
+    make_sample_text_file('', 1000)
     @test_data.clusterSize = 4096
     @test_data.expectedFileSize = 1000
     @test_data.expectedDiskSpace = (4096 * 1)
@@ -105,12 +104,12 @@ class TestDirSize < TempDirTest
   end
 
   def test_sub_dir
-    makeSubDir('suba')
-    makeSubDir("suba\\suba1")
-    makeSampleTextFile('', 1000)
-    makeSampleTextFile('suba', 1000)
-    makeSampleTextFile("suba\\suba1", 1000)
-    makeSampleTextFile("suba\\suba1", 2000)
+    make_sub_dir('suba')
+    make_sub_dir("suba\\suba1")
+    make_sample_text_file('', 1000)
+    make_sample_text_file('suba', 1000)
+    make_sample_text_file("suba\\suba1", 1000)
+    make_sample_text_file("suba\\suba1", 2000)
     @test_data.clusterSize = 4096
     @test_data.expectedFileSize = 1000
     @test_data.expectedDiskSpace = (4096 * 1)

data/cl/util/test/filetest.rb

@@ -32,23 +32,22 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 (based on BSD Open Source License)
 =end
 
-$LOAD_PATH << '..'
-require 'file'
+require File.dirname(__FILE__) + '/../file'
+require File.dirname(__FILE__) + '/../test'
 require 'test/unit'
-require 'ftools'
 
 # don't inherit from clutiltest.rb.TempDirTest, it uses things that are tested here
 class TestUtilFile < Test::Unit::TestCase
   READ_WRITE = 0644
   READ_ONLY = 0444
 
-  def createTestFile(fileName, content, mtime=Time.now, attr=READ_WRITE)
-    f = File.new(fileName, File::CREAT|File::RDWR|File::TRUNC)
+  def create_test_file(file_name, content, mtime=Time.now, attr=READ_WRITE)
+    f = File.new(file_name, 'w+')
     f.puts(content)
     f.flush
     f.close
-    File.utime(mtime, mtime, fileName)
-    File.chmod(attr, fileName)
+    File.utime(mtime, mtime, file_name)
+    File.chmod(attr, file_name)
   end
 
   def setup
@@ -60,7 +59,7 @@ class TestUtilFile < Test::Unit::TestCase
     @dirs.reverse_each { | dirname | Dir.delete(dirname) if File.exists?(dirname) } if @dirs
   end
 
-  def doTestDelTree(attr)
+  def do_test_del_tree(attr)
     @dirs = ['/tmp/utilfiletest',
              '/tmp/utilfiletest/subA',
              '/tmp/utilfiletest/subA/subA1',
@@ -68,84 +67,84 @@ class TestUtilFile < Test::Unit::TestCase
              '/tmp/utilfiletest/subB',
              '/tmp/utilfiletest/subB/subB1',
              '/tmp/utilfiletest/subB/subB1/subB1a']
-    @dirs.each { | dirName | File.makedirs(dirName) }
+    @dirs.each { | dir_name | FileUtils::makedirs(dir_name) }
     @files = ['/tmp/utilfiletest/subA/blah.txt',
               '/tmp/utilfiletest/subA/subA1/blah.txt',
               '/tmp/utilfiletest/subA/subA2/blah.txt',
               '/tmp/utilfiletest/subB/blah.txt',
               '/tmp/utilfiletest/subB/subB1/blah.txt',
               '/tmp/utilfiletest/subB/subB1/subB1a/blah.txt']
-    @files.each { | filename | createTestFile(filename, 'test content', Time.now, attr) }
+    @files.each { | filename | create_test_file(filename, 'test content', Time.now, attr) }
     ClUtilFile.delTree(@dirs[0])
-    @files.each { | fileName | assert(!File.exists?(fileName)) }
-    @dirs.each { | dirName | assert(!File.exists?(dirName)) }
+    @files.each { | file_name | assert(!File.exists?(file_name)) }
+    @dirs.each { | dir_name | assert(!File.exists?(dir_name)) }
   end
 
-  def testDelTree
-    doTestDelTree(READ_WRITE)
+  def test_del_tree
+    do_test_del_tree(READ_WRITE)
   end
 
-  def testDelTreeROFiles
-    doTestDelTree(READ_ONLY)
+  def test_del_tree_ro_files
+    do_test_del_tree(READ_ONLY)
   end
 
-  def testDelTreeFileNameMatch
+  def test_del_tree_file_name_match
     @dirs = ['/tmp/utilfiletest',
              '/tmp/utilfiletest/subA',
              '/tmp/utilfiletest/subB']
-    @dirs.each { | dirName | File.makedirs(dirName) }
-    @filesToStay = ['/tmp/utilfiletest/subA/blah.doc',
+    @dirs.each { | dir_name | FileUtils::makedirs(dir_name) }
+    @files_to_stay = ['/tmp/utilfiletest/subA/blah.doc',
                     '/tmp/utilfiletest/subB/blah.doc']
-    @filesToDelete = ['/tmp/utilfiletest/subA/blah.txt',
+    @files_to_delete = ['/tmp/utilfiletest/subA/blah.txt',
                       '/tmp/utilfiletest/subB/blah.txt']
-    @files << @filesToStay
-    @files << @filesToDelete
+    @files << @files_to_stay
+    @files << @files_to_delete
     @files.flatten!
 
-    @filesToStay.each { | filename | createTestFile(filename, 'test content') }
-    @filesToDelete.each { | filename | createTestFile(filename, 'test content') }
+    @files_to_stay.each { | filename | create_test_file(filename, 'test content') }
+    @files_to_delete.each { | filename | create_test_file(filename, 'test content') }
     ClUtilFile.delTree(@dirs[0], '*.txt')
-    @filesToStay.each { | fileName | assert(File.exists?(fileName)) }
-    @filesToDelete.each { | fileName | assert(!File.exists?(fileName)) }
+    @files_to_stay.each { | file_name | assert(File.exists?(file_name)) }
+    @files_to_delete.each { | file_name | assert(!File.exists?(file_name)) }
     ClUtilFile.delTree(@dirs[0])
-    @filesToStay.each { | fileName | assert(!File.exists?(fileName)) }
-    @filesToDelete.each { | fileName | assert(!File.exists?(fileName)) }
-    @dirs.each { | dirName | assert(!File.exists?(dirName)) }
+    @files_to_stay.each { | file_name | assert(!File.exists?(file_name)) }
+    @files_to_delete.each { | file_name | assert(!File.exists?(file_name)) }
+    @dirs.each { | dir_name | assert(!File.exists?(dir_name)) }
   end
 
-  def testDelTreeAging
+  def test_del_tree_aging
     @dirs = ['/tmp/utilfiletest',
              '/tmp/utilfiletest/subA',
              '/tmp/utilfiletest/subB']
-    @dirs.each { | dirName | File.makedirs(dirName) }
-    @filesToStay = ['/tmp/utilfiletest/subA/blah0.txt',
+    @dirs.each { | dir_name | FileUtils::makedirs(dir_name) }
+    @files_to_stay = ['/tmp/utilfiletest/subA/blah0.txt',
                     '/tmp/utilfiletest/subB/blah1.txt']
-    @filesToDelete = ['/tmp/utilfiletest/subA/blah2.txt',
+    @files_to_delete = ['/tmp/utilfiletest/subA/blah2.txt',
                       '/tmp/utilfiletest/subB/blah3.txt']
-    @files << @filesToStay
-    @files << @filesToDelete
+    @files << @files_to_stay
+    @files << @files_to_delete
     @files.flatten!
 
-    @filesToStay.each { | filename | createTestFile(filename, 'test content') }
+    @files_to_stay.each { | filename | create_test_file(filename, 'test content') }
 
     day = 60 * 60 * 24
-    eightDays = day * 8
-    sevenDays = day * 7
-    @filesToDelete.each { | filename | createTestFile(filename, 'test content', Time.now - eightDays) }
+    eight_days = day * 8
+    seven_days = day * 7
+    @files_to_delete.each { | filename | create_test_file(filename, 'test content', Time.now - eight_days) }
 
-    ClUtilFile.delTree(@dirs[0]) { | fileName |
-      (File.mtime(fileName) < (Time.now - sevenDays))
+    ClUtilFile.delTree(@dirs[0]) { | file_name |
+      (File.mtime(file_name) < (Time.now - seven_days))
     }
 
-    @filesToStay.each { | fileName | assert(File.exists?(fileName)) }
-    @filesToDelete.each { | fileName | assert(!File.exists?(fileName)) }
+    @files_to_stay.each { | file_name | assert(File.exists?(file_name)) }
+    @files_to_delete.each { | file_name | assert(!File.exists?(file_name)) }
     ClUtilFile.delTree(@dirs[0])
-    @filesToStay.each { | fileName | assert(!File.exists?(fileName)) }
-    @filesToDelete.each { | fileName | assert(!File.exists?(fileName)) }
-    @dirs.each { | dirName | assert(!File.exists?(dirName)) }
+    @files_to_stay.each { | file_name | assert(!File.exists?(file_name)) }
+    @files_to_delete.each { | file_name | assert(!File.exists?(file_name)) }
+    @dirs.each { | dir_name | assert(!File.exists?(dir_name)) }
   end
 
-  def testDirFiles
+  def test_dir_files
     @dirs = ['/tmp/utilfiletest',
              '/tmp/utilfiletest/subA',
              '/tmp/utilfiletest/subA/subA1',
@@ -153,14 +152,14 @@ class TestUtilFile < Test::Unit::TestCase
              '/tmp/utilfiletest/subB',
              '/tmp/utilfiletest/subB/subB1',
              '/tmp/utilfiletest/subB/subB1/subB1a']
-    @dirs.each { | dirName | File.makedirs(dirName) }
+    @dirs.each { | dir_name | FileUtils::makedirs(dir_name) }
     @files = ['/tmp/utilfiletest/subA/blah.txt',
               '/tmp/utilfiletest/subA/subA1/blah.txt',
               '/tmp/utilfiletest/subA/subA2/blah.txt',
               '/tmp/utilfiletest/subB/blah.txt',
               '/tmp/utilfiletest/subB/subB1/blah.txt',
               '/tmp/utilfiletest/subB/subB1/subB1a/blah.txt']
-    @files.each { | filename | createTestFile(filename, 'test content') }
+    @files.each { | filename | create_test_file(filename, 'test content') }
     #puts 'Dir.entries'
     #puts Dir.entries('/tmp/utilfiletest/subA/subA1/')
     #puts 'Dir.files'
@@ -168,11 +167,78 @@ class TestUtilFile < Test::Unit::TestCase
     assert_equal(["blah.txt"], Dir.files('/tmp/utilfiletest/subA/subA1/'))
   end
   
-  def testFileExtension
+  def test_file_extension
     assert_equal('rb', File.extension('/test/file.rb'))
     assert_equal(nil, File.extension('/test/file'))
     assert_equal('rb', File.extension('/test/file.of.some.such.rb'))
   end
 end
 
+class TestBackup < TempDirTest
 
+  def setup
+    super
+    @a_dir = make_sub_dir('a')
+    @b_dir = make_sub_dir('b')
+  end
+
+  def test_backed_up_because_not_exists
+    src = make_sample_text_file('a')
+    dst = File.join(@b_dir, File.basename(src))
+    assert_equal(true, File.backup(src, dst))
+    assert_equal(true, File.exists?(dst))
+  end
+
+  def test_not_backed_up_because_exists
+    src = make_sample_text_file('a')
+    dst = File.join(@b_dir, File.basename(src))
+    assert_equal(true, File.backup(src, dst))
+    assert_equal(false, File.backup(src, dst))
+  end
+
+  def test_backed_up_because_exists_different_mtime
+    src = make_sample_text_file('a')
+    dst = File.join(@b_dir, File.basename(src))
+    assert_equal(true, File.backup(src, dst))
+
+    File.utime(0, 0, dst)
+    assert_equal(true, File.backup(src, dst))
+  end
+
+  def test_backed_up_because_exists_different_size
+    src = make_sample_text_file('a')
+    dst = File.join(@b_dir, File.basename(src))
+    assert_equal(true, File.backup(src, dst))
+
+    File.open(dst, 'a+') do |f| f.print "bigger" end
+    assert_equal(true, File.backup(src, dst))
+  end
+
+  def test_not_backed_up_because_exists_byte_diff_but_no_bincompare
+    src = make_sample_text_file('a')
+    dst = File.join(@b_dir, File.basename(src))
+    assert_equal(true, File.backup(src, dst))
+
+    guts = File.read(dst)
+    guts.reverse!
+    File.open(dst, 'w+') do |f| f.print guts end
+    File.utime(File.atime(src), File.mtime(src), dst)
+    assert_equal(false, File.backup(src, dst))
+  end
+
+  def test_backed_up_because_exists_byte_diff_and_bincompare
+    src = make_sample_text_file('a')
+    dst = File.join(@b_dir, File.basename(src))
+    assert_equal(true, File.backup(src, dst))
+
+    guts = File.read(dst)
+    guts.reverse!
+    File.open(dst, 'w+') do |f| f.print guts end
+    File.utime(File.atime(src), File.mtime(src), dst)
+    assert_equal(true, File.backup(src, dst, true))
+  end
+
+end
+
+
+                                                               

data/cl/util/test/nettest.rb

@@ -0,0 +1,13 @@
+require "test/unit"
+
+class NetUseTest < Test::Unit::TestCase
+  def setup
+  end
+
+  def teardown
+  end
+
+  def test_net_use
+    # net_use = NetUse.new()    
+  end
+end

data/cl/util/test/stringtest.rb

@@ -7,13 +7,13 @@ class TestUtilString < Test::Unit::TestCase
   def test_here_ltrim
     test = <<-TEST
       This is a test of the here_ltrim function.
-      It's purpose is to shift this whole paragraph to the left, removing
+      Its purpose is to shift this whole paragraph to the left, removing
       the indention.
     TEST
 
     expected = <<-EXP
 This is a test of the here_ltrim function.
-It's purpose is to shift this whole paragraph to the left, removing
+Its purpose is to shift this whole paragraph to the left, removing
 the indention.
     EXP
   
@@ -23,13 +23,13 @@ the indention.
   def test_here_ltrim_indent
     test = <<-TEST
       This is a test of the here_ltrim function.
-      It's purpose is to shift this whole paragraph to the left, removing
+      Its purpose is to shift this whole paragraph to the left, removing
       the indention.
     TEST
 
     expected = <<-EXP
   This is a test of the here_ltrim function.
-  It's purpose is to shift this whole paragraph to the left, removing
+  Its purpose is to shift this whole paragraph to the left, removing
   the indention.
     EXP
   

data/cl/util/test.rb

@@ -32,23 +32,24 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 (based on BSD Open Source License)
 =end
 
-require 'cl/util/file'
-require 'ftools'
+require File.dirname(__FILE__) + '/file'
+require 'fileutils'
+require 'tmpdir'
 require 'test/unit'
 
 class TempDirTest < Test::Unit::TestCase
-  def setTempDir
-    @tempDir = '/tmp/tests'
+  def set_temp_dir
+    @temp_dir = Dir.mktmpdir
   end
 
   def setup
-    @fileNameInc = 0
-    setTempDir
-    File.makedirs(@tempDir) if !FileTest.directory?(@tempDir)
+    @file_name_inc = 0
+    set_temp_dir
+    FileUtils::makedirs(@temp_dir) if !FileTest.directory?(@temp_dir)
   end
 
-  def tear_down
-    ClUtilFile.delTree(@tempDir)
+  def teardown
+    ClUtilFile.delTree(@temp_dir)
   end
 
   # to ward off the new Test::Unit detection of classes with no test
@@ -57,31 +58,31 @@ class TempDirTest < Test::Unit::TestCase
     super unless(self.class == TempDirTest)
   end
   
-  def makeSubDir(dirname)
-    newdirname = File.join(@tempDir, dirname)
-    File.makedirs(newdirname) if !FileTest.directory?(newdirname)
+  def make_sub_dir(dirname)
+    newdirname = File.join(@temp_dir, dirname)
+    FileUtils::makedirs(newdirname) if !FileTest.directory?(newdirname)
     newdirname
   end
 
-  def makeSampleTextFile(dirname='', size=0)
-    crlfLength = 2
+  def make_sample_text_file(dirname='', size=0)
+    crlf_length = 2
 
     if size == 0
       content = 'this is a sample file'
     else
       content = ''
-      (size - crlfLength).times do content << 'x' end
+      (size - crlf_length).times do content << 'x' end
     end
 
     if dirname.empty?
-      sampleFileDir = @tempDir
+      sample_file_dir = @temp_dir
     else
-      sampleFileDir = File.join(@tempDir, dirname)
+      sample_file_dir = File.join(@temp_dir, dirname)
     end
 
-    @fileNameInc += 1
-    filename = File.join(sampleFileDir, 'sample' + @fileNameInc.to_s + '.txt')
-    File.open(filename, File::CREAT|File::TRUNC|File::RDWR) do |f|
+    @file_name_inc += 1
+    filename = File.join(sample_file_dir, 'sample' + @file_name_inc.to_s + '.txt')
+    File.open(filename, 'w+') do |f|
       f.puts content
     end
     filename

data/cl/util/util.rb

@@ -3,8 +3,8 @@ require 'cl/util/version'
 # VERSION auto generated section
 begin                                                                  
   require 'cl/util/version'                                            
-  VERSION = CLabs::Version.new('2010', '129', '0')
+  VERSION = CLabs::Version.new('2010', '132', '1')
 rescue LoadError                                                       
-  VERSION = '2010.129.0'                                                  
+  VERSION = '2010.132.1'                                                  
 end                                                                    
 # END_VERSION

data/cl/util/win.rb

@@ -32,7 +32,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 =end
 require 'Win32API'
 require 'win32ole'
-require 'cl/util/file'
+require File.dirname(__FILE__) + '/file'
 
 # MENON Jean-Francois [Jean-Francois.MENON@meteo.fr]
 # http://ruby-talk.com/41583
@@ -347,5 +347,4 @@ class File
   STARTMENU         = "StartMenu"
   STARTUP           = "Startup"
   TEMPLATES         = "Templates"
-end
-                       
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2010
-  - 129
-  - 0
-  version: 2010.129.0
+  - 132
+  - 1
+  version: 2010.132.1
 platform: ruby
 authors: 
 - chrismo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-09 00:00:00 -05:00
+date: 2010-05-12 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -50,6 +50,7 @@ files:
 - cl/util/test/dirsizetest.rb
 - cl/util/test/filetest.rb
 - cl/util/test/installtest.rb
+- cl/util/test/nettest.rb
 - cl/util/test/progresstest.rb
 - cl/util/test/stringtest.rb
 - cl/util/test/versiontest.rb