jimweirich-rake 0.8.1.6 → 0.8.1.7

data/CHANGES

@@ -1,6 +1,7 @@
+
 = Rake Changelog
 
-== Pre-Version 0.8.2
+== Version 0.8.2
 
 * Fixed bug in package task so that it will include the subdir
   directory in the package for testing. (Bug found by Adam Majer)
@@ -48,6 +49,10 @@
   :with_defaults method. (Idea for default argument merging supplied
   by (Adam Q. Salter)
 
+* The -T output will only self-truncate if the output is a tty.
+  However, if RAKE_COLUMNS is explicitly set, it will be honored in
+  any case. (Patch provided by Gavin Stark).
+
 == Version 0.8.1
 
 * Removed requires on parsedate.rb (in Ftptools)

data/README

@@ -1,6 +1,6 @@
 = RAKE -- Ruby Make 
 
-Supporting Rake version: 0.7.x
+Supporting Rake version: 0.8.2
 
 This package contains Rake, a simple ruby build program with
 capabilities similar to make.
@@ -26,6 +26,13 @@ The latest version of rake can be found at
 
 * http://rubyforge.org/project/showfiles.php?group_id=50
 
+== Source Repository
+
+Rake is currently hosted at github. The github web page is
+http://github.com/jimweirich/rake. The public git clone URL is
+
+* git://github.com/jimweirich/rake.git
+
 == Installation
 
 === Normal Installation
@@ -46,6 +53,7 @@ Download and install  rake with the following.
 
 If you wish to run the unit and functional tests that come with Rake:
 
+* Install the 'session' gem in order to run the functional tests.
 * CD into the top project directory of rake.
 * Type one of the following:
 
@@ -60,6 +68,7 @@ If you wish to run the unit and functional tests that come with Rake:
 * Rake Project Page: http://rubyforge.org/projects/rake
 * Rake API Documents: http://rake.rubyforge.org
 * Rake Source Code Repo:  http://github.com/jimweirich/rake
+* Rake Git Repo Clone URL: git://github.com/jimweirich/rake.git
 
 == Presentations and Articles about Rake
 
@@ -158,7 +167,7 @@ Options are:
 [<tt><em>name</em>=<em>value</em></tt>]
     Set the environment variable <em>name</em> to <em>value</em>
     during the execution of the <b>rake</b> command.  You can access
-    the value by using ENV['<em>name</em>'].
+    the value by using ENV['<em>name</em>'].  
 
 [<tt>--classic-namespace</tt> (-n)]
     Import the Task, FileTask, and FileCreateTask into the top-level
@@ -167,10 +176,22 @@ Options are:
     'rake/classic_namespace'</code> in your Rakefile to get the
     classic behavior.
 
+[<tt>--describe</tt> _pattern_ (-D)]
+    Describe the tasks (matching optional PATTERN), then exit.
+
 [<tt>--dry-run</tt> (-n)]
     Do a dry run.  Print the tasks invoked and executed, but do not
     actually execute any of the actions.
 
+[<tt>--execute</tt> _code_ (-e)]
+    Execute some Ruby code and exit.
+
+[<tt>--execute-print</tt> _code_ (-p)]
+    Execute some Ruby code, print the result, and exit.
+
+[<tt>--execute-continue</tt> _code_ (-p)]
+    Execute some Ruby code, then continue with normal task processing.
+
 [<tt>--help</tt>  (-H)]
     Display some help text and exit.
 
@@ -194,9 +215,18 @@ Options are:
     directory where the Rakefile is found will become the current
     directory for the actions executed in the Rakefile.
 
+[<tt>--rakelibdir</tt> _rakelibdir_ (-R)]
+    Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')
+
 [<tt>--require</tt> _name_ (-r)]
     Require _name_ before executing the Rakefile.
 
+[<tt>--rules</tt>]
+    Trace the rules resolution.
+
+[<tt>--silent (-s)]
+    Like --quiet, but also suppresses the 'in directory' announcement.
+
 [<tt>--tasks</tt> (-T)]
     Display a list of the major tasks and their comments.  Comments
     are defined using the "desc" command.

data/Rakefile

@@ -216,7 +216,7 @@ else
     pkg.need_tar = true
   end
 
-  file "rake.gemspec" => "Rakefile" do |t|
+  file "rake.gemspec" => ["Rakefile", "lib/rake.rb"] do |t|
     require 'yaml'
     open(t.name, "w") { |f| f.puts SPEC.to_yaml }
   end

data/doc/rakefile.rdoc

@@ -1,4 +1,4 @@
-= Rakefile Format
+= Rakefile Format (as of version 0.8.2)
 
 First of all, there is no special format for a Rakefile.  A Rakefile
 contains executable Ruby code.  Anything legal in a ruby script is
@@ -150,6 +150,124 @@ to do extra synchronization for Rake's benefit.  However, if there are
 user data structures shared between the parallel prerequisites, the
 user must do whatever is necessary to prevent race conditions.
 
+== Tasks with Arguments
+
+Prior to version 0.8.0, rake was only able to handle command line
+arguments of the form NAME=VALUE that were passed into Rake via the
+ENV hash.  Many folks had asked for some kind of simple command line
+arguments, perhaps using "--" to separate regular task names from
+argument values on the command line.  The problem is that there was no
+easy way to associate positional arguments on the command line with
+different tasks.  Suppose both tasks :a and :b expect a command line
+argument: does the first value go with :a?  What if :b is run first?
+Should it then get the first command line argument.
+
+Rake 0.8.0 solves this problem by explicitly passing values directly
+to the tasks that need them.  For example, if I had a release task
+that required a version number, I could say:
+
+   rake release[0.8.2]
+
+And the string "0.8.2" will be passed to the :release task.  Multiple
+arguments can be passed by separating them with a comma, for example:
+
+   rake name[john,doe]
+
+Just a few words of caution.  The rake task name and its arguments
+need to be a single command line argument to rake.  This generally
+means no spaces.  If spaces are needed, then the entire rake +
+argument string should be quoted.  Something like this:
+
+   rake "name[billy bob, smith]"
+
+(Quoting rules vary between operating systems and shells, so make sure
+you consult the proper docs for your OS/shell).
+
+=== Tasks that Expect Parameters
+
+Parameters are only given to tasks that are setup to expect them.  In
+order to handle named parameters, the task declaration syntax for
+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
+
+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).
+
+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|
+     puts "First name is #{args.first_name}"
+     puts "Last  name is #{args.last_name}"
+   end
+
+The first argument of the block "t" is always bound to the current
+task object.  The second argument "args" is an open-struct like object
+that allows access to the task arguments.  Extra command line
+arguments to a task are ignored.  Missing command line arguments are
+given the nil value.
+
+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|
+     args.with_defaults(:first_name => "John", :last_name => "Dough")
+     puts "First name is #{args.first_name}"
+     puts "Last  name is #{args.last_name}"
+   end
+
+=== Tasks that Expect Parameters and Have Prerequisites
+
+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|
+     args.with_defaults(:first_name => "John", :last_name => "Dough")
+     puts "First name is #{args.first_name}"
+     puts "Last  name is #{args.last_name}"
+   end
+
+== Accessing Task Programatically
+
+Sometimes it is useful to manipulate tasks programatically in a
+Rakefile. To find a task object, use the <tt>:[]</tt> operator on the
+<tt>Rake::Task</tt>.
+
+=== Programmatic Task Example
+
+For example, the following Rakefile defines two tasks.  The :doit task
+simply prints a simple "DONE" message.  The :dont class will lookup
+the doit class and remove (clear) all of its prerequisites and
+actions.
+
+   task :doit do
+     puts "DONE"
+   end
+
+   task :dont do
+     Rake::Task[:doit].clear
+   end        
+
+Running this example:
+
+  $ rake doit
+  (in /Users/jim/working/git/rake/x)
+  DONE
+  $ rake dont doit
+  (in /Users/jim/working/git/rake/x)
+  $ 
+
+The ability to programmatically manipulate tasks gives rake very
+powerful meta-programming capabilities w.r.t. task execution, but
+should be used with cation.
+
 == Rules
 
 When a file is named as a prerequisite, but does not have a file task
