@@ -1,3 +1,27 @@ +#!/usr/bin/env ruby + +#-- +# Copyright (c) 2003, 2004, 2005, 2006, 2007 Jim Weirich +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. +#++ + begin require 'rake' rescue LoadError bin/rake @@ -495,16 +495,6 @@ module Rake @arg_names ? "[#{(arg_names || []).join(',')}]" : nil end - # Hash of argument names to argument positions (0 based). (empty if no - # named arguments). - def arg_map - result = {} - arg_names.each_with_index do |n, i| - result[n] = i - end - result - end - # Name of arguments for this task. def arg_names @arg_names || [] @@ -541,16 +531,6 @@ module Rake } end - # Setup the arguments to be passed to prerequesites. - def xsetup_arguments(prereq) # :nodoc: - if ! arg_names.empty? && ! prereq.arg_names.empty? - prereq.args = prereq.arg_names.collect do |name| - arg_map[name] ? args[arg_map[name]] : nil - end - end - end - #private :setup_arguments - # Format the trace flags for display. def format_trace_flags flags = [] @@ -2152,6 +2132,7 @@ module Rake $silent = options.silent end rescue NoMethodError => ex + puts "DBG: RESCUING xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" raise GetoptLong::InvalidOption, "While parsing options, error = #{ex.class}:#{ex.message}" end lib/rake.rb @@ -1,8 +1,12 @@ - module Ruby19 PROG = '/Users/jim/local/ruby19/bin/ruby' GEM_HOME = '/Users/jim/local/ruby19/lib/ruby/gems/1.9' + RELEASE_FILES = FileList['bin/rake', 'lib/rake.rb', 'lib/rake/**/*'] + RELEASE_FILES.exclude('lib/rake/lib', 'project.rake', 'lib/rake/plugins', 'lib/rake/contrib') + + SVN = "../thirdparty/ruby" + def run_tests(files) sh "#{PROG} -Ilib lib/rake/rake_test_loader.rb #{files}" end @@ -11,6 +15,33 @@ module Ruby19 end namespace "ruby19" do + desc "Ruby Release Files" + task :release_files do + puts Ruby19::RELEASE_FILES + end + + desc "Release Rake Files to Ruby 19 SVN working area" + task :release => [:check_svn] do + dirs = Ruby19::RELEASE_FILES.select { |fn| File.directory?(fn) } + dirs.each do |dir| mkdir_p "#{Ruby19::SVN}/#{dir}" end + Ruby19::RELEASE_FILES.each do |fn| + cp fn, "#{Ruby19::SVN}/#{fn}" unless File.directory?(fn) + end + end + + desc "Remove Rake from the Ruby 19 SVN" + task :unrelease => [:check_svn] do + rm_r "#{Ruby19::SVN}/bin/rake" rescue nil + rm_r "#{Ruby19::SVN}/lib/rake" rescue nil + rm_r "#{Ruby19::SVN}/lib/rake.rb" rescue nil + end + + task :check_svn do + fail "Cannot find Ruby 1.9 SVN directory: #{Ruby19::SVN}" unless + File.directory?(Ruby19::SVN) + end + + namespace "test" do desc "Check the file paths" rakelib/ruby19.rake @@ -256,6 +256,13 @@ class TestApplicationOptions < Test::Unit::TestCase assert ! RakeFileUtils.nowrite_flag end + def test_bad_options + assert_raise GetoptLong::InvalidOption do + flags('--bad', '-t') do |opts| + end + end + end + def test_trace_option flags('--trace', '-t') do |opts| assert opts.trace @@ -422,7 +429,7 @@ class TestApplicationOptions < Test::Unit::TestCase assert_equal ["a"], @tasks.sort assert '12', ENV['TESTKEY'] end - + private def flags(*sets) test/test_application.rb @@ -85,20 +85,6 @@ else assert_equal "pkgr-1.2.3.gem", pkg.gem_file end - def test_gem_package_with_specific_platform - gem = Gem::Specification.new do |g| - g.name = "pkgr" - g.version = "1.2.3" - g.files = FileList["x"].resolve - g.platform = Gem::Platform::WIN32 - end - pkg = Rake::GemPackageTask.new(gem) do |p| - p.package_files << "y" - end - assert_equal ["x", "y"], pkg.package_files - assert_match(/pkgr-1\.2\.3-.*mswin32.*\.gem/, pkg.gem_file) - end - def test_gem_package_with_current_platform gem = Gem::Specification.new do |g| g.name = "pkgr" test/test_package_task.rb 1a3f8e6caeb53307864ea3e8180e0c7c87f49909 jimweirich jimweirich@5af023f1-ac1a-0410-98d6-829a145c37ef http://github.com/pragdavespc/rake/commit/8e05fcdc7abb9a188ee054bdbb6af44b662fb0cf 8e05fcdc7abb9a188ee054bdbb6af44b662fb0cf 2007-12-20T09:35:40-08:00 2007-12-20T09:35:40-08:00 updates for ruby 1.9 git-svn-id: svn+ssh://rubyforge.org/var/svn/rake/trunk@620 5af023f1-ac1a-0410-98d6-829a145c37ef 35d2600d946ae9f94edd3fcff538c513894efb7b jimweirich jimweirich@5af023f1-ac1a-0410-98d6-829a145c37ef