rake 0.9.2 → 0.9.2.2

data/CHANGES

@@ -1,5 +1,18 @@
 = Rake Changelog
 
+== Master (for 0.9.3)
+
+* The rake test loader now removes arguments it has processed.  Issue #51
+* Rake::TaskArguments now responds to #values_at
+* RakeFileUtils.verbose_flag = nil silences output the same as 0.8.7
+* Rake tests are now directory-independent
+* Rake tests are no longer require flexmock
+* Commands constant is no longer polluting top level namespace.
+
+== Version 0.9.2
+
+* Unknown
+
 == Version 0.9.1
 
 * Added deprecation warnings to the Rake DSL methods.

data/README.rdoc

@@ -1,9 +1,7 @@
 = RAKE -- Ruby Make
 
-Supporting Rake version: 0.8.7.
-
-This package contains Rake, a simple ruby build program with
-capabilities similar to make.
+This package contains Rake, a simple ruby build program with capabilities
+similar to make.
 
 Rake has the following features:
 
@@ -19,16 +17,17 @@ Rake has the following features:
   file names and paths.
 
 * A library of prepackaged tasks to make building rakefiles easier. For example,
-  tasks for building tarballs, gems and RDoc output are provided.
+  tasks for building tarballs and publishing to FTP or SSH sites.  (Formerly
+  tasks for building RDoc and Gems were included in rake but they're now
+  available in RDoc and RubyGems respectively.)
 
 * Supports parallel execution of tasks.
 
-
 == Installation
 
 === Gem Installation
 
-Download and install  rake with the following.
+Download and install rake with the following.
 
    gem install rake
 
@@ -114,12 +113,9 @@ If you wish to run the unit and functional tests that come with Rake:
 
 Feature requests and bug reports can be made here
 
-* http://onestepback.org/cgi-bin/bugs.cgi?project=rake
-
-No account is needed for posting requests.  Or you can send me an
-email (at jim dot weirich at gmail dot com)
+* https://github.com/jimweirich/rake/issues
 
-Issues and bug reports can be tracked here:
+Issues and bug reports can also be tracked here:
 
 * http://www.pivotaltracker.com/projects/28469
 
@@ -133,11 +129,12 @@ Issues and bug reports can be tracked here:
 * Rake Source Code Repo:  http://github.com/jimweirich/rake
 * Rake Git Repo Clone URL: git://github.com/jimweirich/rake.git
 * Rake Issue Tracking: http://www.pivotaltracker.com/projects/28469
-* Rake Bug Reports: http://onestepback.org/cgi-bin/bugs.cgi?project=rake
+* Rake Bug Reports: https://github.com/jimweirich/rake/issues
 
 === Presentations and Articles about Rake
 
-* Jim Weirich's 2003 RubyConf presentation: http://onestepback.org/articles/buildingwithrake/
+* Jim Weirich's 2003 RubyConf presentation:
+  http://onestepback.org/articles/buildingwithrake/
 * Martin Fowler's article on Rake: http://martinfowler.com/articles/rake.html
 
 == Other Make Reinvisionings ...
@@ -187,7 +184,7 @@ jim dot weirich at gmail.com.
 = Other stuff
 
 Author::   Jim Weirich <jim.weirich@gmail.com>
-Requires:: Ruby 1.8.0 or later
+Requires:: Ruby 1.8.6 or later
 License::  Copyright 2003-2008 by Jim Weirich.
            Released under an MIT-style license.  See the LICENSE file
            included in the distribution.

data/Rakefile

@@ -12,7 +12,7 @@ require 'rubygems'
 system_rake = File.join RbConfig::CONFIG['rubylibdir'], 'rake.rb'
 
 # Use our rake, not the installed rake from system
-if $".include? system_rake then
+if $".include? system_rake or $".grep(/rake\/name_space\.rb$/).empty? then
   exec Gem.ruby, '-Ilib', 'bin/rake', *ARGV
 end
 
