rake 0.9.0.beta.4 → 0.9.0.beta.5

data/Rakefile

@@ -106,16 +106,28 @@ end
 
 begin
   require 'rcov/rcovtask'
+  IGNORE_COVERAGE_IN = FileList[
+    'lib/rake/rdoctask.rb',
+    'lib/rake/testtask.rb',
+    'lib/rake/packagetask.rb',
+    'lib/rake/clean.rb',
+  ]
+
+  unless File::ALT_SEPARATOR
+    IGNORE_COVERAGE_IN.include(
+      'lib/rake/alt_system.rb',
+      'lib/rake/win32.rb')
+  end
 
   Rcov::RcovTask.new do |t|
     t.libs << "test"
-    dot_rakes =
     t.rcov_opts = [
       '-xRakefile', '-xrakefile', '-xpublish.rf',
-      '-xlib/rake/contrib', '-x/Library',
+      '-xlib/rake/contrib', '-x/Library', '-x.rvm',
       '--text-report',
       '--sort coverage'
-    ] + FileList['rakelib/*.rake'].pathmap("-x%p")
+    ] + FileList['rakelib/*.rake'].pathmap("-x%p") +
+      IGNORE_COVERAGE_IN.map { |fn| "-x#{fn}" }
     t.test_files = FileList[
       'test/lib/*_test.rb',
       'test/contrib/*_test.rb',
@@ -248,7 +260,7 @@ else
 #     end
   end
 
-  package_task = Gem::PackageTask.new(SPEC) do |pkg|
+  Gem::PackageTask.new(SPEC) do |pkg|
     pkg.need_zip = true
     pkg.need_tar = true
   end

data/lib/rake.rb

@@ -56,7 +56,6 @@ require 'rake/early_time'
 require 'rake/name_space'
 require 'rake/task_manager'
 require 'rake/application'
-require 'rake/environment'
 
 $trace = false
 

data/lib/rake/application.rb

@@ -449,7 +449,7 @@ module Rake
       paths.each do |path|
         full_path = File.join(path, fn)
         if File.exist?(full_path)
-          Rake::Environment.load_rakefile(full_path)
+          Rake.load_rakefile(full_path)
           loaded << fn
           return true
         end
@@ -492,7 +492,7 @@ module Rake
         Dir.chdir(location)
         print_rakefile_directory(location)
         $rakefile = @rakefile if options.classic_namespace
-        Rake::Environment.load_rakefile(File.expand_path(@rakefile)) if @rakefile && @rakefile != ''
+        Rake.load_rakefile(File.expand_path(@rakefile)) if @rakefile && @rakefile != ''
         options.rakelib.each do |rlib|
           glob("#{rlib}/*.rake") do |name|
             add_import name

data/lib/rake/clean.rb

@@ -13,21 +13,19 @@
 
 require 'rake'
 
-Rake::DSL.environment do
-  CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
-  CLEAN.clear_exclude.exclude { |fn|
-    fn.pathmap("%f") == 'core' && File.directory?(fn)
-  }
+CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
+CLEAN.clear_exclude.exclude { |fn|
+  fn.pathmap("%f") == 'core' && File.directory?(fn)
+}
 
-  desc "Remove any temporary products."
-  task :clean do
-    CLEAN.each { |fn| rm_r fn rescue nil }
-  end
+desc "Remove any temporary products."
+task :clean do
+  CLEAN.each { |fn| rm_r fn rescue nil }
+end
 
-  CLOBBER = Rake::FileList.new
+CLOBBER = Rake::FileList.new
 
-  desc "Remove any generated file."
-  task :clobber => [:clean] do
-    CLOBBER.each { |fn| rm_r fn rescue nil }
-  end
+desc "Remove any generated file."
+task :clobber => [:clean] do
+  CLOBBER.each { |fn| rm_r fn rescue nil }
 end

data/lib/rake/default_loader.rb

@@ -3,7 +3,7 @@ module Rake
   # Default Rakefile loader used by +import+.
   class DefaultLoader
     def load(fn)
-      Rake::Environment.load_rakefile(File.expand_path(fn))
+      Rake.load_rakefile(File.expand_path(fn))
     end
   end
 

data/lib/rake/rake_module.rb

@@ -20,6 +20,10 @@ module Rake
       application.original_dir
     end
 
+    # Load a rakefile.
+    def load_rakefile(path)
+      load(path)
+    end
   end
 
 end

data/lib/rake/task_manager.rb

@@ -238,8 +238,7 @@ module Rake
     end
 
     def trace_rule(level, message)
-      $stderr.puts "#{"    "*level}#{message}" if
-        Rake.application.options.trace_rules
+      $stderr.puts "#{"    "*level}#{message}" if Rake.application.options.trace_rules
     end
 
     # Attempt to create a rule given the list of prerequisites.
@@ -266,7 +265,7 @@ module Rake
     # Make a list of sources from the list of file name extensions /
     # translation procs.
     def make_sources(task_name, extensions)
-      extensions.collect { |ext|
+      result = extensions.collect { |ext|
         case ext
         when /%/
           task_name.pathmap(ext)
@@ -285,7 +284,8 @@ module Rake
         else
           fail "Don't know how to handle rule dependent: #{ext.inspect}"
         end
-      }.flatten
+      }
+      result.flatten
     end
 
 

data/lib/rake/testtask.rb

@@ -103,7 +103,12 @@ module Rake
     end
 
     def option_list # :nodoc:
-      ENV['TESTOPTS'] || @options || ""
+      (ENV['TESTOPTS'] ||
+        ENV['TESTOPT'] ||
+        ENV['TEST_OPTS'] ||
+        ENV['TEST_OPT'] ||
+        @options ||
+        "")
     end
 
     def ruby_opts_string

data/lib/rake/version.rb

@@ -5,7 +5,7 @@ module Rake
       MINOR = 9,
       BUILD = 0,
       BETA  = 'beta',
-      BETANUM = 4,
+      BETANUM = 5,
     ]
   end
   VERSION = Version::NUMBERS.join('.')

