rant 0.5.2 → 0.5.4

data/NEWS

@@ -1,6 +1,22 @@
 
 = Rant NEWS
 
+== Rant 0.5.4
+
+Incompatible changes:
+* The undocumented method <tt>var.is</tt> which is deprecated since
+  release 0.5.2 is not defined anymore.
+
+Fixes and minor improvements:
+* Fix a rule bug where a custom rule task wouldn't find it's
+  prerequisites in subdirectories.
+* An non-backwards compatible change in the YAML library of Ruby 1.8.3
+  and newer causes gems to be non-backwards compatible. The fix for
+  backwards compatibility of gems created with RubyPackage is enabled
+  for all newer Ruby versions now. (See changes of last Rant release.)
+* The new method <tt>sys.write_to_binfile</tt>. (Kevin Burge's idea.)
+  Read doc/sys.rdoc[link:files/doc/sys_rdoc.html] for documentation.
+
 == Rant 0.5.2
 
 Incompatible changes:

data/README

@@ -42,7 +42,7 @@ Running rant in the directory of this file:
 will ensure that the "data" file in the "backup" directory is up to
 date.
 
-This document was written for version 0.5.2 of Rant. Most things
+This document was written for version 0.5.4 of Rant. Most things
 described here will work for older/newer versions of Rant, but look at
 the README file in the Rant distribution you've installed for exact
 documentation of your Rant version.

data/Rantfile

@@ -41,6 +41,10 @@ gen RubyPackage, "rant#{var :pkg_ext}" do |t|
     t.package_task
 end
 
+task "dev-pkg" do
+    make Package::Tgz, "pkg/rant-dev", :files => dist_files
+end
+
 task "dist-files" do
     puts dist_files
 end
@@ -291,4 +295,17 @@ def count_rb_lines(fn)
     [lines, code_lines]
 end
 
+@prefix = var[:prefix] || "/usr/local"
+
+task "uninstall" do
+    print <<-EOF
+    Run task _uninstall_ to uninstall Rant from prefix[#@prefix].
+    EOF
+end
+
+task "_uninstall_" do
+    sys.rm_rf FileList["#@prefix/lib/ruby/site_ruby/1.8/rant*"]
+    sys.rm_f FileList["#@prefix/bin/rant*"]
+end
+
 # vim:ft=ruby

data/doc/sys.rdoc

@@ -400,6 +400,22 @@ The following methods print messages to standard output:
 
     sys.write_to_file "version", "1.2.0\n"  # => prints "writing 6 bytes to file `version'"
 
+* <b>write_to_binfile(fn, data)</b>
+
+  Requires <tt>import "sys/more"</tt>
+
+  Like <tt>write_to_file(fn, data)</tt> but opens the file in binary
+  mode.
+
+  Example:
+
+    import "sys/more"
+
+    require "digest/md5"
+    data = Digest::MD5.digest("some_string")
+
+    sys.write_to_binfile "hash", data  # => prints "writing 16 bytes to file `hash'"
+
 * <b>unpack_tgz(fn, options = {})</b>
 
   Requires <tt>import "sys/tgz"</tt>

data/lib/rant/coregen.rb

@@ -179,9 +179,11 @@ module Rant
                         have_src = true
                         src = @src_proc[target]
                         if src.respond_to? :to_ary
-                            have_src = src.to_ary.all? { |s| have_src?(s) }
+                            have_src = src.to_ary.all? { |s|
+                                have_src?(rel_project_dir, s)
+                            }
                         else
-                            have_src = have_src?(src)
+                            have_src = have_src?(rel_project_dir, src)
                         end
                         if have_src
                             create_nodes(rel_project_dir, target, src)
@@ -190,33 +192,33 @@ module Rant
                 end
                 alias [] call
                 private
-                def have_src?(name)
-                    !@rant.rec_save_resolve(name, self).empty? or
-                        test(?e, name)
+                def have_src?(rel_project_dir, name)
+                    return true unless
+                        @rant.rec_save_resolve(name, self, rel_project_dir).empty?
+                    test(?e, @rant.abs_path(rel_project_dir, name))
                 end
                 def create_nodes(rel_project_dir, target, deps)
+                    @rant.goto_project_dir rel_project_dir
                     case nodes = @block[target, deps]
                     when Array: nodes
                     when Node: [nodes]
                     else
                         @rant.abort_at(@ch, "Block has to " +
                             "return Node or array of Nodes.")
-                    end.each { |node|
-                        node.project_subdir = @rant.current_subdir
-                    }
+                    end
                 end
             end
             class FileHook < Hook
                 private
-                def have_src?(name)
-                    test(?e, name) or
-                        @rant.rec_save_resolve(name, self
+                def have_src?(rel_project_dir, name)
+                    test(?e, @rant.abs_path(rel_project_dir, name)) or
+                        @rant.rec_save_resolve(name, self, rel_project_dir
                             ).any? { |t| t.file_target? }
                 end
                 def create_nodes(rel_project_dir, target, deps)
+                    @rant.goto_project_dir rel_project_dir
                     t = @rant.file(:__caller__ => @ch,
                             target => deps, &@block)
-                    t.project_subdir = @rant.current_subdir
                     [t]
                 end
             end

data/lib/rant/import/rubypackage.rb

@@ -246,8 +246,13 @@ class Rant::Generators::RubyPackage
 	    end
 
             # fix for YAML bug in Ruby 1.8.3 and 1.8.4 previews
-            if RUBY_VERSION == "1.8.3" or
-                RUBY_VERSION == "1.8.4" && RUBY_RELEASE_DATE < "2005-12-24"
+            # 
+            # Update: That's not a bug in YAML 1.8.3 and later, it's a
+            # non-backwards compatible change, because YAML 1.8.2 and
+            # later is buggy. (My current understanding of this
+            # issue.) Adding the "---" at the start ensures that it
+            # can be read with all Ruby YAML versions.
+            if RUBY_VERSION > "1.8.2"
                 def spec.to_yaml(*args, &block)
                     yaml = super
                     yaml =~ /^---/ ? yaml : "--- #{yaml}"

data/lib/rant/import/sys/more.rb

@@ -12,6 +12,13 @@ module Rant
                 f.write content
             end
         end
+        def write_to_binfile(fn, content)
+            content = content.to_str
+            fu_output_message "writing #{content.size} bytes to file `#{fn}'"
+            File.open fn, "wb" do |f|
+                f.write content
+            end
+        end
         def clean(entry)
             if test ?f, entry
                 rm_f entry

data/lib/rant/init.rb

@@ -56,7 +56,7 @@ class String
 end
 
 module Rant
-    VERSION = '0.5.2'
+    VERSION = '0.5.4'
 
     @__rant_no_value__ = Object.new.freeze
     def self.__rant_no_value__

data/lib/rant/rantlib.rb

@@ -451,6 +451,12 @@ class Rant::RantApp
 	sub = expand_path(@current_subdir, path)
 	sub.empty? ? @rootdir : File.join(@rootdir, sub)
     end
+    def abs_path(subdir, fn)
+        path = File.join(@rootdir, subdir, fn)
+        path.gsub!(%r{/+}, "/")
+        path.sub!(%r{/$}, "") if path.length > 1
+        path
+    end
     def goto(dir)
         goto_project_dir(expand_path(@current_subdir, dir))
     end

data/lib/rant/rantvar.rb

@@ -110,7 +110,6 @@ module Rant
 		# holds constraints for values in @store
 		@constraints = {}
 		# set by default query
-		@current_var = nil # this line will go in 0.5.4
 	    end
 
 	    def query(*args, &block)
@@ -123,7 +122,6 @@ module Rant
 		    if Hash === arg
 			if arg.size == 1
 			    arg.each { |k,v|
-				@current_var = k # this line will go in 0.5.4
 				self[k] = v if self[k].nil?
 			    }
 			    self
@@ -135,7 +133,6 @@ module Rant
 		    end
 		when 2, 3
 		    vid, cf, val = *args
-                    @current_var = vid # this line will go in 0.5.4
                     constrain vid,
                         get_factory(cf).rant_constraint
 		    self[vid] = val if val
@@ -144,15 +141,6 @@ module Rant
 		end
 	    end
 
-	    def is ct, *ct_args
-                warn caller[0]
-                warn "method `var.is' is deprecated and will not be " +
-                    "in Rant 0.5.4 and later"
-		constrain @current_var,
-		    get_factory(ct).rant_constraint(*ct_args)
-		self
-	    end
-
 	    def restrict vid, ct, *ct_args
 		if vid.respond_to? :to_ary
 		    vid.to_ary.each { |v| restrict(v, ct, *ct_args) }
@@ -165,54 +153,10 @@ module Rant
 
 	    def get_factory id
 		if String === id || Symbol === id
-		    begin
-                        ### temporary solution ###
-                        raise unless Constraints.const_defined? id
-                        ##########################
-			id = Constraints.const_get(id)
-		    rescue
-                        ### temporary solution ###
-                        id_sym = id.to_sym
-                        rl =
-                        if [:Integer, :IntegerInRange, :Float,
-                            :FloatInRange].include? id_sym
-                            'rant/import/var/numbers'
-                        elsif [:Bool, :BoolTrue].include? id_sym
-                            'rant/import/var/booleans'
-                        elsif :List == id_sym
-                            'rant/import/var/lists'
-                        elsif [:String, :ToString].include? id_sym
-                            'rant/import/var/strings'
-                        else
-                        ##########################
-                            raise NotAConstraintFactoryError.new(id), caller
-                        end
-                        warn "Explicitely <code>import " +
-                            "'#{rl.sub(/^rant\/import\//, '')}'" +
-                            "</code> to use the #{id_sym.inspect} " +
-                            "constraint."
-                        require rl #rant-import:remove
-                        retry
-		    end
+                    id = Constraints.const_get(id) rescue nil
 		end
 		unless id.respond_to? :rant_constraint
-                    ### temporary solution ###
-                    rl =
-                    if id == true || id == false
-                        'rant/import/var/booleans'
-                    elsif id == String
-                        'rant/import/var/strings'
-                    elsif id.kind_of? Range
-                        'rant/import/var/numbers'
-                    else
-                    ##########################
-                        raise NotAConstraintFactoryError.new(id), caller
-                    end
-                    warn "Explicitely <code>import " +
-                        "'#{rl.sub(/^rant\/import\//, '')}'" +
-                        "</code> to use the #{id.inspect} " +
-                        "constraint."
-                    require rl #rant-import:remove
+                    raise NotAConstraintFactoryError.new(id), caller
 		end
 		id
 	    end
@@ -372,10 +316,3 @@ module Rant
         end # module Constraints
     end # module RantVar
 end # module Rant
-
-### temporary solution ###
-#require 'rant/import/var/numbers' #rant-import:uncomment
-#require 'rant/import/var/booleans' #rant-import:uncomment
-#require 'rant/import/var/lists' #rant-import:uncomment
-#require 'rant/import/var/strings' #rant-import:uncomment
-##########################

data/test/subdirs2/root.rant

@@ -30,6 +30,14 @@ end
 
 gen Command, "c1.t", ["sub1/c1.t"], "$[sh_puts] ${<} > $(>)"
 
+gen Rule, ".r.t" => ".s.t" do |target, sources|
+    gen Command, target, sources, "$[sh_cat] $(<) > $(>)"
+end
+
+gen Action, /\.s\.t$/ do
+    puts ".s.t action"
+end
+
 gen SubFile, "t/t", "a.t" => "b.t" do |t|
     write(t.name, "abc")
 end

data/test/subdirs2/sub1/sub.rant

@@ -13,4 +13,6 @@ end
 gen Command, "c1.t", "@config.t", "$[sh_cat] ${<} > $(>)"
 gen Command, "c2.t", "@config.t", "$[sh_cat] ${prerequisites} > $(name)"
 
+gen Command, "c3.t", "a.r.t", "$[sh_cat] ${<} > $(>)"
+
 gen Directory, "dir.t"

data/test/subdirs2/test_subdirs2.rb

@@ -1,6 +1,7 @@
 
 require 'test/unit'
 require 'tutil'
+require 'rant/import/sys/more'
 
 $test_subdirs2_dir ||= File.expand_path(File.dirname(__FILE__))
 
@@ -255,4 +256,13 @@ EOF
         assert err.empty?
         assert out.split(/\n/).size < 2
     end
+    def test_custom_rule_task
+        Rant::Sys.write_to_file "sub1/a.s.t", "foo\n"
+        out, err = assert_rant "sub1/c3.t"
+        assert err.empty?
+        assert_match(/\.s\.t action/, out)
+        assert_file_content "sub1/c3.t", "foo\n"
+    ensure
+        Rant::Sys.rm_f ["sub1/a.s.t"]
+    end
 end

data/test/test_sys_methods.rb

@@ -2,6 +2,7 @@
 require 'test/unit'
 require 'tutil'
 require 'rant/import/sys/more'
+require 'rant/import/filelist/std'
 
 $testDir ||= File.expand_path(File.dirname(__FILE__))
 
@@ -555,6 +556,23 @@ class TestSysMethods < Test::Unit::TestCase
         end
         assert_file_content "a.t", "hello\n"
     end
+    def test_write_to_binfile
+        @cx.import "sys/more"
+        capture_std do
+            # TODO: specialize exception class
+            assert_raise_kind_of(StandardError) do
+                @sys.write_to_binfile "a.t", Object.new
+            end
+        end
+        assert !test(?e, "a.t")
+        out, err = capture_std do
+            @sys.write_to_binfile "a.t", "hello\nsepp"
+        end
+        assert test(?f, "a.t")
+        File.open("a.t", "rb") do |f|
+            assert_equal "hello\nsepp", f.read
+        end
+    end
     def test_regular_filename
         if Rant::Env.on_windows?
             assert_equal "a/b", Rant::Sys.regular_filename('a\b')

data/test/test_var.rb

@@ -18,6 +18,7 @@ class TestVar < Test::Unit::TestCase
     def teardown
     end
     def test_space
+        require "rant/import/var/numbers"
 	s = nil
 	assert_nothing_raised {
 	    s = RS.new
@@ -41,6 +42,7 @@ class TestVar < Test::Unit::TestCase
 	assert_equal(%w(CVS), @cx.var["ignore"])
     end
     def test_invalid_for_constraint
+        @cx.import "var/numbers"
 	@cx.var :a, :Integer
 	assert_equal(0, @cx.var[:a])
 	assert_raises(Rant::RantVar::ConstraintError) {
@@ -100,6 +102,7 @@ class TestVar < Test::Unit::TestCase
 	end
     end
     def test_is_string
+        @cx.import "var/strings"
 	@rac.var :s, :String
 	assert_equal("", @rac.var["s"])
 	@rac.var[:s] = "abc"
@@ -115,7 +118,9 @@ class TestVar < Test::Unit::TestCase
 	}
 	assert_equal("obj", @rac.var[:s])
     end
+=begin
     def test_is_integer
+        @cx.import "var/numbers"
 	@rac.var(:count => 10).is :Integer
 	assert_equal(10, @rac.var[:count])
 	assert_raise(::Rant::RantVar::ConstraintError) {
@@ -139,7 +144,9 @@ class TestVar < Test::Unit::TestCase
 	@rac.var[:count] = "15"
 	assert_equal(15, @rac.var(:count))
     end
+=end
     def test_restrict
+        @cx.import "var/numbers"
 	assert_equal(nil, @rac.var[:num])
 	@rac.var.restrict :num, :Float, -1.1..2.0
 	assert_equal(-1.1, @rac.var[:num])
@@ -189,6 +196,7 @@ class TestVar < Test::Unit::TestCase
 	assert_match(/num 1.1/, out)
     end
     def test_env_to_string
+        @cx.import "var/strings"
 	@rac.var "RT_TO_S", :ToString
 	@rac.var.env "RT_TO_S"
 	if Rant::Env.on_windows?
@@ -210,6 +218,7 @@ class TestVar < Test::Unit::TestCase
 	}
     end
     def test_bool
+        @cx.import "var/booleans"
 	@rac.var "true?", :Bool
 	assert_equal(false, @rac.var[:true?])
 	assert_nothing_raised {
@@ -246,6 +255,7 @@ class TestVar < Test::Unit::TestCase
 	assert_equal(false, @rac.var[:true?])
     end
     def test_bool_shortcut_true
+        @cx.import "var/booleans"
 	@rac.var :bs, true
 	assert_equal(true, @rac.var[:bs])
 	@rac.var[:bs] = false
@@ -256,6 +266,7 @@ class TestVar < Test::Unit::TestCase
 	assert_equal(false, @rac.var[:bs])
     end
     def test_bool_shortcut_false
+        @cx.import "var/booleans"
 	@rac.var :bs, false
 	assert_equal(false, @rac.var[:bs])
 	@rac.var[:bs] = "1"
@@ -277,7 +288,7 @@ class TestVar < Test::Unit::TestCase
     end
     def test_rant_import
 	@rac.args.replace %w(-fvar.rf show_num)
-        run_import "-q", "ant.t"
+        run_import "-q", "-ivar/numbers", "ant.t"
         assert_exit
         out = run_ruby("ant.t", "-fvar.rf", "show_num")
         assert_exit

data/test/var.rf

@@ -1,4 +1,6 @@
 
+import "var/numbers"
+
 var "v1" => "default_1.t"
 var["v2"] = "default_2.t"
 var.restrict :count, :Integer, 1..10

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rant
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2005-12-12 00:00:00 +01:00
+  version: 0.5.4
+date: 2005-12-18 00:00:00 +01:00
 summary: Rant is a Ruby based build tool.
 require_paths: 
   - lib
@@ -286,7 +286,6 @@ files:
   - test/subdirs2/sub1/sub.rant
   - test/subdirs2/sub00/sub.rant
   - test/deprecated/README
-  - test/deprecated/test_0_5_4.rb
   - test/deprecated/test_0_6_0.rb
   - doc/rantfile.rdoc
   - doc/md5.rdoc

data/test/deprecated/test_0_5_4.rb

@@ -1,53 +0,0 @@
-
-require 'test/unit'
-require 'tutil'
-require 'rant/import/sys/more'
-
-$test_deprecated_dir ||= File.expand_path(File.dirname(__FILE__))
-
-class TestDeprecated_0_5_4 < Test::Unit::TestCase
-    include Rant::TestUtil
-
-    def setup
-        Dir.chdir $test_deprecated_dir
-    end
-    def test_autoimport_var_constraints
-        Rant::Sys.write_to_file "var.t", <<-EOF
-            var :a, :Integer
-            var :b, :String
-            var :c, :List
-            var :d, :Bool
-            task :default do
-                p var[:a].kind_of?(Integer)
-                p var[:b].kind_of?(String)
-                p var[:c].kind_of?(Array)
-                p(var[:d] == true || var[:d] == false)
-            end
-        EOF
-        out, err = assert_rant "-fvar.t", "a=2", "d=1"
-        assert_match(/import 'var\/numbers'/, err)
-        assert_match(/import 'var\/strings'/, err)
-        assert_match(/import 'var\/lists'/, err)
-        assert_match(/import 'var\/booleans'/, err)
-        lines = out.split(/\n/)
-        assert_equal %w(true true true true), lines
-    ensure
-        Rant::Sys.rm_f "var.t"
-    end
-    def test_var_is
-        Rant::Sys.write_to_file "var.t", <<-EOF
-            import "var/booleans"
-            var(:b => true).is :Bool
-            task :default do
-                p var[:b]
-                var[:b] = "off"
-                p var[:b]
-            end
-        EOF
-        out, err = assert_rant("-fvar.t")
-        assert_match(/\bvar\.t\b.*\b2\b.*var\.is.*deprecated.*0\.5\.4/m, err)
-        assert_equal %w(true false), out.split(/\n/)
-    ensure
-        Rant::Sys.rm_f "var.t"
-    end
-end