ohloh_scm 2.0.0 → 2.0.1

data/test/unit/bzr_commits_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class BzrCommitsTest < Scm::Test
+	class BzrCommitsTest < OhlohScm::Test
 
 		def test_commit_count
 			with_bzr_repository('bzr') do |bzr|
@@ -63,7 +63,7 @@ module OhlohScm::Adapters
 				assert_equal [
 					'test@example.com-20090206214301-s93cethy9atcqu9h',
 					'test@example.com-20090206214451-lzjngefdyw3vmgms',
-					'test@example.com-20090206214350-rqhdpz92l11eoq2t', # branch commit 
+					'test@example.com-20090206214350-rqhdpz92l11eoq2t', # branch commit
 					'test@example.com-20090206214515-21lkfj3dbocao5pr'  # merge commit
 				], bzr.commit_tokens(:trunk_only => false)
 			end
@@ -95,8 +95,8 @@ module OhlohScm::Adapters
           'test@example.com-20110803170648-o0xcbni7lwp97azj',
           'test@example.com-20110803170818-v44umypquqg8migo'
         ], bzr.commit_tokens(:trunk_only => false)
-      end 
-    end 
+      end
+    end
 
     def test_nested_branches_commit_tokens_trunk_only_true
       with_bzr_repository('bzr_with_nested_branches') do |bzr|
@@ -109,15 +109,15 @@ module OhlohScm::Adapters
           'obnox@samba.org-20090204004942-73rnw0izen42f154',
           'test@example.com-20110803170818-v44umypquqg8migo'
         ], bzr.commit_tokens(:trunk_only => true)
-      end 
-    end 
+      end
+    end
 
 		def test_commits_trunk_only_false
 			with_bzr_repository('bzr_with_branch') do |bzr|
 				assert_equal [
 					'test@example.com-20090206214301-s93cethy9atcqu9h',
 					'test@example.com-20090206214451-lzjngefdyw3vmgms',
-					'test@example.com-20090206214350-rqhdpz92l11eoq2t', # branch commit 
+					'test@example.com-20090206214350-rqhdpz92l11eoq2t', # branch commit
 					'test@example.com-20090206214515-21lkfj3dbocao5pr'  # merge commit
 				], bzr.commits(:trunk_only => false).map { |c| c.token }
 			end
@@ -163,8 +163,8 @@ module OhlohScm::Adapters
           'test@example.com-20110803170648-o0xcbni7lwp97azj',
           'test@example.com-20110803170818-v44umypquqg8migo'
         ], bzr.commits(:trunk_only => false).map { |c| c.token }
-      end 
-    end 
+      end
+    end
 
     def test_nested_branches_commits_trunk_only_true
       with_bzr_repository('bzr_with_nested_branches') do |bzr|
@@ -177,8 +177,8 @@ module OhlohScm::Adapters
           'obnox@samba.org-20090204004942-73rnw0izen42f154',
           'test@example.com-20110803170818-v44umypquqg8migo'
         ], bzr.commits(:trunk_only => true).map { |c| c.token }
-      end 
-    end 
+      end
+    end
 
 		def test_commits
 			with_bzr_repository('bzr') do |bzr|
@@ -345,7 +345,7 @@ module OhlohScm::Adapters
         assert_equal 'Abhay Mujumdar', commits[0].committer_name
         assert_equal nil, commits[0].author_name
         assert_equal nil, commits[0].author_email
-        
+
         assert_equal 'Updated.', commits[1].message
         assert_equal 'Abhay Mujumdar', commits[1].committer_name
         assert_equal 'John Doe', commits[1].author_name

data/test/unit/bzr_head_test.rb

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

data/test/unit/bzr_misc_test.rb

@@ -2,7 +2,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class BzrMiscTest < Scm::Test
+	class BzrMiscTest < OhlohScm::Test
 
 		def test_exist
 			save_bzr = nil
