ohloh_scm 4.0.4 → 5.0.0

data/spec/ohloh_scm/bzr/activity_spec.rb

@@ -8,7 +8,7 @@ describe 'Bzr::Activity' do
       tmpdir do |dir|
         bzr.activity.export(dir)
         entries = ['.', '..', 'Cédric.txt', 'file1.txt', 'file3.txt', 'file4.txt', 'file5.txt']
-        Dir.entries(dir).sort.must_equal entries
+        assert_equal Dir.entries(dir).sort, entries
       end
     end
   end
@@ -17,11 +17,11 @@ describe 'Bzr::Activity' do
     with_bzr_repository('bzr') do |bzr|
       activity = bzr.activity
 
-      activity.head_token.must_equal 'test@example.com-20111222183733-y91if5npo3pe8ifs'
-      activity.head.token.must_equal 'test@example.com-20111222183733-y91if5npo3pe8ifs'
+      assert_equal activity.head_token, 'test@example.com-20111222183733-y91if5npo3pe8ifs'
+      assert_equal activity.head.token, 'test@example.com-20111222183733-y91if5npo3pe8ifs'
       assert activity.head.diffs.any? # diffs should be populated
 
-      activity.parents(activity.head).first.token.must_equal 'obnox@samba.org-20090204004942-73rnw0izen42f154'
+      assert_equal activity.parents(activity.head).first.token, 'obnox@samba.org-20090204004942-73rnw0izen42f154'
       assert activity.parents(activity.head).first.diffs.any?
     end
   end
@@ -35,11 +35,11 @@ describe 'Bzr::Activity' do
 
       commit = OhlohScm::Commit.new(token: 6)
       diff = OhlohScm::Diff.new(path: 'file1.txt')
-      bzr.activity.cat_file(commit, diff).must_equal expected
+      assert_equal bzr.activity.cat_file(commit, diff), expected
 
       # file2.txt has been removed in commit #5
       diff2 = OhlohScm::Diff.new(path: 'file2.txt')
-      bzr.activity.cat_file(bzr.activity.commits.last, diff2).must_be_nil
+      assert_nil bzr.activity.cat_file(bzr.activity.commits.last, diff2)
     end
   end
 
@@ -52,7 +52,7 @@ describe 'Bzr::Activity' do
 
       commit = OhlohScm::Commit.new(token: 7)
       diff = OhlohScm::Diff.new(path: 'Cédric.txt')
-      bzr.activity.cat_file(commit, diff).must_equal expected
+      assert_equal bzr.activity.cat_file(commit, diff), expected
     end
   end
 
@@ -65,7 +65,7 @@ describe 'Bzr::Activity' do
 
       commit = OhlohScm::Commit.new(token: 6)
       diff = OhlohScm::Diff.new(path: 'file1.txt')
-      bzr.activity.cat_file_parent(commit, diff).must_equal expected
+      assert_equal bzr.activity.cat_file_parent(commit, diff), expected
 
       # file2.txt has been removed in commit #5
       expected = <<-EXPECTED.gsub(/ {8}/, '')
@@ -74,24 +74,24 @@ describe 'Bzr::Activity' do
 
       commit2 = OhlohScm::Commit.new(token: 5)
       diff2 = OhlohScm::Diff.new(path: 'file2.txt')
-      bzr.activity.cat_file_parent(commit2, diff2).must_equal expected
+      assert_equal bzr.activity.cat_file_parent(commit2, diff2), expected
     end
   end
 
   describe 'commits' do
     it 'must test_commit_count' do
       with_bzr_repository('bzr') do |bzr|
-        bzr.activity.commit_count.must_equal 7
-        bzr.activity.commit_count(after: revision_ids.first).must_equal 6
-        bzr.activity.commit_count(after: revision_ids[5]).must_equal 1
-        bzr.activity.commit_count(after: revision_ids.last).must_equal 0
+        assert_equal bzr.activity.commit_count, 7
+        assert_equal bzr.activity.commit_count(after: revision_ids.first), 6
+        assert_equal bzr.activity.commit_count(after: revision_ids[5]), 1
+        assert_equal bzr.activity.commit_count(after: revision_ids.last), 0
       end
     end
 
     it 'must test_commit_count_with_branches' do
       with_bzr_repository('bzr_with_branch') do |bzr|
         # Only 3 commits are on main line... make sure we catch the branch commit as well
