jimweirich-rake 0.8.1.5 → 0.8.1.6

data/CHANGES

@@ -18,7 +18,7 @@
   Emanuel Inderm�hle)
 
 * Switched from getoptlong to optparse (patches supplied by Edwin
-  Pratomo (edpratomo@yahoo.co.id))
+  Pratomo)
 
 * The -T option will now attempt to dynamically sense the size of the
   terminal.  RAKE_COLUMNS will override any dynamic sensing.
@@ -31,6 +31,23 @@
 
 * Added the ability to reenable a task to be invoked a second time.
 
+* Changed RDoc test task to have no default template. This makes it
+  easier for the tempate to pick up the template from the environment.
+
+* Changed from using Mutex to Monitor. Evidently Mutex causes thread
+  join errors when Ruby is compiled with -disable-pthreads. (Patch
+  supplied by Ittay Dror) 
+
+* Fixed bug in makefile parser that had problems with extra spaces in
+  file task names. (Patch supplied by Ittay Dror)
+
+* Added a performance patch for reading large makefile dependency
+  files. (Patch supplied by Ittay Dror)
+
+* Default values for task arguments can easily be specified with the
+  :with_defaults method. (Idea for default argument merging supplied
+  by (Adam Q. Salter)
+
 == Version 0.8.1
 
 * Removed requires on parsedate.rb (in Ftptools)

data/Rakefile

@@ -221,6 +221,7 @@ else
     open(t.name, "w") { |f| f.puts SPEC.to_yaml }
   end
 
+  desc "Create a stand-alone gemspec"
   task :gemspec => "rake.gemspec"
 end
 

data/lib/rake.rb

@@ -29,13 +29,13 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.1.5'
+RAKEVERSION = '0.8.1.6'
 
 require 'rbconfig'
 require 'getoptlong'
 require 'fileutils'
 require 'singleton'
-require 'thread'
+require 'monitor'
 require 'optparse'
 require 'ostruct'
 
@@ -293,12 +293,15 @@ module Rake
 
     attr_reader :names
 
+    # Create a TaskArgument object with a list of named arguments
+    # (given by :names) and a set of associated values (given by
+    # :values).  :parent is the parent argument object.
     def initialize(names, values, parent=nil)
       @names = names
       @parent = parent
       @hash = {}
       names.each_with_index { |name, i|
-        @hash[name.to_sym] = values[i]
+        @hash[name.to_sym] = values[i] unless values[i].nil?
       }
     end
 
@@ -314,6 +317,13 @@ module Rake
       lookup(index.to_sym)
     end
 
+    # Specify a hash of default values for task arguments. Use the
+    # defaults only if there is no specific value for the given
+    # argument.
+    def with_defaults(defaults)
+      @hash = defaults.merge(@hash)
+    end
+
     def each(&block)
       @hash.each(&block)
     end
@@ -456,12 +466,12 @@ module Rake
     # +enhance+ to add actions and prerequisites.
     def initialize(task_name, app)
       @name = task_name.to_s
-      @prerequisites = FileList[]
+      @prerequisites = []
       @actions = []
       @already_invoked = false
       @full_comment = nil
       @comment = nil
-      @lock = Mutex.new
+      @lock = Monitor.new
       @application = app
       @scope = app.current_scope
       @arg_names = nil
@@ -2081,6 +2091,21 @@ module Rake
             options.show_task_pattern = Regexp.new(value || '')
           }
         ],
