[NEW] Adding Bazaar support: add misc, pull and push adapter modules with tests

Michael

Author: obnoxxx

lib/scm/adapters/bzr/misc.rb

@@ -0,0 +1,16 @@
+module Scm::Adapters
+	class BzrAdapter < AbstractAdapter
+		def exist?
+			begin
+				!!(head_token)
+			rescue
+				logger.debug { $! }
+				false
+			end
+		end
+
+		def ls_tree(token)
+			run("cd #{path} && bzr ls -V -r #{token}").split("\n")
+		end
+	end
+end

lib/scm/adapters/bzr/pull.rb

@@ -0,0 +1,22 @@
+module Scm::Adapters
+	class BzrAdapter < AbstractAdapter
+
+		def pull(from, &block)
+			raise ArgumentError.new("Cannot pull from #{from.inspect}") unless from.is_a?(BzrAdapter)
+			logger.info { "Pulling #{from.url}" }
+
+			yield(0,1) if block_given? # Progress bar callback
+
+			unless self.exist?
+				run "mkdir -p '#{self.url}'"
+				run "rm -rf '#{self.url}'"
+				run "bzr branch '#{from.url}' '#{self.url}'"
+			else
+				run "cd '#{self.url}' && bzr pull --overwrite '#{from.url}'"
+			end
+
+			yield(1,1) if block_given? # Progress bar callback
+		end
+
+	end
+end

lib/scm/adapters/bzr/push.rb

@@ -0,0 +1,51 @@
+module Scm::Adapters
+	class BzrAdapter < AbstractAdapter
+
+		def push(to, &block)
+			raise ArgumentError.new("Cannot push to #{to.inspect}") unless to.is_a?(BzrAdapter)
+			logger.info { "Pushing to #{to.url}" }
+
+			yield(0,1) if block_given? # Progress bar callback
+
+			unless to.exist?
+				if to.local?
+					# Create a new repo on the same local machine. Just use existing pull code in reverse.
+					to.pull(self)
+				else
+					run "ssh #{to.hostname} 'mkdir -p #{to.path}'"
+					run "scp -rpqB #{bzr_path} #{to.hostname}:#{to.path}"
+				end
+			else
+				run "cd '#{self.url}' && bzr push '#{to.url}'"
+			end
+
+			yield(1,1) if block_given? # Progress bar callback
+		end
+
+		def local?
+			return true if hostname == Socket.gethostname
+			return true if url =~ /^file:\/\//
+			return true if url !~ /:/
+			false
+		end
+
+		def hostname
+			$1 if url =~ /^ssh:\/\/([^\/]+)/
+		end
+
+		def path
+			case url
+			when /^file:\/\/(.+)$/
+				$1
+			when /^ssh:\/\/[^\/]+(\/.+)$/
+				$1
+			when /^[^:]*$/
+				url
+			end
+		end
+
+		def bzr_path
+			path && File.join(path, '.bzr')
+		end
+	end
+end

lib/scm/adapters/bzr_adapter.rb

@@ -10,3 +10,6 @@ def english_name
 require 'lib/scm/adapters/bzr/commits'
 require 'lib/scm/adapters/bzr/head'
 require 'lib/scm/adapters/bzr/cat_file'
+require 'lib/scm/adapters/bzr/misc'
+require 'lib/scm/adapters/bzr/pull'
+require 'lib/scm/adapters/bzr/push'

test/unit/bzr_misc_test.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Scm::Adapters
+	class BzrMiscTest < Scm::Test
+
+		def test_exist
+			save_bzr = nil
+			with_bzr_repository('bzr') do |bzr|
+				save_bzr = bzr
+				assert save_bzr.exist?
+			end
+			assert !save_bzr.exist?
+		end
+
+		def test_ls_tree
+			with_bzr_repository('bzr') do |bzr|
+				assert_equal ['file1.txt',
+					      'file3.txt',
+					      'file4.txt',
+					      'file5.txt'],
+					     bzr.ls_tree(bzr.head_token).sort
+			end
+		end
+
+	end
+end

