jimweirich-rake 0.8.1.9 → 0.8.1.10

data/Rakefile

@@ -95,9 +95,13 @@ begin
 
   Rcov::RcovTask.new do |t|
     t.libs << "test"
+    dot_rakes = 
     t.rcov_opts = [
-      '-xRakefile', '-xrakefile', '-xpublish.rf', '--text-report',
-    ]
+      '-xRakefile', '-xrakefile', '-xpublish.rf',
+      '-xlib/rake/contrib', '-x/Library', 
+      '--text-report',
+      '--sort coverage'
+    ] + FileList['rakelib/*.rake'].pathmap("-x%p")
     t.test_files = FileList[
       'test/test*.rb', 'test/functional.rb'
     ]

data/doc/rakefile.rdoc

@@ -192,16 +192,16 @@ tasks has been extended slightly.
 For example, a task that needs a first name and last name might be
 declared as:
 
-   task :name, :first_name, :last_name
+   task :name, [:first_name, :last_name]
 
 The first argument is still the name of the task (:name in this case).
 The next to argumements are the names of the parameters expected by
-:name (:first_name and :last_name in the example).
+:name in an array (:first_name and :last_name in the example).
 
 To access the values of the paramters, the block defining the task
 behaviour can now accept a second parameter:
 
-   task :name, :first_name, :last_name do |t, args|
+   task :name, [:first_name, :last_name] do |t, args|
      puts "First name is #{args.first_name}"
      puts "Last  name is #{args.last_name}"
    end
@@ -216,7 +216,7 @@ If you wish to specify default values for the arguments, you can use
 the with_defaults method in the task body.  Here is the above example
 where we specify default values for the first and last names:
 
-   task :name, :first_name, :last_name do |t, args|
+   task :name, [:first_name, :last_name] do |t, args|
      args.with_defaults(:first_name => "John", :last_name => "Dough")
      puts "First name is #{args.first_name}"
      puts "Last  name is #{args.last_name}"
@@ -228,12 +228,19 @@ Tasks that use parameters have a slightly different format for
 prerequisites.  Use the <tt>:needs</tt> keyword to specify the
 prerequisites for tasks with arguments.  For example:
 
-   task :name, :first_name, :last_name, :needs => [:pre_name] do |t, args|
+   task :name, [:first_name, :last_name] => [:pre_name] do |t, args|
      args.with_defaults(:first_name => "John", :last_name => "Dough")
      puts "First name is #{args.first_name}"
      puts "Last  name is #{args.last_name}"
    end
 
+=== Deprecated Task Parameters Format
+
+There is an older format for declaring task parameters that omitted
+the task array and used the :needs keyword to introduce the
+dependencies.  That format is still supported for compatibility, but
+is not recommended for use.
+
 == Accessing Task Programatically
 
 Sometimes it is useful to manipulate tasks programatically in a

data/lib/rake/rdoctask.rb

@@ -91,14 +91,14 @@ module Rake
       task name
       
       desc "Force a rebuild of the RDOC files"
-      task paste("re", name) => [paste("clobber_", name), name]
+      task "re#{name}" => ["clobber_#{name}", name]
       
       desc "Remove rdoc products" 
-      task paste("clobber_", name) do
+      task "clobber_#{name}" do
         rm_r rdoc_dir rescue nil
       end
-
-      task :clobber => [paste("clobber_", name)]
+      
+      task :clobber => ["clobber_#{name}"]
       
       directory @rdoc_dir
       task name => [rdoc_target]

data/lib/rake/tasklib.rb

@@ -6,11 +6,16 @@ module Rake
 
   # Base class for Task Libraries.
   class TaskLib
-
     include Cloneable
 
