Merge pull request #12 from blackducksw/OTWO-3048

Change Git Validation to convert https and http protocols for git and web urls to git protocol

Author: Peter Degen-Portnoy

lib/scm/adapters/git/validation.rb

@@ -10,17 +10,21 @@ def self.public_url_regex
 
 		def normalize
 			super
-      @url = read_only_url
+      @url = normalize_url
 			@branch_name = 'master' if @branch_name.to_s == ''
 			self
 		end
 
-    # Given a Github read-write URL, return a read-only URL.
-    # Otherwise, return the original URL.
-    def read_only_url
+    # Given a Github read-write URL, return a git protocol read-only URL
+    # Given a Github web URL, return a git protocol read-only URL
+    # Given a Git read-write protocol URL, return a git protocol read-only URL
+    # Else, return the URL
+    def normalize_url
       case @url
-      when /^https:\/\/\w+@github.com\/(.+)\.git$/
+      when /^https?:\/\/\w+@github.com\/(.+)\.git$/
         "git://github.com/#{$1}.git"
+      when /^https?:\/\/github.com\/(.+)/
+        "git://github.com/#{$1}"
       when /^git@github.com:(.+)\.git$/
         "git://github.com/#{$1}.git"
       else

test/unit/git_validation_test.rb

@@ -23,7 +23,11 @@ def test_accepted_urls
 			"https://kernel.org/pub/scm/git/git.git",
 			"https://kernel.org:8080/pub/scm/git/git.git",
 			"git://kernel.org/~foo/git.git",
-			"http://git.onerussian.com/pub/deb/impose+.git"
+			"http://git.onerussian.com/pub/deb/impose+.git",
+      "https://Person@github.com/Person/some_repo.git",
+      "http://Person@github.com/Person/some_repo.git",
+      "https://github.com/Person/some_repo",
+      "http://github.com/Person/some_repo"
 			].each do |url|
 				git = GitAdapter.new(:url => url)
 				assert !git.validate_url
@@ -41,32 +45,49 @@ def test_guess_forge
 			assert_equal 'kernel.org', git.guess_forge
 		end
 
-    def test_read_only_url
-      assert_equal nil, GitAdapter.new(:url => nil).read_only_url
-      assert_equal '', GitAdapter.new(:url => '').read_only_url
-      assert_equal 'foo', GitAdapter.new(:url => 'foo').read_only_url
+    def test_normalize_url
+      assert_equal nil, GitAdapter.new(:url => nil).normalize_url
+      assert_equal '', GitAdapter.new(:url => '').normalize_url
+      assert_equal 'foo', GitAdapter.new(:url => 'foo').normalize_url
 
       # A non-Github URL: no change
 			assert_equal 'git://kernel.org/pub/scm/git/git.git',
-        GitAdapter.new(:url => 'git://kernel.org/pub/scm/git/git.git').read_only_url
+        GitAdapter.new(:url => 'git://kernel.org/pub/scm/git/git.git').normalize_url
 
       # A Github read-write URL: converted to read-only
       assert_equal 'git://github.com/robinluckey/ohcount.git',
-        GitAdapter.new(:url => 'https://robinluckey@github.com/robinluckey/ohcount.git').read_only_url
+        GitAdapter.new(:url => 'https://robinluckey@github.com/robinluckey/ohcount.git').normalize_url
 
       # A Github read-write URL: converted to read-only
       assert_equal 'git://github.com/robinluckey/ohcount.git',
-        GitAdapter.new(:url => 'git@github.com:robinluckey/ohcount.git').read_only_url
+        GitAdapter.new(:url => 'git@github.com:robinluckey/ohcount.git').normalize_url
 
       # A Github read-only URL: no change
       assert_equal 'git://github.com/robinluckey/ohcount.git',
-        GitAdapter.new(:url => 'git@github.com:robinluckey/ohcount.git').read_only_url
+        GitAdapter.new(:url => 'git@github.com:robinluckey/ohcount.git').normalize_url
     end
 
     def test_normalize_converts_to_read_only
-      git = GitAdapter.new(:url => 'https://robinluckey@github.com/robinluckey/ohcount.git')
-      git.normalize
-      assert_equal 'git://github.com/robinluckey/ohcount.git', git.url
+      normalize_url_test('https://robinluckey@github.com/robinluckey/ohcount.git', 'git://github.com/robinluckey/ohcount.git')
+    end
+
+    def test_normalize_handles_https_with_user_at_github_format
+      normalize_url_test('http://Person@github.com/Person/something.git', 'git://github.com/Person/something.git')
+    end
+
+    def test_normalize_handles_https_web_url
+      normalize_url_test('https://github.com/Person/something', 'git://github.com/Person/something')
     end
+
+    def test_normalize_handles_http_web_url
+      normalize_url_test('http://github.com/Person/something', 'git://github.com/Person/something')
+    end
+
+  private
+    def normalize_url_test(url, result_url)
+      git = GitAdapter.new(:url => url)
+      git.normalize
+      assert_equal result_url, git.url
+     end
 	end
 end