Merge pull request #13 from blackducksw/Normalize_Branch_Name

Normalize_Branch_Name: set the branch name when normalizing an SvnAdapter

Author: Peter Degen-Portnoy

lib/scm/adapters/svn/misc.rb

@@ -35,10 +35,10 @@ def restrict_url_to_trunk
 
 			if list.include? 'trunk/'
 				self.url = File.join(self.url, 'trunk')
-				self.branch_name = File.join(self.branch_name, 'trunk')
+				self.branch_name = File.join(self.branch_name, 'trunk') if self.branch_name
 			elsif list.size == 1 and list.first[-1..-1] == '/'
 				self.url = File.join(self.url, list.first[0..-2])
-				self.branch_name = File.join(self.branch_name, list.first[0..-2])
+				self.branch_name = File.join(self.branch_name, list.first[0..-2]) if self.branch_name
 				return restrict_url_to_trunk
 			end
 			self.url

lib/scm/adapters/svn/validation.rb

@@ -12,7 +12,7 @@ def normalize
 			super
 			@url = path_to_file_url(@url)
 			@url = force_https_if_sourceforge(@url)
-			@branch_name = @branch_name[0..-2] if @branch_name && @branch_name[-1..-1] == '/'
+      @branch_name = recalc_branch_name
 			self
 		end
 
@@ -32,7 +32,7 @@ def path_to_file_url(path)
 
 		def force_https_if_sourceforge(url)
 			# SourceForge requires https for svnsync
-			url =~ /http(:\/\/.*svn\.sourceforge\.net.*)/ ? "https#{$1}" : url
+      url =~ /http(:\/\/.*svn\.(sourceforge|code\.sf)\.net.*)/ ? "https#{$1}" : url
 		end
 
 		def validate_server_connection
@@ -54,7 +54,12 @@ def validate_server_connection
 		# From the given URL, determine which part of it is the root and which part of it is the branch_name.
 		# The current branch_name is overwritten.
 		def recalc_branch_name
-			@branch_name = @url ? @url[root.length..-1] : @branch_name
+      begin
+        @branch_name = @url ? @url[root.length..-1] : @branch_name
+      rescue RuntimeError => exception
+        exception.message =~ /svn:*is not a working copy/ # we have a file system
+        @branch_name = ''
+      end
 			@branch_name = @branch_name[0..-2] if @branch_name[-1..-1] == '/'
 			@branch_name
 		end

test/unit/svn_validation_test.rb

@@ -95,6 +95,9 @@ def test_guess_forge
 			svn = SvnAdapter.new(:url => 'https://vegastrike.svn.sourceforge.net/svnroot/vegastrike/trunk')
 			assert_equal 'sourceforge.net', svn.guess_forge
 
+      svn = SvnAdapter.new(:url => 'https://svn.code.sf.net/p/gallery/code/trunk/gallery2')
+      assert_equal 'code.sf.net', svn.guess_forge
+
 			svn = SvnAdapter.new(:url => 'https://appfuse.dev.java.net/svn/appfuse/trunk')
 			assert_equal 'java.net', svn.guess_forge
 
@@ -106,14 +109,13 @@ def test_guess_forge
 		end
 
 		def test_sourceforge_requires_https
-			assert_equal 'https://gallery.svn.sourceforge.net/svnroot/gallery/trunk/gallery2',
-				SvnAdapter.new(:url => 'http://gallery.svn.sourceforge.net/svnroot/gallery/trunk/gallery2').normalize.url
+      url = '://svn.code.sf.net/p/gallery/code/trunk/gallery2'
+      assert_equal "https#{url}", SvnAdapter.new(:url => "http#{url}").normalize.url
 
-			assert_equal 'https://gallery.svn.sourceforge.net/svnroot/gallery/trunk/gallery2',
-				SvnAdapter.new(:url => 'https://gallery.svn.sourceforge.net/svnroot/gallery/trunk/gallery2').normalize.url
+			assert_equal "https#{url}", SvnAdapter.new(:url => "https#{url}").normalize.url
 
-			assert_equal 'http://pianosa.googlecode.com/svn/trunk',
-				SvnAdapter.new(:url => 'http://pianosa.googlecode.com/svn/trunk').normalize.url
+      url = 'https://github.com/blackducksw/ohloh_scm/trunk'
+			assert_equal url,  SvnAdapter.new(:url => url).normalize.url
 		end
 
 		def test_validate_server_connection
@@ -145,6 +147,16 @@ def test_recalc_branch_name
 				assert !svn_trunk_with_whack.branch_name
 				assert_equal '/trunk', svn_trunk_with_whack.recalc_branch_name
 				assert_equal '/trunk', svn_trunk_with_whack.branch_name
+
+				svn_trunk = SvnAdapter.new(:url => svn.root + '/trunk')
+				assert !svn_trunk.branch_name
+        svn_trunk.normalize # only normalize to ensure branch_name is populated correctly
+				assert_equal '/trunk', svn_trunk.branch_name
+
+        svn_trunk = SvnAdapter.new(:url => svn.root)
+				assert !svn_trunk.branch_name
+        svn_trunk.normalize
+				assert_equal '', svn_trunk.branch_name
 			end
 		end
 	end