ohloh_scm 2.0.0 → 2.0.1

data/test/unit/git_commit_all_test.rb

@@ -1,10 +1,10 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class GitCommitAllTest < Scm::Test
+	class GitCommitAllTest < OhlohScm::Test
 
 		def test_commit_all
-			Scm::ScratchDir.new do |dir|
+			OhlohScm::ScratchDir.new do |dir|
 				git = GitAdapter.new(:url => dir).normalize
 
 				git.init_db
@@ -13,7 +13,7 @@ module OhlohScm::Adapters
 				File.open(File.join(dir, 'README'), 'w') {}
 				assert git.anything_to_commit?
 
-				c = Scm::Commit.new
+				c = OhlohScm::Commit.new
 				c.author_name = "John Q. Developer"
 				c.message = "Initial checkin."
 				git.commit_all(c)

data/test/unit/git_commits_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class GitCommitsTest < Scm::Test
+	class GitCommitsTest < OhlohScm::Test
 
 		def test_commit_count
 			with_git_repository('git') do |git|

data/test/unit/git_head_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class GitHeadTest < Scm::Test
+	class GitHeadTest < OhlohScm::Test
 
 		def test_head_and_parents
 			with_git_repository('git') do |git|

data/test/unit/git_log_parser_test.rb

@@ -2,7 +2,7 @@ require_relative '../test_helper'
 require 'date'
 
 module OhlohScm::Parsers
-	class GitStyledParserTest < Scm::Test
+	class GitStyledParserTest < OhlohScm::Test
 
 		def test_basic
 			commits = []
@@ -187,7 +187,7 @@ __END_COMMENT__
 
 __BEGIN_COMMIT__
 Commit: fa3ee9d4cefc2db81adadf36da9cacbe92ce96f1
-Author: 
+Author:
 AuthorEmail: mickeyl@openembedded.org
 Date: Wed, 11 Jun 2008 00:37:06 +0000
 __BEGIN_COMMENT__

data/test/unit/git_misc_test.rb

@@ -1,11 +1,11 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class GitMiscTest < Scm::Test
+	class GitMiscTest < OhlohScm::Test
 
 		def test_export
 			with_git_repository('git') do |git|
-				Scm::ScratchDir.new do |dir|
+				OhlohScm::ScratchDir.new do |dir|
 					git.export(dir)
 					assert_equal ['.','..','.gitignore','COPYING','README','helloworld.c','makefile','ohloh_token'], Dir.entries(dir).sort
 				end
@@ -27,8 +27,8 @@ module OhlohScm::Adapters
 
 		def test_is_merge_commit
 			with_git_repository('git_walk') do |git|
-				assert git.is_merge_commit?(Scm::Commit.new(:token => 'f264fb40c340a415b305ac1f0b8f12502aa2788f'))
-				assert !git.is_merge_commit?(Scm::Commit.new(:token => 'd067161caae2eeedbd74976aeff5c4d8f1ccc946'))
+				assert git.is_merge_commit?(OhlohScm::Commit.new(:token => 'f264fb40c340a415b305ac1f0b8f12502aa2788f'))
+				assert !git.is_merge_commit?(OhlohScm::Commit.new(:token => 'd067161caae2eeedbd74976aeff5c4d8f1ccc946'))
 			end
 		end
 

data/test/unit/git_parser_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Parsers
-	class GitParserTest < Scm::Test
+	class GitParserTest < OhlohScm::Test
 
 		def test_empty_array
 			assert_equal([], GitParser.parse(''))

data/test/unit/git_patch_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-  class GitPatchTest < Scm::Test
+  class GitPatchTest < OhlohScm::Test
     def test_patch_for_commit
       with_git_repository('git') do |repo|
         commit = repo.verbose_commit('b6e9220c3cabe53a4ed7f32952aeaeb8a822603d')

data/test/unit/git_pull_test.rb

@@ -1,11 +1,11 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class GitPullTest < Scm::Test
+	class GitPullTest < OhlohScm::Test
 
 		def test_basic_pull
 			with_git_repository('git') do |src|
-				Scm::ScratchDir.new do |dest_dir|
+				OhlohScm::ScratchDir.new do |dest_dir|
 
 					dest = GitAdapter.new(:url => dest_dir).normalize
 					assert !dest.exist?

