Merge branch 'master' of git://github.com/robinluckey/ohloh_scm

lib/scm/adapters/bzr/commits.rb

@@ -49,11 +49,18 @@ def verbose_commit(token)
 		def each_commit(since=0)
 			open_log_file(since) do |io|
 				Scm::Parsers::BzrParser.parse(io) do |commit|
-					yield commit if block_given? && commit.token != since
+					yield remove_directories(commit) if block_given? && commit.token != since
 				end
 			end
 		end
 
+		# Ohloh tracks only files, not directories. This function removes directories
+		# from the commit diffs.
+		def remove_directories(commit)
+			commit.diffs.delete_if { |d| d.path[-1..-1] == '/' }
+			commit
+		end
+
 		# Not used by Ohloh proper, but handy for debugging and testing
 		def log(since=nil)
 			run "#{rev_list_command(since)} -v"

test/unit/bzr_commits_test.rb

@@ -63,6 +63,23 @@ def test_each_commit
 			end
 		end
 
+		# This bzr repository contains the following tree structure
+		#    /foo/
+		#    /foo/helloworld.c
+		#    /bar/
+		# Ohloh doesn't care about directories, so only /foo/helloworld.c should be reported.
+		def test_each_commit_excludes_directories
+			with_bzr_repository('bzr_with_subdirectories') do |bzr|
+				commits = []
+				bzr.each_commit do |c|
+					commits << c
+				end
+				assert_equal 1, commits.size
+				assert_equal 1, commits.first.diffs.size
+				assert_equal 'foo/helloworld.c', commits.first.diffs.first.path
+			end
+		end
+
 		protected
 
 		def revision_ids