public
Fork of pgr0ss/rake_commit_tasks
Description: A set of rake tasks to help with checking in code
Clone URL: git://github.com/dan-manges/rake_commit_tasks.git
svn:revert_all works with new directories
dan-manges (author)
Wed Jun 18 20:31:23 -0700 2008
commit  f5c36d9e345ff0a84e5660e7f90e811ea13cfbb4
tree    8a6d9ba51f6f2f2fc7884b000d5e46a3a37edf4f
parent  ea673e38678c82be2289a308e44e66b1e995ef9c
...
51
52
53
54
 
55
56
57
...
51
52
53
 
54
55
56
57
0
@@ -51,7 +51,7 @@ namespace :svn do
0
       next unless line[0,1] == '?'
0
       filename = line[1..-1].strip
0
       puts "removed #{filename}"
0
- File.delete(filename)
0
+ rm_r filename
0
     end
0
   end
0
 
...
74
75
76
77
 
78
79
80
81
 
 
 
82
83
84
...
74
75
76
 
77
78
 
 
 
79
80
81
82
83
84
0
@@ -74,11 +74,11 @@ class SvnRakeTest < Test::Unit::TestCase
0
     assert_equal "removed removed_file\nremoved removed_file2\n", output
0
   end
0
   
0
- test "svn:revert_all calls svn revert and then removes all new files" do
0
+ test "svn:revert_all calls svn revert and then removes all new files and directories" do
0
     Kernel.expects(:system).with('svn revert -R .')
0
- Kernel.expects(:`).with("svn st").returns("? some_file.rb\n? another file.txt")
0
- File.expects(:delete).with("some_file.rb")
0
- File.expects(:delete).with("another file.txt")
0
+ Kernel.expects(:`).with("svn st").returns("? some_file.rb\n? a directory")
0
+ MAIN.expects(:rm_r).with("some_file.rb")
0
+ MAIN.expects(:rm_r).with("a directory")
0
     capture_stdout do
0
       Rake::Task["svn:revert_all"].execute nil
0
     end
...
1
2
3
4
 
5
6
7
...
40
41
42
 
 
43
...
1
2
 
3
4
5
6
7
...
40
41
42
43
44
45
0
@@ -1,7 +1,7 @@
0
 unless defined?(TEST_HELPER_LOADED)
0
   TEST_HELPER_LOADED = true
0
- require "rubygems"
0
 
0
+ require "rubygems"
0
   require "rake"
0
   Dir.glob(File.dirname(__FILE__) + "/../tasks/**/*.rake").each { |rakefile| load rakefile }
0
 
0
@@ -40,4 +40,6 @@ unless defined?(TEST_HELPER_LOADED)
0
   
0
     alias_method :system, :system_with_hook
0
   end
0
+
0
+ MAIN = self
0
 end

Comments

    No one has commented yet.