rant 0.4.6 → 0.4.8

data/test/test_env.rb

@@ -13,16 +13,17 @@ class TestRantEnv < Test::Unit::TestCase
     end
     def test_on_windows
 	# rather primitive test, but should catch obvious programming
-	# errors when making changes in when in hurry ;)
+	# errors when making changes when in hurry ;)
 	if Rant::Env.on_windows?
 	    assert(File::ALT_SEPARATOR,
 		"Env says we're on windows, but there is no ALT_SEPARATOR")
 	end
     end
     def test_find_bin
-	assert(Rant::Env.find_bin(Rant::Env::RUBY),
-	    "RUBY_INSTALL_NAME should be found by Env.find_bin, " +
-	    "doesn't need to be a bug of Rant")
+        # not required since Rant 0.4.7
+	#assert(Rant::Env.find_bin(Rant::Env::RUBY),
+	#    "RUBY_INSTALL_NAME should be found by Env.find_bin, " +
+	#    "doesn't need to be a bug of Rant")
 	# let's check for the `echo' command which should be on most
 	# systems:
 	have_echo = false

data/test/test_filelist.rb

@@ -1,12 +1,12 @@
 
 require 'test/unit'
-require 'rant/rantlib'
-require 'fileutils'
 require 'tutil'
 
 $testDir ||= File.expand_path(File.dirname(__FILE__))
 
 class TestFileList < Test::Unit::TestCase
+    include Rant::TestUtil
+
     def fl(*args, &block)
 	Rant::FileList.new(*args, &block)
     end
@@ -421,7 +421,64 @@ if Rant::Env.on_windows?
 else
     def test_to_s_quoting_spaces
         cx = Rant::RantApp.new.cx
-        assert_equal("'a a' b", "#{cx.sys[].concat(["a a", "b"])}")
+        # changed in 0.4.7
+        #assert_equal("'a a' b", "#{cx.sys[].concat(["a a", "b"])}")
+        assert_equal("a\\ a b", "#{cx.sys[].concat(["a a", "b"])}")
     end
 end
+    def test_dotfiles
+        in_local_temp_dir do
+            Rant::Sys.touch %w(a.t .a.t)
+            Rant::Sys.mkdir %w(d.t .d.t)
+            Rant::Sys.touch %w(d.t/a.t d.t/.a.t)
+            Rant::Sys.touch %w(.d.t/a.t .d.t/.a.t)
+            Rant::Sys.mkdir %w(d.t/d.t)
+            Rant::Sys.touch %w(d.t/d.t/a.t d.t/d.t/.a.t)
+            cx = Rant::RantApp.new.cx
+            files = cx.sys["**/*.t"]
+            %w(a.t d.t d.t/a.t d.t/d.t d.t/d.t/a.t).each { |fn|
+                assert files.include?(fn), "#{fn} missing"
+            }
+            #p files.sort.to_a
+            assert_equal 5, files.size
+            files = cx.sys.glob_all "**/*.t"
+            %w(a.t .a.t d.t .d.t d.t/a.t d.t/.a.t .d.t/a.t .d.t/.a.t d.t/d.t d.t/d.t/a.t d.t/d.t/.a.t).each { |fn|
+                assert files.include?(fn), "#{fn} missing"
+            }
+            assert_equal 11, files.size
+            files = cx.sys.glob_all("**/*.t").exclude(".a.*")
+            %w(a.t d.t .d.t d.t/a.t d.t/.a.t .d.t/a.t .d.t/.a.t d.t/d.t d.t/d.t/a.t d.t/d.t/.a.t).each { |fn|
+                assert files.include?(fn), "#{fn} missing"
+            }
+            assert_equal 10, files.size
+            files = cx.sys.glob_all("**/*.t").shun(".d.t")
+            %w(a.t .a.t d.t d.t/a.t d.t/.a.t d.t/d.t d.t/d.t/a.t d.t/d.t/.a.t).each { |fn|
+                assert files.include?(fn), "#{fn} missing"
+            }
+            assert_equal 8, files.size
+            files.include("**/*.t").uniq!
+            %w(a.t .a.t d.t d.t/a.t d.t/.a.t d.t/d.t d.t/d.t/a.t d.t/d.t/.a.t).each { |fn|
+                assert files.include?(fn), "#{fn} missing"
+            }
+            assert_equal 11, files.size
+            # redundant, just to emphasize
+            assert !files.include?(".")
+            assert !files.include?("..")
+            assert !files.include?("d.t/.")
+            assert !files.include?("d.t/..")
+            assert !files.include?(".d.t/.")
+            assert !files.include?(".d.t/..")
+        end
+    end
+    def test_dotdirs
+        in_local_temp_dir do
+            cx = Rant::RantApp.new.cx
+            Rant::Sys.mkdir ["d", ".d", "d/d", "d/.d", ".d/.d", ".d/d", "d/.d/d"]
+            files = cx.sys["**/*"]
+            %w(d d/d).each { |fn|
+                files.include?(fn)
+            }
+            assert_equal 2, files.size
+        end
+    end
 end

