@@ -12,6 +12,7 @@ * Fixed error in functional tests that were not including session (and silently skipping the functionl tests. * Removed --usage and make -h the same as -H. +* Make a prettier inspect for tasks. == Version 0.7.3 CHANGES @@ -97,13 +97,12 @@ begin ] t.test_files = FileList[ 'test/test*.rb', 'test/functional.rb' -# 'test/contrib/test*.rb' ] t.output_dir = 'coverage' t.verbose = true end rescue LoadError - # No rcov available + puts "RCov is not available" end directory 'testdata' Rakefile @@ -4,6 +4,7 @@ Send suggestions for this list to mailto:jim@weirichhouse.org or on the rake-devel@rubyforge.org mailing list. === To Do +* Need a nice API for accessing tasks in namespaces, namespaces in an app, etc. * Provide a way to disable -w warning mode. * Define a set of default rules that work in the absense of any Rakefile * What about cyclic dependencies? TODO @@ -372,6 +372,10 @@ module Rake name end + def inspect + "<#{self.class} #{name} => [#{prerequisites.join(', ')}]>" + end + # List of sources for task. attr_writer :sources def sources @@ -1936,14 +1940,9 @@ module Rake return false end - # Display the program usage line. - def usage - puts "rake [-f rakefile] {options} targets..." - end - # Display the rake command line help. def help - usage + puts "rake [-f rakefile] {options} targets..." puts puts "Options are ..." puts @@ -2051,9 +2050,6 @@ module Rake when '--trace' options.trace = true verbose(true) - when '--usage' - usage - exit when '--verbose' verbose(true) when '--version' lib/rake.rb @@ -9,14 +9,13 @@ end require 'test/unit' require 'rake' require 'test/capture_stdout' -require 'flexmock' +require 'flexmock/test_unit' TESTING_REQUIRE = [ ] ###################################################################### class TestApplication < Test::Unit::TestCase include CaptureStdout - include FlexMock::TestCase def setup @app = Rake::Application.new test/test_application.rb @@ -2,6 +2,7 @@ require 'test/unit' require 'rake' + require 'test/capture_stdout' class TestFileList < Test::Unit::TestCase test/test_filelist.rb @@ -7,11 +7,10 @@ rescue LoadError end require 'test/unit' -require 'flexmock' +require 'flexmock/test_unit' require 'rake' class TestNameSpace < Test::Unit::TestCase - include FlexMock::TestCase def test_namespace_creation mgr = flexmock("TaskManager") test/test_namespace.rb @@ -29,6 +29,11 @@ class TestTask < Test::Unit::TestCase assert_equal [], t.args end + def test_inspect + t = intern(:foo).enhance([:bar, :baz]) + assert_equal "<Rake::Task foo [bar, baz]>", t.inspect + end + def test_invoke runlist = [] t1 = intern(:t1).enhance([:t2, :t3]) { |t| runlist << t.name; 3321 } test/test_tasks.rb @@ -9,10 +9,9 @@ end require 'test/unit' require 'test/capture_stdout' require 'rake' -require 'flexmock' +require 'flexmock/test_case' class TestTopLevelFunctions < Test::Unit::TestCase - include FlexMock::TestCase include CaptureStdout def setup test/test_top_level_functions.rb 388dece7dc2de1865d8e13fbee408de7e397e0d9 jimweirich jimweirich@5af023f1-ac1a-0410-98d6-829a145c37ef http://github.com/technicalpickles/rake/commit/fbead1c8532453fb0b372e4deef29e4f164c9944 fbead1c8532453fb0b372e4deef29e4f164c9944 2007-10-30T16:32:39-07:00 2007-10-30T16:32:39-07:00 Prettier inspect for tasks. git-svn-id: svn+ssh://rubyforge.org/var/svn/rake/trunk@610 5af023f1-ac1a-0410-98d6-829a145c37ef fad621d5e4c766de38e726fdcd2d377b8de201f2 jimweirich jimweirich@5af023f1-ac1a-0410-98d6-829a145c37ef