-        bzr.activity.commit_count.must_equal 4
+        assert_equal bzr.activity.commit_count, 4
       end
     end
 
@@ -105,16 +105,16 @@ describe 'Bzr::Activity' do
     it 'must test_commit_count_trunk_only' do
       with_bzr_repository('bzr_with_branch') do |bzr|
         # Only 3 commits are on main line
-        bzr.activity.commit_count(trunk_only: true).must_equal 3
+        assert_equal bzr.activity.commit_count(trunk_only: true), 3
       end
     end
 
     it 'must test_commit_tokens_after' do
       with_bzr_repository('bzr') do |bzr|
-        bzr.activity.commit_tokens.must_equal revision_ids
-        bzr.activity.commit_tokens(after: revision_ids.first).must_equal revision_ids[1..6]
-        bzr.activity.commit_tokens(after: revision_ids[5]).must_equal revision_ids[6..6]
-        bzr.activity.commit_tokens(after: revision_ids.last).must_equal []
+        assert_equal bzr.activity.commit_tokens, revision_ids
+        assert_equal bzr.activity.commit_tokens(after: revision_ids.first), revision_ids[1..6]
+        assert_equal bzr.activity.commit_tokens(after: revision_ids[5]), revision_ids[6..6]
+        assert_equal bzr.activity.commit_tokens(after: revision_ids.last), []
       end
     end
 
@@ -140,7 +140,7 @@ describe 'Bzr::Activity' do
                     'test@example.com-20090206214451-lzjngefdyw3vmgms',
                     'test@example.com-20090206214350-rqhdpz92l11eoq2t', # branch commit
                     'test@example.com-20090206214515-21lkfj3dbocao5pr']  # merge commit
-        bzr.activity.commit_tokens.must_equal expected
+        assert_equal bzr.activity.commit_tokens, expected
       end
     end
 
@@ -149,7 +149,7 @@ describe 'Bzr::Activity' do
         expected = ['test@example.com-20090206214301-s93cethy9atcqu9h',
                     'test@example.com-20090206214451-lzjngefdyw3vmgms',
                     'test@example.com-20090206214515-21lkfj3dbocao5pr']  # merge commit
-        bzr.activity.commit_tokens(trunk_only: true).must_equal expected
+        assert_equal bzr.activity.commit_tokens(trunk_only: true), expected
       end
     end
 
@@ -167,7 +167,7 @@ describe 'Bzr::Activity' do
                     'test@example.com-20110803170522-asv6i9z6m22jc8zz',
                     'test@example.com-20110803170648-o0xcbni7lwp97azj',
                     'test@example.com-20110803170818-v44umypquqg8migo']
-        bzr.activity.commit_tokens.must_equal expected
+        assert_equal bzr.activity.commit_tokens, expected
       end
     end
 
@@ -180,7 +180,7 @@ describe 'Bzr::Activity' do
                     'obnox@samba.org-20090204002540-gmana8tk5f9gboq9',
                     'obnox@samba.org-20090204004942-73rnw0izen42f154',
                     'test@example.com-20110803170818-v44umypquqg8migo']
-        bzr.activity.commit_tokens(trunk_only: true).must_equal expected
+        assert_equal bzr.activity.commit_tokens(trunk_only: true), expected
       end
     end
 
@@ -191,7 +191,7 @@ describe 'Bzr::Activity' do
                     'test@example.com-20090206214350-rqhdpz92l11eoq2t', # branch commit
                     'test@example.com-20090206214515-21lkfj3dbocao5pr']  # merge commit
 
-        bzr.activity.commits.map(&:token).must_equal expected
+        assert_equal bzr.activity.commits.map(&:token), expected
       end
     end
 
@@ -200,21 +200,21 @@ describe 'Bzr::Activity' do
         expected = ['test@example.com-20090206214301-s93cethy9atcqu9h',
                     'test@example.com-20090206214451-lzjngefdyw3vmgms',
                     'test@example.com-20090206214515-21lkfj3dbocao5pr']  # merge commit