data/test/test_rant_interface.rb

@@ -87,4 +87,9 @@ class TestRantInterface < Test::Unit::TestCase
         assert lines.size < 3
         assert_match(/\[ERROR\].*option.*\bnix\b/, lines.first)
     end
+    def test_opt_rantfile_no_such_file
+        out, err = assert_rant :fail, "-fdoesnt_exist.rf"
+        assert out.empty?
+        assert err =~ /\bdoesnt_exist\.rf\b/
+    end
 end

data/test/test_sys.rb

@@ -162,7 +162,7 @@ class TestSys < Test::Unit::TestCase
     end
     # ...
     def test_standalone
-	out = `#{Rant::Sys.sp(Rant::Env::RUBY)} -I#{Rant::Sys.sp(RANT_DEV_LIB_DIR)} standalone.rf`
+	out = `#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} -I#{Rant::Sys.sp(RANT_DEV_LIB_DIR)} standalone.rf`
         assert_exit
 	assert_match(/^t_standalone/, out)
     end
@@ -193,7 +193,7 @@ class TestSys < Test::Unit::TestCase
         open "rf.t", "w" do |f|
             f << <<-EOF
             task :rbexit1_block do
-                sys Env::RUBY, "exit_1.t" do |status|
+                sys Env::RUBY_EXE, "exit_1.t" do |status|
                     puts "no success" if status != 0
                     puts status.exitstatus
                 end
@@ -210,4 +210,55 @@ class TestSys < Test::Unit::TestCase
     ensure
         FileUtils.rm_f %w(exit_1.t rf.t)
     end
+    def test_escape
+        assert_equal "abc", Rant::Sys.escape("abc")
+        assert_equal "", Rant::Sys.escape("")
+        # might change
+        assert_equal "", Rant::Sys.escape(nil)
+        if Rant::Env.on_windows?
+            assert_equal '"a b"', Rant::Sys.escape("a b")
+            assert_equal '" "', Rant::Sys.escape(" ")
+            assert_equal '" a b "', Rant::Sys.escape(" a b ")
+            o = Object.new
+            def o.to_s; "to s"; end
+            assert_equal '"to s"', Rant::Sys.escape(o)
+        else
+            assert_equal "a\\ b", Rant::Sys.escape("a b")
+            assert_equal "\\ ", Rant::Sys.escape(" ")
+            assert_equal "\\ a\\ b\\ ", Rant::Sys.escape(" a b ")
+            o = Object.new
+            def o.to_s; "to s"; end
+            assert_equal "to\\ s", Rant::Sys.escape(o)
+        end
+    end
+    def test_escape_array
+        assert_equal "a b", Rant::Sys.escape(%w(a b))
+        assert_equal "", Rant::Sys.escape([])
+        assert_equal "", Rant::Sys.escape([[]])
+        res = Rant::Sys.escape(["", []])
+        assert_equal "", res.strip
+        assert res.length < 2
+        if Rant::Env.on_windows?
+            assert_equal '"a  b" c d " e"', Rant::Sys.escape([["a  b"], "c", ["d", " e"]])
+        else
+            assert_equal "a\\ \\ b c d \\ e", Rant::Sys.escape([["a  b"], "c", ["d", " e"]])
+        end
+    end
+    def test_sp
+        assert_equal "a", Rant::Sys.sp("a")
+        assert_equal "", Rant::Sys.sp("")
+        if Rant::Env.on_windows?
+            assert_equal '"a b"', Rant::Sys.sp("a b")
+            assert_equal '" " a b "c " d', Rant::Sys.sp([" ", ["a", "b", "c ", ["d"]]])
+            assert_equal "a\\b", Rant::Sys.sp("a/b")
+            assert_equal '"a\ b" c\d', Rant::Sys.sp(["a/ b", "c/d"])
+	    assert_equal "a\\b\\c\\", Rant::Sys.sp("a/b/c/")
+	    assert_equal "\"a b\\c\\\\\"", Rant::Sys.sp("a b/c/")
+        else
+            assert_equal "a\\ b", Rant::Sys.sp("a b")
+            assert_equal "\\  a b c\\  d", Rant::Sys.sp([" ", ["a", "b", "c ", ["d"]]])
+            assert_equal "a/b", Rant::Sys.sp("a/b")
+            assert_equal "a/\\ b c/d", Rant::Sys.sp(["a/ b", "c/d"])
+        end
+    end
 end