@@ -26,7 +26,7 @@ module OhlohScm::Adapters
 
 		def test_export
 			with_bzr_repository('bzr') do |bzr|
-				Scm::ScratchDir.new do |dir|
+				OhlohScm::ScratchDir.new do |dir|
 					bzr.export(dir)
 					assert_equal ['.', '..', 'Cédric.txt', 'file1.txt', 'file3.txt', 'file4.txt', 'file5.txt'], Dir.entries(dir).sort
 				end

data/test/unit/bzr_parser_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Parsers
-	class BzrParserTest < Scm::Test
+	class BzrParserTest < OhlohScm::Test
 
 		def test_empty_array
 			assert_equal([], BzrParser.parse(''))
@@ -305,8 +305,8 @@ renamed:
 		end
 
 		def test_remove_dupes_add_remove
-			diffs = BzrParser.remove_dupes([ Scm::Diff.new(:action => "A", :path => "foo"),
-																				Scm::Diff.new(:action => "D", :path => "foo") ])
+			diffs = BzrParser.remove_dupes([ OhlohScm::Diff.new(:action => "A", :path => "foo"),
+																				OhlohScm::Diff.new(:action => "D", :path => "foo") ])
 			assert_equal 1, diffs.size
 			assert_equal 'M', diffs.first.action
 			assert_equal 'foo', diffs.first.path
@@ -378,9 +378,9 @@ message:
   This is a tricky commit message to confirm fix
   to Ticket 5. We're including a line of dashes in
   the message that resembles a log delimiter.
-  
+
   ------------------------------------------------------------
-  
+
 	Happy parsing!
 added:
   goodbyeworld.c

data/test/unit/bzr_pull_test.rb

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

data/test/unit/bzr_push_test.rb

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

data/test/unit/bzr_validation_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class BzrValidationTest < Scm::Test
+	class BzrValidationTest < OhlohScm::Test
 		def test_rejected_urls
 			[	nil, "", "foo", "http:/", "http:://", "http://", "http://a",
 				"www.selenic.com/repo/hello", # missing a protool prefix
@@ -21,8 +21,8 @@ module OhlohScm::Adapters
 				"http://www.selenic.com:80/repo/hello",
 				"https://www.selenic.com/repo/hello",
 				"bzr://www.selenic.com/repo/hello",
-				"lp:foobar", 
-				"lp:~foobar/bar", 
+				"lp:foobar",
+				"lp:~foobar/bar",
 			].each do |url|
 				bzr = BzrAdapter.new(:url => url, :public_urls_only => true)
 				assert !bzr.validate_url

data/test/unit/bzr_xml_parser_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Parsers
-	class BzrXmlParserTest < Scm::Test
+	class BzrXmlParserTest < OhlohScm::Test
 
 		def test_empty_array
 			assert_equal([], BzrXmlParser.parse(''))
@@ -10,7 +10,7 @@ module OhlohScm::Parsers
 		def test_empty_xml
 			assert_equal("<?xml version=\"1.0\"?>\n<ohloh_log scm=\"bzr\">\n</ohloh_log>\n", BzrXmlParser.parse('', :writer => XmlWriter.new))
 		end
-	
+
     def test_basic_xml
       xml = <<-XML
 <?xml version="1.0" encoding="UTF-8"?>
@@ -31,7 +31,7 @@ module OhlohScm::Parsers
 			commits = BzrXmlParser.parse(xml)
 			assert_equal 1, commits.size
       c = commits.first
-			assert_equal 0, c.diffs.size 
+			assert_equal 0, c.diffs.size
       assert_equal "Renamed test1.txt to subdir/test_b.txt, removed test2.txt and added test_a.txt.", c.message
       assert_equal "test@example.com-20110725174345-brbpkwumeh07aoh8", c.token
     end
@@ -71,7 +71,7 @@ module OhlohScm::Parsers
 
 			assert_equal "test2.txt", c.diffs[0].path
       assert_equal "D", c.diffs[0].action
