clutil 2010.330.0 → 2010.331.1

data/cl/util/file.rb

@@ -134,10 +134,8 @@ class << File
   end
 end
 
-module ClUtilFile
-  ALL_FILES = '*'
-
-  def ClUtilFile.delTree(rootDirName, pattern=ALL_FILES)
+class ClUtilFile
+  def ClUtilFile.delTree(rootDirName, pattern='*')
     if (rootDirName == '/') or (rootDirName.empty?)
       raise 'Cannot delete root or empty?'
     end
@@ -174,7 +172,7 @@ module ClUtilFile
 =begin
   1.8 FileUtils has cp_r in it ...
 
-  def ClUtilFile.copyTree(fromDir, toDir, pattern=ALL_FILES)
+  def ClUtilFile.copyTree(fromDir, toDir, pattern='*')
     ##################################################################
     # cp_r  - recursive copy
     # usage: cp_r(from,to,file_param,permissions)

data/cl/util/install.rb

@@ -1,7 +1,7 @@
 # $Id: install.rb,v 1.7 2002/09/09 03:04:38 chrismo Exp $
 =begin
 --------------------------------------------------------------------------
-Copyright (c) 2002, Chris Morris
+Copyright (c) 2002-2010, Chris Morris
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -36,72 +36,82 @@ require 'find'
 require 'fileutils'
 require "#{File.dirname(__FILE__)}/console"
 
-include Config
+module CLabs
+  class Install
+    include Config
 
-# altered copy of rbconfig.rb -> Config::expand
-def custom_expand(val, conf)
-  val.gsub!(/\$\(([^()]+)\)/) do |var|
-    key = $1
-    if CONFIG.key? key
-      custom_expand(conf[key], conf)
-    else
-      var
+    attr_reader :version, :libdir, :bindir, :sitedir, :siteverdir, :archdir
+
+    def initialize
+      init
     end
-  end
-  val
-end
 
-def get_conf(customizations)
-  conf = {}
-  MAKEFILE_CONFIG.each{|k,v| conf[k] = v.dup}
-  customizations.each do |k, v| 
-    conf[k] = v
-  end
-  conf.each_value do |val| custom_expand(val, conf) end
-  conf
-end
+    # altered copy of rbconfig.rb -> Config::expand
+    def custom_expand(val, conf)
+      val.gsub!(/\$\(([^()]+)\)/) do |var|
+        key = $1
+        if CONFIG.key? key
+          custom_expand(conf[key], conf)
+        else
+          var
+        end
+      end
+      val
+    end
 
-def init
-  prefixdir = get_switch('-p')
-  customizations = {}
-  customizations['prefix'] = prefixdir if prefixdir
-  conf = get_conf(customizations)
-  
-  $version = conf["MAJOR"]+"."+conf["MINOR"]
-  $libdir = File.join(conf["libdir"], "ruby", $version)
-  
-  $bindir =  conf["bindir"]
-  $sitedir = conf["sitedir"] || File.join($libdir, "site_ruby")
-  $siteverdir = File.join($sitedir, $version)
-  $archdir = File.join($libdir, "i586-mswin32")
-end
+    def get_conf(customizations)
+      conf = {}
+      MAKEFILE_CONFIG.each { |k, v| conf[k] = v.dup }
+      customizations.each do |k, v|
+        conf[k] = v
+      end
+      conf.each_value do |val|
+        custom_expand(val, conf)
+      end
+      conf
+    end
+
+    def init
+      prefixdir = get_switch('-p')
+      customizations = {}
+      customizations['prefix'] = prefixdir if prefixdir
+      conf = get_conf(customizations)
+
+      @version = conf["MAJOR"]+"."+conf["MINOR"]
+      @libdir = File.join(conf["libdir"], "ruby", @version)
+
+      @bindir =  conf["bindir"]
+      @sitedir = conf["sitedir"] || File.join(@libdir, "site_ruby")
+      @siteverdir = File.join(@sitedir, @version)
+      @archdir = File.join(@libdir, "i586-mswin32")
+    end
 
-def install_executables(files)
-  tmpfn = "cl_tmp"
-  files.each do |aFile, dest|
-    File.open(aFile) do |ip|
-      File.open(tmpfn, "w") do |op|
-        ruby = File.join($bindir, "ruby")
-        op.puts "#!#{ruby}"
-        op.write ip.read
+    def install_executables(files)
+      tmpfn = "cl_tmp"
+      files.each do |aFile, dest|
+        File.open(aFile) do |ip|
+          File.open(tmpfn, "w") do |op|
+            ruby = File.join($bindir, "ruby")
+            op.puts "#!#{ruby}"
+            op.write ip.read
+          end
+        end
+
+        File::makedirs(dest)
+        # 0755 I assume means read/write/execute, not needed for Windows
+        File::chmod(0755, dest, true)
+        File::install(tmpfn, File.join(dest, File.basename(aFile)), 0755, true)
+        File::unlink(tmpfn)
       end
     end
 