data/test/tutil.rb

@@ -32,10 +32,10 @@ module Test
                 if newproc
                     if capture
                         # TODO: stderr
-                        `#{Rant::Sys.sp(Rant::Env::RUBY)} #{Rant::Sys.sp(RANT_BIN)} #{args.flatten.join(' ')}`
+                        `#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} #{Rant::Sys.sp(RANT_BIN)} #{args.flatten.join(' ')}`
                     else
-                        system("#{Rant::Sys.sp(Rant::Env::RUBY)} " +
-                            #{Rant::Sys.sp(RANT_BIN)} " +
+                        system("#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} " +
+                            "#{Rant::Sys.sp(RANT_BIN)} " +
                             "#{args.flatten.join(' ')}")
                     end
                     assert_equal(res, $?.exitstatus)
@@ -51,6 +51,14 @@ module Test
             def assert_exit(status = 0)
                 assert_equal(status, $?.exitstatus)
             end
+            def assert_file_content(fn, content, *opts)
+                assert(test(?f, fn), "`#{fn}' doesn't exist")
+                fc = File.read(fn)
+                fc.strip! if opts.include? :strip
+                assert(fc == content,
+                    "file `#{fn}' should contain `#{content}' " +
+                    "but contains `#{fc}'")
+            end
             if RUBY_VERSION < "1.8.1"
                 def assert_raise(*args, &block)
                     assert_raises(*args, &block)
@@ -168,15 +176,15 @@ 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.join(' ')}`
+    `#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} #{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.join(' ')}`
+    `#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} #{Rant::Sys.sp(RANT_IMPORT_BIN)} #{args.flatten.join(' ')}`
 end
 
 def run_ruby(*args)
-    `#{Rant::Sys.sp(Rant::Env::RUBY)} #{args.flatten.join(' ')}`
+    `#{Rant::Sys.sp(Rant::Env::RUBY_EXE)} #{args.flatten.join(' ')}`
 end
 
 # Returns a list with the files required by the IO object script.

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rant
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
-date: 2005-09-25 00:00:00 +02:00
+  version: 0.4.8
+date: 2005-10-31 00:00:00 +01:00
 summary: Rant is a Ruby based build tool.
 require_paths: 
   - lib
@@ -16,7 +16,7 @@ autorequire:
 default_executable: 
 bindir: 
   - bin
-has_rdoc: true
+has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
     - 
@@ -38,6 +38,7 @@ files:
   - run_rant
   - run_import
   - setup.rb
+  - INSTALL
   - COPYING
   - bin/rant
   - bin/rant-import
@@ -57,6 +58,7 @@ files:
   - lib/rant/tempfile.rb
   - lib/rant/coregen.rb
   - lib/rant/archive
+  - lib/rant/metautils.rb
   - lib/rant/import.rb
   - lib/rant/c/include.rb
   - lib/rant/import/c
@@ -73,6 +75,7 @@ files:
   - lib/rant/import/archive.rb
   - lib/rant/import/md5.rb
   - lib/rant/import/package
+  - lib/rant/import/command.rb
   - lib/rant/import/archive
   - lib/rant/import/subfile.rb
   - lib/rant/import/signature