-			
+
 			assert_equal "test_a.txt", c.diffs[1].path
       assert_equal "A", c.diffs[1].action
 
@@ -83,9 +83,9 @@ module OhlohScm::Parsers
 		end
 
     # When an directory is deleted, bzr outputs one delete entry
-    # per file and one for the directory. For empty dirs, there 
-    # is only one directory remove entry. 
-    # Ohloh keeps file delete entries but ignores directory 
+    # per file and one for the directory. For empty dirs, there
+    # is only one directory remove entry.
+    # Ohloh keeps file delete entries but ignores directory
     # delete entry.
     def test_ignore_dir_delete_xml
       xml = <<-XML
@@ -114,7 +114,7 @@ module OhlohScm::Parsers
     XML
       commits = BzrXmlParser.parse(xml)
       assert_equal 1, commits.size
-    
+
       c = commits.first
       assert_equal 1, c.diffs.size
       assert_equal "uspace/lib/net/include/nil_interface.h", c.diffs.first.path
@@ -243,12 +243,12 @@ module OhlohScm::Parsers
       assert_equal "test", c.committer_name
       assert_equal "test@example.com", c.committer_email
       assert_equal nil, c.author_name
-      assert_equal nil, c.author_email      
+      assert_equal nil, c.author_email
     end
 
     def test_rename
       xml = <<-XML
-<logs>    
+<logs>
   <log>
     <revno>10</revno>
     <revisionid>test@example.com-20110725174345-brbpkwumeh07aoh8</revisionid>
@@ -265,7 +265,7 @@ module OhlohScm::Parsers
       </renamed>
     </affected-files>
   </log>
-</logs>    
+</logs>
       XML
       commits = BzrXmlParser.parse(xml)
       assert_equal 1, commits.size
@@ -278,21 +278,21 @@ module OhlohScm::Parsers
     end
 
     def test_remove_dupes_add_remove
-      diffs = BzrXmlParser.remove_dupes([ Scm::Diff.new(:action => "A", :path => "foo"),
-                                        Scm::Diff.new(:action => "D", :path => "foo") ])
+      diffs = BzrXmlParser.remove_dupes([ OhlohScm::Diff.new(:action => "A", :path => "foo"),
+                                        OhlohScm::Diff.new(:action => "D", :path => "foo") ])
       assert_equal 1, diffs.size
       assert_equal 'M', diffs.first.action
       assert_equal 'foo', diffs.first.path
-    end    
+    end
 
-    # A complex delete/rename/modify test. 
-    # Removed test_a.txt, Renamed test3.txt to test_a.txt, edited test_a.txt 
-    #   
+    # A complex delete/rename/modify test.
+    # Removed test_a.txt, Renamed test3.txt to test_a.txt, edited test_a.txt
+    #
     # This is what Ohloh expects to see:
-    #   
-    #   D  test3.txt 
+    #
+    #   D  test3.txt
     #   M  test_a.txt
-    #   
+    #
     def test_complex_rename
       xml = <<-XML
 <logs>

data/test/unit/bzrlib_cat_file_test.rb

@@ -2,7 +2,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class BzrlibCatFileTest < Scm::Test
+	class BzrlibCatFileTest < OhlohScm::Test
 
 		def test_cat_file
 			with_bzrlib_repository('bzr') do |bzr|
@@ -11,12 +11,12 @@ first file
 second line
 EXPECTED
 				assert_equal expected,
-					bzr.cat_file(Scm::Commit::new(:token => 6),
-						     Scm::Diff.new(:path => "file1.txt"))
+					bzr.cat_file(OhlohScm::Commit::new(:token => 6),
+						     OhlohScm::Diff.new(:path => "file1.txt"))
 
 				# file2.txt has been removed in commit #5
 				assert_equal nil, bzr.cat_file(bzr.head,
-							       Scm::Diff.new(:path => "file2.txt"))
+							       OhlohScm::Diff.new(:path => "file2.txt"))
 			end
 		end
 