-        bzr.activity.commits(trunk_only: true).map(&:token).must_equal expected
+        assert_equal bzr.activity.commits(trunk_only: true).map(&:token), expected
       end
     end
 
     it 'must test_commits_after_merge' do
       with_bzr_repository('bzr_with_branch') do |bzr|
         last_commit = bzr.activity.commits.last
-        bzr.activity.commits(after: last_commit.token).must_be :empty?
+        assert_predicate bzr.activity.commits(after: last_commit.token), :empty?
       end
     end
 
     it 'must test_commits_after_nested_merge' do
       with_bzr_repository('bzr_with_nested_branches') do |bzr|
         last_commit = bzr.activity.commits.last
-        bzr.activity.commits(after: last_commit.token).must_be :empty?
+        assert_predicate bzr.activity.commits(after: last_commit.token), :empty?
       end
     end
 
@@ -232,7 +232,7 @@ describe 'Bzr::Activity' do
                     'test@example.com-20110803170522-asv6i9z6m22jc8zz',
                     'test@example.com-20110803170648-o0xcbni7lwp97azj',
                     'test@example.com-20110803170818-v44umypquqg8migo']
-        bzr.activity.commits.map(&:token).must_equal expected
+        assert_equal bzr.activity.commits.map(&:token), expected
       end
     end
 
@@ -245,18 +245,18 @@ describe 'Bzr::Activity' do
                     'obnox@samba.org-20090204002540-gmana8tk5f9gboq9',
                     'obnox@samba.org-20090204004942-73rnw0izen42f154',
                     'test@example.com-20110803170818-v44umypquqg8migo']
-        bzr.activity.commits(trunk_only: true).map(&:token).must_equal expected
+        assert_equal bzr.activity.commits(trunk_only: true).map(&:token), expected
       end
     end
 
     it 'must test_commits' do
       with_bzr_repository('bzr') do |bzr|
-        bzr.activity.commits.collect(&:token).must_equal revision_ids
-        bzr.activity.commits(after: revision_ids[5]).collect(&:token).must_equal revision_ids[6..6]
-        bzr.activity.commits(after: revision_ids.last).collect(&:token).must_equal []
+        assert_equal bzr.activity.commits.collect(&:token), revision_ids
+        assert_equal bzr.activity.commits(after: revision_ids[5]).collect(&:token), revision_ids[6..6]
+        assert_equal bzr.activity.commits(after: revision_ids.last).collect(&:token), []
 
         # Check that the diffs are not populated
-        bzr.activity.commits.first.diffs.must_equal []
+        assert_equal bzr.activity.commits.first.diffs, []
       end
     end
 
@@ -280,7 +280,7 @@ describe 'Bzr::Activity' do
         assert !FileTest.exist?(bzr.activity.log_filename)
 
         # Verify that we got the commits in forward chronological order
-        commits.collect(&:token).must_equal revision_ids
+        assert_equal commits.collect(&:token), revision_ids
       end
     end
 
@@ -292,7 +292,7 @@ describe 'Bzr::Activity' do
                     'test@example.com-20090206214451-lzjngefdyw3vmgms',
                     'test@example.com-20090206214350-rqhdpz92l11eoq2t', # branch commit
                     'test@example.com-20090206214515-21lkfj3dbocao5pr'] # merge commit]
-        commits.map(&:token).must_equal expected
+        assert_equal commits.map(&:token), expected
       end
     end
 
@@ -306,7 +306,7 @@ describe 'Bzr::Activity' do
           'test@example.com-20090206214515-21lkfj3dbocao5pr' # merge commit
           # 'test@example.com-20090206214350-rqhdpz92l11eoq2t' # branch commit -- after merge!
         ]
-        commits.map(&:token).must_equal expected
+        assert_equal commits.map(&:token), expected
       end
     end
 
@@ -316,7 +316,7 @@ describe 'Bzr::Activity' do
 
         commits = []
         bzr.activity.each_commit(after: last_commit.token) { |c| commits << c }
-        commits.must_equal []
+        assert_equal commits, []
       end
     end
 
@@ -326,7 +326,7 @@ describe 'Bzr::Activity' do
 
         commits = []
         bzr.activity.each_commit(after: last_commit.token) { |c| commits << c }