data/test/contrib/test_sys.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
-require 'test/filecreation'
+require 'test/file_creation'
 begin
   old_verbose = $VERBOSE
   $VERBOSE = nil

data/test/data/rakelib/test1.rb

@@ -1,5 +1,4 @@
-Rake::DSL.environment do
-  task :default do
-    puts "TEST1"
-  end
+
+task :default do
+  puts "TEST1"
 end

data/test/{filecreation.rb → file_creation.rb}

@@ -5,13 +5,16 @@ module FileCreation
   NEWFILE = "testdata/new"
 
   def create_timed_files(oldfile, *newfiles)
-    return if File.exist?(oldfile) && newfiles.all? { |newfile| File.exist?(newfile) }
-    old_time = create_file(oldfile)
+    return if (File.exist?(oldfile) &&
+      newfiles.all? { |newfile|
+        File.exist?(newfile) && File.stat(newfile).mtime > File.stat(oldfile).mtime
+      })
+    now = Time.now
+
+    create_file(oldfile, now - 60)
+
     newfiles.each do |newfile|
-      while create_file(newfile) <= old_time
-        sleep(0.1)
-        File.delete(newfile) rescue nil
-      end
+      create_file(newfile, now)
     end
   end
 
@@ -20,9 +23,10 @@ module FileCreation
     File.stat(dirname).mtime
   end
 
-  def create_file(name)
+  def create_file(name, file_time=nil)
     create_dir(File.dirname(name))
     FileUtils.touch(name) unless File.exist?(name)
+    File.utime(file_time, file_time, name) unless file_time.nil?
     File.stat(name).mtime
   end
 

data/test/lib/application_test.rb

@@ -33,10 +33,10 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_constant_warning
-    err = capture_stderr do @app.instance_eval { const_warning("Task") } end
-    assert_match(/warning/i, err)
-    assert_match(/deprecated/i, err)
-    assert_match(/Task/i, err)
+    error_messages = capture_stderr do @app.instance_eval { const_warning("Task") } end
+    assert_match(/warning/i, error_messages)
+    assert_match(/deprecated/i, error_messages)
+    assert_match(/Task/i, error_messages)
   end
 
   def test_display_tasks