-    # Make a symbol by pasting two strings together. 
-    def paste(a,b)
+    # Make a symbol by pasting two strings together.
+    #
+    # NOTE: DEPRECATED! This method is kinda stupid. I don't know why
+    # I didn't just use string interpolation. But now other task
+    # libraries depend on this so I can't remove it without breaking
+    # other people's code. So for now it stays for backwards
+    # compatibility. BUT DON'T USE IT.
+    def paste(a,b)              # :nodoc:
       (a.to_s + b.to_s).intern
     end
   end

data/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.8.1.9'
+RAKEVERSION = '0.8.1.10'
 
 require 'rbconfig'
 require 'getoptlong'
@@ -240,6 +240,33 @@ end # class String
 ##############################################################################
 module Rake
 
+  # Errors -----------------------------------------------------------
+
+  # Error indicating an ill-formed task declaration.
+  class TaskArgumentError < ArgumentError
+  end
+
+  # Error indicating a recursion overflow error in task selection.
+  class RuleRecursionOverflowError < StandardError
+    def initialize(*args)
+      super
+      @targets = []
+    end
+
+    def add_target(target)
+      @targets << target
+    end
+
+    def message
+      super + ": [" + @targets.reverse.join(' => ') + "]"
+    end
+  end
+
+  # Error indicating a problem in locating the home directory on a
+  # Win32 system.
+  class Win32HomeError < RuntimeError
+  end
+
   # --------------------------------------------------------------------------
   # Rake module singleton methods.
   #
@@ -1148,21 +1175,6 @@ private(*RakeFileUtils.instance_methods(false))
 ######################################################################
 module Rake
 
-  class RuleRecursionOverflowError < StandardError
-    def initialize(*args)
-      super
-      @targets = []
-    end
-
-    def add_target(target)
-      @targets << target
-    end
-
-    def message
-      super + ": [" + @targets.reverse.join(' => ') + "]"
-    end
-  end
-
   # #########################################################################
   # A FileList is essentially an array with a few helper methods defined to
   # make file manipulation a bit easier.
@@ -1696,23 +1708,65 @@ module Rake
     # Resolve the arguments for a task/rule.  Returns a triplet of
     # [task_name, arg_name_list, prerequisites].
     def resolve_args(args)
+      if args.last.is_a?(Hash)
+        deps = args.pop
+        resolve_args_with_dependencies(args, deps)
+      else
+        resolve_args_without_dependencies(args)
+      end
+    end
+
+    # Resolve task arguments for a task or rule when there are no
+    # dependencies declared.
+    #
+    # The patterns recognized by this argument resolving function are:
+    #
+    #   task :t
+    #   task :t, [:a]
+    #   task :t, :a                 (deprecated)
+    #
+    def resolve_args_without_dependencies(args)
       task_name = args.shift
-      arg_names = args #.map { |a| a.to_sym }
-      needs = []
-      if task_name.is_a?(Hash)
-        hash = task_name
-        task_name = hash.keys[0]
-        needs = hash[task_name]
+      if args.size == 1 && args.first.respond_to?(:to_ary)
+        arg_names = args.first.to_ary
+      else
+        arg_names = args
       end
-      if arg_names.last.is_a?(Hash)
-        hash = arg_names.pop
-        needs = hash[:needs]
-        fail "Unrecognized keys in task hash: #{hash.keys.inspect}" if hash.size > 1
+      [task_name, arg_names, []]
+    end
+    private :resolve_args_without_dependencies
+    
+    # Resolve task arguments for a task or rule when there are
+    # dependencies declared.
+    #
+    # The patterns recognized by this argument resolving function are:
+    #
+    #   task :t => [:d]
+    #   task :t, [a] => [:d]
+    #   task :t, :needs => [:d]                 (deprecated)
+    #   task :t, :a, :needs => [:d]             (deprecated)
+    #
+    def resolve_args_with_dependencies(args, hash) # :nodoc:
+      fail "Task Argument Error" if hash.size != 1
+      key, value = hash.map { |k, v| [k,v] }.first
+      if args.empty?
+        task_name = key
+        arg_names = []
+        deps = value
+      elsif key == :needs
+        task_name = args.shift
+        arg_names = args
+        deps = value
+      else
+        task_name = args.shift
+        arg_names = key
+        deps = value
       end