@@ -28,11 +28,7 @@ rescue Gem::LoadError
 end
 
 CLEAN.include('**/*.o', '*.dot', '**/*.rbc')
-CLOBBER.include('doc/example/main', 'testdata')
-CLOBBER.include('test/data/**/temp_*')
-CLOBBER.include('test/data/chains/play.*')
-CLOBBER.include('test/data/file_creation_task/build')
-CLOBBER.include('test/data/file_creation_task/src')
+CLOBBER.include('doc/example/main')
 CLOBBER.include('TAGS')
 CLOBBER.include('coverage', 'rcov_aggregate')
 
@@ -107,9 +103,6 @@ rescue LoadError
   end
 end
 
-directory 'testdata'
-task :test => ['testdata']
-
 # CVS Tasks ----------------------------------------------------------
 
 # Install rake using the standard install.rb script.
@@ -149,13 +142,9 @@ PKG_FILES = FileList[
   '.gemtest',
   'install.rb',
   '[A-Z]*',
-  'bin/**/*',
+  'bin/rake',
   'lib/**/*.rb',
   'test/**/*.rb',
-  'test/**/*.rf',
-  'test/**/*.mf',
-  'test/**/Rakefile',
-  'test/**/subdir',
   'doc/**/*'
 ]
 PKG_FILES.exclude('doc/example/*.o')
@@ -163,44 +152,25 @@ PKG_FILES.exclude('TAGS')
 PKG_FILES.exclude(%r{doc/example/main$})
 
 if ! defined?(Gem)
-  puts "Package Target requires RubyGEMs"
+  puts "Package Target requires RubyGems"
 else
   SPEC = Gem::Specification.new do |s|
-
-    #### Basic information.
-
     s.name = 'rake'
     s.version = $package_version
     s.summary = "Ruby based make-like utility."
-    s.description = <<-EOF
-      Rake is a Make-like program implemented in Ruby. Tasks
-      and dependencies are specified in standard Ruby syntax.
+    s.description = <<-EOF.delete "\n"
+Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
+specified in standard Ruby syntax.
     EOF
 
-    #### Dependencies and requirements.
-
+    s.required_ruby_version = '>= 1.8.6'
     s.required_rubygems_version = '>= 1.3.2'
     s.add_development_dependency 'minitest', '~> 2.1'
-    s.add_development_dependency 'session', '~> 2.4'
-    s.add_development_dependency 'flexmock', '~> 0.8.11'
-
-    #### Which files are to be included in this gem?  Everything!  (Except CVS directories.)
 
     s.files = PKG_FILES.to_a
 
-    #### C code extensions.
-
-    #s.extensions << "ext/rmagic/extconf.rb"
-
-    #### Load-time details: library and application (you will need one or both).
-
-    s.require_path = 'lib'                         # Use these for libraries.
-
-    s.bindir = "bin"                               # Use these for applications.
     s.executables = ["rake"]
 
