rant 0.3.8 → 0.4.0

data/test/project_rb1/test_project_rb1.rb

@@ -1,6 +1,5 @@
 
 require 'test/unit'
-require 'rant/rantlib'
 require 'tutil'
 
 $testProjectRb1Dir = File.expand_path(File.dirname(__FILE__))
@@ -11,12 +10,10 @@ class TestProjectRb1 < Test::Unit::TestCase
 	    test/text test/tc_wgrep.rb README test_project_rb1.rb
 	    rantfile.rb)
 	# Ensure we run in test directory.
-	Dir.chdir($testProjectRb1Dir) unless Dir.pwd == $testProjectRb1Dir
+	Dir.chdir($testProjectRb1Dir)
     end
     def teardown
-	capture_std do
-	    assert_equal(Rant.run(%w(clean)), 0)
-	end
+        assert_rant("clean")
 	manifest = @manifest.dup
 	check_manifest "after clean: "
     end
@@ -31,9 +28,7 @@ class TestProjectRb1 < Test::Unit::TestCase
 	}
     end
     def test_doc
-	capture_std do
-	    assert_equal(Rant.run(%w(doc)), 0)
-	end
+        assert_rant("doc")
 	assert(test(?d, "doc"),
 	    "RDoc task should generate dir `doc'")
 	assert(test(?f, "doc/index.html"),
@@ -45,26 +40,12 @@ class TestProjectRb1 < Test::Unit::TestCase
 	    "README should be in html docs")
     end
     def test_test
-	capture_std do
-	    assert_equal(0, Rant.run(%w(test)))
-	end
+        assert_rant("test")
     end
     def test_package
-	capture_std do
-	    assert_equal(0, Rant.run(%w(pkg)))
-	end
+        assert_rant("pkg")
 	assert(test(?d, "packages"),
 	    "task `pkg' should create dir `packages'")
-	begin
-	    have_tar = !`tar --help`.empty?
-	rescue
-	    have_tar = false
-	end
-	begin
-	    have_zip = !`zip -help`.empty?
-	rescue
-	    have_zip = false
-	end
 	have_gem = false
 	pkg_base = "packages/wgrep-1.0.0"
 	begin
@@ -72,21 +53,13 @@ class TestProjectRb1 < Test::Unit::TestCase
 	    have_gem = true
 	rescue LoadError
 	end
-	if have_tar
-	    tar_fn = pkg_base + ".tar.gz"
-	    assert(test(?f, tar_fn),
-		"tar is available, so a tar.gz should have been built")
-	    verify_tar "packages", "wgrep-1.0.0", ".tar.gz"
-	else
-	    puts "*** tar not available ***"
-	end
-	if have_zip
+        tar_fn = pkg_base + ".tar.gz"
+        assert(test(?f, tar_fn),
+            "tar is available, so a tar.gz should have been built")
+        verify_tar "packages", "wgrep-1.0.0", ".tar.gz"
 	    assert(test(?f, pkg_base + ".zip"),
 		"zip is available, so a zip should have been built")
 	    verify_zip "packages", "wgrep-1.0.0", ".zip"
-	else
-	    puts "*** zip not available ***"
-	end
 	if have_gem
 	    assert(test(?f, pkg_base + ".gem"),
 		"gem is available, so a gem should have been built")
@@ -103,7 +76,8 @@ class TestProjectRb1 < Test::Unit::TestCase
 	FileUtils.mkdir tmp_dir
 	FileUtils.cp tar_fn, tmp_dir
 	FileUtils.cd tmp_dir do
-	    `tar xzf #{tar_fn}`
+            #`tar xzf #{tar_fn}`
+            unpack_archive :tgz, tar_fn
 	    assert(test(?d, pkg_base),
 		"`#{pkg_base}' should be root directory of all files in tar")
 	    FileUtils.cd pkg_base do
@@ -123,7 +97,8 @@ class TestProjectRb1 < Test::Unit::TestCase
 	FileUtils.mkdir tmp_dir
 	FileUtils.cp zip_fn, tmp_dir
 	FileUtils.cd tmp_dir do
-	    `unzip -q #{zip_fn}`
+            #`unzip -q #{zip_fn}`
+            unpack_archive :zip, zip_fn
 	    assert(test(?d, pkg_base),
 		"`#{pkg_base}' should be root directory of all files in zip")
 	    FileUtils.cd pkg_base do