-      needs = [needs] unless needs.respond_to?(:to_ary)
-      [task_name, arg_names, needs]
+      deps = [deps] unless deps.respond_to?(:to_ary)
+      [task_name, arg_names, deps]
     end
-
+    private :resolve_args_with_dependencies
+    
     # If a rule can be found that matches the task name, enhance the
     # task with the prerequisites and actions from the rule.  Set the
     # source attribute of the task appropriately for the rule.  Return
@@ -2092,16 +2146,10 @@ module Rake
       end
     end
 
-    # Return a list of the command line options supported by the
-    # program.
-    def command_line_options
-      OPTIONS.collect { |lst| lst[0..-2] }
-    end
-
-    # Read and handle the command line options.
-    def handle_options
-      # optparse version of OPTIONS
-      op_options = [
+    # A list of all the standard options used in rake, suitable for
+    # passing to OptionParser.
+    def standard_rake_options
+      [
         ['--classic-namespace', '-C', "Put Task and FileTask in the top level namespace",
           lambda { |value|
             require 'rake/classic_namespace'
@@ -2135,22 +2183,13 @@ module Rake
             exit
           }
         ],
-        ['--execute-continue',  '-E',
+        ['--execute-continue',  '-E CODE',
           "Execute some Ruby code, then continue with normal task processing.",
           lambda { |value| eval(value) }            
         ],
         ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
           lambda { |value| $:.push(value) }
         ],
-        ['--system',  '-G', "Run tasks using system wide (global) rakefiles (usually '~/.rake/*.rake'). Project Rakefiles are ignored.",
-          lambda { |value| options.load_system = true }
-        ],
-        ['--no-system',  '-g', "Run tasks using standard project Rakefile search paths, ignoring system wide rakefiles.",
-          lambda { |value| options.ignore_system = true }
-        ],
-        ['--nosearch', '-N', "Do not search parent directories for the Rakefile.",
-          lambda { |value| options.nosearch = true }
-        ],
         ['--prereqs', '-P', "Display the tasks and dependencies, then exit.",
           lambda { |value| options.show_prereqs = true }
         ],
@@ -2184,6 +2223,9 @@ module Rake
         ['--rules', "Trace the rules resolution.",
           lambda { |value| options.trace_rules = true }
         ],
+        ['--no-search', '--nosearch', '-N', "Do not search parent directories for the Rakefile.",
+          lambda { |value| options.nosearch = true }
+        ],
         ['--silent', '-s', "Like --quiet, but also suppresses the 'in directory' announcement.",
           lambda { |value|
             verbose(false)
@@ -2194,7 +2236,7 @@ module Rake
           "Using system wide (global) rakefiles (usually '~/.rake/*.rake').",
           lambda { |value| options.load_system = true }
         ],
-        ['--no-system',  '-G',
+        ['--no-system', '--nosystem', '-G',
           "Use standard project Rakefile search paths, ignore system wide rakefiles.",
           lambda { |value| options.ignore_system = true }
         ],
@@ -2219,25 +2261,26 @@ module Rake
             puts "rake, version #{RAKEVERSION}"
             exit
           }
-        ],
+        ]
       ]
+    end
 
+    # Read and handle the command line options.
+    def handle_options
       options.rakelib = ['rakelib']
 
-      parsed_argv = nil
-      opts = OptionParser.new do |opts|
-        opts.banner = "rake [-f rakefile] {options} targets..."
-        opts.separator ""
-        opts.separator "Options are ..."
-
-      	opts.on_tail("-h", "--help", "-H", "Display this help message.") do
-    	  	puts opts
-    		  exit
-      	end
-
-        op_options.each { |args| opts.on(*args) }
-      	parsed_argv = opts.parse(ARGV)
+      opts = OptionParser.new
+      opts.banner = "rake [-f rakefile] {options} targets..."
+      opts.separator ""
+      opts.separator "Options are ..."
+      
+      opts.on_tail("-h", "--help", "-H", "Display this help message.") do
+        puts opts
+        exit
       end