-    #### Documentation and testing.
-
     s.extra_rdoc_files = FileList[
       'README.rdoc',
       'MIT-LICENSE',
@@ -211,16 +181,10 @@ else
 
     s.rdoc_options = BASE_RDOC_OPTIONS
 
-    #### Author and project details.
-
     s.author = "Jim Weirich"
     s.email = "jim@weirichhouse.org"
     s.homepage = "http://rake.rubyforge.org"
     s.rubyforge_project = "rake"
-#     if ENV['CERT_DIR']
-#       s.signing_key = File.join(ENV['CERT_DIR'], 'gem-private_key.pem')
-#       s.cert_chain  = [File.join(ENV['CERT_DIR'], 'gem-public_cert.pem')]
-#     end
   end
 
   Gem::PackageTask.new(SPEC) do |pkg|

data/bin/rake

@@ -24,6 +24,7 @@
 
 begin
   require 'rubygems'
+  gem 'rake'
 rescue LoadError
 end
 

data/lib/rake.rb

@@ -23,7 +23,9 @@
 
 require 'rake/version'
 
+# :stopdoc:
 RAKEVERSION = Rake::VERSION
+# :startdoc:
 
 require 'rbconfig'
 require 'fileutils'
@@ -59,6 +61,8 @@ require 'rake/application'
 
 $trace = false
 
+# :stopdoc:
+#
 # Some top level Constants.
 
 FileList = Rake::FileList

data/lib/rake/application.rb

@@ -22,6 +22,9 @@ module Rake
     # Name of the actual rakefile used.
     attr_reader :rakefile
 
+    # Number of columns on the terminal
+    attr_accessor :terminal_columns
+
     # List of the top level task names (task names from the command line).
     attr_reader :top_level_tasks
 
@@ -43,6 +46,7 @@ module Rake
       add_loader('rf', DefaultLoader.new)
       add_loader('rake', DefaultLoader.new)
       @tty_output = STDOUT.tty?
+      @terminal_columns = ENV['RAKE_COLUMNS'].to_i
     end
 
     # Run the Rake application.  The run method performs the following
@@ -198,7 +202,7 @@ module Rake
     # 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']
+      tty_output? || @terminal_columns.nonzero?
     end
 
     # Display the tasks and comments.
@@ -210,6 +214,7 @@ module Rake
       when :tasks
         width = displayable_tasks.collect { |t| t.name_with_args.length }.max || 10
         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, max_column ? truncate(t.comment, max_column) : t.comment
@@ -234,8 +239,8 @@ module Rake
     end
 
     def terminal_width
-      if ENV['RAKE_COLUMNS']
-        result = ENV['RAKE_COLUMNS'].to_i
+      if @terminal_columns.nonzero?
+        result = @terminal_columns
       else
         result = unix? ? dynamic_width : 80
       end
@@ -343,6 +348,7 @@ module Rake
         ],
         ['--rakelibdir', '--rakelib', '-R RAKELIBDIR',
           "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')",
+          # HACK Use File::PATH_SEPARATOR
           lambda { |value| options.rakelib = value.split(':') }
         ],
         ['--require', '-r MODULE', "Require MODULE before executing rakefile.",

data/lib/rake/classic_namespace.rb

@@ -3,7 +3,9 @@
 # referenced Task from the top level.
 
 warn "WARNING: Classic namespaces are deprecated and will be removed from future versions of Rake."
+# :stopdoc:
 Task = Rake::Task
 FileTask = Rake::FileTask
 FileCreationTask = Rake::FileCreationTask
 RakeApp = Rake::Application
+# :startdoc:

data/lib/rake/clean.rb

@@ -13,6 +13,7 @@
 
 require 'rake'
 
+# :stopdoc:
 CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
 CLEAN.clear_exclude.exclude { |fn|
   fn.pathmap("%f") == 'core' && File.directory?(fn)

data/lib/rake/contrib/publisher.rb

@@ -1,15 +1,19 @@
 # Copyright 2003-2010 by Jim Weirich (jim.weirich@gmail.com)
 # All rights reserved.
 
+# :stopdoc:
+
 # Configuration information about an upload host system.
-# * name   :: Name of host system.
-# * webdir :: Base directory for the web information for the
-#             application.  The application name (APP) is appended to
-#             this directory before using.
-# * pkgdir :: Directory on the host system where packages can be
-#             placed.
+# name   :: Name of host system.
+# webdir :: Base directory for the web information for the
+#           application.  The application name (APP) is appended to
+#           this directory before using.
+# pkgdir :: Directory on the host system where packages can be
+#           placed.
 HostInfo = Struct.new(:name, :webdir, :pkgdir)
 
+# :startdoc:
+
 # Manage several publishers as a single entity.
 class CompositePublisher
   def initialize

data/lib/rake/contrib/sshpublisher.rb

@@ -1,3 +1,4 @@
+require 'rake/dsl_definition'
 require 'rake/contrib/compositepublisher'
 
 module Rake
@@ -5,6 +6,8 @@ module Rake
   # Publish an entire directory to an existing remote directory using
   # SSH.
   class SshDirPublisher
+    include Rake::DSL
+
     def initialize(host, remote_dir, local_dir)
       @host = host
       @remote_dir = remote_dir
@@ -27,6 +30,8 @@ module Rake
 
   # Publish a list of files to an existing remote directory.
   class SshFilePublisher
+    include Rake::DSL
+
     # Create a publisher using the give host information.
     def initialize(host, remote_dir, local_dir, *files)
       @host = host

data/lib/rake/dsl_definition.rb

@@ -2,11 +2,18 @@
 require 'rake/file_utils_ext'
 
 module Rake
+
+  ##
+  # DSL is a module that provides #task, #desc, #namespace, etc.  Use this
+  # when you'd like to use rake outside the top level scope.
+
   module DSL
 
+    #--
     # Include the FileUtils file manipulation functions in the top
     # level module, but mark them private so that they don't
     # unintentionally define methods on other objects.
+    #++
 
     include FileUtilsExt
     private(*FileUtils.instance_methods(false))
@@ -137,10 +144,12 @@ module Rake
         Rake.application.add_import(fn)
       end
     end
+
   end
 
-  module DeprecatedObjectDSL
-    Commands = Object.new.extend DSL
+  DeprecatedCommands = Object.new.extend(DSL)
+
+  module DeprecatedObjectDSL # :nodoc:
     DSL.private_instance_methods(false).each do |name|
       line = __LINE__+1
       class_eval %{
@@ -153,8 +162,8 @@ module Rake
             end
             $stderr.puts "WARNING: DSL method \#{self.class}##{name} called at \#{caller.first}"
           end
-          Rake::DeprecatedObjectDSL::Commands.send(:#{name}, *args, &block)
-          end
+          Rake::DeprecatedCommands.send(:#{name}, *args, &block)
+        end
         private :#{name}
       }, __FILE__, line
     end

data/lib/rake/ext/time.rb

@@ -1,6 +1,6 @@
-# ###########################################################################
+#--
 # Extensions to time to allow comparisons with an early time class.
-#
+
 class Time
   alias rake_original_time_compare :<=>
   def <=>(other)
@@ -10,5 +10,5 @@ class Time
       rake_original_time_compare(other)
     end
   end
-end # class Time
+end
 

data/lib/rake/file_utils.rb

@@ -1,10 +1,9 @@
 require 'rbconfig'
 require 'fileutils'
 
-# ###########################################################################
+#--
 # This a FileUtils extension that defines several additional commands to be
 # added to the FileUtils utility functions.
-#
 module FileUtils
   # Path to the currently running Ruby program
   RUBY = File.join(
@@ -38,6 +37,7 @@ module FileUtils
     options[:noop] ||= Rake::FileUtilsExt.nowrite_flag
     Rake.rake_check_options options, :noop, :verbose
     Rake.rake_output_message cmd.join(" ") if options[:verbose]
+
     unless options[:noop]
       res = rake_system(*cmd)
       status = $?
@@ -46,7 +46,7 @@ module FileUtils
     end
   end
 
-  def create_shell_runner(cmd)
+  def create_shell_runner(cmd) # :nodoc:
     show_command = cmd.join(" ")
     show_command = show_command[0,42] + "..." unless $trace
     lambda { |ok, status|
@@ -55,14 +55,16 @@ module FileUtils
   end
   private :create_shell_runner
 
-  def set_verbose_option(options)
-    if options[:verbose].nil?
-      options[:verbose] = Rake::FileUtilsExt.verbose_flag.nil? || Rake::FileUtilsExt.verbose_flag
+  def set_verbose_option(options) # :nodoc:
+    unless options.key? :verbose
+      options[:verbose] =
+        Rake::FileUtilsExt.verbose_flag == Rake::FileUtilsExt::DEFAULT ||
+        Rake::FileUtilsExt.verbose_flag
     end
   end
   private :set_verbose_option
 
-  def rake_system(*cmd)
+  def rake_system(*cmd) # :nodoc:
     Rake::AltSystem.system(*cmd)
   end
   private :rake_system