Merge pull request #14 from blackducksw/Normalize_Branch_Name

Normalize_Branch_Name: Correct condition in recalc_branch_name

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') if self.branch_name
+				self.branch_name = File.join(self.branch_name, 'trunk')
 			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]) if self.branch_name
+				self.branch_name = File.join(self.branch_name, list.first[0..-2])
 				return restrict_url_to_trunk
 			end
 			self.url

lib/scm/adapters/svn/validation.rb

@@ -12,7 +12,11 @@ def normalize
 			super
 			@url = path_to_file_url(@url)
 			@url = force_https_if_sourceforge(@url)
-      @branch_name = recalc_branch_name
+      if @branch_name
+        clean_branch_name
+      else
+        @branch_name = recalc_branch_name
+      end
 			self
 		end
 
@@ -57,11 +61,10 @@ def recalc_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 = ''
+        @branch_name = '' if exception.message =~ /(svn:*is not a working copy|Unable to open an ra_local session to URL)/ # we have a file system
       end
-			@branch_name = @branch_name[0..-2] if @branch_name[-1..-1] == '/'
-			@branch_name
+      clean_branch_name
+      @branch_name
 		end
 
 		def guess_forge
@@ -74,5 +77,11 @@ def guess_forge
 				u
 			end
 		end
+
+    private
+    def clean_branch_name
+      return unless @branch_name
+      @branch_name.chop! if @branch_name.end_with?('/')
+    end
 	end
 end

test/unit/svn_validation_test.rb

@@ -159,9 +159,18 @@ def test_recalc_branch_name
 				assert_equal '', svn_trunk.branch_name
 			end
 		end
-	end
 
-	def test_strip_trailing_whack_from_branch_name
-		assert_equal '/trunk', SvnAdapter.new(:branch_name => "/trunk/").normalize.branch_name
+    def test_strip_trailing_whack_from_branch_name
+      with_svn_repository('svn') do |svn|
+        assert_equal '/trunk', SvnAdapter.new(:url => svn.root, :branch_name => "/trunk/").normalize.branch_name
+      end
+    end
+
+    def test_empty_branch_name_with_file_system
+      Scm::ScratchDir.new do |dir|
+        svn = SvnAdapter.new(:url => dir).normalize
+        assert_equal '', svn.branch_name
+      end
+    end
 	end
 end