+      
+      standard_rake_options.each { |args| opts.on(*args) }
+      parsed_argv = opts.parse(ARGV)
 
       # If class namespaces are requested, set the global options
       # according to the values in the options structure.
@@ -2248,9 +2291,7 @@ module Rake
         $dryrun = options.dryrun
         $silent = options.silent
       end
-      return parsed_argv
-    rescue NoMethodError => ex
-      raise OptionParser::InvalidOption, "While parsing options, error = #{ex.class}:#{ex.message}"
+      parsed_argv
     end
 
     # Similar to the regular Ruby +require+ command, but will check
@@ -2287,7 +2328,7 @@ module Rake
       rakefile, location = find_rakefile_location
       if (! options.ignore_system) &&
           (options.load_system || rakefile.nil?) &&
-          File.directory?(system_dir)
+          directory?(system_dir)
         puts "(in #{Dir.pwd})" unless options.silent
         Dir["#{system_dir}/*.rake"].each do |name|
           add_import name
@@ -2298,7 +2339,7 @@ module Rake
         @rakefile = rakefile
         Dir.chdir(location)
         puts "(in #{Dir.pwd})" unless options.silent
-        $rakefile = @rakefile
+        $rakefile = @rakefile if options.classic_namespace
         load File.expand_path(@rakefile) if @rakefile && @rakefile != ''
       end
       options.rakelib.each do |rlib|
@@ -2327,14 +2368,20 @@ module Rake
     # The standard directory containing system wide rake files on Win
     # 32 systems.
     def win32_system_dir #:nodoc:
-      unless File.exists?(win32home = File.join(ENV['APPDATA'], 'Rake'))
-        raise Win32HomeError, "# Unable to determine home path environment variable."
+      win32home = File.join(ENV['APPDATA'], 'Rake')
+      unless directory?(win32home)
+        raise Win32HomeError, "Unable to determine home path environment variable."
       else
         win32home
       end
     end
     private :win32_system_dir
 
+    def directory?(path)
+      File.directory?(path)
+    end
+    private :directory?
+
     # Collect the list of tasks on the command line.  If no tasks are
     # given, return a list containing only the default task.
     # Environmental assignments are processed at this time as well.

data/test/data/file_creation_task/Rakefile

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 N = 2
 
 task :default => :run
@@ -17,7 +19,7 @@ FileList['src/*'].each do |src|
   target = File.join TARGET_DIR, File.basename(src)
   file target => [src, TARGET_DIR] do
     cp src, target
-    sleep 3 if src !~ /foo#{N-1}$/
+    # sleep 3 if src !~ /foo#{N-1}$/   # I'm commenting out this sleep, it doesn't seem to do anything.
   end
   task :run => target
 end
@@ -25,6 +27,7 @@ end
 task :prep => :clean do
   mkdir_p 'src'
   N.times do |n|
+    puts "DBG: Touching src/foo#{n}"
     touch "src/foo#{n}"
   end
 end

data/test/in_environment.rb

@@ -18,6 +18,8 @@ module InEnvironment
       result[k] = ENV[k]
       if k == 'PWD'
         Dir.chdir(v)
+      elsif v.nil?
+        ENV.delete(k)
       else
         ENV[k] = v
       end

data/test/session_functional.rb

@@ -29,8 +29,6 @@ class FunctionalTest < Test::Unit::TestCase
 
   def setup
     @rake_path = File.expand_path("bin/rake")
-    @coverage_aggregate_file = File.expand_path("rcov_aggregate")
-    @rcov_dir = File.expand_path("coverage")
     lib_path = File.expand_path("lib")
     @ruby_options = "-I#{lib_path} -I."
     @verbose = ! ENV['VERBOSE'].nil?