@@ -100,6 +103,7 @@ files:
   - lib/rant/archive/rubyzip/ioextras.rb
   - lib/rant/archive/rubyzip/tempfile_bugfixed.rb
   - test/c
+  - test/test_dyn_dependencies.rb
   - test/test_filetask.rb
   - test/test_examples.rb
   - test/Rantfile
@@ -128,6 +132,7 @@ files:
   - test/project2
   - test/rant-import
   - test/subdirs2
+  - test/dyn_dependencies.rf
   - test/test_clean.rb
   - test/test_filelist.rb
   - test/deprecated
@@ -155,6 +160,7 @@ files:
   - test/import/c
   - test/import/md5
   - test/import/sys
+  - test/import/command
   - test/import/metadata
   - test/import/nodes
   - test/import/truth
@@ -195,6 +201,8 @@ files:
   - test/import/sys/data/pkg/test.h
   - test/import/sys/data/pkg/bin/test
   - test/import/sys/data/pkg/bin/test.o
+  - test/import/command/Rantfile
+  - test/import/command/test_command.rb
   - test/import/metadata/sub
   - test/import/metadata/test_metadata.rb
   - test/import/metadata/Rantfile
@@ -258,8 +266,8 @@ files:
   - test/subdirs2/sub1/sub.rant
   - test/subdirs2/sub00/sub.rant
   - test/deprecated/README
-  - test/deprecated/test_0_4_8.rb
   - test/deprecated/test_0_5_2.rb
+  - test/deprecated/test_0_6_0.rb
   - doc/rantfile.rdoc
   - doc/md5.rdoc
   - doc/configure.rdoc
@@ -270,11 +278,13 @@ files:
   - doc/homepage
   - doc/rant.rdoc
   - doc/jamis.rb
+  - doc/rant_vs_rake.rdoc
   - doc/rant.1
   - doc/csharp.rdoc
   - doc/rant-import.rdoc
   - doc/examples
   - doc/package.rdoc
+  - doc/command.rdoc
   - doc/homepage/index.html
   - doc/homepage/rant_home.css
   - doc/examples/c_cpp
@@ -353,9 +363,8 @@ rdoc_options:
   - README
 extra_rdoc_files: 
   - README
-  - doc/examples/myprog/README
-  - lib/rant/plugin/README
   - NEWS
+  - INSTALL
   - doc/rantfile.rdoc
   - doc/md5.rdoc
   - doc/configure.rdoc
@@ -364,9 +373,11 @@ extra_rdoc_files:
   - doc/rubyproject.rdoc
   - doc/c.rdoc
   - doc/rant.rdoc
+  - doc/rant_vs_rake.rdoc
   - doc/csharp.rdoc
   - doc/rant-import.rdoc
   - doc/package.rdoc
+  - doc/command.rdoc
 executables: 
   - rant
   - rant-import

data/test/deprecated/test_0_4_8.rb

@@ -1,41 +0,0 @@
-
-require 'test/unit'
-require 'tutil'
-
-$test_deprecated_dir ||= File.expand_path(File.dirname(__FILE__))
-
-class TestDeprecated_0_4_8 < Test::Unit::TestCase
-    include Rant::TestUtil
-
-    def setup
-        Dir.chdir $test_deprecated_dir
-    end
-    def test_Rantfile_rb
-        in_local_temp_dir do
-            write_to_file "Rantfile.rb", <<-EOF
-                task :a do |t|
-                    puts t.name
-                end
-            EOF
-            out, err = assert_rant
-            assert_equal("a\n", out)
-            assert_match(/\bWARNING\b/, err)
-            assert_match(/\bRantfile\.rb\b/, err)
-            assert_match(/\bdeprecated\b/, err)
-        end
-    end
-    def test_rantfile_rb
-        in_local_temp_dir do
-            write_to_file "Rantfile.rb", <<-EOF
-                task :a do |t|
-                    puts t.name
-                end
-            EOF
-            out, err = assert_rant
-            assert_equal("a\n", out)
-            assert_match(/\bWARNING\b/, err)
-            assert_match(/\bRantfile\.rb\b/, err)
-            assert_match(/\bdeprecated\b/, err)
-        end
-    end
-end