@@ -155,14 +155,14 @@ class TestApplication < Test::Unit::TestCase
 
   def test_load_rakefile_doesnt_print_rakefile_directory_from_same_dir
     in_environment("PWD" => "test/data/unittest") do
-      err = capture_stderr do
+      error_messages = capture_stderr do
         @app.instance_eval do
           @original_dir = File.expand_path(".") # pretend we started from the unittest dir
           raw_load_rakefile
         end
       end
       _, location = @app.find_rakefile_location
-      assert_no_match(/\(in #{location}\)/, err)
+      assert_no_match(/\(in #{location}\)/, error_messages)
     end
   end
 
@@ -180,19 +180,19 @@ class TestApplication < Test::Unit::TestCase
 
   def test_load_rakefile_prints_rakefile_directory_from_subdir
     in_environment("PWD" => "test/data/unittest/subdir") do
-      err = capture_stderr do
+      error_messages = capture_stderr do
         @app.instance_eval do
           raw_load_rakefile
         end
       end
       _, location = @app.find_rakefile_location
-      assert_match(/\(in #{location}\)/, err)
+      assert_match(/\(in #{location}\)/, error_messages)
     end
   end
 
   def test_load_rakefile_doesnt_print_rakefile_directory_from_subdir_if_silent
     in_environment("PWD" => "test/data/unittest/subdir") do
-      err = capture_stderr do
+      error_messages = capture_stderr do
         @app.instance_eval do
           handle_options
           options.silent = true
@@ -200,7 +200,7 @@ class TestApplication < Test::Unit::TestCase
         end
       end
       _, location = @app.find_rakefile_location
-      assert_no_match(/\(in #{location}\)/, err)
+      assert_no_match(/\(in #{location}\)/, error_messages)
     end
   end
 
@@ -232,6 +232,21 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
+  def test_load_from_calculated_system_rakefile
+    flexmock(@app, :standard_system_dir => "__STD_SYS_DIR__")
+    in_environment('RAKE_SYSTEM' => nil) do
+      @app.options.rakelib = []
+      @app.instance_eval do
+        handle_options
+        options.silent = true
+        options.load_system = true
+        options.rakelib = []
+        load_rakefile
+      end
+      assert_equal "__STD_SYS_DIR__", @app.system_dir
+    end
+  end
+
   def test_windows
     assert ! (@app.windows? && @app.unix?)
   end
@@ -320,8 +335,8 @@ class TestApplication < Test::Unit::TestCase
     ARGV.clear
     ARGV << '-f' << '-s' <<  '--rakelib=""'
     assert_exception(SystemExit) {
-      err = capture_stderr { @app.run }
-      assert_match(/see full trace/, err)
+      error_messages = capture_stderr { @app.run }
+      assert_match(/see full trace/, error_messages)
     }
   ensure
     ARGV.clear
@@ -332,8 +347,8 @@ class TestApplication < Test::Unit::TestCase
     ARGV.clear
     ARGV << '-f' << '-s' << '-t'
     assert_exception(SystemExit) {
-      err = capture_stderr { capture_stdout { @app.run } }
-      assert_no_match(/see full trace/, err)
+      error_messages = capture_stderr { capture_stdout { @app.run } }
+      assert_no_match(/see full trace/, error_messages)
     }
   ensure
     ARGV.clear
@@ -349,6 +364,17 @@ class TestApplication < Test::Unit::TestCase
   ensure
     ARGV.clear
   end
+
+  def test_deprecation_message
+    in_environment do
+      error_messages = capture_stderr do
+        @app.deprecate("a", "b", "c")
+      end
+      assert_match(/'a' is deprecated/i, error_messages)
+      assert_match(/use 'b' instead/i, error_messages)
+      assert_match(/at c$/i, error_messages)
+    end
+  end
 end
 
 
@@ -596,7 +622,28 @@ class TestApplicationOptions < Test::Unit::TestCase
       end
       flags(['--tasks', 'xyz'], ['-Txyz']) do |opts|
         assert_equal :tasks, opts.show_tasks
-        assert_equal(/xyz/, opts.show_task_pattern)
+        assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
+      end
+    end
+  end
+
+  def test_where
+    in_environment do
+      flags('--where', '-W') do |opts|
+        assert_equal :lines, opts.show_tasks
+        assert_equal(//.to_s, opts.show_task_pattern.to_s)
+      end
+      flags(['--where', 'xyz'], ['-Wxyz']) do |opts|
+        assert_equal :lines, opts.show_tasks
+        assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
+      end
+    end
+  end
+
+  def test_no_deprecated_messages
+    in_environment do
+      flags('--no-deprecation-warnings', '-X') do |opts|
+        assert opts.ignore_deprecate
       end
     end
   end
@@ -622,7 +669,7 @@ class TestApplicationOptions < Test::Unit::TestCase
 
   def test_classic_namespace
     in_environment do
-      error_output = capture_stderr do
+      error_messages = capture_stderr do
         flags(['--classic-namespace'], ['-C', '-T', '-P', '-n', '-s', '-t']) do |opts|
           assert opts.classic_namespace
           assert_equal opts.show_tasks, $show_tasks
@@ -632,13 +679,13 @@ class TestApplicationOptions < Test::Unit::TestCase
           assert_equal opts.silent, $silent
         end
       end
-      assert_match(/deprecated/, error_output)
+      assert_match(/deprecated/, error_messages)
     end
   end
 
   def test_bad_option
     in_environment do
-      error_output = capture_stderr do
+      error_messages = capture_stderr do
         ex = assert_exception(OptionParser::InvalidOption) do
           flags('--bad-option')
         end
@@ -649,7 +696,7 @@ class TestApplicationOptions < Test::Unit::TestCase
           assert_match(/--bad-option/, ex.message)
         end
       end
-      assert_equal '', error_output
+      assert_equal '', error_messages
     end
   end
 

data/test/lib/definitions_test.rb

@@ -3,7 +3,7 @@
 require 'test/unit'
 require 'fileutils'
 require 'rake'
-require 'test/filecreation'
+require 'test/file_creation'
 require 'test/rake_test_setup'
 
 ######################################################################

data/test/lib/file_creation_task_test.rb

@@ -3,7 +3,7 @@
 require 'test/unit'
 require 'fileutils'
 require 'rake'
-require 'test/filecreation'
+require 'test/file_creation'
 
 ######################################################################
 class TestFileCreationTask < Test::Unit::TestCase

data/test/lib/file_task_test.rb

@@ -3,7 +3,7 @@
 require 'test/unit'
 require 'fileutils'
 require 'rake'
-require 'test/filecreation'
+require 'test/file_creation'
 require 'test/rake_test_setup'
 
 ######################################################################

data/test/lib/filelist_test.rb

@@ -347,6 +347,16 @@ class TestFileList < Test::Unit::TestCase
     assert_match(/files\.egrep/, found[2])
   end
 
+  def test_egrep_with_error
+    files = FileList['test/lib/*_test.rb']
+    error_messages = capture_stderr do
+      files.egrep(/ANYTHING/) do |fn, ln, line |
+        fail "_EGREP_FAILURE_"
+      end
+    end
+    assert_match(/_EGREP_FAILURE_/, error_messages)
+  end
+
   def test_existing
     fl = FileList['testdata/abc.c', 'testdata/notthere.c']
     assert_equal ["testdata/abc.c"], fl.existing

data/test/lib/fileutils_test.rb

@@ -2,7 +2,7 @@
 
 require 'rake'
 require 'test/unit'
-require 'test/filecreation'
+require 'test/file_creation'
 require 'fileutils'
 require 'stringio'
 require 'test/rake_test_setup'

data/test/lib/rules_test.rb

@@ -3,7 +3,7 @@
 require 'test/unit'
 require 'fileutils'
 require 'rake'
-require 'test/filecreation'
+require 'test/file_creation'
 require 'test/rake_test_setup'
 
 ######################################################################

data/test/lib/top_level_functions_test.rb

@@ -41,6 +41,12 @@ class TestTopLevelFunctions < Test::Unit::TestCase
     Rake.import('x', 'y', 'z')
   end
 
+  def test_deprecated_import
+    Rake.application.should_receive(:add_import).with("x").once.ordered
+    error_messages = capture_stderr { import('x') }
+    assert_match(/deprecated/, error_messages)
+  end
+
   def test_when_writing
     out = capture_stdout do
       when_writing("NOTWRITING") do

data/test/rake_test_setup.rb

@@ -8,7 +8,7 @@ rescue LoadError
 end
 
 require 'flexmock/test_unit'
-require 'test/filecreation'
+require 'test/file_creation'
 require 'test/capture_stdout'
 require 'test/test_helper'
 

metadata

@@ -2,7 +2,7 @@
 name: rake
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.9.0.beta.4
+  version: 0.9.0.beta.5
 platform: ruby
 authors: 
 - Jim Weirich
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-06 00:00:00 -05:00
+date: 2011-03-12 23:00:00 -05:00
 default_executable: rake
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +92,6 @@ files:
 - lib/rake/dsl.rb
 - lib/rake/dsl_definition.rb
 - lib/rake/early_time.rb
-- lib/rake/environment.rb
 - lib/rake/ext/core.rb
 - lib/rake/ext/module.rb
 - lib/rake/ext/string.rb
@@ -132,7 +131,7 @@ files:
 - test/contrib/test_sys.rb
 - test/data/rakelib/test1.rb
 - test/data/rbext/rakefile.rb
-- test/filecreation.rb
+- test/file_creation.rb
 - test/functional/functional_test.rb
 - test/functional/session_based_tests.rb
 - test/in_environment.rb
@@ -141,7 +140,6 @@ files:
 - test/lib/definitions_test.rb
 - test/lib/dsl_test.rb
 - test/lib/earlytime_test.rb
-- test/lib/environment_test.rb
 - test/lib/extension_test.rb
 - test/lib/file_creation_task_test.rb
 - test/lib/file_task_test.rb

data/lib/rake/environment.rb

@@ -1,40 +0,0 @@
-require 'rake/dsl_definition'
-
-module Rake
-
-  # Rakefile are evaluated in the Rake::Environment module space.  Top
-  # level rake functions (e.g. :task, :file) are available in this
-  # environment.
-  module Environment
-    extend Rake::DSL
-
-    class << self
-      # Load a rakefile from the given path.  The Rakefile is loaded
-      # in an environment that includes the Rake DSL methods.
-      def load_rakefile(rakefile_path)
-        rakefile = open(rakefile_path) { |f| f.read }
-        load_string(rakefile, rakefile_path)
-      end
-
-      # Run a block of code in the Rake DSL environment.
-      def run(&block)
-        block.call
-      end
-
-      # Load a string of code in the Rake DSL environment.  If the
-      # string comes from a file, include the file path so that proper
-      # line numbers references may be retained.
-      def load_string(code, file_name=nil)
-        eval(code, binding, file_name)
-      end
-    end
-  end
-
-  # Run the code block in an environment including the Rake DSL
-  # commands.
-  def DSL.environment(&block)
-    Rake::Environment.run(&block)
-  end
-end
-
-

data/test/lib/environment_test.rb

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'test/test_helper'
-require 'rake/environment'
-
-class TestEnvironment < Test::Unit::TestCase
-  def test_load_rakefile
-    Rake::Task.clear
-    Rake::Environment.load_rakefile("test/data/default/Rakefile")
-    assert Rake::Task[:default], "Should have a default task"
-  end
-
-  def test_run
-    Rake::Task.clear
-    Rake::Environment.run do
-      desc "demo comment"
-      task :default
-    end
-    assert Rake::Task[:default], "Should have a default task"
-  end
-
-  def test_environment
-    Rake::Task.clear
-    Rake::DSL.environment do
-      desc "demo comment"
-      task :default
-    end
-    assert Rake::Task[:default], "Should have a default task"
-  end
-end