@@ -306,10 +304,6 @@ class FunctionalTest < Test::Unit::TestCase
   end
   
   def rake(*option_list)
-#     self.class.format_command = lambda { |ruby_options, rake_path, options|
-#       "rcov --output=#{@rcov_dir} --aggregate=#{@coverage_aggregate_file} #{ruby_options} #{rake_path} -- #{options}"
-#     }
-
     options = option_list.join(' ')
     shell = Session::Shell.new
     command = self.class.format_command[@ruby_options, @rake_path, options]

data/test/test_application.rb

@@ -169,6 +169,66 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
+  def test_load_from_system_rakefile_on_unix
+    flexmock(@app, :windows? => false,
+      :win32_system_dir => nil,
+      :load => nil)
+    flexmock(File).should_receive(:expand_path).with("~").and_return("/HOME")
+    flexmock(File).should_receive(:expand_path).and_return { |fn| fn }
+    
+    in_environment('RAKE_SYSTEM' => nil) do
+      @app.options.rakelib = []
+      @app.instance_eval do
+        handle_options
+        options.silent = true
+        options.load_system = true
+        load_rakefile
+      end
+      assert_equal "/HOME/.rake", @app.system_dir
+    end
+  end
+
+  def test_windows
+    assert ! (@app.windows? && @app.unix?)
+  end
+
+  def test_load_from_system_rakefile_on_windows
+    flexmock(@app, :windows? => true,
+      :standard_system_dir => "XX")
+    flexmock(@app).should_receive(:directory?).with("/AD/Rake").and_return(true)
+    flexmock(@app).should_receive(:load).and_return { |fn| puts "LOADING #{fn}" }
+    in_environment('RAKE_SYSTEM' => nil, 'APPDATA' => '/AD') do
+      @app.options.rakelib = []
+      @app.instance_eval do
+        handle_options
+        options.silent = true
+        options.load_system = true
+        load_rakefile
+      end
+      assert_equal "/AD/Rake", @app.system_dir
+    end
+  end
+
+  def test_load_from_system_rakefile_on_windows_with_no_appdata
+    flexmock(@app, :windows? => true,
+      :standard_system_dir => "XX"
+      )
+    flexmock(File).should_receive(:exists?).with("/AD/Rake").and_return(false)
+    out = capture_stderr do
+      assert_raise(SystemExit) do
+        in_environment('RAKE_SYSTEM' => nil, 'APPDATA' => "/AD") do
+          @app.options.rakelib = []
+          @app.instance_eval do
+            handle_options
+            options.silent = true
+            options.load_system = true
+            load_rakefile
+          end
+        end
+      end
+    end
+  end
+
   def test_loading_imports
     mock = flexmock("loader")
     mock.should_receive(:load).with("x.dummy").once
@@ -199,7 +259,9 @@ class TestApplication < Test::Unit::TestCase
     @app.instance_eval do
       intern(Rake::Task, "default").enhance { ran = true }
     end
-    @app.run
+    in_environment("PWD" => "test/data/default") do
+      @app.run
+    end
     assert ran
   end
 
@@ -295,54 +357,73 @@ class TestApplicationOptions < Test::Unit::TestCase
 
   def test_default_options
     opts = command_line
-    assert_nil opts.show_task_pattern
+    assert_nil opts.classic_namespace
     assert_nil opts.dryrun
-    assert_nil opts.trace
+    assert_nil opts.full_description
+    assert_nil opts.ignore_system
+    assert_nil opts.load_system
     assert_nil opts.nosearch
-    assert_nil opts.silent
+    assert_equal ['rakelib'], opts.rakelib
     assert_nil opts.show_prereqs
+    assert_nil opts.show_task_pattern
     assert_nil opts.show_tasks
-    assert_nil opts.classic_namespace
+    assert_nil opts.silent
+    assert_nil opts.trace
     assert_equal ['rakelib'], opts.rakelib
     assert ! RakeFileUtils.verbose_flag
     assert ! RakeFileUtils.nowrite_flag
   end
 
