rake 10.0.4 → 10.1.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of rake might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/doc/rakefile.rdoc +19 -0
- data/lib/rake/alt_system.rb +3 -4
- data/lib/rake/application.rb +114 -67
- data/lib/rake/backtrace.rb +9 -8
- data/lib/rake/contrib/ftptools.rb +6 -18
- data/lib/rake/contrib/sys.rb +2 -1
- data/lib/rake/dsl_definition.rb +1 -1
- data/lib/rake/ext/core.rb +2 -1
- data/lib/rake/ext/string.rb +1 -3
- data/lib/rake/file_list.rb +14 -14
- data/lib/rake/file_task.rb +1 -2
- data/lib/rake/file_utils.rb +9 -7
- data/lib/rake/file_utils_ext.rb +2 -1
- data/lib/rake/gempackagetask.rb +2 -1
- data/lib/rake/invocation_chain.rb +2 -0
- data/lib/rake/packagetask.rb +11 -6
- data/lib/rake/pseudo_status.rb +5 -0
- data/lib/rake/rdoctask.rb +2 -1
- data/lib/rake/ruby182_test_unit_fix.rb +4 -2
- data/lib/rake/runtest.rb +2 -2
- data/lib/rake/task.rb +9 -10
- data/lib/rake/task_arguments.rb +13 -2
- data/lib/rake/task_manager.rb +9 -8
- data/lib/rake/tasklib.rb +1 -1
- data/lib/rake/testtask.rb +10 -7
- data/lib/rake/thread_history_display.rb +1 -1
- data/lib/rake/thread_pool.rb +10 -4
- data/lib/rake/version.rb +3 -7
- data/lib/rake/win32.rb +3 -2
- data/test/helper.rb +28 -28
- data/test/test_rake_application.rb +14 -12
- data/test/test_rake_application_options.rb +7 -5
- data/test/test_rake_backtrace.rb +30 -1
- data/test/test_rake_definitions.rb +2 -3
- data/test/test_rake_file_creation_task.rb +2 -2
- data/test/test_rake_file_list.rb +9 -10
- data/test/test_rake_file_task.rb +4 -4
- data/test/test_rake_file_utils.rb +6 -2
- data/test/test_rake_ftp_file.rb +28 -13
- data/test/test_rake_functional.rb +4 -2
- data/test/test_rake_makefile_loader.rb +3 -1
- data/test/test_rake_multi_task.rb +2 -3
- data/test/test_rake_name_space.rb +1 -1
- data/test/test_rake_path_map.rb +23 -12
- data/test/test_rake_rake_test_loader.rb +2 -3
- data/test/test_rake_rules.rb +11 -12
- data/test/test_rake_task.rb +7 -7
- data/test/test_rake_task_arguments.rb +35 -2
- data/test/test_rake_task_manager.rb +3 -4
- data/test/test_rake_task_with_arguments.rb +2 -2
- data/test/test_rake_test_task.rb +1 -2
- data/test/test_rake_thread_pool.rb +36 -16
- data/test/test_thread_history_display.rb +16 -6
- data/test/test_trace_output.rb +2 -0
- metadata +2 -2
@@ -34,12 +34,12 @@ class TestRakeDefinitions < Rake::TestCase
|
|
34
34
|
t = Task[n1]
|
35
35
|
assert Task === t, "Should be a Task"
|
36
36
|
assert_equal n1.to_s, t.name
|
37
|
-
assert_equal [n2.to_s], t.prerequisites.
|
37
|
+
assert_equal [n2.to_s], t.prerequisites.map { |n| n.to_s }
|
38
38
|
t.invoke
|
39
39
|
t2 = Task[n2]
|
40
40
|
assert_equal FileList[], t2.prerequisites
|
41
41
|
t3 = Task[n3]
|
42
|
-
assert_equal [n1.to_s, n2.to_s], t3.prerequisites.
|
42
|
+
assert_equal [n1.to_s, n2.to_s], t3.prerequisites.map { |n| n.to_s }
|
43
43
|
end
|
44
44
|
|
45
45
|
def test_incremental_definitions
|
@@ -77,4 +77,3 @@ class TestRakeDefinitions < Rake::TestCase
|
|
77
77
|
end
|
78
78
|
|
79
79
|
end
|
80
|
-
|
@@ -21,7 +21,7 @@ class TestRakeFileCreationTask < Rake::TestCase
|
|
21
21
|
FileUtils.rm_rf fc_task.name
|
22
22
|
assert fc_task.needed?, "file should be needed"
|
23
23
|
FileUtils.mkdir fc_task.name
|
24
|
-
assert_equal nil, fc_task.prerequisites.
|
24
|
+
assert_equal nil, fc_task.prerequisites.map { |n| Task[n].timestamp }.max
|
25
25
|
assert ! fc_task.needed?, "file should not be needed"
|
26
26
|
end
|
27
27
|
|
@@ -51,6 +51,6 @@ class TestRakeFileCreationTask < Rake::TestCase
|
|
51
51
|
def test_very_early_timestamp
|
52
52
|
t1 = Rake.application.intern(FileCreationTask, OLDFILE)
|
53
53
|
assert t1.timestamp < Time.now
|
54
|
-
assert t1.timestamp < Time.now -
|
54
|
+
assert t1.timestamp < Time.now - 1_000_000
|
55
55
|
end
|
56
56
|
end
|
data/test/test_rake_file_list.rb
CHANGED
@@ -482,12 +482,12 @@ class TestRakeFileList < Rake::TestCase
|
|
482
482
|
a = ['b', 'a']
|
483
483
|
b = ['b', 'b']
|
484
484
|
c = ['b', 'c']
|
485
|
-
assert_equal(
|
486
|
-
assert_equal(
|
487
|
-
assert_equal(
|
488
|
-
assert_equal(
|
489
|
-
assert_equal(
|
490
|
-
assert_equal(
|
485
|
+
assert_equal(1, fl <=> a)
|
486
|
+
assert_equal(0, fl <=> b)
|
487
|
+
assert_equal(-1, fl <=> c)
|
488
|
+
assert_equal(-1, a <=> fl)
|
489
|
+
assert_equal(0, b <=> fl)
|
490
|
+
assert_equal(1, c <=> fl)
|
491
491
|
end
|
492
492
|
|
493
493
|
def test_array_equality
|
@@ -503,7 +503,7 @@ class TestRakeFileList < Rake::TestCase
|
|
503
503
|
|
504
504
|
def test_enumeration_methods
|
505
505
|
a = FileList['a', 'b']
|
506
|
-
b = a.
|
506
|
+
b = a.map { |it| it.upcase }
|
507
507
|
assert_equal ['A', 'B'], b
|
508
508
|
assert_equal FileList, b.class
|
509
509
|
|
@@ -519,7 +519,7 @@ class TestRakeFileList < Rake::TestCase
|
|
519
519
|
assert_equal ['a', 'b'], b
|
520
520
|
assert_equal FileList, b.class
|
521
521
|
|
522
|
-
b = a.
|
522
|
+
b = a.select { |it| it == 'b' }
|
523
523
|
assert_equal ['b'], b
|
524
524
|
assert_equal FileList, b.class
|
525
525
|
|
@@ -609,7 +609,7 @@ class TestRakeFileList < Rake::TestCase
|
|
609
609
|
assert_equal FileList, r.class
|
610
610
|
|
611
611
|
f = FileList['a', 'b', 'c', 'd']
|
612
|
-
r = f.values_at(1,3)
|
612
|
+
r = f.values_at(1, 3)
|
613
613
|
assert_equal ['b', 'd'], r
|
614
614
|
assert_equal FileList, r.class
|
615
615
|
end
|
@@ -625,4 +625,3 @@ class TestRakeFileList < Rake::TestCase
|
|
625
625
|
end
|
626
626
|
|
627
627
|
end
|
628
|
-
|
data/test/test_rake_file_task.rb
CHANGED
@@ -26,7 +26,7 @@ class TestRakeFileTask < Rake::TestCase
|
|
26
26
|
|
27
27
|
open(ftask.name, "w") { |f| f.puts "HI" }
|
28
28
|
|
29
|
-
assert_equal nil, ftask.prerequisites.
|
29
|
+
assert_equal nil, ftask.prerequisites.map { |n| Task[n].timestamp }.max
|
30
30
|
assert ! ftask.needed?, "file should not be needed"
|
31
31
|
ensure
|
32
32
|
File.delete(ftask.name) rescue nil
|
@@ -61,10 +61,10 @@ class TestRakeFileTask < Rake::TestCase
|
|
61
61
|
def test_file_times_old_depends_on_new
|
62
62
|
create_timed_files(OLDFILE, NEWFILE)
|
63
63
|
|
64
|
-
t1 = Rake.application.intern(FileTask,OLDFILE).enhance([NEWFILE])
|
64
|
+
t1 = Rake.application.intern(FileTask, OLDFILE).enhance([NEWFILE])
|
65
65
|
t2 = Rake.application.intern(FileTask, NEWFILE)
|
66
66
|
assert ! t2.needed?, "Should not need to build new file"
|
67
|
-
preq_stamp = t1.prerequisites.
|
67
|
+
preq_stamp = t1.prerequisites.map { |t| Task[t].timestamp }.max
|
68
68
|
assert_equal t2.timestamp, preq_stamp
|
69
69
|
assert t1.timestamp < preq_stamp, "T1 should be older"
|
70
70
|
assert t1.needed?, "Should need to rebuild old file because of new"
|
@@ -112,7 +112,7 @@ class TestRakeFileTask < Rake::TestCase
|
|
112
112
|
Task[NEWFILE].invoke
|
113
113
|
rescue Exception
|
114
114
|
end
|
115
|
-
assert(
|
115
|
+
assert(! File.exist?(NEWFILE), "NEWFILE should be deleted")
|
116
116
|
end
|
117
117
|
|
118
118
|
def load_phony
|
@@ -44,15 +44,19 @@ class TestRakeFileUtils < Rake::TestCase
|
|
44
44
|
class BadLink
|
45
45
|
include Rake::FileUtilsExt
|
46
46
|
attr_reader :cp_args
|
47
|
+
|
47
48
|
def initialize(klass)
|
48
49
|
@failure_class = klass
|
49
50
|
end
|
51
|
+
|
50
52
|
def cp(*args)
|
51
53
|
@cp_args = args
|
52
54
|
end
|
55
|
+
|
53
56
|
def ln(*args)
|
54
57
|
fail @failure_class, "ln not supported"
|
55
58
|
end
|
59
|
+
|
56
60
|
public :safe_ln
|
57
61
|
end
|
58
62
|
|
@@ -94,7 +98,7 @@ class TestRakeFileUtils < Rake::TestCase
|
|
94
98
|
assert_equal true, nowrite
|
95
99
|
nowrite false
|
96
100
|
assert_equal false, nowrite
|
97
|
-
nowrite(true){
|
101
|
+
nowrite(true) {
|
98
102
|
assert_equal true, nowrite
|
99
103
|
}
|
100
104
|
assert_equal false, nowrite
|
@@ -250,7 +254,7 @@ class TestRakeFileUtils < Rake::TestCase
|
|
250
254
|
assert_equal ['..', 'a', 'b'], Rake::FileUtilsExt.split_all('../a/b')
|
251
255
|
end
|
252
256
|
|
253
|
-
def command
|
257
|
+
def command(name, text)
|
254
258
|
open name, 'w', 0750 do |io|
|
255
259
|
io << text
|
256
260
|
end
|
data/test/test_rake_ftp_file.rb
CHANGED
@@ -5,10 +5,11 @@ require 'rake/contrib/ftptools'
|
|
5
5
|
|
6
6
|
class FakeDate
|
7
7
|
def self.today
|
8
|
-
Date.new(2003,10,3)
|
8
|
+
Date.new(2003, 10, 3)
|
9
9
|
end
|
10
|
+
|
10
11
|
def self.now
|
11
|
-
Time.local(2003,10,3,12,00,00)
|
12
|
+
Time.local(2003, 10, 3, 12, 00, 00)
|
12
13
|
end
|
13
14
|
end
|
14
15
|
|
@@ -17,43 +18,57 @@ class TestRakeFtpFile < Rake::TestCase
|
|
17
18
|
def setup
|
18
19
|
super
|
19
20
|
|
20
|
-
Rake::FtpFile.class_eval {
|
21
|
+
Rake::FtpFile.class_eval {
|
22
|
+
@date_class = FakeDate
|
23
|
+
@time_class = FakeDate
|
24
|
+
}
|
21
25
|
end
|
22
26
|
|
23
27
|
def test_general
|
24
|
-
file = Rake::FtpFile.new(
|
28
|
+
file = Rake::FtpFile.new(
|
29
|
+
"here",
|
30
|
+
"-rw-r--r-- 1 a279376 develop 121770 Mar 6 14:50 wiki.pl")
|
25
31
|
assert_equal "wiki.pl", file.name
|
26
32
|
assert_equal "here/wiki.pl", file.path
|
27
33
|
assert_equal "a279376", file.owner
|
28
34
|
assert_equal "develop", file.group
|
29
35
|
assert_equal 0644, file.mode
|
30
|
-
assert_equal
|
31
|
-
assert_equal Time.mktime(2003,3,6,14,50,0,0), file.time
|
36
|
+
assert_equal 121_770, file.size
|
37
|
+
assert_equal Time.mktime(2003, 3, 6, 14, 50, 0, 0), file.time
|
32
38
|
assert ! file.directory?
|
33
39
|
assert ! file.symlink?
|
34
40
|
end
|
35
41
|
|
36
42
|
def test_far_date
|
37
|
-
file = Rake::FtpFile.new(
|
38
|
-
|
43
|
+
file = Rake::FtpFile.new(
|
44
|
+
".",
|
45
|
+
"drwxr-xr-x 3 a279376 develop 4096 Nov 26 2001 vss")
|
46
|
+
assert_equal Time.mktime(2001, 11, 26, 0, 0, 0, 0), file.time
|
39
47
|
end
|
40
48
|
|
41
49
|
def test_close_date
|
42
|
-
file = Rake::FtpFile.new(
|
43
|
-
|
50
|
+
file = Rake::FtpFile.new(
|
51
|
+
".",
|
52
|
+
"drwxr-xr-x 3 a279376 develop 4096 Nov 26 15:35 vss")
|
53
|
+
assert_equal Time.mktime(2002, 11, 26, 15, 35, 0, 0), file.time
|
44
54
|
end
|
45
55
|
|
46
56
|
def test_directory
|
47
|
-
file = Rake::FtpFile.new(
|
57
|
+
file = Rake::FtpFile.new(
|
58
|
+
".",
|
59
|
+
"drwxrwxr-x 9 a279376 develop 4096 Mar 13 14:32 working")
|
48
60
|
assert file.directory?
|
49
61
|
assert !file.symlink?
|
50
62
|
end
|
51
63
|
|
52
64
|
def test_symlink
|
53
|
-
file = Rake::FtpFile.new(
|
65
|
+
file = Rake::FtpFile.new(
|
66
|
+
".",
|
67
|
+
"lrwxrwxrwx 1 a279376 develop 64 Mar 26 2002 " +
|
68
|
+
"xtrac -> /home/a279376/working/ics/development/java/" +
|
69
|
+
"com/fmr/fwp/ics/xtrac")
|
54
70
|
assert_equal 'xtrac', file.name
|
55
71
|
assert file.symlink?
|
56
72
|
assert !file.directory?
|
57
73
|
end
|
58
74
|
end
|
59
|
-
|
@@ -420,8 +420,10 @@ class TestRakeFunctional < Rake::TestCase
|
|
420
420
|
status = $?
|
421
421
|
if @verbose
|
422
422
|
puts " SIG status = #{$?.inspect}"
|
423
|
-
puts " SIG status.respond_to?(:signaled?) =
|
424
|
-
|
423
|
+
puts " SIG status.respond_to?(:signaled?) = " +
|
424
|
+
"#{$?.respond_to?(:signaled?).inspect}"
|
425
|
+
puts " SIG status.signaled? = #{status.signaled?}" if
|
426
|
+
status.respond_to?(:signaled?)
|
425
427
|
end
|
426
428
|
status.respond_to?(:signaled?) && status.signaled?
|
427
429
|
end
|
@@ -38,7 +38,9 @@ g\ 0: g1 g\ 2 g\ 3 g4
|
|
38
38
|
assert_equal %w(d1 d2).sort, Task['d'].prerequisites.sort
|
39
39
|
assert_equal %w(e1 f1).sort, Task['e'].prerequisites.sort
|
40
40
|
assert_equal %w(e1 f1).sort, Task['f'].prerequisites.sort
|
41
|
-
assert_equal
|
41
|
+
assert_equal(
|
42
|
+
["g1", "g 2", "g 3", "g4"].sort,
|
43
|
+
Task['g 0'].prerequisites.sort)
|
42
44
|
assert_equal 7, Task.tasks.size
|
43
45
|
end
|
44
46
|
end
|
@@ -49,11 +49,10 @@ class TestRakeMultiTask < Rake::TestCase
|
|
49
49
|
end
|
50
50
|
|
51
51
|
def test_multitasks_with_parameters
|
52
|
-
task :a, [:arg] do |t,args| add_run(args[:arg]) end
|
53
|
-
multitask :b, [:arg] => [:a] do |t,args| add_run(args[:arg]+'mt') end
|
52
|
+
task :a, [:arg] do |t, args| add_run(args[:arg]) end
|
53
|
+
multitask :b, [:arg] => [:a] do |t, args| add_run(args[:arg] + 'mt') end
|
54
54
|
Task[:b].invoke "b"
|
55
55
|
assert @runs[0] == "b"
|
56
56
|
assert @runs[1] == "bmt"
|
57
57
|
end
|
58
58
|
end
|
59
|
-
|
data/test/test_rake_path_map.rb
CHANGED
@@ -52,7 +52,7 @@ class TestRakePathMap < Rake::TestCase
|
|
52
52
|
assert_equal "", "dir/.depends".pathmap("%x")
|
53
53
|
end
|
54
54
|
|
55
|
-
def
|
55
|
+
def test_x_returns_everything_but_extension
|
56
56
|
assert_equal "abc", "abc".pathmap("%X")
|
57
57
|
assert_equal "abc", "abc.rb".pathmap("%X")
|
58
58
|
assert_equal "abc.xyz", "abc.xyz.rb".pathmap("%X")
|
@@ -142,16 +142,27 @@ class TestRakePathMap < Rake::TestCase
|
|
142
142
|
|
143
143
|
def test_complex_patterns
|
144
144
|
sep = "".pathmap("%s")
|
145
|
-
assert_equal
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
"
|
151
|
-
assert_equal
|
152
|
-
"
|
153
|
-
|
154
|
-
assert_equal
|
145
|
+
assert_equal(
|
146
|
+
"dir/abc.rb",
|
147
|
+
"dir/abc.rb".pathmap("%d/%n%x"))
|
148
|
+
assert_equal(
|
149
|
+
"./abc.rb",
|
150
|
+
"abc.rb".pathmap("%d/%n%x"))
|
151
|
+
assert_equal(
|
152
|
+
"Your file extension is '.rb'",
|
153
|
+
"dir/abc.rb".pathmap("Your file extension is '%x'"))
|
154
|
+
assert_equal(
|
155
|
+
"bin/org/onstepback/proj/A.class",
|
156
|
+
"src/org/onstepback/proj/A.java".pathmap("%{src,bin}d/%n.class"))
|
157
|
+
assert_equal(
|
158
|
+
"src_work/bin/org/onstepback/proj/A.class",
|
159
|
+
"src_work/src/org/onstepback/proj/A.java"
|
160
|
+
.pathmap('%{\bsrc\b,bin}X.class'))
|
161
|
+
assert_equal(
|
162
|
+
".depends.bak",
|
163
|
+
".depends".pathmap("%X.bak"))
|
164
|
+
assert_equal(
|
165
|
+
"d#{sep}a/b/c#{sep}file.txt",
|
166
|
+
"a/b/c/d/file.txt".pathmap("%-1d%s%3d%s%f"))
|
155
167
|
end
|
156
168
|
end
|
157
|
-
|
@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
|
|
3
3
|
class TestRakeRakeTestLoader < Rake::TestCase
|
4
4
|
|
5
5
|
def test_pattern
|
6
|
-
|
6
|
+
orig_loaded_features = $:.dup
|
7
7
|
FileUtils.touch 'foo.rb'
|
8
8
|
FileUtils.touch 'test_a.rb'
|
9
9
|
FileUtils.touch 'test_b.rb'
|
@@ -14,8 +14,7 @@ class TestRakeRakeTestLoader < Rake::TestCase
|
|
14
14
|
|
15
15
|
assert_equal %w[-v], ARGV
|
16
16
|
ensure
|
17
|
-
$:.replace
|
17
|
+
$:.replace orig_loaded_features
|
18
18
|
end
|
19
19
|
|
20
20
|
end
|
21
|
-
|
data/test/test_rake_rules.rb
CHANGED
@@ -102,7 +102,7 @@ class TestRakeRules < Rake::TestCase
|
|
102
102
|
verbose(false) do
|
103
103
|
|
104
104
|
create_file(".foo")
|
105
|
-
rule '.o' => lambda{".foo"} do |t|
|
105
|
+
rule '.o' => lambda { ".foo" } do |t|
|
106
106
|
@runs << "#{t.name} - #{t.source}"
|
107
107
|
end
|
108
108
|
Task[OBJFILE].invoke
|
@@ -113,7 +113,7 @@ class TestRakeRules < Rake::TestCase
|
|
113
113
|
def test_file_names_containing_percent_can_be_wrapped_in_lambda
|
114
114
|
verbose(false) do
|
115
115
|
create_file("foo%x")
|
116
|
-
rule '.o' => lambda{"foo%x"} do |t|
|
116
|
+
rule '.o' => lambda { "foo%x" } do |t|
|
117
117
|
@runs << "#{t.name} - #{t.source}"
|
118
118
|
end
|
119
119
|
Task[OBJFILE].invoke
|
@@ -186,7 +186,7 @@ class TestRakeRules < Rake::TestCase
|
|
186
186
|
|
187
187
|
def test_rule_with_two_sources_runs_if_both_sources_are_present
|
188
188
|
create_timed_files(OBJFILE, SRCFILE, SRCFILE2)
|
189
|
-
rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
|
189
|
+
rule OBJFILE => [lambda { SRCFILE }, lambda { SRCFILE2 }] do
|
190
190
|
@runs << :RULE
|
191
191
|
end
|
192
192
|
Task[OBJFILE].invoke
|
@@ -196,7 +196,7 @@ class TestRakeRules < Rake::TestCase
|
|
196
196
|
def test_rule_with_two_sources_but_one_missing_does_not_run
|
197
197
|
create_timed_files(OBJFILE, SRCFILE)
|
198
198
|
delete_file(SRCFILE2)
|
199
|
-
rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
|
199
|
+
rule OBJFILE => [lambda { SRCFILE }, lambda { SRCFILE2 }] do
|
200
200
|
@runs << :RULE
|
201
201
|
end
|
202
202
|
Task[OBJFILE].invoke
|
@@ -222,10 +222,10 @@ class TestRakeRules < Rake::TestCase
|
|
222
222
|
def test_second_rule_runs_when_first_rule_doesnt
|
223
223
|
create_timed_files(OBJFILE, SRCFILE)
|
224
224
|
delete_file(SRCFILE2)
|
225
|
-
rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
|
225
|
+
rule OBJFILE => [lambda { SRCFILE }, lambda { SRCFILE2 }] do
|
226
226
|
@runs << :RULE1
|
227
227
|
end
|
228
|
-
rule OBJFILE => [lambda{SRCFILE}] do
|
228
|
+
rule OBJFILE => [lambda { SRCFILE }] do
|
229
229
|
@runs << :RULE2
|
230
230
|
end
|
231
231
|
Task[OBJFILE].invoke
|
@@ -234,10 +234,10 @@ class TestRakeRules < Rake::TestCase
|
|
234
234
|
|
235
235
|
def test_second_rule_doest_run_if_first_triggers
|
236
236
|
create_timed_files(OBJFILE, SRCFILE, SRCFILE2)
|
237
|
-
rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
|
237
|
+
rule OBJFILE => [lambda { SRCFILE }, lambda { SRCFILE2 }] do
|
238
238
|
@runs << :RULE1
|
239
239
|
end
|
240
|
-
rule OBJFILE => [lambda{SRCFILE}] do
|
240
|
+
rule OBJFILE => [lambda { SRCFILE }] do
|
241
241
|
@runs << :RULE2
|
242
242
|
end
|
243
243
|
Task[OBJFILE].invoke
|
@@ -246,10 +246,10 @@ class TestRakeRules < Rake::TestCase
|
|
246
246
|
|
247
247
|
def test_second_rule_doest_run_if_first_triggers_with_reversed_rules
|
248
248
|
create_timed_files(OBJFILE, SRCFILE, SRCFILE2)
|
249
|
-
rule OBJFILE => [lambda{SRCFILE}] do
|
249
|
+
rule OBJFILE => [lambda { SRCFILE }] do
|
250
250
|
@runs << :RULE1
|
251
251
|
end
|
252
|
-
rule OBJFILE => [lambda{SRCFILE}, lambda{SRCFILE2}] do
|
252
|
+
rule OBJFILE => [lambda { SRCFILE }, lambda { SRCFILE2 }] do
|
253
253
|
@runs << :RULE2
|
254
254
|
end
|
255
255
|
Task[OBJFILE].invoke
|
@@ -319,9 +319,8 @@ class TestRakeRules < Rake::TestCase
|
|
319
319
|
end
|
320
320
|
|
321
321
|
def test_rules_with_bad_dependents_will_fail
|
322
|
-
rule "a" => [
|
322
|
+
rule "a" => [1] do |t| puts t.name end
|
323
323
|
assert_raises(RuntimeError) do Task['a'].invoke end
|
324
324
|
end
|
325
325
|
|
326
326
|
end
|
327
|
-
|
data/test/test_rake_task.rb
CHANGED
@@ -156,8 +156,8 @@ class TestRakeTask < Rake::TestCase
|
|
156
156
|
def test_multi_invocations
|
157
157
|
runs = []
|
158
158
|
p = proc do |t| runs << t.name end
|
159
|
-
task({:t1=>[:t2
|
160
|
-
task({:t2=>[:t3]}, &p)
|
159
|
+
task({ :t1 => [:t2, :t3] }, &p)
|
160
|
+
task({ :t2 => [:t3] }, &p)
|
161
161
|
task(:t3, &p)
|
162
162
|
Task[:t1].invoke
|
163
163
|
assert_equal ["t1", "t2", "t3"], runs.sort
|
@@ -166,7 +166,7 @@ class TestRakeTask < Rake::TestCase
|
|
166
166
|
def test_task_list
|
167
167
|
task :t2
|
168
168
|
task :t1 => [:t2]
|
169
|
-
assert_equal ["t1", "t2"], Task.tasks.
|
169
|
+
assert_equal ["t1", "t2"], Task.tasks.map { |t| t.name }
|
170
170
|
end
|
171
171
|
|
172
172
|
def test_task_gives_name_on_to_s
|
@@ -271,15 +271,15 @@ class TestRakeTask < Rake::TestCase
|
|
271
271
|
|
272
272
|
t_a = task(:a) do |t|
|
273
273
|
sleep 0.02
|
274
|
-
mx.synchronize{ result << t.name }
|
274
|
+
mx.synchronize { result << t.name }
|
275
275
|
end
|
276
276
|
|
277
277
|
t_b = task(:b) do |t|
|
278
|
-
mx.synchronize{ result << t.name }
|
278
|
+
mx.synchronize { result << t.name }
|
279
279
|
end
|
280
280
|
|
281
|
-
t_c = task(:c => [:a
|
282
|
-
mx.synchronize{ result << t.name }
|
281
|
+
t_c = task(:c => [:a, :b]) do |t|
|
282
|
+
mx.synchronize { result << t.name }
|
283
283
|
end
|
284
284
|
|
285
285
|
t_c.invoke
|