-        commits.must_equal []
+        assert_equal commits, []
       end
     end
 
@@ -337,7 +337,7 @@ describe 'Bzr::Activity' do
 
         yielded_commits = []
         bzr.activity.each_commit(after: next_to_last_commit.token) { |c| yielded_commits << c }
-        yielded_commits.map(&:token).must_equal [last_commit.token]
+        assert_equal yielded_commits.map(&:token), [last_commit.token]
       end
     end
 
@@ -357,7 +357,7 @@ describe 'Bzr::Activity' do
                     'test@example.com-20110803170522-asv6i9z6m22jc8zz',
                     'test@example.com-20110803170648-o0xcbni7lwp97azj',
                     'test@example.com-20110803170818-v44umypquqg8migo']
-        commits.map(&:token).must_equal expected
+        assert_equal commits.map(&:token), expected
       end
     end
 
@@ -372,7 +372,7 @@ describe 'Bzr::Activity' do
                     'obnox@samba.org-20090204002540-gmana8tk5f9gboq9',
                     'obnox@samba.org-20090204004942-73rnw0izen42f154',
                     'test@example.com-20110803170818-v44umypquqg8migo']
-        commits.map(&:token).must_equal expected
+        assert_equal commits.map(&:token), expected
       end
     end
 
@@ -387,16 +387,16 @@ describe 'Bzr::Activity' do
         bzr.activity.each_commit do |c|
           commits << c
         end
-        commits.size.must_equal 1
-        commits.first.diffs.size.must_equal 1
-        commits.first.diffs.first.path.must_equal 'foo/helloworld.c'
+        assert_equal commits.size, 1
+        assert_equal commits.first.diffs.size, 1
+        assert_equal commits.first.diffs.first.path, 'foo/helloworld.c'
       end
     end
 
     # Verfies OTWO-344
     it 'must test_commit_tokens_with_colon_character' do
       with_bzr_repository('bzr_colon') do |bzr|
-        bzr.activity.commit_tokens.must_equal ['svn-v4:364a429a-ab12-11de-804f-e3d9c25ff3d2::0']
+        assert_equal bzr.activity.commit_tokens, ['svn-v4:364a429a-ab12-11de-804f-e3d9c25ff3d2::0']
       end
     end
 
@@ -406,23 +406,23 @@ describe 'Bzr::Activity' do
         bzr.activity.each_commit do |c|
           commits << c
         end
-        commits.size.must_equal 3
+        assert_equal commits.size, 3
 
-        commits[0].message.must_equal 'Initial.'
-        commits[0].committer_name.must_equal 'Abhay Mujumdar'
-        commits[0].author_name.must_be_nil
-        commits[0].author_email.must_be_nil
+        assert_equal commits[0].message, 'Initial.'
+        assert_equal commits[0].committer_name, 'Abhay Mujumdar'
+        assert_nil commits[0].author_name
+        assert_nil commits[0].author_email
 
-        commits[1].message.must_equal 'Updated.'
-        commits[1].committer_name.must_equal 'Abhay Mujumdar'
-        commits[1].author_name.must_equal 'John Doe'
-        commits[1].author_email.must_equal 'johndoe@example.com'
+        assert_equal commits[1].message, 'Updated.'
+        assert_equal commits[1].committer_name, 'Abhay Mujumdar'
+        assert_equal commits[1].author_name, 'John Doe'
+        assert_equal commits[1].author_email, 'johndoe@example.com'
 
         # When there are multiple authors, first one is captured.
-        commits[2].message.must_equal 'Updated by two authors.'
-        commits[2].committer_name.must_equal 'test'
-        commits[2].author_name.must_equal 'John Doe'
-        commits[2].author_email.must_equal 'johndoe@example.com'
+        assert_equal commits[2].message, 'Updated by two authors.'
+        assert_equal commits[2].committer_name, 'test'
+        assert_equal commits[2].author_name, 'John Doe'
+        assert_equal commits[2].author_email, 'johndoe@example.com'
       end
     end
 
@@ -453,8 +453,8 @@ describe 'Bzr::Activity' do
       time2 = Time.parse('2011-12-22 18:37:33 +0000')
       time3 = Time.parse('2009-02-04 00:24:22 +0000')
 