test/unit/bzr_pull_test.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Scm::Adapters
+	class BzrPullTest < Scm::Test
+
+		def test_pull
+			with_bzr_repository('bzr') do |src|
+				Scm::ScratchDir.new do |dest_dir|
+
+					dest = BzrAdapter.new(:url => dest_dir).normalize
+					assert !dest.exist?
+
+					dest.pull(src)
+					assert dest.exist?
+
+					assert_equal src.log, dest.log
+
+					# Commit some new code on the original and pull again
+					src.run "cd '#{src.url}' && touch foo && bzr add foo && bzr whoami 'test <[email protected]>' && bzr commit -m test"
+					assert_equal "test\n", src.commits.last.message
+					assert_equal "test", src.commits.last.committer_name
+					assert_equal "[email protected]", src.commits.last.committer_email
+
+					dest.pull(src)
+					assert_equal src.log, dest.log
+				end
+			end
+		end
+
+	end
+end

test/unit/bzr_push_test.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+module Scm::Adapters
+	class BzrPushTest < Scm::Test
+
+		def test_hostname
+			assert !BzrAdapter.new.hostname
+			assert !BzrAdapter.new(:url => "http://www.ohloh.net/test").hostname
+			assert !BzrAdapter.new(:url => "/Users/test/foo").hostname
+			assert_equal "foo", BzrAdapter.new(:url => 'ssh://foo/bar').hostname
+		end
+
+		def test_local
+			assert !BzrAdapter.new(:url => "foo:/bar").local? # Assuming your machine is not named "foo" :-)
+			assert !BzrAdapter.new(:url => "http://www.ohloh.net/foo").local?
+			assert !BzrAdapter.new(:url => "ssh://host/Users/test/src").local?
+			assert BzrAdapter.new(:url => "src").local?
+			assert BzrAdapter.new(:url => "/Users/test/src").local?
+			assert BzrAdapter.new(:url => "file:///Users/test/src").local?
+			assert BzrAdapter.new(:url => "ssh://#{Socket.gethostname}/Users/test/src").local?
+		end
+
+		def test_path
+			assert_equal nil, BzrAdapter.new().path
+			assert_equal nil, BzrAdapter.new(:url => "http://ohloh.net/foo").path
+			assert_equal nil, BzrAdapter.new(:url => "https://ohloh.net/foo").path
+			assert_equal "/Users/test/foo", BzrAdapter.new(:url => "file:///Users/test/foo").path
+			assert_equal "/Users/test/foo", BzrAdapter.new(:url => "ssh://localhost/Users/test/foo").path
+			assert_equal "/Users/test/foo", BzrAdapter.new(:url => "/Users/test/foo").path
+		end
+
+		def test_bzr_path
+			assert_equal nil, BzrAdapter.new().bzr_path
+			assert_equal "/Users/test/src/.bzr", BzrAdapter.new(:url => "/Users/test/src").bzr_path
+		end
+
+		def test_push
+			with_bzr_repository('bzr') do |src|
+				Scm::ScratchDir.new do |dest_dir|
+
+					dest = BzrAdapter.new(:url => dest_dir).normalize
+					assert !dest.exist?
+
+					src.push(dest)
+					assert dest.exist?
+					assert_equal src.log, dest.log
+
+					# Commit some new code on the original and pull again
+					src.run "cd '#{src.url}' && touch foo && bzr add foo && bzr whoami 'test <[email protected]>' && bzr commit -m test"
+					assert_equal "test\n", src.commits.last.message
+					assert_equal "test", src.commits.last.committer_name
+					assert_equal "[email protected]", src.commits.last.committer_email
+
+					src.push(dest)
+					assert_equal src.log, dest.log
+				end
+			end
+		end
+
+	end
+end