+        ['--execute',  '-e CODE', "Execute some Ruby code and exit.",
+          lambda { |value|
+            eval(value)
+            exit
+          }
+        ],
+        ['--execute-print',  '-p CODE', "Execute some Ruby code, print, then exit.",
+          lambda { |value|
+            puts eval(value)
+            exit
+          }
+        ],
+        ['--execute-continue',  '-E', "Execute some Ruby code, then run tasks.",
+          lambda { |value| eval(value) }            
+        ],
         ['--rakefile', '-f [FILE]', "Use FILE as the rakefile.",
           lambda { |value| 
             value ||= ''

data/lib/rake/loaders/makefile.rb

@@ -7,21 +7,14 @@ module Rake
 
     # Load the makefile dependencies in +fn+.
     def load(fn)
-      buffer = ''
       open(fn) do |mf|
-        mf.each do |line|
-          next if line =~ /^\s*#/
-          buffer << line
-          if buffer =~ /\\$/
-            buffer.sub!(/\\\n/, ' ')
-            state = :append
-          else
-            process_line(buffer)
-            buffer = ''
-          end
+        lines = mf.read
+        lines.gsub!(/#[^\n]*\n/m, "")
+        lines.gsub!(/\\\n/, ' ')
+        lines.split("\n").each do |line|
+          process_line(line)
         end
       end
-      process_line(buffer) if buffer != ''
     end
 
     private
@@ -30,6 +23,7 @@ module Rake
     def process_line(line)
       file_task, args = line.split(':')
       return if args.nil?
+      file_task.strip!
       dependents = args.split
       file file_task => dependents
     end

data/lib/rake/rdoctask.rb

@@ -55,7 +55,7 @@ module Rake
     # RDoc. (default is none)
     attr_accessor :main
 
-    # Name of template to be used by rdoc. (default is 'html')
+    # Name of template to be used by rdoc. (defaults to rdoc's default)
     attr_accessor :template
 
     # List of files to be included in the rdoc generation. (default is [])
@@ -74,7 +74,7 @@ module Rake
       @rdoc_dir = 'html'
       @main = nil
       @title = nil
-      @template = 'html'
+      @template = nil
       @external = false
       @options = []
       yield self if block_given?

data/test/data/sample.mf

@@ -4,6 +4,7 @@ b: b1 b2 b3 \
    b4 b5 b6\
 # Mid: Comment
 b7
-a: a5 a6 a7
+
+ a : a5 a6 a7
 c: c1
 d: d1 d2 \

data/test/test_makefile_loader.rb

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 class TestMakefileLoader < Test::Unit::TestCase
   include Rake
 
-  def test_create
+  def test_parse
     Task.clear
     loader = Rake::MakefileLoader.new
     loader.load("test/data/sample.mf")

data/test/test_task_arguments.rb

@@ -61,7 +61,7 @@ class TestTaskArguments < Test::Unit::TestCase
   def test_creating_new_argument_scopes
     parent = Rake::TaskArguments.new(['p'], [1])
     child = parent.new_scope(['c', 'p'])
-    assert_equal({:c => nil, :p=>1}, child.to_hash)
+    assert_equal({:p=>1}, child.to_hash)
     assert_equal 1, child.p
     assert_equal 1, child["p"]
     assert_equal 1, child[:p]
@@ -73,4 +73,17 @@ class TestTaskArguments < Test::Unit::TestCase
     child = Rake::TaskArguments.new(['aa'], [2], parent)
     assert_equal 2, child.aa
   end
+  
+  def test_default_arguments_values_can_be_merged
+    ta = Rake::TaskArguments.new(["aa", "bb"], [nil, "original_val"])
+    ta.with_defaults({ :aa => 'default_val' })
+    assert_equal 'default_val', ta[:aa]
+    assert_equal 'original_val', ta[:bb]
+  end
+
+  def test_default_arguements_that_dont_match_names_are_ignored
+    ta = Rake::TaskArguments.new(["aa", "bb"], [nil, "original_val"])
+    ta.with_defaults({ "cc" => "default_val" })
+    assert_nil ta[:cc]
+  end
 end

data/test/test_tasks.rb

@@ -20,7 +20,6 @@ class TestTask < Test::Unit::TestCase
     t = task(:name) { |task| arg = task; 1234 }
     assert_equal "name", t.name
     assert_equal [], t.prerequisites
-    assert t.prerequisites.is_a?(FileList)
     assert t.needed?
     t.execute(0)
     assert_equal t, arg
@@ -364,7 +363,7 @@ class TestTaskWithArguments < Test::Unit::TestCase
 
   def test_args_not_passed_if_no_arg_names
     pre = task(:pre, :rev) { |t, args|
-      assert_equal({ :rev => nil }, args.to_hash)
+      assert_equal({}, args.to_hash)
     }
     t = task(:t, :needs => [:pre])
     t.invoke("bill", "1.2")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jimweirich-rake
 version: !ruby/object:Gem::Version 
-  version: 0.8.1.5
+  version: 0.8.1.6
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-06 21:00:00 -07:00
+date: 2008-08-09 21:00:00 -07:00
 default_executable: rake
 dependencies: []