-      bzr.activity.tags.must_equal [['v1.0.0', '5', time1],
-                                    ['v2.0.0', '7', time2], ['v 3.0.0', '2', time3]]
+      assert_equal bzr.activity.tags, [['v1.0.0', '5', time1],
+                                       ['v2.0.0', '7', time2], ['v 3.0.0', '2', time3]]
     end
   end
 end

data/spec/ohloh_scm/bzr/validation_spec.rb

@@ -7,7 +7,7 @@ describe 'Bzr::Validation' do
     it 'must handle non existent remote source' do
       core = OhlohScm::Factory.get_core(scm_type: :bzr, url: 'lp:foobar')
       core.validate
-      core.errors.wont_be :empty?
+      refute_empty core.errors
     end
   end
 

data/spec/ohloh_scm/cvs/activity_spec.rb

@@ -6,23 +6,23 @@ describe 'Cvs::Activity' do
   it 'must return the host' do
     activity = get_core(:cvs, url: ':ext:anonymous:@moodle.cvs.sourceforge.net:/cvsroot/moodle',
                               branch_name: 'contrib').activity
-    activity.send(:host).must_equal 'moodle.cvs.sourceforge.net'
+    assert_equal activity.send(:host), 'moodle.cvs.sourceforge.net'
   end
 
   it 'must return the protocol' do
     activity = get_core(:cvs, url: ':pserver:foo:@foo.com:/cvsroot/a', branch_name: 'b').activity
-    activity.send(:protocol).must_equal :pserver
+    assert_equal activity.send(:protocol), :pserver
 
     activity = get_core(:cvs, url: ':ext:foo:@foo.com:/cvsroot/a', branch_name: 'b').activity
-    activity.send(:protocol).must_equal :ext
+    assert_equal activity.send(:protocol), :ext
 
     activity = get_core(:cvs, url: ':pserver:ext:@foo.com:/cvsroot/a', branch_name: 'b').activity
-    activity.send(:protocol).must_equal :pserver
+    assert_equal activity.send(:protocol), :pserver
   end
 
   it 'must test tags' do
     with_cvs_repository('cvs', 'simple') do |cvs|
-      cvs.activity.tags.must_equal [['simple_release_tag', '1.1.1.1'], ['simple_vendor_tag', '1.1.1']]
+      assert_equal cvs.activity.tags, [['simple_release_tag', '1.1.1.1'], ['simple_vendor_tag', '1.1.1']]
     end
   end
 
@@ -30,29 +30,28 @@ describe 'Cvs::Activity' do
     with_cvs_repository('cvs', 'simple') do |cvs|
       Dir.mktmpdir('oh_scm_tag_') do |dir|
         cvs.activity.export_tag(dir, 'simple_release_tag')
-        Dir.entries(dir).sort.must_equal ['.', '..', 'foo.rb']
+        assert_equal Dir.entries(dir).sort, ['.', '..', 'foo.rb']
       end
     end
   end
 
   it 'must test commits' do
     with_cvs_repository('cvs', 'simple') do |cvs|
-      cvs.activity.commits.collect(&:token).must_equal ['2006-06-29 16:21:07',
-                                                        '2006-06-29 18:14:47',
-                                                        '2006-06-29 18:45:29',
-                                                        '2006-06-29 18:48:54',
-                                                        '2006-06-29 18:52:23']
+      assert_equal cvs.activity.commits.collect(&:token), ['2006-06-29 16:21:07',
+                                                           '2006-06-29 18:14:47',
+                                                           '2006-06-29 18:45:29',
+                                                           '2006-06-29 18:48:54',
+                                                           '2006-06-29 18:52:23']
 
       # Make sure we are date format agnostic (2008/01/01 is the same as 2008-01-01)
-      cvs.activity.commits(after: '2006/06/29 18:45:29').collect(&:token)
-         .must_equal ['2006-06-29 18:48:54',
-                      '2006-06-29 18:52:23']
+      assert_equal cvs.activity.commits(after: '2006/06/29 18:45:29').collect(&:token),
+                   ['2006-06-29 18:48:54', '2006-06-29 18:52:23']
 
