@@ -13,3 +13,4 @@ Started with the code at Jay Field's blog: http://blog.jayfields.com/2006/12/rub * Prompt for a story number * Show example at prompt if there is no previously entered data * Refactor saved data handling +* Added a svn:revert_all task which reverts all modified files and deletes all new files CHANGES @@ -3,6 +3,8 @@ require 'open-uri' require 'rexml/document' require 'tmpdir' +require File.expand_path(File.dirname(__FILE__) + '/commit_message') + desc "Run before checking in" task :pc => ['svn:add', 'svn:delete', 'svn:up', :default, 'svn:st'] @@ -19,18 +21,6 @@ task :ci do end end -class CommitMessage < Struct.new(:who, :id, :what) - def self.prompt - new retrieve_saved_data("pair", "bg/pg"), - retrieve_saved_data("feature", "story 83"), - retrieve_saved_data("message", "Refactored GodClass") - end - - def to_s - "#{who} - #{id} - #{what}" - end -end unless defined?(CommitMessage) # Protect against multiple requires. - def files_to_check_in? %x[svn st --ignore-externals].split("\n").reject {|line| line[0,1] == "X"}.any? end tasks/commit.rake @@ -6,9 +6,9 @@ namespace :svn do desc "svn up and check for conflicts" task :up do - status = %x[svn up] - puts status - status.each do |line| + output = %x[svn up] + puts output + output.each do |line| raise "SVN conflict detected. Please resolve conflicts before proceeding." if line[0,1] == "C" end end @@ -43,4 +43,16 @@ namespace :svn do end end task :rm => "svn:delete" + + desc "reverts all files in svn and deletes new files" + task :revert_all do + system "svn revert -R ." + %x[svn st].split("\n").each do |line| + next unless line[0,1] == '?' + filename = line[1..-1].strip + puts "removed #{filename}" + File.delete(filename) + end + end + end tasks/svn.rake @@ -74,4 +74,14 @@ class SvnRakeTest < Test::Unit::TestCase assert_equal "removed removed_file\nremoved removed_file2\n", output end + test "svn:revert_all calls svn revert and then removes all new files" do + Kernel.expects(:system).with('svn revert -R .') + Kernel.expects(:`).with("svn st").returns("? some_file.rb\n? another file.txt") + File.expects(:delete).with("some_file.rb") + File.expects(:delete).with("another file.txt") + capture_stdout do + Rake::Task["svn:revert_all"].execute nil + end + end + end test/svn_rake_test.rb @@ -26,6 +26,15 @@ module Kernel Kernel.send :`, command end - alias_method :backtick_without_hook, :` alias_method :`, :backtick_with_hook + + def self.system(command) + raise "need to stub: Kernel.system(#{command.inspect})" + end + + def system_with_hook(command) + Kernel.send :system, command + end + + alias_method :system, :system_with_hook end test/test_helper.rb 4ff548b94f571f52bf95038127f48c08eb231150 Paul Gross pgross@gmail.com http://github.com/pgr0ss/rake_commit_tasks/commit/563876a414efa1ed7fa2453a5a175e5f194b2a29 563876a414efa1ed7fa2453a5a175e5f194b2a29 2008-06-18T13:40:41-07:00 2008-06-18T13:40:41-07:00 Added a svn:revert_all task which reverts all modified files and deletes all new files 99fba8f5de42dc9211e893076d57138ea0313924 Paul Gross pgross@gmail.com