@@ -142,12 +117,13 @@ class TestProjectRb1 < Test::Unit::TestCase
 	# TODO: some out, err checking
 	
 	# run the monolithic rant script
-	out = `#{Rant::Env::RUBY} make -T`
+        #out = `#{Rant::Env::RUBY} make -T`
+        out = run_ruby("make", "-T")
 	assert_equal(0, $?,
 	    "imported `rant -T' should return 0")
 	assert_match(/\bpkg\b/, out,
 	    "imported `rant -T' should list described task `pkg'")
     ensure
-	File.delete "make" if File.exist? "make"
+        FileUtils.rm_f "make"
     end
 end

data/test/rant-import/test_rant-import.rb

@@ -29,7 +29,7 @@ class TestRantImport < Test::Unit::TestCase
 	open("mylib.t/rant/import/mygen.rb", "w") { |f|
 	    f << <<-EOF
 	    mygen = Object.new
-	    def mygen.rant_generate(rac, ch, args, &block)
+	    def mygen.rant_gen(rac, ch, args, &block)
 		tn = args.first || "mygen"
 		rac.task(:__caller__ => ch, tn => []) do |t|
 		    puts "Greetings from `" + t.name + "', generated by MyGen."
@@ -73,7 +73,7 @@ class TestRantImport < Test::Unit::TestCase
 	    module Rant::Generators
 		module Sub
 		    class T
-			def self.rant_generate(rac, ch, args, &blk)
+			def self.rant_gen(rac, ch, args, &blk)
 			    raise "no ch" unless Hash === ch
 			    rac.cx.task args.first do |t|
 				puts args
@@ -122,7 +122,7 @@ class TestRantImport < Test::Unit::TestCase
 	    module Rant::Generators
 		module Sub2
 		    class T
-			def self.rant_generate(rac, ch, args, &blk)
+			def self.rant_gen(rac, ch, args, &blk)
 			    rac.cx.task args.first do |t|
 				misc_print(args)
 			    end

data/test/test_filelist.rb

@@ -158,6 +158,15 @@ class TestFileList < Test::Unit::TestCase
 	    assert_equal(1, l2.size)
 	end
     end
+    def test_add_array
+	touch_temp %w(1.t 2.t) do
+	    l1 = fl "*.t"
+	    l2 = l1 + %w(x)
+	    assert_equal(2, l1.size)
+	    assert_equal(3, l2.size)
+	    assert(l2.include?("x"))
+	end
+    end
     def test_glob
 	touch_temp %w(t.t1 t.t2) do
 	    l = fl "*.t1"
@@ -287,8 +296,36 @@ class TestFileList < Test::Unit::TestCase
 	    l2 = cx.sys["*.t"]
 	    assert_equal(4, l1.size)
 	    assert_equal(2, l2.size)
-	    %w(a.t .a.t b.t .b.t).each { |f| l1.include? f }
-	    %w(a.t b.t ).each { |f| l2.include? f }
+	    %w(a.t .a.t b.t .b.t).each { |f|
+                assert(l1.include?(f))
+            }
+	    %w(a.t b.t ).each { |f|
+                assert(l2.include?(f))
+            }
 	end
     end
+    def test_add_no_dir
+        cx = Rant::RantApp.new.cx
+        FileUtils.mkdir "tfl.t"
+        FileUtils.mkdir "tfl.tt"
+        touch_temp %w(a.t a.tt) do
+            l1 = cx.sys["*.t"]
+            l1 += cx.sys["*.tt"].no_dir
+            assert_equal(3, l1.size)
+            %w(tfl.t a.t a.tt).each { |f|
+                assert(l1.include?(f))
+            }
+        end
+    ensure
+        FileUtils.rm_rf %w(tfl.t tfl.tt)
+    end
+    def test_exclude_arrows_op
+        cx = Rant::RantApp.new.cx
+        touch_temp %w(a.t b.t) do
+            fl = cx.sys["*.t"]
+            fl.exclude "*.t"
+            fl << "a.t"
+            assert(fl.include?("a.t"))
+        end
+    end
 end

data/test/tutil.rb

@@ -10,6 +10,7 @@ module Test
 	    def assert_rant(*args)
 		res = 0
 		capture = true
+                newproc = false
 		args.flatten!
 		args.reject! { |arg|
 		    if Symbol === arg
@@ -17,6 +18,7 @@ module Test
 			when :fail: res = 1
 			when :v: capture = false
 			when :verbose: capture = false
+                        when :x: newproc = true
 			else
 			    raise "No such option -- #{arg}"
 			end
@@ -25,6 +27,17 @@ module Test
 			false
 		    end
 		}
+                if newproc
+                    if capture
+                        # TODO: stderr
+                        `#{Rant::Sys.sp(Rant::Env::RUBY)} #{Rant::Sys.sp(RANT_BIN)} #{args.flatten.join(' ')}`
+                    else
+                        system("#{Rant::Sys.sp(Rant::Env::RUBY)} " +
+                            #{Rant::Sys.sp(RANT_BIN)} " +
+                            "#{args.flatten.join(' ')}")
+                    end
+                    assert_equal(res, $?.exitstatus)
+                end
 		if capture
 		    capture_std do
 			assert_equal(res, ::Rant::RantApp.new.run(*args))
@@ -33,6 +46,9 @@ module Test
 		    assert_equal(res, ::Rant::RantApp.new.run(*args))
 		end
 	    end
+            def assert_exit(status = 0)
+                assert_equal(status, $?.exitstatus)
+            end
 	end
     end
 end
@@ -145,13 +161,83 @@ When testing Rant: `#{Dir.pwd + "/" + errfn}' exists.
 end
 
 def run_rant(*args)
-    `#{Rant::Sys.sp(Rant::Env::RUBY)} #{Rant::Sys.sp(RANT_BIN)} #{args.flatten.arglist}`
+    `#{Rant::Sys.sp(Rant::Env::RUBY)} #{Rant::Sys.sp(RANT_BIN)} #{args.flatten.join(' ')}`
 end
 
 def run_import(*args)
-    `#{Rant::Sys.sp(Rant::Env::RUBY)} #{Rant::Sys.sp(RANT_IMPORT_BIN)} #{args.flatten.arglist}`
+    `#{Rant::Sys.sp(Rant::Env::RUBY)} #{Rant::Sys.sp(RANT_IMPORT_BIN)} #{args.flatten.join(' ')}`
 end
 
 def run_ruby(*args)
-    `#{Rant::Sys.sp(Rant::Env::RUBY)} #{args.flatten.arglist}`
+    `#{Rant::Sys.sp(Rant::Env::RUBY)} #{args.flatten.join(' ')}`
+end
+
+$have_unzip = !!Rant::Env.find_bin("unzip")
+
+def unpack_archive(atype, archive)
+    case atype
+    when :tgz
+        if ::Rant::Env.have_tar?
+            `tar -xzf #{archive}`
+        else
+            minitar_unpack archive
+        end
+    when :zip
+        if $have_unzip
+            `unzip -q #{archive}`
+        else
+            rubyzip_unpack archive
+        end
+    else
+        raise "can't unpack archive type #{atype}"
+    end
+end
+def minitar_unpack(archive)
+    require 'rant/archive/minitar'
+    tgz = Zlib::GzipReader.new(File.open(archive, 'rb'))
+    # unpack closes tgz
+    Rant::Archive::Minitar.unpack(tgz, '.')
+end
+def rubyzip_unpack(archive)
+    require 'rant/archive/rubyzip'
+    f = Rant::Archive::Rubyzip::ZipFile.open archive
+    f.entries.each { |e|
+        dir, = File.split(e.name)
+        FileUtils.mkpath dir unless test ?d, dir
+        f.extract e, e.name
+    }
+    f.close
+end
+
+# Returns a list with the files required by the IO object script.
+def extract_requires(script, dynamic_requires = [])
+    in_ml_comment = false
+    requires = []
+    script.each { |line|
+        if in_ml_comment
+            if line =~ /^=end/
+                in_ml_comment = false
+            end
+            next
+        end
+        # skip shebang line
+        next if line =~ /^#! ?(\/|\\)?\w/
+        # skip pure comment lines
+        next if line =~ /^\s*#/
+        if line =~ /^=begin\s/
+            in_ml_comment = true
+            next
+        end
+        name = nil
+        lib_file = nil
+        if line =~ /\s*(require|load)\s*('|")([^\2]*)\2/
+            fn = $3
+            if fn =~ /\#\{[^\}]+\}/ || fn =~ /\#\@/
+                dynamic_requires << fn
+            else
+                requires << fn
+            end
+        end
+    }
+    requires
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: rant
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
-date: 2005-05-15
+  version: 0.4.0
+date: 2005-07-10
 summary: Rant is a Ruby based build tool.
 require_paths: 
   - lib
@@ -30,13 +30,10 @@ authors:
     - Stefan Lang
 files: 
   - NEWS
-  - TODO
   - README
   - Rantfile
   - install.rb
   - run_rant
-  - devel-notes
-  - rantmethods.rb
   - run_import
   - setup.rb
   - COPYING
@@ -54,6 +51,7 @@ files:
   - lib/rant/import
   - lib/rant/plugin_methods.rb
   - lib/rant/plugin
+  - lib/rant/archive
   - lib/rant/import.rb
   - lib/rant/c/include.rb
   - lib/rant/import/c
@@ -63,15 +61,27 @@ files:
   - lib/rant/import/rubydoc.rb
   - lib/rant/import/rubytest.rb
   - lib/rant/import/rubypackage.rb
+  - lib/rant/import/archive.rb
+  - lib/rant/import/package
+  - lib/rant/import/archive
   - lib/rant/import/subfile.rb
-  - lib/rant/import/package.rb
   - lib/rant/import/clean.rb
   - lib/rant/import/autoclean.rb
   - lib/rant/import/c/dependencies.rb
   - lib/rant/import/win32/rubycmdwrapper.rb
+  - lib/rant/import/package/tgz.rb
+  - lib/rant/import/package/zip.rb
+  - lib/rant/import/archive/tgz.rb
+  - lib/rant/import/archive/zip.rb
   - lib/rant/plugin/README
   - lib/rant/plugin/configure.rb
   - lib/rant/plugin/csharp.rb
+  - lib/rant/archive/minitar.rb
+  - lib/rant/archive/rubyzip
+  - lib/rant/archive/rubyzip.rb
+  - lib/rant/archive/rubyzip/stdrubyext.rb
+  - lib/rant/archive/rubyzip/ioextras.rb
+  - lib/rant/archive/rubyzip/tempfile_bugfixed.rb
   - test/c
   - test/test_filetask.rb
   - test/test_lighttask.rb
@@ -128,6 +138,7 @@ files:
   - test/import/truth
   - test/import/subfile
   - test/import/directedrule
+  - test/import/package
   - test/import/c/dependencies
   - test/import/c/dependencies/src
   - test/import/c/dependencies/bar.h
@@ -151,6 +162,17 @@ files:
   - test/import/subfile/autoclean.rf
   - test/import/directedrule/Rantfile
   - test/import/directedrule/test_directedrule.rb
+  - test/import/package/sub
+  - test/import/package/deep
+  - test/import/package/sub2
+  - test/import/package/Rantfile
+  - test/import/package/test_package.rb
+  - test/import/package/MANIFEST
+  - test/import/package/sub/f1
+  - test/import/package/deep/sub
+  - test/import/package/deep/sub/sub
+  - test/import/package/deep/sub/sub/f1
+  - test/import/package/sub2/f1
   - test/plugin/configure
   - test/plugin/csharp
   - test/plugin/rantfile
@@ -183,6 +205,7 @@ files:
   - doc/csharp.rdoc
   - doc/rant-import.rdoc
   - doc/examples
+  - doc/package.rdoc
   - doc/examples/directedrule
   - doc/examples/myprog
   - doc/examples/c_dependencies
@@ -206,6 +229,11 @@ files:
   - doc/examples/c_dependencies/src/util.c
   - doc/examples/c_dependencies/include/hello.h
   - doc/examples/c_dependencies/include/util.h
+  - misc/TODO
+  - misc/t.rb
+  - misc/mt.rb
+  - misc/devel-notes
+  - misc/rantmethods.rb
 test_files: []
 rdoc_options: 
   - "-S"
@@ -224,6 +252,7 @@ extra_rdoc_files:
   - doc/rant.rdoc
   - doc/csharp.rdoc
   - doc/rant-import.rdoc
+  - doc/package.rdoc
   - README
   - doc/examples/myprog/README
   - lib/rant/plugin/README

data/TODO

@@ -1,21 +0,0 @@
-
-= TODO
-
-== GET RID OF CLASS Rant::Path
-Done.
-
-== Packaging
-Try minitar if tar is not available.
-
-== C# plugin
-Define the method +assembly+ for building a file with the C# compiler?
-Done.
-
-== Predefined tasks
-
-Add a 'distclean' task that removes all files and directories
-generatet by any file task.
-
-== Java plugin
-
-At least for the 1.0.0 release.