-  def test_bad_options
-    assert_raise OptionParser::InvalidOption do
-      capture_stderr do
-        flags('--bad', '-t') do |opts|
-        end
-      end
-    end
-  end
-  
-  def test_trace_option
-    flags('--trace', '-t') do |opts|
+  def test_dry_run
+    flags('--dry-run', '-n') do |opts|
+      assert opts.dryrun
       assert opts.trace
       assert RakeFileUtils.verbose_flag
-      assert ! RakeFileUtils.nowrite_flag
+      assert RakeFileUtils.nowrite_flag
     end
   end
 
-  def test_system_option
-    flags('--system', '-G') do |opts|
-      assert opts.load_system
+  def test_describe
+    flags('--describe') do |opts|
+      assert opts.full_description
+      assert opts.show_tasks
+      assert_equal(//.to_s, opts.show_task_pattern.to_s)
     end
   end
 
-  def test_no_system_option
-    flags('--no-system', '-g') do |opts|
-      assert opts.ignore_system
+  def test_describe_with_pattern
+    flags('--describe=X') do |opts|
+      assert opts.full_description
+      assert opts.show_tasks
+      assert_equal(/X/.to_s, opts.show_task_pattern.to_s)
     end
   end
 
-  def test_dry_run
-    flags('--dry-run', '-n') do |opts|
-      assert opts.dryrun
-      assert opts.trace
-      assert RakeFileUtils.verbose_flag
-      assert RakeFileUtils.nowrite_flag
+  def test_execute
+    $xyzzy = 0
+    flags('--execute=$xyzzy=1', '-e $xyzzy=1') do |opts|
+      assert_equal 1, $xyzzy
+      assert_equal :exit, @exit
+      $xyzzy = 0
+    end
+  end
+
+  def test_execute_and_continue
+    $xyzzy = 0
+    flags('--execute-continue=$xyzzy=1', '-E $xyzzy=1') do |opts|
+      assert_equal 1, $xyzzy
+      assert_not_equal :exit, @exit
+      $xyzzy = 0
+    end
+  end
+
+  def test_execute_and_print
+    $xyzzy = 0
+    flags('--execute-print=$xyzzy="pugh"', '-p $xyzzy="pugh"') do |opts|
+      assert_equal 'pugh', $xyzzy
+      assert_equal :exit, @exit
+      assert_match(/^pugh$/, @out)
+      $xyzzy = 0
     end
   end
 
@@ -356,14 +437,6 @@ class TestApplicationOptions < Test::Unit::TestCase
     end
   end
 
-  def test_describe
-    flags('--describe') do |opts|
-      assert opts.full_description
-      assert opts.show_tasks
-      assert_equal(//.to_s, opts.show_task_pattern.to_s)
-    end
-  end
-
   def test_libdir
     flags(['--libdir', 'xx'], ['-I', 'xx'], ['-Ixx']) do |opts|
       $:.include?('xx')
@@ -372,13 +445,37 @@ class TestApplicationOptions < Test::Unit::TestCase
     $:.delete('xx')
   end
 
-  def test_nosearch
-    flags('--nosearch', '-N') do |opts|
-      assert opts.nosearch
+  def test_rakefile
+    flags(['--rakefile', 'RF'], ['--rakefile=RF'], ['-f', 'RF'], ['-fRF']) do |opts|
+      assert_equal ['RF'], @app.instance_eval { @rakefiles }
+    end
+  end
+
+  def test_rakelib
+    flags(['--rakelibdir', 'A:B:C'], ['--rakelibdir=A:B:C'], ['-R', 'A:B:C'], ['-RA:B:C']) do |opts|
+      assert_equal ['A', 'B', 'C'], opts.rakelib
+    end
+  end
+
+  def test_require
+    flags(['--require', 'test/reqfile'], '-rtest/reqfile2', '-rtest/reqfile3') do |opts|
+    end
+    assert TESTING_REQUIRE.include?(1)
+    assert TESTING_REQUIRE.include?(2)
+    assert TESTING_REQUIRE.include?(3)
+    assert_equal 3, TESTING_REQUIRE.size
+  end
+
+  def test_missing_require
+    ex = assert_raises(LoadError) do
+      flags(['--require', 'test/missing']) do |opts|
+      end
     end
+    assert_match(/no such file/, ex.message)
+    assert_match(/test\/missing/, ex.message)
   end
 
-  def test_show_prereqs
+  def test_prereqs
     flags('--prereqs', '-P') do |opts|
       assert opts.show_prereqs
     end
@@ -391,6 +488,12 @@ class TestApplicationOptions < Test::Unit::TestCase
     end
   end
 
+  def test_no_search
+    flags('--nosearch', '--no-search', '-N') do |opts|
+      assert opts.nosearch
+    end
+  end
+
   def test_silent
     flags('--silent', '-s') do |opts|
       assert ! RakeFileUtils.verbose_flag
@@ -398,34 +501,30 @@ class TestApplicationOptions < Test::Unit::TestCase
     end
   end
 
-  def test_rakefile
-    flags(['--rakefile', 'RF'], ['--rakefile=RF'], ['-f', 'RF'], ['-fRF']) do |opts|
-      assert_equal ['RF'], @app.instance_eval { @rakefiles }
+  def test_system
+    flags('--system', '-g') do |opts|
+      assert opts.load_system
     end
   end
 
-  def test_rakelib
-    flags(['--rakelibdir', 'A:B:C'], ['--rakelibdir=A:B:C'], ['-R', 'A:B:C'], ['-RA:B:C']) do |opts|
-      assert_equal ['A', 'B', 'C'], opts.rakelib
+  def test_no_system
+    flags('--no-system', '-G') do |opts|
+      assert opts.ignore_system
     end
   end
 
-  def test_require
-    flags(['--require', 'test/reqfile'], '-rtest/reqfile2', '-rtest/reqfile3') do |opts|
+  def test_trace
+    flags('--trace', '-t') do |opts|
+      assert opts.trace
+      assert RakeFileUtils.verbose_flag
+      assert ! RakeFileUtils.nowrite_flag
     end
-    assert TESTING_REQUIRE.include?(1)
-    assert TESTING_REQUIRE.include?(2)
-    assert TESTING_REQUIRE.include?(3)
-    assert_equal 3, TESTING_REQUIRE.size
   end
 
-  def test_missing_require
-    ex = assert_raises(LoadError) do
-      flags(['--require', 'test/missing']) do |opts|
-      end
+  def test_trace_rules
+    flags('--rules') do |opts|
+      assert opts.trace_rules
     end
-    assert_match(/no such file/, ex.message)
-    assert_match(/test\/missing/, ex.message)
   end
 
   def test_tasks
@@ -500,6 +599,7 @@ class TestApplicationOptions < Test::Unit::TestCase
 
   def flags(*sets)
     sets.each do |set|
+      ARGV.clear
       @out = capture_stdout { 
         @exit = catch(:system_exit) { opts = command_line(*set) }
       }
@@ -563,3 +663,52 @@ class TestTaskArgumentParsing < Test::Unit::TestCase
   end
 
 end
+
+class TestTaskArgumentParsing < Test::Unit::TestCase
+  include InEnvironment
+
+  def test_terminal_width_using_env
+    app = Rake::Application.new
+    in_environment('RAKE_COLUMNS' => '1234') do
+      assert_equal 1234, app.terminal_width
+    end
+  end
+
+  def test_terminal_width_using_stty
+    app = Rake::Application.new
+    flexmock(app,
+      :unix? => true,
+      :dynamic_width_stty => 1235,
+      :dynamic_width_tput => 0)
+    in_environment('RAKE_COLUMNS' => nil) do
+      assert_equal 1235, app.terminal_width
+    end
+  end
+
+  def test_terminal_width_using_tput
+    app = Rake::Application.new
+    flexmock(app,
+      :unix? => true,
+      :dynamic_width_stty => 0,
+      :dynamic_width_tput => 1236)
+    in_environment('RAKE_COLUMNS' => nil) do
+      assert_equal 1236, app.terminal_width
+    end
+  end
+
+  def test_terminal_width_using_hardcoded_80
+    app = Rake::Application.new
+    flexmock(app, :unix? => false)
+    in_environment('RAKE_COLUMNS' => nil) do
+      assert_equal 80, app.terminal_width
+    end
+  end
+
+  def test_terminal_width_with_failure
+    app = Rake::Application.new
+    flexmock(app).should_receive(:unix?).and_throw(RuntimeError)
+    in_environment('RAKE_COLUMNS' => nil) do
+      assert_equal 80, app.terminal_width
+    end
+  end
+end

data/test/test_task_manager.rb

@@ -53,7 +53,7 @@ class TestTaskManager < Test::Unit::TestCase
     assert_equal ["fn"], @tm.tasks.collect { |t| t.name }
   end
 
-  def testS_namespace_yields_same_namespace_as_returned
+  def test_namespace_yields_same_namespace_as_returned
     yielded_namespace = nil
     returned_namespace = @tm.in_namespace("x") do |ns|
       yielded_namespace = ns
@@ -146,3 +146,25 @@ class TestTaskManager < Test::Unit::TestCase
   end
   
 end
+
+class TestTaskManagerArgumentResolution < Test::Unit::TestCase
+  def test_good_arg_patterns
+    assert_equal [:t, [], []],       task(:t)
+    assert_equal [:t, [], [:x]],     task(:t => :x)
+    assert_equal [:t, [], [:x, :y]], task(:t => [:x, :y])
+
+    assert_equal [:t, [:a, :b], []],       task(:t, :a, :b)
+    assert_equal [:t, [], [:x]],           task(:t, :needs => :x)
+    assert_equal [:t, [:a, :b], [:x]],     task(:t, :a, :b, :needs => :x)
+    assert_equal [:t, [:a, :b], [:x, :y]], task(:t, :a, :b, :needs => [:x, :y])
+
+    assert_equal [:t, [:a, :b], []],       task(:t, [:a, :b])
+    assert_equal [:t, [:a, :b], [:x]],     task(:t, [:a, :b] => :x)
+    assert_equal [:t, [:a, :b], [:x, :y]], task(:t, [:a, :b] => [:x, :y])
+  end
+
+  def task(*args)
+    tm = TaskManager.new
+    tm.resolve_args(args)
+  end
+end

data/test/test_tasklib.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'rake/tasklib'
+
+
+class TestTaskLib < Test::Unit::TestCase
+  def test_paste
+    tl = Rake::TaskLib.new
+    assert_equal :ab, tl.paste(:a, :b)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jimweirich-rake
 version: !ruby/object:Gem::Version 
-  version: 0.8.1.9
+  version: 0.8.1.10
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-30 21:00:00 -07:00
+date: 2008-08-31 21:00:00 -07:00
 default_executable: rake
 dependencies: []
 
@@ -68,7 +68,7 @@ files:
 - lib/rake/testtask.rb
 - lib/rake.rb
 - test/capture_stdout.rb
-- test/contrib/testsys.rb
+- test/contrib/test_sys.rb
 - test/data/rakelib/test1.rb
 - test/data/rbext/rakefile.rb
 - test/filecreation.rb
@@ -100,6 +100,7 @@ files:
 - test/test_rules.rb
 - test/test_task_arguments.rb
 - test/test_task_manager.rb
+- test/test_tasklib.rb
 - test/test_tasks.rb
 - test/test_test_task.rb
 - test/test_top_level_functions.rb