-      cvs.activity.commits(after: '2006-06-29 18:45:29')
-         .collect(&:token).must_equal ['2006-06-29 18:48:54',
-                                       '2006-06-29 18:52:23']
+      assert_equal cvs.activity.commits(after: '2006-06-29 18:45:29')
+                      .collect(&:token), ['2006-06-29 18:48:54',
+                                          '2006-06-29 18:52:23']
 
-      cvs.activity.commits(after: '2006/06/29 18:52:23').collect(&:token).must_be_empty
+      assert_empty cvs.activity.commits(after: '2006/06/29 18:52:23').collect(&:token)
     end
   end
 
@@ -64,7 +63,7 @@ describe 'Cvs::Activity' do
         utc_dates = ['2006-06-29 16:21:07 UTC', '2006-06-29 18:14:47 UTC',
                      '2006-06-29 18:45:29 UTC', '2006-06-29 18:48:54 UTC',
                      '2006-06-29 18:52:23 UTC']
-        git_core.activity.commits.map(&:author_date).map(&:to_s).must_equal utc_dates
+        assert_equal git_core.activity.commits.map(&:author_date).map(&:to_s), utc_dates
       end
     end
   end
@@ -72,7 +71,7 @@ describe 'Cvs::Activity' do
   it 'must test commits sets scm' do
     with_cvs_repository('cvs', 'simple') do |cvs|
       cvs.activity.commits.each do |c|
-        cvs.activity.scm.must_equal c.scm
+        assert_equal cvs.activity.scm, c.scm
       end
     end
   end
@@ -80,7 +79,7 @@ describe 'Cvs::Activity' do
   it 'must test open log file encoding' do
     with_cvs_repository('cvs', 'invalid_utf8') do |cvs|
       cvs.activity.send(:open_log_file) do |io|
-        io.read.valid_encoding?.must_equal true
+        assert_equal io.read.valid_encoding?, true
       end
     end
   end

data/spec/ohloh_scm/cvs/scm_spec.rb

@@ -4,109 +4,109 @@ describe 'Cvs::Scm' do
   it 'must test symlink fixup' do
     scm = get_core(:cvs, url: ':pserver:anoncvs:@cvs.netbeans.org:/cvs').scm
     scm.normalize
-    scm.url.must_equal ':pserver:anoncvs:@cvs.netbeans.org:/shared/data/ccvs/repository'
+    assert_equal scm.url, ':pserver:anoncvs:@cvs.netbeans.org:/shared/data/ccvs/repository'
 
     scm = get_core(:cvs, url: ':pserver:anoncvs:@cvs.dev.java.net:/cvs').scm
     scm.normalize
-    scm.url.must_equal ':pserver:anoncvs:@cvs.dev.java.net:/shared/data/ccvs/repository'
+    assert_equal scm.url, ':pserver:anoncvs:@cvs.dev.java.net:/shared/data/ccvs/repository'
 
     scm = get_core(:cvs, url: ':PSERVER:ANONCVS:@CVS.DEV.JAVA.NET:/cvs').scm
     scm.normalize
-    scm.url.must_equal ':PSERVER:ANONCVS:@CVS.DEV.JAVA.NET:/shared/data/ccvs/repository'
+    assert_equal scm.url, ':PSERVER:ANONCVS:@CVS.DEV.JAVA.NET:/shared/data/ccvs/repository'
 
     scm = get_core(:cvs, url: ':pserver:anonymous:@cvs.gna.org:/cvs/eagleusb').scm
     scm.normalize
-    scm.url.must_equal ':pserver:anonymous:@cvs.gna.org:/var/cvs/eagleusb'
+    assert_equal scm.url, ':pserver:anonymous:@cvs.gna.org:/var/cvs/eagleusb'
   end
 
   it 'must test sync_pserver_username_password' do
     # Pull username only from url
     scm = get_core(:cvs, url: ':pserver:guest:@ohloh.net:/test').scm
     scm.normalize
-    scm.url.must_equal ':pserver:guest:@ohloh.net:/test'
-    scm.username.must_equal 'guest'
-    scm.password.must_equal ''
+    assert_equal scm.url, ':pserver:guest:@ohloh.net:/test'
+    assert_equal scm.username, 'guest'
+    assert_equal scm.password, ''
 
     # Pull username and password from url
     scm = get_core(:cvs, url: ':pserver:guest:secret@ohloh.net:/test').scm
     scm.normalize
 