data/test/unit/git_push_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class GitPushTest < Scm::Test
+	class GitPushTest < OhlohScm::Test
 
 		def test_hostname
 			assert_equal "foo", GitAdapter.new(:url => 'foo:/bar').hostname
@@ -23,7 +23,7 @@ module OhlohScm::Adapters
 
 		def test_basic_push
 			with_git_repository('git') do |src|
-				Scm::ScratchDir.new do |dest_dir|
+				OhlohScm::ScratchDir.new do |dest_dir|
 
 					dest = GitAdapter.new(:url => dest_dir).normalize
 					assert !dest.exist?
@@ -34,7 +34,7 @@ module OhlohScm::Adapters
 
 					# Now push again. This tests a different code path!
 					File.open(File.join(src.url, 'foo'), 'w') { }
-					src.commit_all(Scm::Commit.new)
+					src.commit_all(OhlohScm::Commit.new)
 
 					src.push(dest)
 					assert dest.exist?

data/test/unit/git_rev_list_test.rb

@@ -7,7 +7,7 @@ module OhlohScm::Adapters
 	#     /      \    \
 	#    A -> B -> C -> D -> master
 	#
-	class GitRevListTest < Scm::Test
+	class GitRevListTest < OhlohScm::Test
 
 		def test_rev_list
 			with_git_repository('git_walk') do |git|

data/test/unit/git_styled_parser_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Parsers
-	class GitStyledParserTest < Scm::Test
+	class GitStyledParserTest < OhlohScm::Test
 
 		def test_empty_array
 			assert_equal([], GitStyledParser.parse(''))
@@ -13,13 +13,13 @@ __BEGIN_COMMIT__
 Commit: 1df547800dcd168e589bb9b26b4039bff3a7f7e4
 Author: Jason Allen
 AuthorEmail: jason@ohloh.net
-Date:   
+Date: 
 __BEGIN_COMMENT__
     moving COPYING
 
 __END_COMMENT__
 SAMPLE
-      
+
 			commits = GitStyledParser.parse(sample_log)
 			assert_equal 1, commits.size
 			assert_equal Time.utc(1970,1,1,0,0,0), commits[0].author_date
@@ -37,7 +37,7 @@ __BEGIN_COMMENT__
 
 __END_COMMENT__
 SAMPLE
-      
+
 			commits = GitStyledParser.parse(sample_log)
 			assert_equal 1, commits.size
 			assert_equal Time.utc(1970,1,1,0,0,0), commits[0].author_date

data/test/unit/git_token_test.rb

@@ -1,10 +1,10 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class GitTokenTest < Scm::Test
+	class GitTokenTest < OhlohScm::Test
 
 		def test_no_token_returns_nil
-			Scm::ScratchDir.new do |dir|
+			OhlohScm::ScratchDir.new do |dir|
 				git = GitAdapter.new(:url => dir).normalize
 				assert !git.read_token
 				git.init_db
@@ -13,21 +13,21 @@ module OhlohScm::Adapters
 		end
 
 		def test_write_and_read_token
-			Scm::ScratchDir.new do |dir|
+			OhlohScm::ScratchDir.new do |dir|
 				git = GitAdapter.new(:url => dir).normalize
 				git.init_db
 				git.write_token("FOO")
 				assert !git.read_token # Token not valid until committed
-				git.commit_all(Scm::Commit.new)
+				git.commit_all(OhlohScm::Commit.new)
 				assert_equal "FOO", git.read_token
 			end
 		end
 
 		def test_commit_all_includes_write_token
-			Scm::ScratchDir.new do |dir|
+			OhlohScm::ScratchDir.new do |dir|
 				git = GitAdapter.new(:url => dir).normalize
 				git.init_db
-				c = Scm::Commit.new
+				c = OhlohScm::Commit.new
 				c.token = "BAR"
 				git.commit_all(c)
 				assert_equal c.token, git.read_token

