diff --git a/ChangeLog b/ChangeLog index 9b8870d664..b0938060ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 27 20:55:42 2015 SHIBATA Hiroshi + + * lib/rake: Update to rake (9237e74), typo fix and remove needless + private syntax. + * test/rake: ditto. + Fri Feb 27 17:06:44 2015 Koichi Sasada * vm_core.h: define vm_svar_index. diff --git a/lib/rake/dsl_definition.rb b/lib/rake/dsl_definition.rb index 26f4ca828c..4c57c1eb9f 100644 --- a/lib/rake/dsl_definition.rb +++ b/lib/rake/dsl_definition.rb @@ -7,7 +7,7 @@ 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. # - # For a Rakefile you run from the comamnd line this module is automatically + # For a Rakefile you run from the command line this module is automatically # included. module DSL diff --git a/lib/rake/task_manager.rb b/lib/rake/task_manager.rb index cbb9f5ee2f..d9b4d85e75 100644 --- a/lib/rake/task_manager.rb +++ b/lib/rake/task_manager.rb @@ -291,9 +291,6 @@ module Rake result.flatten end - - private - # Return the current description, clearing it in the process. def get_description(task) desc = @last_description diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb index 2daa589634..02fbe5e92b 100644 --- a/lib/rake/testtask.rb +++ b/lib/rake/testtask.rb @@ -62,7 +62,7 @@ module Rake # attr_accessor :loader - # Array of commandline options to pass to ruby when running test loader. + # Array of command line options to pass to ruby when running test loader. attr_accessor :ruby_opts # Description of the test task. (default is 'Run tests') diff --git a/test/rake/test_rake_application_options.rb b/test/rake/test_rake_application_options.rb index 37adfacd7d..1914240590 100644 --- a/test/rake/test_rake_application_options.rb +++ b/test/rake/test_rake_application_options.rb @@ -198,7 +198,7 @@ class TestRakeApplicationOptions < Rake::TestCase def test_quiet Rake::FileUtilsExt.verbose_flag = true flags('--quiet', '-q') do |opts| - assert ! Rake::FileUtilsExt.verbose_flag, "verbose flag shoud be false" + assert ! Rake::FileUtilsExt.verbose_flag, "verbose flag should be false" assert ! opts.silent, "should not be silent" end end diff --git a/test/rake/test_rake_linked_list.rb b/test/rake/test_rake_linked_list.rb index 10957fba6d..32d7306268 100644 --- a/test/rake/test_rake_linked_list.rb +++ b/test/rake/test_rake_linked_list.rb @@ -57,13 +57,13 @@ class TestLinkedList < Rake::TestCase refute_equal short, list end - def test_converstion_to_string + def test_conversion_to_string list = LinkedList.make(:one, :two, :three) assert_equal "LL(one, two, three)", list.to_s assert_equal "LL()", LinkedList.make().to_s end - def test_converstion_with_inspect + def test_conversion_with_inspect list = LinkedList.make(:one, :two, :three) assert_equal "LL(:one, :two, :three)", list.inspect assert_equal "LL()", LinkedList.make().inspect diff --git a/test/rake/test_rake_path_map.rb b/test/rake/test_rake_path_map.rb index 038ba1f9a7..98e8df0620 100644 --- a/test/rake/test_rake_path_map.rb +++ b/test/rake/test_rake_path_map.rb @@ -152,11 +152,11 @@ class TestRakePathMap < Rake::TestCase "Your file extension is '.rb'", "dir/abc.rb".pathmap("Your file extension is '%x'")) assert_equal( - "bin/org/onstepback/proj/A.class", - "src/org/onstepback/proj/A.java".pathmap("%{src,bin}d/%n.class")) + "bin/org/onestepback/proj/A.class", + "src/org/onestepback/proj/A.java".pathmap("%{src,bin}d/%n.class")) assert_equal( - "src_work/bin/org/onstepback/proj/A.class", - "src_work/src/org/onstepback/proj/A.java". + "src_work/bin/org/onestepback/proj/A.class", + "src_work/src/org/onestepback/proj/A.java". pathmap('%{\bsrc\b,bin}X.class')) assert_equal( ".depends.bak", diff --git a/test/rake/test_rake_task.rb b/test/rake/test_rake_task.rb index d7f14efcdb..0416dfa8dd 100644 --- a/test/rake/test_rake_task.rb +++ b/test/rake/test_rake_task.rb @@ -195,14 +195,14 @@ class TestRakeTask < Rake::TestCase assert_equal ["b", "c"], Task[:a].prerequisites end - def test_prerequiste_tasks_returns_tasks_not_strings + def test_prerequisite_tasks_returns_tasks_not_strings a = task :a => ["b", "c"] b = task :b c = task :c assert_equal [b, c], a.prerequisite_tasks end - def test_prerequiste_tasks_fails_if_prerequisites_are_undefined + def test_prerequisite_tasks_fails_if_prerequisites_are_undefined a = task :a => ["b", "c"] task :b assert_raises(RuntimeError) do @@ -210,7 +210,7 @@ class TestRakeTask < Rake::TestCase end end - def test_prerequiste_tasks_honors_namespaces + def test_prerequisite_tasks_honors_namespaces a = b = nil namespace "X" do a = task :a => ["b", "c"]