app/models/subversion_info_parser.rb app/models/subversion_propget_parser.rb app/models/subversion_update_parser.rb lib/file_sandbox.rb lib/redcloth.rb test/unit/subversion_info_parser_test.rb test/unit/subversion_propget_parser_test.rb test/unit/subversion_update_parser_test.rb @@ -1,4 +1,5 @@ TRUNK + - [patch] subversion external support ------------------------------------------------------------------------------------------------------------------------ * 1.2.1 - [bugfix] fixed some windows specific things to do with running a server CHANGELOG @@ -21,6 +21,10 @@ Revision #{number} committed by #{committed_by} on #{time.strftime('%Y-%m-%d %H: @number <=> other.number end + def eql?(other) + @number == other.number + end + def to_i @number end app/models/revision.rb @@ -3,11 +3,12 @@ require 'builder_error' class Subversion include CommandLine - attr_accessor :url, :username, :password + attr_accessor :url, :username, :password, :check_externals def initialize(options = {}) - @url, @username, @password, @interactive = + @url, @username, @password, @interactive = options.delete(:url), options.delete(:username), options.delete(:password), options.delete(:interactive) + @check_externals = true raise "don't know how to handle '#{options.keys.first}'" if options.length > 0 end @@ -42,31 +43,54 @@ class Subversion def latest_revision(project) svn_output = execute_in_local_copy(project, log('HEAD', last_locally_known_revision(project))) - SubversionLogParser.new.parse_log(svn_output).first + SubversionLogParser.new.parse(svn_output).first end def revisions_since(project, revision_number) - svn_output = execute_in_local_copy(project, log('HEAD', revision_number)) - new_revisions = SubversionLogParser.new.parse_log(svn_output).reverse - new_revisions.delete_if { |r| r.number == revision_number } - new_revisions + new_revisions = revisions_since_for_url(project, revision_number) + + if @check_externals + externals(project).each do |directory, svn_external_path| + new_revisions += revisions_since_for_url(project, revision_number, svn_external_path) + end + end + + new_revisions = new_revisions.sort_by {|rev| rev.number} + + #uniq doesn't work on arrays of revisions for some reason + final_revisions = [] + new_revisions.each do |rev| + final_revisions << rev unless rev.number == revision_number || final_revisions.include?(rev) + end + final_revisions + end + + def revisions_since_for_url(project, revision_number, url = @url) + svn_output = execute_in_local_copy(project, log('HEAD', revision_number, url)) + log_parser = SubversionLogParser.new + log_parser.parse(svn_output) end def update(project, revision = nil) revision_number = revision ? revision_number(revision) : 'HEAD' svn_output = execute_in_local_copy(project, svn('update', "--revision", revision_number)) - SubversionLogParser.new.parse_update(svn_output) + SubversionUpdateParser.new.parse(svn_output) + end + + def externals(project) + svn_output = execute_in_local_copy(project, svn('propget', '-R', 'svn:externals')) + SubversionPropgetParser.new.parse(svn_output) end private - def log(from, to) - svn('log', "--revision", "#{from}:#{to}", '--verbose', '--xml', @url) + def log(from, to, url = @url) + svn('log', "--revision", "#{from}:#{to}", '--verbose', '--xml', url) end def info(project) svn_output = execute_in_local_copy(project, svn('info', "--xml")) - SubversionLogParser.new.parse_info(svn_output) + SubversionInfoParser.new.parse(svn_output) end def svn(operation, *options) app/models/subversion.rb @@ -3,30 +3,12 @@ require 'xml_simple' class SubversionLogParser - def parse_log(lines) + def parse(lines) return [] if lines.empty? entries = XmlSimple.xml_in(lines.join, 'ForceArray' => ['logentry','path'])['logentry'] || [] entries.map {|entry| parse_revision(entry) } end - UPDATE_PATTERN = /^(...) (\S.*)$/ - def parse_update(lines) - lines[0..-2].collect do |line| - match = UPDATE_PATTERN.match(line) - if match - operation, file = match[1..2] - ChangesetEntry.new(operation, file) - else - nil - end - end.compact - end - - def parse_info(xml) - info = XmlSimple.xml_in(xml.to_s, 'ForceArray' => false)['entry'] - Subversion::Info.new(info['revision'].to_i, info['commit']['revision'].to_i, info['commit']['author']) - end - private def parse_revision(hash) app/models/subversion_log_parser.rb @@ -45,7 +45,6 @@ Rails::Initializer.run do |config| # Add additional load paths for your own custom dirs config.load_paths << "#{RAILS_ROOT}/builder_plugins/installed" - config.load_paths << "vendor/redcloth" # Use the database for sessions instead of the file system # (create the session table with 'rake db:sessions:create') config/environment.rb @@ -15,8 +15,6 @@ require 'breakpoint' require 'mocha' require 'stubba' -require 'rubygems' -gem 'file_sandbox', '>= 0.3' require 'file_sandbox' ActionMailer::Base.delivery_method = :test test/test_helper.rb @@ -61,20 +61,6 @@ LOG_ENTRY_WITH_MULTIPLE_ENTRIES = <<EOF </log> EOF -UPDATE_OUTPUT = <<EOF -A failing_project -D failing_project\\Rakefile -U* failing_project\\failing_test.rb -G failing_project\\revision_label.txt -C B passing_project\\revision_label.txt -? foo.txt - -Fetching external item into 'vendor\rails' -Updated external to revision 5875. - -Updated to revision 46. -EOF - def test_can_parse_LOG_WITH_NO_OPTIONAL_VALUES expected_result = [Revision.new(359, nil, nil, nil, [])] @@ -121,18 +107,6 @@ EOF parse_log(LOG_ENTRY_WITH_MULTIPLE_ENTRIES) end - def test_can_parse_UPDATE_OUTPUT - expected_result = [ - ChangesetEntry.new('A ', 'failing_project'), - ChangesetEntry.new('D ', 'failing_project\Rakefile'), - ChangesetEntry.new('U* ', 'failing_project\\failing_test.rb'), - ChangesetEntry.new('G ', 'failing_project\\revision_label.txt'), - ChangesetEntry.new('C B', 'passing_project\\revision_label.txt'), - ChangesetEntry.new('? ', 'foo.txt')] - - assert_equal expected_result, parse_update(UPDATE_OUTPUT) - end - def test_revision_and_changeset_should_know_how_to_convert_to_string expected_result = <<-EOL Revision 359 committed by aslak on #{DateTime.parse("2006-05-22 13:23:29 -0600").strftime('%Y-%m-%d %H:%M:%S')} @@ -142,164 +116,8 @@ versioning assert_equal expected_result, parse_log(SIMPLE_LOG_ENTRY)[0].to_s end -INFO_XML_OUTPUT = <<-EOF -<?xml version="1.0" encoding="utf-8"?> -<info> -<entry - kind="dir" - path="cruisecontrolrb" - revision="328"> -<url>svn://rubyforge.org/var/svn/cruisecontrolrb</url> -<repository> -<root>svn://rubyforge.org/var/svn/cruisecontrolrb</root> -<uuid>c04ce798-636b-4ca8-9149-0f9336831111</uuid> -</repository> -<commit - revision="328"> -<author>stellsmi</author> -<date>2007-03-08T02:00:09.035499Z</date> -</commit> -</entry> -</info> -EOF - -INFO_XML_OUTPUT_WITH_WORKING_COPY = <<-EOF -<?xml version="1.0" encoding="utf-8"?> -<info> -<entry - kind="file" - path="README" - revision="328"> -<url>svn://rubyforge.org/var/svn/cruisecontrolrb/README</url> -<repository> -<root>svn://rubyforge.org/var/svn/cruisecontrolrb</root> -<uuid>c04ce798-636b-4ca8-9149-0f9336831111</uuid> -</repository> -<wc-info> -<schedule>add</schedule> -<copy-from-url>svn://rubyforge.org/var/svn/cruisecontrolrb/README</copy-from-url> -<copy-from-rev>99</copy-from-rev> -<text-updated>2007-03-10T03:35:34.000000Z</text-updated> -<prop-updated>2007-03-10T03:35:34.000000Z</prop-updated> -<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum> -</wc-info> -<commit - revision="328"> -<author>stellsmi</author> -<date>2007-03-08T02:00:09.035499Z</date> -</commit> -</entry> -</info> -EOF - -INFO_XML_OUTPUT_WITH_LOCK = <<-EOF -<?xml version="1.0" encoding="utf-8"?> -<info> -<entry - kind="dir" - path="cruisecontrolrb" - revision="328"> -<url>svn://rubyforge.org/var/svn/cruisecontrolrb</url> -<repository> -<root>svn://rubyforge.org/var/svn/cruisecontrolrb</root> -<uuid>c04ce798-636b-4ca8-9149-0f9336831111</uuid> -</repository> -<commit - revision="328"> -<author>stellsmi</author> -<date>2007-03-08T02:00:09.035499Z</date> -</commit> -<lock> -<token>opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b</token> -<owner>dtsato</owner> -<comment>Dummy comment</comment> -<created>2007-03-08T16:29:18.035499Z</created> -<expires>2007-03-09T16:29:18.035499Z</expires> -</lock> -</entry> -</info> -EOF - -INFO_XML_OUTPUT_WITH_CONFLICT = <<-EOF -<?xml version="1.0" encoding="utf-8"?> -<info> -<entry - kind="file" - path="README" - revision="328"> -<url>svn://rubyforge.org/var/svn/cruisecontrolrb/README</url> -<repository> -<root>svn://rubyforge.org/var/svn/cruisecontrolrb</root> -<uuid>c04ce798-636b-4ca8-9149-0f9336831111</uuid> -</repository> -<wc-info> -<schedule>replace</schedule> -<text-updated>2007-03-10T03:35:34.000000Z</text-updated> -<prop-updated>2007-03-10T03:35:34.000000Z</prop-updated> -<checksum>d41d8cd98f00b204e9800998ecf8427e</checksum> -</wc-info> -<commit - revision="328"> -<author>stellsmi</author> -<date>2007-03-08T02:00:09.035499Z</date> -</commit> -<conflict> -<prev-base-file>README_base</prev-base-file> -<prev-wc-file>README_wc</prev-wc-file> -<cur-base-file>README_file</cur-base-file> -<prop-file>README_prop</prop-file> -</conflict> -</entry> -</info> -EOF - - def test_should_parse_INFO_XML_OUTPUT - expected_result = {:revision => 328, - :last_changed_revision => 328, - :last_changed_author => 'stellsmi'} - - assert_info_equal expected_result, parse_info(INFO_XML_OUTPUT) - end - - def test_should_parse_INFO_XML_OUTPUT_WITH_WORKING_COPY - expected_result = {:revision => 328, - :last_changed_revision => 328, - :last_changed_author => 'stellsmi'} - - assert_info_equal expected_result, parse_info(INFO_XML_OUTPUT_WITH_WORKING_COPY) - end - - def test_should_parse_INFO_XML_OUTPUT_WITH_LOCK - expected_result = {:revision => 328, - :last_changed_revision => 328, - :last_changed_author => 'stellsmi'} - - assert_info_equal expected_result, parse_info(INFO_XML_OUTPUT_WITH_LOCK) - end - - def test_should_parse_INFO_XML_OUTPUT_WITH_CONFLICT - expected_result = {:revision => 328, - :last_changed_revision => 328, - :last_changed_author => 'stellsmi'} - - assert_info_equal expected_result, parse_info(INFO_XML_OUTPUT_WITH_CONFLICT) - end - def parse_log(log_entry) - SubversionLogParser.new.parse_log(log_entry.split("\n")) + SubversionLogParser.new.parse(log_entry.split("\n")) end - def parse_update(log_entry) - SubversionLogParser.new.parse_update(log_entry.split("\n")) - end - - def parse_info(svn_output) - SubversionLogParser.new.parse_info(svn_output) - end - - def assert_info_equal(expected_fields, info) - expected_fields.each do |name, value| - assert_equal value, info.send(name), "comparing #{name}" - end - end end \ No newline at end of file test/unit/subversion_log_parser_test.rb @@ -69,10 +69,9 @@ class SubversionTest < Test::Unit::TestCase def test_revisions_since_should_reverse_the_log_entries_and_skip_the_one_corresponding_to_current_revision svn = Subversion.new + svn.check_externals = false - svn.expects(:execute).with(["svn", "--non-interactive", "log", "--revision", "HEAD:15", "--verbose", "--xml"], - {:stderr => './svn.err'}).yields(StringIO.new(LOG_ENTRY)) - + svn.expects(:revisions_since_for_url).with(dummy_project, 15).returns([Revision.new(18), Revision.new(17), Revision.new(15)]) revisions = svn.revisions_since(dummy_project, 15) assert_equal [17, 18], numbers(revisions) @@ -80,10 +79,9 @@ class SubversionTest < Test::Unit::TestCase def test_revisions_since_should_return_all_revisions_when_curreent_revision_is_not_in_the_log_output svn = Subversion.new + svn.check_externals = false - svn.expects(:execute).with(["svn", "--non-interactive", "log", "--revision", "HEAD:14", "--verbose", "--xml"], - {:stderr => './svn.err'}).yields(StringIO.new(LOG_ENTRY)) - + svn.expects(:revisions_since_for_url).with(dummy_project, 14).returns([Revision.new(18), Revision.new(17), Revision.new(15)]) revisions = svn.revisions_since(dummy_project, 14) assert_equal [15, 17, 18], numbers(revisions) @@ -91,15 +89,53 @@ class SubversionTest < Test::Unit::TestCase def test_revisions_since_should_return_an_empty_array_for_empty_log_output svn = Subversion.new + svn.check_externals = false - svn.expects(:execute).with(["svn", "--non-interactive", "log", "--revision", "HEAD:14", "--verbose", "--xml"], - {:stderr => './svn.err'}).yields(StringIO.new(EMPTY_LOG)) - + svn.expects(:revisions_since_for_url).with(dummy_project, 14).returns([]) revisions = svn.revisions_since(dummy_project, 14) assert_equal [], numbers(revisions) end + def test_revisions_since_should_support_check_externals_as_well_and_combine_all_revisions_together + svn = Subversion.new + svn.check_externals = true + svn.expects(:externals).returns({"a" => "svn+ssh://a", "b" => "svn+ssh://b"}) + svn.expects(:revisions_since_for_url).with(dummy_project, 14).returns([Revision.new(18), Revision.new(17)]) + svn.expects(:revisions_since_for_url).with(dummy_project, 14, "svn+ssh://a").returns([Revision.new(18), Revision.new(15)]) + svn.expects(:revisions_since_for_url).with(dummy_project, 14, "svn+ssh://b").returns([]) + + revisions = svn.revisions_since(dummy_project, 14) + assert_equal [15, 17, 18], numbers(revisions) + end + + def test_externals + svn = Subversion.new + svn.expects(:execute).with(["svn", "--non-interactive", "propget", "-R", "svn:externals"], {:stderr => './svn.err'}).returns("propget results") + parser = mock("parser") + SubversionPropgetParser.expects(:new).returns(parser) + parser.expects(:parse).returns("parse results") + + assert_equal("parse results", svn.externals(dummy_project)) + end + + def test_revisions_since_for_url_should_work_without_url_argument + svn = Subversion.new + + svn.expects(:execute).with(["svn", "--non-interactive", "log", "--revision", "HEAD:14", "--verbose", "--xml"], + {:stderr => './svn.err'}).yields(StringIO.new(LOG_ENTRY)) + revisions = svn.revisions_since_for_url(dummy_project, 14) + assert_equal [18, 17, 15], numbers(revisions) + end + + def test_revisions_since_for_url_should_support_url_argument + svn = Subversion.new + svn.expects(:execute).with(["svn", "--non-interactive", "log", "--revision", "HEAD:14", "--verbose", "--xml", "svn+ssh://a"], + {:stderr => './svn.err'}).yields(StringIO.new(LOG_ENTRY)) + revisions = svn.revisions_since_for_url(dummy_project, 14, "svn+ssh://a") + assert_equal [18, 17, 15], numbers(revisions) + end + def test_checkout_with_no_user_password svn = Subversion.new(:url => 'http://foo.com/svn/project') svn.expects(:execute).with(["svn", "--non-interactive", "co", "http://foo.com/svn/project", "."]) test/unit/subversion_test.rb vendor/redcloth/redcloth.rb 5eb784fdcbfec159e367a7b70ff2d3a3c485824d stellsmi stellsmi@c04ce798-636b-4ca8-9149-0f9336831111 http://github.com/dustin/cruisecontrolrb/commit/3df8d5e6090655b4b3cefb21c5790430c00e84f0 3df8d5e6090655b4b3cefb21c5790430c00e84f0 2007-11-16T22:20:58-08:00 2007-11-16T22:20:58-08:00 applying svn external patch & moving file sandbox & redcloth to lib dir git-svn-id: http://cruisecontrolrb.rubyforge.org/svn/trunk@565 c04ce798-636b-4ca8-9149-0f9336831111 837ce7eb41c49138722d3e7b7faa5986ad7ce575 stellsmi stellsmi@c04ce798-636b-4ca8-9149-0f9336831111