@@ -372,8 +490,6 @@ Or give it a glob pattern:
 
    fl = FileList['*.rb']
 
-   
-
 == Odds and Ends
 
 === do/end verses { }

data/doc/release_notes/rake-0.8.2.rdoc

@@ -0,0 +1,163 @@
+= Rake 0.8.2 Released
+
+Rake version 0.8.2 is a new release of rake that includes a number of
+new features and numerous bug fixes.
+
+== Changes
+
+=== New Features in Version 0.8.2
+
+* Switched from getoptlong to optparse (patches supplied by Edwin
+  Pratomo).
+
+* The -T option will now attempt to dynamically sense the size of the
+  terminal. The -T output will only self-truncate if the output is a
+  tty. However, if RAKE_COLUMNS is explicitly set, it will be honored
+  in any case. (Patch provided by Gavin Stark).
+
+* The following public methods have been added to rake task objects:
+
+  * task.clear -- Clear both the prerequisites and actions of the
+    target rake task.
+  * task.clear_prerequisites -- Clear all the existing prerequisites
+    from the target rake task.
+  * task.clear_actions -- Clear all the existing actions from the
+    target rake task.
+  * task.reenable -- Re-enable a task, allowing its actions to be
+    executed again if the task is invoked.
+
+* Changed RDoc test task to have no default template. This makes it
+  easier for the tempate to pick up the template from the environment.
+
+* Default values for task arguments can easily be specified with the
+  :with_defaults method. (Idea for default argument merging supplied
+  by (Adam Q. Salter)
+
+=== Bug Fixes in Version 0.8.2
+
+* Fixed bug in package task so that it will include the subdir
+  directory in the package for testing. (Bug found by Adam Majer)
+
+* Fixed filename dependency order bug in test_inspect_pending and
+  test_to_s_pending. (Bug found by Adam Majer)
+
+* Fixed check for file utils options to make them immune to the
+  symbol/string differences. (Patch supplied by Edwin Pratomo)
+
+* Fixed bug with rules involving multiple source, where only the first
+  dependency of a rule has any effect (Patch supplied by Emanuel
+  Inderm�hle)
+
+* FileList#clone and FileList#dup have better sematics w.r.t. taint
+  and freeze.
+
+* 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)
+
+== Other changes in Version 0.8.2
+
+* Added ENV var to rake's own Rakefile to prevent OS X from including
+  extended attribute junk in the rake package tar file. (Bug found by
+  Adam Majer)
+
+* Added a performance patch for reading large makefile dependency
+  files. (Patch supplied by Ittay Dror)
+
+== What is Rake
+
+Rake is a build tool similar to the make program in many ways. But
+instead of cryptic make recipes, Rake uses standard Ruby code to
+declare tasks and dependencies. You have the full power of a modern
+scripting language built right into your build tool.
+
+== Availability
+
+The easiest way to get and install rake is via RubyGems ...
+
+  gem install rake    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Home Page:: http://rake.rubyforge.org/
+Download::  http://rubyforge.org/project/showfiles.php?group_id=50
+
+== Task Argument Examples
+
+Prior to version 0.8.0, rake was only able to handle command line
+arguments of the form NAME=VALUE that were passed into Rake via the
+ENV hash.  Many folks had asked for some kind of simple command line
+arguments, perhaps using "--" to separate regular task names from
+argument values on the command line.  The problem is that there was no
+easy way to associate positional arguments on the command line with
+different tasks.  Suppose both tasks :a and :b expect a command line
+argument: does the first value go with :a?  What if :b is run first?
+Should it then get the first command line argument.
+
+Rake 0.8.0 solves this problem by explicitly passing values directly
+to the tasks that need them.  For example, if I had a release task
+that required a version number, I could say:
+
+   rake release[0.8.2]
+
+And the string "0.8.2" will be passed to the :release task.  Multiple
+arguments can be passed by separating them with a comma, for example:
+
+   rake name[john,doe]
+
+Just a few words of caution.  The rake task name and its arguments
+need to be a single command line argument to rake.  This generally
+means no spaces.  If spaces are needed, then the entire rake +
+argument string should be quoted.  Something like this:
+
+   rake "name[billy bob, smith]"
+
+(Quoting rules vary between operating systems and shells, so make sure
+you consult the proper docs for your OS/shell).
+
+=== Tasks that Expect Parameters
+
+Parameters are only given to tasks that are setup to expect them.  In
+order to handle named parameters, the task declaration syntax for
+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
+
+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).
+
+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|
+     puts "First name is #{args.first_name}"
+     puts "Last  name is #{args.last_name}"
+   end
+
+The first argument of the block "t" is always bound to the current
+task object.  The second argument "args" is an open-struct like object
+that allows access to the task arguments.  Extra command line
+arguments to a task are ignored.  Missing command line arguments are
+given the nil value.
+
+== Thanks
+
+As usual, it was input from users that drove a alot of these changes. The
+following people either contributed patches, made suggestions or made
+otherwise helpful comments.  Thanks to ...
+
+* Edwin Pratomo
+* Gavin Stark
+* Adam Q. Salter
+* Adam Majer
+* Emanuel Inderm�hle
+* Ittay Dror
+
+-- Jim Weirich