-    File::makedirs(dest)
-    # 0755 I assume means read/write/execute, not needed for Windows
-    File::chmod(0755, dest, true)
-    File::install(tmpfn, File.join(dest, File.basename(aFile)), 0755, true)
-    File::unlink(tmpfn)
+    def install_lib(files)
+      files.each do |aFile, dest|
+        File::makedirs(dest)
+        File::install(aFile, File.join(dest, File.basename(aFile)), 0644, true)
+      end
+    end
   end
 end
 
-def install_lib(files)
-  files.each do |aFile, dest|
-    File::makedirs(dest)
-    File::install(aFile, File.join(dest, File.basename(aFile)), 0644, true)
-  end
-end
 
-if __FILE__ == $0
-  init
-end

data/cl/util/test/installtest.rb

@@ -1,11 +1,10 @@
-$LOAD_PATH << '..'
-
-require 'install'
+require File.expand_path(File.dirname(__FILE__) + '/../install')
 require 'test/unit'
 
 class TestInstall < Test::Unit::TestCase
   def test_set_prefix
-    conf = get_conf({'prefix' => '/tmp/ruby'})
+    install = CLabs::Install.new
+    conf = install.get_conf({'prefix' => '/tmp/ruby'})
     assert_equal('/tmp/ruby', conf['prefix'])
     assert_equal('/tmp/ruby/lib/ruby/site_ruby', conf['sitedir'])
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2010
-  - 330
-  - 0
-  version: 2010.330.0
+  - 331
+  - 1
+  version: 2010.331.1
 platform: ruby
 authors: 
 - chrismo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 -06:00
+date: 2010-11-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,6 @@ files:
 - cl/util/test/installtest.rb
 - cl/util/test/progresstest.rb
 - cl/util/test/stringtest.rb
-- cl/util/test/versiontest.rb
 - cl/util/test/wintest.rb
 has_rdoc: true
 homepage: http://clabs.org/ruby.htm

data/cl/util/test/versiontest.rb

@@ -1,72 +0,0 @@
-$LOAD_PATH << '..'
-
-require 'test/unit'
-require 'version'
-require 'test'
-require 'cl/util/test'
-
-class TestVersion < TempDirTest
-  def setup
-    super
-    @lineBefore = 'test line before'
-    @lineAfter  = 'test line after'
-  end
-
-  def make_sample_file(v, indent)
-    fn = File.join(@tempDir, 'test.rb')
-    File.open(fn, 'w+') do |f|
-      f.puts ' ' * indent << @lineBefore
-      f.puts ' ' * indent << CLabs::Version.header_start
-      f.puts ' ' * indent << CLabs::Version.header_end
-      f.puts ' ' * indent << @lineAfter
-    end
-    v.write_version_header(fn)
-    fn
-  end
-
-  def do_test(indent=0)
-    v = CLabs::Version.new(1,2,'3')
-    fn = make_sample_file(v, indent)
-    readlines = nil
-    File.open(fn, 'r') do |f| readlines = f.readlines end
-    readlines.collect! { |ln| ln.rstrip.chomp }
-    #puts
-    #puts readlines
-    assert_equal(' ' * indent << @lineBefore, readlines[0])
-    assert_equal(' ' * indent << CLabs::Version.header_start, readlines[1])
-    assert_equal(' ' * indent << 'begin', readlines[2])
-    assert_equal(' ' * indent << '  ' << "require 'cl/util/version'", readlines[3])
-    assert_equal(' ' * indent << '  ' << "VERSION = CLabs::Version.new('1', '2', '3')", readlines[4])
-    assert_equal(' ' * indent << 'rescue LoadError', readlines[5])
-    assert_equal(' ' * indent << '  ' << "VERSION = '1.2.3'", readlines[6])
-    assert_equal(' ' * indent << 'end', readlines[7])
-    assert_equal(' ' * indent << CLabs::Version.header_end, readlines[8])
-    assert_equal(' ' * indent << @lineAfter, readlines[9])
-  end
-
-  def test_write_version_header_no_indent
-    do_test(0)
-  end
-  
-  def test_write_version_header_indent
-    do_test(2)
-  end
-  
-  def test_to_s
-    v = CLabs::Version.new(1,2,3)
-    assert_equal('1.2.3', v.to_s)
-
-    v = CLabs::Version.new(1,2,'3')
-    assert_equal('1.2.3', v.to_s)
-  end
-  
-  def test_comparison
-    assert_equal(0, CLabs::Version.new(0,0,0) <=> CLabs::Version.new(0,0,0)) 
-    assert_equal(1, CLabs::Version.new(1,0,0) <=> CLabs::Version.new(0,0,0)) 
-    assert_equal(1, CLabs::Version.new(0,1,0) <=> CLabs::Version.new(0,0,0)) 
-    assert_equal(1, CLabs::Version.new(0,0,1) <=> CLabs::Version.new(0,0,0)) 
-    assert_equal(-1, CLabs::Version.new(0,0,0) <=> CLabs::Version.new(1,0,0)) 
-    assert_equal(-1, CLabs::Version.new(0,0,0) <=> CLabs::Version.new(0,1,0)) 
-    assert_equal(-1, CLabs::Version.new(0,0,0) <=> CLabs::Version.new(0,0,1)) 
-  end
-end