Added task arguments

git-svn-id: svn+ssh://rubyforge.org/var/svn/rake/trunk@587 5af023f1-ac1a-0410-98d6-829a145c37ef

CHANGES

@@ -1,6 +1,10 @@
 = Rake Changelog
 
-== Pre-version 0.7.3
+== Pre-Version 0.7.4
+
+* Added task parameters (e.g. "rake build[version7]")
+
+== Version 0.7.3
 
 * Added existing and existing! methods to FileList
 * FileLists now claim to be Arrays (via is_a?) to get better support

Rakefile

@@ -51,6 +51,9 @@ desc "Default Task"
 task :default => :test_all
 
 # Test Tasks ---------------------------------------------------------
+task :dbg do |t|
+  puts "Arguments are: #{t.args.join(', ')}"
+end
 
 # Common Abbreviations ...
 

lib/rake.rb

@@ -29,7 +29,7 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.7.3'
+RAKEVERSION = '0.7.3.1'
 
 require 'rbconfig'
 require 'ftools'
@@ -308,6 +308,9 @@ class Task
 
     # Array of nested namespaces names used for task lookup by this task.
     attr_reader :scope
+
+    # List of arguments to the task
+    attr_accessor :args
 
     # Return task name
     def to_s
@@ -336,6 +339,7 @@ def initialize(task_name, app)
       @lock = Mutex.new
       @application = app
       @scope = app.current_scope
+      @args = []
     end
 
     # Enhance a task with prerequisites or actions.  Returns self.
@@ -1736,7 +1740,7 @@ def top_level
         elsif options.show_prereqs
           display_prerequisites
         else
-          top_level_tasks.each { |task_name| self[task_name].invoke }
+          top_level_tasks.each { |task_name| invoke_task(task_name) }
         end
       end
     end
@@ -1755,6 +1759,29 @@ def options
 
     # private ----------------------------------------------------------------
 
+    def invoke_task(task_string)
+      name, args = parse_task_string(task_string)
+      t = self[name]
+      t.args = args if args
+      t.invoke
+      t.args = []
+    end
+
+    def parse_task_string(string)
+      if string =~ /^([^\[]+)(\[(.*)\])?$/
+        name = $1
+        if $3
+          args = $3.split(/\s*,\s*/)
+        else
+          args = []
+        end
+      else
+        name = string
+        args = []
+      end
+      [name, args]
+    end
+
     # Provide standard execption handling for the given block.
     def standard_exception_handling
       begin

test/test_application.rb

@@ -423,3 +423,45 @@ def @app.exit(*args)
   end
 end
 
+class TestTaskArgumentParsing < Test::Unit::TestCase
+  def setup
+    @app = Rake::Application.new
+  end
+
+  def test_name_only
+    name, args = @app.parse_task_string("name")
+    assert_equal "name", name
+    assert_equal [], args
+  end
+
+  def test_empty_args
+    name, args = @app.parse_task_string("name[]")
+    assert_equal "name", name
+    assert_equal [], args
+  end
+
+  def test_one_argument
+    name, args = @app.parse_task_string("name[one]")
+    assert_equal "name", name
+    assert_equal ["one"], args
+  end
+
+  def test_two_arguments
+    name, args = @app.parse_task_string("name[one,two]")
+    assert_equal "name", name
+    assert_equal ["one", "two"], args
+  end
+
+  def test_can_handle_spaces_between_args
+    name, args = @app.parse_task_string("name[one, two,\tthree , \tfour]")
+    assert_equal "name", name
+    assert_equal ["one", "two", "three", "four"], args
+  end
+
+  def test_keeps_embedded_spaces
+    name, args = @app.parse_task_string("name[a one ana, two]")
+    assert_equal "name", name
+    assert_equal ["a one ana", "two"], args
+  end
+
+end

test/test_tasks.rb

@@ -26,6 +26,7 @@ def test_create
     assert_equal t, arg
     assert_nil t.source
     assert_equal [], t.sources
+    assert_equal [], t.args
   end
 
   def test_invoke
@@ -135,6 +136,17 @@ def test_investigation_output
     assert_match(/needed:\s*true/, out)
     assert_match(/pre-requisites:\s*--t2/, out)
   end
+
+  def test_tasks_can_access_arguments
+    t = intern(:t1).enhance { |t| 
+      a, b, c = t.args
+      assert_equal 1, a
+      assert_equal 2, b
+      assert_equal 3, c
+    }
+    t.args = [1, 2, 3]
+    t.invoke
+  end
 
   private