data/lib/rake/loaders/makefile.rb

@@ -21,11 +21,12 @@ module Rake
 
     # Process one logical line of makefile data.
     def process_line(line)
-      file_task, args = line.split(':')
+      file_tasks, args = line.split(':')
       return if args.nil?
-      file_task.strip!
       dependents = args.split
-      file file_task => dependents
+      file_tasks.strip.split.each do |file_task|
+        file file_task => dependents
+      end
     end
   end
 

data/lib/rake/packagetask.rb

@@ -122,6 +122,7 @@ module Rake
           task :package => ["#{package_dir}/#{file}"]
           file "#{package_dir}/#{file}" => [package_dir_path] + package_files do
             chdir(package_dir) do
+              sh %{env}
               sh %{#{@tar_command} #{flag}cvf #{file} #{package_name}}
             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.6'
+RAKEVERSION = '0.8.1.7'
 
 require 'rbconfig'
 require 'getoptlong'
@@ -359,6 +359,8 @@ module Rake
     end
   end
 
+  EMPTY_TASK_ARGS = TaskArguments.new([], [])
+
   ####################################################################
   # InvocationChain tracks the chain of task invocations to detect
   # circular dependencies.
@@ -508,25 +510,26 @@ module Rake
       @arg_names || []
     end
 
-    # Reenable the task, allowing it to be invoked again
+    # Reenable the task, allowing its tasks to be executed if the task
+    # is invoked again.
     def reenable
       @already_invoked = false
     end
 
-    # Clear an existing task of both prerequisites and actions
+    # Clear the existing prerequisites and actions of a rake task.
     def clear
       clear_prerequisites
       clear_actions
       self
     end
 
-    # Clear the prerequisites of a task.
+    # Clear the existing prerequisites of a rake task.
     def clear_prerequisites
       prerequisites.clear
       self
     end
 
-    # Clear the actions on a task.
+    # Clear the existing actions on a rake task.
     def clear_actions
       actions.clear
       self
@@ -540,7 +543,7 @@ module Rake
 
     # Same as invoke, but explicitly pass a call chain to detect
     # circular dependencies.
-    def invoke_with_call_chain(task_args, invocation_chain)
+    def invoke_with_call_chain(task_args, invocation_chain) # :nodoc:
       new_chain = InvocationChain.append(self, invocation_chain)
       @lock.synchronize do
         if application.options.trace
@@ -555,7 +558,7 @@ module Rake
     protected :invoke_with_call_chain
 
     # Invoke all the prerequisites of a task.
-    def invoke_prerequisites(task_args, invocation_chain)
+    def invoke_prerequisites(task_args, invocation_chain) # :nodoc:
       @prerequisites.each { |n|
         prereq = application[n, @scope]
         prereq_args = task_args.new_scope(prereq.arg_names)
@@ -1887,6 +1890,7 @@ module Rake
       @top_level_tasks = []
       add_loader('rf', DefaultLoader.new)
       add_loader('rake', DefaultLoader.new)
+      @tty_output = STDOUT.tty?
     end
 
     # Run the Rake application.  The run method performs the following three steps:
@@ -1991,7 +1995,7 @@ module Rake
 
     # True if one of the files in RAKEFILES is in the current directory.
     # If a match is found, it is copied into @rakefile.
-    def have_rakefile
+    def have_project_rakefile
       @rakefiles.each do |fn|
         if File.exist?(fn) || fn == ''
           @rakefile = fn
@@ -2001,6 +2005,22 @@ module Rake
       return false
     end
 
+    # True if we are outputting to TTY, false otherwise
+    def tty_output?
+      @tty_output
+    end
+
+    # Override the detected TTY output state (mostly for testing)
+    def tty_output=( tty_output_state )
+      @tty_output = tty_output_state
+    end
+
+    # We will truncate output if we are outputting to a TTY or if we've been
+    # given an explicit column width to honor
+    def truncate_output?
+      tty_output? || ENV['RAKE_COLUMNS']
+    end
+
     # Display the tasks and dependencies.
     def display_tasks_and_comments
       displayable_tasks = tasks.select { |t|
@@ -2016,10 +2036,10 @@ module Rake
         end
       else
         width = displayable_tasks.collect { |t| t.name_with_args.length }.max || 10
-        max_column = terminal_width - name.size - width - 7
+        max_column = truncate_output? ? terminal_width - name.size - width - 7 : nil
         displayable_tasks.each do |t|
           printf "#{name} %-#{width}s  # %s\n",
-            t.name_with_args, truncate(t.comment, max_column)
+            t.name_with_args, max_column ? truncate(t.comment, max_column) : t.comment
         end
       end
     end
@@ -2052,11 +2072,15 @@ module Rake
       RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux|)/i
     end
     
+    def windows?
+      Config::CONFIG['host_os'] =~ /mswin/
+    end
+    
     def truncate(string, width)
       if string.length <= width
         string
       else
-        string[0, width-3] + "..."
+        ( string[0, width-3] || "" ) + "..."
       end
     end
 
@@ -2091,38 +2115,38 @@ module Rake
             options.show_task_pattern = Regexp.new(value || '')
           }
         ],