-    scm.url.must_equal ':pserver:guest:secret@ohloh.net:/test'
-    scm.username.must_equal 'guest'
-    scm.password.must_equal 'secret'
+    assert_equal scm.url, ':pserver:guest:secret@ohloh.net:/test'
+    assert_equal scm.username, 'guest'
+    assert_equal scm.password, 'secret'
 
     # Apply username and password to url
     scm = get_core(:cvs, url: ':pserver::@ohloh.net:/test', username: 'guest', password: 'secret').scm
     scm.normalize
-    scm.url.must_equal ':pserver:guest:secret@ohloh.net:/test'
-    scm.username.must_equal 'guest'
-    scm.password.must_equal 'secret'
+    assert_equal scm.url, ':pserver:guest:secret@ohloh.net:/test'
+    assert_equal scm.username, 'guest'
+    assert_equal scm.password, 'secret'
 
     # Passwords disagree, use :password attribute
     scm = get_core(:cvs, url: ':pserver:guest:old@ohloh.net:/test', username: 'guest', password: 'new').scm
     scm.normalize
-    scm.url.must_equal ':pserver:guest:new@ohloh.net:/test'
-    scm.username.must_equal 'guest'
-    scm.password.must_equal 'new'
+    assert_equal scm.url, ':pserver:guest:new@ohloh.net:/test'
+    assert_equal scm.username, 'guest'
+    assert_equal scm.password, 'new'
   end
 
   it 'must test guess_forge' do
     scm = get_core(:cvs, url: nil).scm
-    scm.send(:guess_forge).must_be_nil
+    assert_nil scm.send(:guess_forge)
 
     scm = get_core(:cvs, url: 'garbage_in_garbage_out').scm
-    scm.send(:guess_forge).must_be_nil
+    assert_nil scm.send(:guess_forge)
 
     scm = get_core(:cvs, url: ':pserver:anonymous:@boost.cvs.sourceforge.net:/cvsroot/boost').scm
-    scm.send(:guess_forge).must_equal 'sourceforge.net'
+    assert_equal scm.send(:guess_forge), 'sourceforge.net'
 
     scm = get_core(:cvs, url: ':pserver:guest:@cvs.dev.java.net:/cvs').scm
-    scm.send(:guess_forge).must_equal 'java.net'
+    assert_equal scm.send(:guess_forge), 'java.net'
 
     scm = get_core(:cvs, url: ':PSERVER:ANONCVS:@CVS.DEV.JAVA.NET:/cvs').scm
-    scm.send(:guess_forge).must_equal 'java.net'
+    assert_equal scm.send(:guess_forge), 'java.net'
 
     scm = get_core(:cvs, url: ':pserver:guest:@colorchooser.dev.java.net:/cvs').scm
-    scm.send(:guess_forge).must_equal 'java.net'
+    assert_equal scm.send(:guess_forge), 'java.net'
   end
 
   it 'must test local directory trim' do
     scm = get_core(:cvs, url: '/Users/robin/cvs_repo/', branch_name: 'simple').scm
-    scm.send(:trim_directory, '/Users/robin/cvs_repo/simple/foo.rb').must_equal '/Users/robin/cvs_repo/simple/foo.rb'
+    assert_equal scm.send(:trim_directory, '/Users/robin/cvs_repo/simple/foo.rb'), '/Users/robin/cvs_repo/simple/foo.rb'
   end
 
   it 'must test remote directory trim' do
     scm = get_core(:cvs, url: ':pserver:anonymous:@moodle.cvs.sourceforge.net:/cvsroot/moodle',
                          branch_name: 'contrib').scm
-    scm.send(:trim_directory, '/cvsroot/moodle/contrib/foo.rb').must_equal 'foo.rb'
+    assert_equal scm.send(:trim_directory, '/cvsroot/moodle/contrib/foo.rb'), 'foo.rb'
   end
 
   it 'must test remote directory trim with port number' do
     scm = get_core(:cvs, url: ':pserver:anoncvs:anoncvs@libvirt.org:2401/data/cvs', branch_name: 'libvirt').scm