@@ -27,8 +27,8 @@ first file
 second line
 EXPECTED
 				assert_equal expected,
-					bzr.cat_file(Scm::Commit::new(:token => 7),
-						     Scm::Diff.new(:path => "Cédric.txt"))
+					bzr.cat_file(OhlohScm::Commit::new(:token => 7),
+						     OhlohScm::Diff.new(:path => "Cédric.txt"))
 			end
 		end
 
@@ -39,16 +39,16 @@ first file
 second line
 EXPECTED
 				assert_equal expected,
-					bzr.cat_file_parent(Scm::Commit::new(:token => 6),
-							    Scm::Diff.new(:path => "file1.txt"))
+					bzr.cat_file_parent(OhlohScm::Commit::new(:token => 6),
+							    OhlohScm::Diff.new(:path => "file1.txt"))
 
 				# file2.txt has been removed in commit #5
 				expected = <<-EXPECTED
 another file
 EXPECTED
 				assert_equal expected,
-					bzr.cat_file_parent(Scm::Commit.new(:token => 5),
-							    Scm::Diff.new(:path => "file2.txt"))
+					bzr.cat_file_parent(OhlohScm::Commit.new(:token => 5),
+							    OhlohScm::Diff.new(:path => "file2.txt"))
 			end
 		end
 

data/test/unit/bzrlib_head_test.rb

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

data/test/unit/cvs_branch_number_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Parsers
-	class CvsBranchNumberTest < Scm::Test
+	class CvsBranchNumberTest < OhlohScm::Test
 		def test_basic
 			assert_equal [1,1], BranchNumber.new('1.1').to_a
 			assert_equal [1234,1234], BranchNumber.new('1234.1234').to_a

data/test/unit/cvs_commits_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class CvsCommitsTest < Scm::Test
+	class CvsCommitsTest < OhlohScm::Test
 
 		def test_commits
 			with_cvs_repository('cvs', 'simple') do |cvs|

data/test/unit/cvs_convert_test.rb

@@ -1,11 +1,11 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class CvsConvertTest < Scm::Test
+	class CvsConvertTest < OhlohScm::Test
 
 		def test_basic_convert
 			with_cvs_repository('cvs', 'simple') 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/cvs_misc_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class CvsMiscTest < Scm::Test
+	class CvsMiscTest < OhlohScm::Test
 		def test_local_directory_trim
 			r = CvsAdapter.new(:url => "/Users/robin/cvs_repo/", :module_name => "simple")
 			assert_equal "/Users/robin/cvs_repo/simple/foo.rb", r.trim_directory('/Users/robin/cvs_repo/simple/foo.rb')

data/test/unit/cvs_parser_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Parsers
-	class CvsParserTest < Scm::Test
+	class CvsParserTest < OhlohScm::Test
 
 		def test_basic
 			assert_convert(CvsParser, DATA_DIR + '/basic.rlog', DATA_DIR + '/basic.ohlog')

data/test/unit/cvs_validation_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class CvsValidationTest < Scm::Test
+	class CvsValidationTest < OhlohScm::Test
 		def test_rejected_urls
 			[	nil, "", "foo", "http:/", "http:://", "http://", "http://a",
 				":pserver", # that's not enough

data/test/unit/git_cat_file_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 
 module OhlohScm::Adapters
-	class GitCatFileTest < Scm::Test
+	class GitCatFileTest < OhlohScm::Test
 
 		def test_cat_file
 			with_git_repository('git') do |git|
@@ -13,7 +13,7 @@ main()
 	printf("Hello, World!\\n");
 }
 EXPECTED
-				assert_equal expected, git.cat_file(nil, Scm::Diff.new(:sha1 => '4c734ad53b272c9b3d719f214372ac497ff6c068'))
+				assert_equal expected, git.cat_file(nil, OhlohScm::Diff.new(:sha1 => '4c734ad53b272c9b3d719f214372ac497ff6c068'))
 			end
 		end