[NEW] Adding Bazaar support: add bzr to the adapter factory.

      Add test_factory_bzr to the FactoryTest.
      And add validation.rb adapter module: Needed for adapter factory.
      Add bzr validation unit test.

Michael

Author: obnoxxx

lib/scm/adapters/bzr/validation.rb

@@ -0,0 +1,16 @@
+module Scm::Adapters
+	class BzrAdapter < AbstractAdapter
+		def self.url_regex
+			/^((http|https|ssh|file):\/\/((\w+@)?[A-Za-z0-9_\-\.]+(:\d+)?\/)?)?[A-Za-z0-9_\-\.\/\~\+]*$/
+		end
+
+		def self.public_url_regex
+			/^(http|https):\/\/(\w+@)?[A-Za-z0-9_\-\.]+(:\d+)?\/[A-Za-z0-9_\-\.\/\~\+]*$/
+		end
+
+		def validate_server_connection
+			return unless valid?
+			@errors << [:failed, "The server did not respond to the 'bzr revno' command. Is the URL correct?"] unless self.exist?
+		end
+	end
+end

lib/scm/adapters/bzr_adapter.rb

@@ -5,3 +5,5 @@ def english_name
 		end
 	end
 end
+
+require 'lib/scm/adapters/bzr/validation'

lib/scm/adapters/factory.rb

@@ -11,6 +11,9 @@ def self.from_path(path)
 			elsif FileTest.exist?(File.join(path, '.hg'))
 				HgAdapter.new(:url => File.expand_path(path)).normalize
 
+			elsif FileTest.exist?(File.join(path, '.bzr'))
+				BzrAdapter.new(:url => File.expand_path(path)).normalize
+
 			elsif FileTest.exist?(File.join(path, 'db'))
 				SvnAdapter.new(:url => File.expand_path(path)).normalize
 

test/unit/adapter_factory_test.rb

@@ -12,6 +12,15 @@ def test_factory_hg
 			end
 		end
 
+		def test_factory_bzr
+			Scm::ScratchDir.new do |path|
+				`cd #{path} && bzr init`
+				bzr = Factory.from_path(path)
+				assert bzr.is_a?(BzrAdapter)
+				assert_equal bzr.url, path
+			end
+		end
+
 		def test_factory_git
 			Scm::ScratchDir.new do |path|
 				`cd #{path} && git init`

test/unit/bzr_validation_test.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Scm::Adapters
+	class BzrValidationTest < Scm::Test
+		def test_rejected_urls
+			[	nil, "", "foo", "http:/", "http:://", "http://", "http://a",
+				"www.selenic.com/repo/hello", # missing a protool prefix
+				"http://www.selenic.com/repo/hello%20world", # no encoded strings allowed
+				"http://www.selenic.com/repo/hello world", # no spaces allowed
+				"git://www.selenic.com/repo/hello", # git protocol not allowed
+				"svn://www.selenic.com/repo/hello" # svn protocol not allowed
+			].each do |url|
+				bzr = BzrAdapter.new(:url => url, :public_urls_only => true)
+				assert bzr.validate_url.any?
+			end
+		end
+
+		def test_accepted_urls
+			[ "http://www.selenic.com/repo/hello",
+				"http://www.selenic.com:80/repo/hello",
+				"https://www.selenic.com/repo/hello",
+			].each do |url|
+				bzr = BzrAdapter.new(:url => url, :public_urls_only => true)
+				assert !bzr.validate_url
+			end
+		end
+
+		# These urls are not available to the public
+		def test_rejected_public_urls
+			[ "file:///home/test/bzr",
+				"/home/test/bzr",
+				"ssh://test@localhost/home/test/bzr",
+				"ssh://localhost/home/test/bzr"
+			].each do |url|
+				bzr = BzrAdapter.new(:url => url, :public_urls_only => true)
+				assert bzr.validate_url
+
+				bzr = BzrAdapter.new(:url => url)
+				assert !bzr.validate_url
+			end
+		end
+
+		def test_guess_forge
+			bzr = BzrAdapter.new(:url => nil)
+			assert_equal nil, bzr.guess_forge
+
+			bzr = BzrAdapter.new(:url => "/home/test/bzr")
+			assert_equal nil, bzr.guess_forge
+
+			bzr = BzrAdapter.new( :url => 'http://www.selenic.com/repo/hello')
+			assert_equal 'www.selenic.com', bzr.guess_forge
+		end
+	end
+end