data/test/unit/git_validation_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class GitValidationTest < Scm::Test
+	class GitValidationTest < OhlohScm::Test
 		def test_rejected_urls
 			[	nil, "", "foo", "http:/", "http:://", "http://", "http://a",
 			"kernel.org/linux/linux.git", # missing a protocol prefix

data/test/unit/hg_cat_file_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class HgCatFileTest < Scm::Test
+	class HgCatFileTest < OhlohScm::Test
 
 		def test_cat_file
 			with_hg_repository('hg') do |hg|
@@ -21,15 +21,15 @@ main()
 EXPECTED
 
 				# The file was deleted in revision 468336c6671c. Check that it does not exist now, but existed in parent.
-				assert_equal nil, hg.cat_file(Scm::Commit.new(:token => '75532c1e1f1d'), Scm::Diff.new(:path => 'helloworld.c'))
-				assert_equal expected, hg.cat_file_parent(Scm::Commit.new(:token => '75532c1e1f1d'), Scm::Diff.new(:path => 'helloworld.c'))
-				assert_equal expected, hg.cat_file(Scm::Commit.new(:token => '468336c6671c'), Scm::Diff.new(:path => 'helloworld.c'))
+				assert_equal nil, hg.cat_file(OhlohScm::Commit.new(:token => '75532c1e1f1d'), OhlohScm::Diff.new(:path => 'helloworld.c'))
+				assert_equal expected, hg.cat_file_parent(OhlohScm::Commit.new(:token => '75532c1e1f1d'), OhlohScm::Diff.new(:path => 'helloworld.c'))
+				assert_equal expected, hg.cat_file(OhlohScm::Commit.new(:token => '468336c6671c'), OhlohScm::Diff.new(:path => 'helloworld.c'))
 			end
 		end
 
 		# Ensure that we escape bash-significant characters like ' and & when they appear in the filename
 		def test_funny_file_name_chars
-			Scm::ScratchDir.new do |dir|
+			OhlohScm::ScratchDir.new do |dir|
 				# Make a file with a problematic filename
 				funny_name = '#|file_name` $(&\'")#'
 				File.open(File.join(dir, funny_name), 'w') { |f| f.write "contents" }
@@ -39,7 +39,7 @@ EXPECTED
 
 				# Confirm that we can read the file back
 				hg = HgAdapter.new(:url => dir).normalize
-				assert_equal "contents", hg.cat_file(hg.head, Scm::Diff.new(:path => funny_name))
+				assert_equal "contents", hg.cat_file(hg.head, OhlohScm::Diff.new(:path => funny_name))
 			end
 		end
 

data/test/unit/hg_commits_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class HgCommitsTest < Scm::Test
+	class HgCommitsTest < OhlohScm::Test
 
 		def test_commit_count
 			with_hg_repository('hg') do |hg|

data/test/unit/hg_head_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class HgHeadTest < Scm::Test
+	class HgHeadTest < OhlohScm::Test
 
 		def test_head_and_parents
 			with_hg_repository('hg') do |hg|

data/test/unit/hg_misc_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class HgMiscTest < Scm::Test
+	class HgMiscTest < OhlohScm::Test
 
 		def test_exist
 			save_hg = nil
@@ -20,7 +20,7 @@ module OhlohScm::Adapters
 
 		def test_export
 			with_hg_repository('hg') do |hg|
-				Scm::ScratchDir.new do |dir|
+				OhlohScm::ScratchDir.new do |dir|
 					hg.export(dir)
 					assert_equal ['.', '..', 'README', 'makefile'], Dir.entries(dir).sort
 				end

data/test/unit/hg_parser_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Parsers
-	class HgParserTest < Scm::Test
+	class HgParserTest < OhlohScm::Test
 
 		def test_empty_array
 			assert_equal([], HgParser.parse(''))

data/test/unit/hg_patch_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-  class HgPatchTest < Scm::Test
+  class HgPatchTest < OhlohScm::Test
     def test_patch_for_commit
       with_hg_repository('hg') do |repo|
         commit = repo.verbose_commit(1)

data/test/unit/hg_pull_test.rb

@@ -1,11 +1,11 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class HgPullTest < Scm::Test
+	class HgPullTest < OhlohScm::Test
 
 		def test_pull
 			with_hg_repository('hg') do |src|
-				Scm::ScratchDir.new do |dest_dir|
+				OhlohScm::ScratchDir.new do |dest_dir|
 
 					dest = HgAdapter.new(:url => dest_dir).normalize
 					assert !dest.exist?

data/test/unit/hg_push_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class HgPushTest < Scm::Test
+	class HgPushTest < OhlohScm::Test
 
 		def test_hostname
 			assert !HgAdapter.new.hostname
@@ -36,7 +36,7 @@ module OhlohScm::Adapters
 
 		def test_push
 			with_hg_repository('hg') do |src|
-				Scm::ScratchDir.new do |dest_dir|
+				OhlohScm::ScratchDir.new do |dest_dir|
 
 					dest = HgAdapter.new(:url => dest_dir).normalize
 					assert !dest.exist?

data/test/unit/hg_rev_list_test.rb

@@ -7,7 +7,7 @@ module OhlohScm::Adapters
 	#     /      \    \
 	#    A -> B -> C -> D -> tip
 	#
-	class HgRevListTest < Scm::Test
+	class HgRevListTest < OhlohScm::Test
 
 		def test_rev_list
 			with_hg_repository('hg_walk') do |hg|

data/test/unit/hg_validation_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class HgValidationTest < Scm::Test
+	class HgValidationTest < OhlohScm::Test
 		def test_rejected_urls
 			[	nil, "", "foo", "http:/", "http:://", "http://", "http://a",
 				"www.selenic.com/repo/hello", # missing a protool prefix

data/test/unit/hglib_cat_file_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class HglibCatFileTest < Scm::Test
+	class HglibCatFileTest < OhlohScm::Test
 
 		def test_cat_file
 			with_hglib_repository('hg') do |hg|
@@ -21,15 +21,15 @@ main()
 EXPECTED
 
 				# The file was deleted in revision 468336c6671c. Check that it does not exist now, but existed in parent.
-				assert_equal nil, hg.cat_file(Scm::Commit.new(:token => '75532c1e1f1d'), Scm::Diff.new(:path => 'helloworld.c'))
-				assert_equal expected, hg.cat_file_parent(Scm::Commit.new(:token => '75532c1e1f1d'), Scm::Diff.new(:path => 'helloworld.c'))
-				assert_equal expected, hg.cat_file(Scm::Commit.new(:token => '468336c6671c'), Scm::Diff.new(:path => 'helloworld.c'))
+				assert_equal nil, hg.cat_file(OhlohScm::Commit.new(:token => '75532c1e1f1d'), OhlohScm::Diff.new(:path => 'helloworld.c'))
+				assert_equal expected, hg.cat_file_parent(OhlohScm::Commit.new(:token => '75532c1e1f1d'), OhlohScm::Diff.new(:path => 'helloworld.c'))
+				assert_equal expected, hg.cat_file(OhlohScm::Commit.new(:token => '468336c6671c'), OhlohScm::Diff.new(:path => 'helloworld.c'))
 			end
 		end
 
 		# Ensure that we escape bash-significant characters like ' and & when they appear in the filename
 		def test_funny_file_name_chars
-			Scm::ScratchDir.new do |dir|
+			OhlohScm::ScratchDir.new do |dir|
 				# Make a file with a problematic filename
 				funny_name = '#|file_name` $(&\'")#'
 				File.open(File.join(dir, funny_name), 'w') { |f| f.write "contents" }
@@ -39,7 +39,7 @@ EXPECTED
 
 				# Confirm that we can read the file back
 				hg = HglibAdapter.new(:url => dir).normalize
-				assert_equal "contents", hg.cat_file(hg.head, Scm::Diff.new(:path => funny_name))
+				assert_equal "contents", hg.cat_file(hg.head, OhlohScm::Diff.new(:path => funny_name))
 			end
 		end
 

data/test/unit/hglib_head_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class HgHeadTest < Scm::Test
+	class HgHeadTest < OhlohScm::Test
 
 		def test_head_and_parents
 			with_hglib_repository('hg') do |hg|

data/test/unit/ohlog_command_line_test.rb

@@ -1,5 +1,5 @@
 module OhlohScm::Parsers
-	class CommandLineTest < Scm::Test
+	class CommandLineTest < OhlohScm::Test
 		def test_cvs_from_file
 			result = `#{File.dirname(__FILE__) + '/../../bin/ohlog'} --xml --cvs #{DATA_DIR + '/basic.rlog'}`
 			assert_equal 0, $?