-    scm.send(:trim_directory, '/data/cvs/libvirt/docs/html/Attic').must_equal 'docs/html/Attic'
+    assert_equal scm.send(:trim_directory, '/data/cvs/libvirt/docs/html/Attic'), 'docs/html/Attic'
   end
 
   it 'must test ordered directory list' do
     scm = get_core(:cvs, url: ':pserver:anonymous:@moodle.cvs.sourceforge.net:/cvsroot/moodle',
                          branch_name: 'contrib').scm
 
-    list = scm.send(:build_ordered_directory_list, ['/cvsroot/moodle/contrib/foo/bar'.intern,
-                                                    '/cvsroot/moodle/contrib'.intern,
-                                                    '/cvsroot/moodle/contrib/hello'.intern,
-                                                    '/cvsroot/moodle/contrib/hello'.intern])
-    list.size.must_equal 4
-    list.must_equal ['', 'foo', 'hello', 'foo/bar']
+    list = scm.send(:build_ordered_directory_list, %i[/cvsroot/moodle/contrib/foo/bar
+                                                      /cvsroot/moodle/contrib
+                                                      /cvsroot/moodle/contrib/hello
+                                                      /cvsroot/moodle/contrib/hello])
+    assert_equal list.size, 4
+    assert_equal list, ['', 'foo', 'hello', 'foo/bar']
   end
 
   it 'must test ordered directory list ignores Attic' do
     scm = get_core(:cvs, url: ':pserver:anonymous:@moodle.cvs.sourceforge.net:/cvsroot/moodle',
                          branch_name: 'contrib').scm
 
-    list = scm.send(:build_ordered_directory_list, ['/cvsroot/moodle/contrib/foo/bar'.intern,
-                                                    '/cvsroot/moodle/contrib/Attic'.intern,
-                                                    '/cvsroot/moodle/contrib/hello/Attic'.intern])
+    list = scm.send(:build_ordered_directory_list, %i[/cvsroot/moodle/contrib/foo/bar
+                                                      /cvsroot/moodle/contrib/Attic
+                                                      /cvsroot/moodle/contrib/hello/Attic])
 
-    list.size.must_equal 4
-    list.must_equal ['', 'foo', 'hello', 'foo/bar']
+    assert_equal list.size, 4
+    assert_equal list, ['', 'foo', 'hello', 'foo/bar']
   end
 end

data/spec/ohloh_scm/cvs/validation_spec.rb

@@ -6,14 +6,14 @@ describe 'Cvs::Validation' do
       url = ':pserver:anonymous:@foobar.xyz_example.org:/cvsroot'
       core = OhlohScm::Factory.get_core(scm_type: :cvs, url: url, branch_name: 'foo')
       core.validate
-      core.errors.wont_be :empty?
+      refute_empty core.errors
     end
   end
 
   it 'must have errors for invalid branch_name' do
-    get_core(:cvs, branch_name: 'x' * 81).validation.send(:branch_name_errors).must_be_nil
-    get_core(:cvs, branch_name: 'x' * 121).validation.send(:branch_name_errors).wont_be :empty?
-    get_core(:cvs, branch_name: 'foo@bar').validation.send(:branch_name_errors).wont_be :empty?
+    assert_nil get_core(:cvs, branch_name: 'x' * 81).validation.send(:branch_name_errors)
+    refute_empty get_core(:cvs, branch_name: 'x' * 201).validation.send(:branch_name_errors)
+    refute_empty get_core(:cvs, branch_name: 'foo@bar').validation.send(:branch_name_errors)
   end
 
   it 'must test rejected urls' do

data/spec/ohloh_scm/factory_spec.rb

@@ -7,8 +7,8 @@ describe 'Factory' do
     url = 'https://foobar.git'
     core = OhlohScm::Factory.get_core(scm_type: :git, url: url)
 
-    core.status.scm.must_be_instance_of OhlohScm::Git::Scm
-    core.scm.url.must_equal url
+    assert core.status.scm.is_a?(OhlohScm::Git::Scm)
+    assert_equal core.scm.url, url
     assert core.activity.method(:commits)
     assert core.status.method(:exist?)
     assert core.validation.method(:validate)