+        ['--dry-run', '-n', "Do a dry run without executing actions.",
+          lambda { |value|
+            verbose(true)
+            nowrite(true)
+            options.dryrun = true
+            options.trace = true
+          }
+        ],
         ['--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.",
+        ['--execute-print',  '-p CODE', "Execute some Ruby code, print the result, then exit.",
           lambda { |value|
             puts eval(value)
             exit
           }
         ],
-        ['--execute-continue',  '-E', "Execute some Ruby code, then run tasks.",
+        ['--execute-continue',  '-E',
+          "Execute some Ruby code, then continue with normal task processing.",
           lambda { |value| eval(value) }            
         ],
-        ['--rakefile', '-f [FILE]', "Use FILE as the rakefile.",
-          lambda { |value| 
-            value ||= ''
-            @rakefiles.clear 
-            @rakefiles << value
-          }
-        ],
         ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
           lambda { |value| $:.push(value) }
         ],
-        ['--dry-run', '-n', "Do a dry run without executing actions.",
-          lambda { |value|
-            verbose(true)
-            nowrite(true)
-            options.dryrun = true
-            options.trace = true
-          }
+        ['--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 }
@@ -2133,6 +2157,17 @@ module Rake
         ['--quiet', '-q', "Do not log messages to standard output.",
           lambda { |value| verbose(false) }
         ],
+        ['--rakefile', '-f [FILE]', "Use FILE as the rakefile.",
+          lambda { |value| 
+            value ||= ''
+            @rakefiles.clear 
+            @rakefiles << value
+          }
+        ],
+        ['--rakelibdir', '--rakelib', '-R RAKELIBDIR',
+          "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')",
+          lambda { |value| options.rakelib = value.split(':') }
+        ],
         ['--require', '-r MODULE', "Require MODULE before executing rakefile.",
           lambda { |value|
             begin
@@ -2146,10 +2181,7 @@ module Rake
             end
           }
         ],
-        ['--rakelibdir', '--rakelib', '-R RAKELIBDIR', "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')",
-          lambda { |value| options.rakelib = value.split(':') }
-        ],
-        ['--rules', "Trace the rules resolution",
+        ['--rules', "Trace the rules resolution.",
           lambda { |value| options.trace_rules = true }
         ],
         ['--silent', '-s', "Like --quiet, but also suppresses the 'in directory' announcement.",
@@ -2217,7 +2249,7 @@ module Rake
     end
 
     # Similar to the regular Ruby +require+ command, but will check
-    # for .rake files in addition to .rb files.
+    # for *.rake files in addition to *.rb files.
     def rake_require(file_name, paths=$LOAD_PATH, loaded=$")
       return false if loaded.include?(file_name)
       paths.each do |path|
@@ -2234,22 +2266,60 @@ module Rake
 
     def raw_load_rakefile # :nodoc:
       here = Dir.pwd
-      while ! have_rakefile
-        Dir.chdir("..")
-        if Dir.pwd == here || options.nosearch
-          fail "No Rakefile found (looking for: #{@rakefiles.join(', ')})"
+      if (options.load_system || ! have_project_rakefile) && ! options.ignore_system && have_system_rakefiles
+        Dir["#{system_dir}/*.rake"].each do |name|
+          add_import name
+        end
+      else
+        while ! have_project_rakefile
+          Dir.chdir("..")
+          if Dir.pwd == here || options.nosearch
+            fail "No Rakefile found (looking for: #{@rakefiles.join(', ')})"
+          end
+          here = Dir.pwd
         end
-        here = Dir.pwd
       end
       puts "(in #{Dir.pwd})" unless options.silent
       $rakefile = @rakefile
-      load File.expand_path(@rakefile) if @rakefile != ''
+      load File.expand_path(@rakefile) if @rakefile && @rakefile != ''
       options.rakelib.each do |rlib|
         Dir["#{rlib}/*.rake"].each do |name| add_import name end
       end
       load_imports
     end
 
+    def have_system_rakefiles
+      Dir[File.join(system_dir, '*.rake')].size > 0
+    end
+    
+    # The directory path containing the system wide rakefiles.
+    def system_dir
+      if ENV['RAKE_SYSTEM']
+        ENV['RAKE_SYSTEM']
+      elsif windows?
+        win32_system_dir
+      else
+        standard_system_dir
+      end
+    end
+ 
+    # The standard directory containing system wide rake files.
+    def standard_system_dir #:nodoc:
+      File.join(File.expand_path('~'), '.rake')
+    end
+    private :standard_system_dir
+
+    # 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."
+      else
+        win32home
+      end
+    end
+    private :win32_system_dir
+
     # 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/sample.mf

@@ -8,3 +8,5 @@ b7
  a : a5 a6 a7
 c: c1
 d: d1 d2 \
+
+e f : e1 f1

data/test/functional.rb

@@ -6,7 +6,7 @@ begin
   require 'session'
 rescue LoadError
   puts "UNABLE TO RUN FUNCTIONAL TESTS"
-  puts "No Session Found"
+  puts "No Session Found (gem install session)"
 end
 
 if defined?(Session)

data/test/session_functional.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'test/unit'
 require 'fileutils'
 require 'session'
@@ -154,7 +155,7 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match(/^TEST1$/, @out)
   end
 
-  def test_dot_rake_files_can_be_laoded_with_dash_r
+  def test_dot_rake_files_can_be_loaded_with_dash_r
     rake "-I test/data/rakelib -rtest2 -f"
     assert_match(/^TEST2$/, @out)
   end

data/test/test_application.rb

@@ -41,7 +41,56 @@ class TestApplication < Test::Unit::TestCase
   def test_display_tasks_with_long_comments
     ENV['RAKE_COLUMNS'] = '80'
     @app.options.show_task_pattern = //
-    @app.last_description = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+    @app.last_description = "1234567890" * 8
+    @app.define_task(Rake::Task, "t")
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+    assert_match(/^rake t/, out)
+    assert_match(/# 12345678901234567890123456789012345678901234567890123456789012345\.\.\./, out)
+  ensure
+    ENV['RAKE_COLUMNS'] = nil
+  end
+
+  def test_display_tasks_with_task_name_wider_than_tty_display
+    ENV['RAKE_COLUMNS'] = '80'
+    @app.options.show_task_pattern = //
+    description = "something short"
+    task_name = "task name" * 80
+    @app.last_description = "something short"
+    @app.define_task(Rake::Task, task_name )
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+    # Ensure the entire task name is output and we end up showing no description
+    assert_match(/rake #{task_name}  # .../, out)
+  ensure
+    ENV['RAKE_COLUMNS'] = nil
+  end
+
+  def test_display_tasks_with_very_long_task_name_to_a_non_tty_shows_name_and_comment
+    @app.options.show_task_pattern = //
+    @app.tty_output = false
+    description = "something short"
+    task_name = "task name" * 80
+    @app.last_description = "something short"
+    @app.define_task(Rake::Task, task_name )
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+    # Ensure the entire task name is output and we end up showing no description
+    assert_match(/rake #{task_name}  # #{description}/, out)
+  end
+
+  def test_display_tasks_with_long_comments_to_a_non_tty_shows_entire_comment
+    @app.options.show_task_pattern = //
+    @app.tty_output = false
+    @app.last_description = "1234567890" * 8
+    @app.define_task(Rake::Task, "t")
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+    assert_match(/^rake t/, out)
+    assert_match(/# #{@app.last_description}/, out)
+  end
+
+  def test_display_tasks_with_long_comments_to_a_non_tty_with_columns_set_truncates_comments
+    ENV['RAKE_COLUMNS'] = '80'
+    @app.options.show_task_pattern = //
+    @app.tty_output = false
+    @app.last_description = "1234567890" * 8
     @app.define_task(Rake::Task, "t")
     out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
     assert_match(/^rake t/, out)
@@ -61,13 +110,13 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_finding_rakefile
-    assert @app.instance_eval { have_rakefile }
+    assert @app.instance_eval { have_project_rakefile }
     assert_equal "rakefile", @app.rakefile.downcase
   end
 
   def test_not_finding_rakefile
     @app.instance_eval { @rakefiles = ['NEVER_FOUND'] }
-    assert( ! @app.instance_eval do have_rakefile end )
+    assert( ! @app.instance_eval do have_project_rakefile end )
     assert_nil @app.rakefile
   end
 
@@ -77,6 +126,7 @@ class TestApplication < Test::Unit::TestCase
     @app.instance_eval do 
       handle_options
       options.silent = true
+      options.ignore_system = true
       load_rakefile
     end
     assert_equal "rakefile", @app.rakefile.downcase
@@ -100,23 +150,36 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_load_rakefile_not_found
-    original_dir = Dir.pwd
-    Dir.chdir("/")
-    @app.instance_eval do
-      handle_options
-      options.silent = true
+    in_environment("PWD" => "/") do
+      @app.instance_eval do
+        handle_options
+        options.silent = true
+        options.ignore_system = true
+      end
+      ex = assert_raise(RuntimeError) do 
+        @app.instance_eval do raw_load_rakefile end 
+      end
+      assert_match(/no rakefile found/i, ex.message)
     end
-    ex = assert_raise(RuntimeError) do 
-      @app.instance_eval do raw_load_rakefile end 
+  end
+
+  def test_load_from_system_rakefile
+    in_environment('RAKE_SYSTEM' => 'test') do
+      @app.options.rakelib = []
+      @app.instance_eval do
+        handle_options
+        options.silent = true
+        options.load_system = true
+        load_rakefile
+      end
+      assert_equal "test", @app.system_dir
+      assert_nil @app.rakefile
     end
-    assert_match(/no rakefile found/i, ex.message)
-  ensure
-    Dir.chdir(original_dir)
   end
 
   def test_not_caring_about_finding_rakefile
     @app.instance_eval do @rakefiles = [''] end
-    assert(@app.instance_eval do have_rakefile end)
+    assert(@app.instance_eval do have_project_rakefile end)
     assert_equal '', @app.rakefile
   end
 
@@ -219,6 +282,29 @@ class TestApplication < Test::Unit::TestCase
     ARGV.clear
   end
 
+  private
+
+  def set_env(settings)
+    result = {}
+    settings.each do |k, v|
+      result[k] = ENV[k]
+      if k == 'PWD'
+        Dir.chdir(v)
+      else
+        ENV[k] = v
+      end
+    end
+    result
+  end
+
+  def in_environment(settings)
+    original_dir = Dir.pwd
+    original_settings = set_env(settings)
+    yield    
+  ensure
+    set_env(original_settings)
+  end
+
 end
 
 
@@ -230,6 +316,7 @@ class TestApplicationOptions < Test::Unit::TestCase
     clear_argv
     RakeFileUtils.verbose_flag = false
     RakeFileUtils.nowrite_flag = false
+    TESTING_REQUIRE.clear
   end
 
   def teardown
@@ -276,6 +363,18 @@ class TestApplicationOptions < Test::Unit::TestCase
     end
   end
 
+  def test_system_option
+    flags('--system', '-G') do |opts|
+      assert opts.load_system
+    end
+  end
+
+  def test_no_system_option
+    flags('--no-system', '-g') do |opts|
+      assert opts.ignore_system
+    end
+  end
+
   def test_dry_run
     flags('--dry-run', '-n') do |opts|
       assert opts.dryrun

data/test/test_makefile_loader.rb

@@ -18,6 +18,8 @@ class TestMakefileLoader < Test::Unit::TestCase
     assert_equal %w(b1 b2 b3 b4 b5 b6 b7).sort, Task['b'].prerequisites.sort
     assert_equal %w(c1).sort, Task['c'].prerequisites.sort
     assert_equal %w(d1 d2).sort, Task['d'].prerequisites.sort
-    assert_equal 4, Task.tasks.size
+    assert_equal %w(e1 f1).sort, Task['e'].prerequisites.sort
+    assert_equal %w(e1 f1).sort, Task['f'].prerequisites.sort
+    assert_equal 6, Task.tasks.size
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jimweirich-rake
 version: !ruby/object:Gem::Version 
-  version: 0.8.1.6
+  version: 0.8.1.7
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-09 21:00:00 -07:00
+date: 2008-08-23 21:00:00 -07:00
 default_executable: rake
 dependencies: []
 
@@ -39,10 +39,10 @@ extra_rdoc_files:
 - doc/release_notes/rake-0.7.2.rdoc
 - doc/release_notes/rake-0.7.3.rdoc
 - doc/release_notes/rake-0.8.0.rdoc
+- doc/release_notes/rake-0.8.2.rdoc
 files: 
 - install.rb
 - CHANGES
-- CVSROOT
 - MIT-LICENSE
 - Rakefile
 - README
@@ -138,6 +138,7 @@ files:
 - doc/release_notes/rake-0.7.2.rdoc
 - doc/release_notes/rake-0.7.3.rdoc
 - doc/release_notes/rake-0.8.0.rdoc
+- doc/release_notes/rake-0.8.2.rdoc
 has_rdoc: true
 homepage: http://rake.rubyforge.org
 post_install_message: