ohloh_scm 4.0.5 → 5.0.0

data/spec/ohloh_scm/hg/activity_spec.rb

@@ -4,8 +4,8 @@ describe 'Hg::Activity' do
   it 'must fetch tags' do
     with_hg_repository('hg') do |hg|
       time = Time.parse('Mon Sep 19 15:27:19 2022 +0000')
-      hg.activity.tags.first.must_equal ['tip', '6', time]
-      hg.activity.tags.last.first(2).must_equal ['tagname with space', '2']
+      assert_equal hg.activity.tags.first, ['tip', '6', time]
+      assert_equal hg.activity.tags.last.first(2), ['tagname with space', '2']
     end
   end
 
@@ -14,7 +14,7 @@ describe 'Hg::Activity' do
       Dir.mktmpdir do |dir|
         hg.activity.export(dir)
         entries = ['.', '..', '.hgtags', 'Gemfile.lock', 'Godeps', 'README', 'makefile', 'nested', 'two']
-        Dir.entries(dir).sort.must_equal entries
+        assert_equal Dir.entries(dir).sort, entries
       end
     end
   end
@@ -22,72 +22,72 @@ describe 'Hg::Activity' do
   describe 'commits' do
     it 'commit_count' do
       with_hg_repository('hg') do |hg|
-        hg.activity.commit_count.must_equal 6
-        hg.activity.commit_count(after: 'b14fa4692f949940bd1e28da6fb4617de2615484').must_equal 4
-        hg.activity.commit_count(after: '655f04cf6ad708ab58c7b941672dce09dd369a18').must_equal 1
+        assert_equal hg.activity.commit_count, 6
+        assert_equal hg.activity.commit_count(after: 'b14fa4692f949940bd1e28da6fb4617de2615484'), 4
+        assert_equal hg.activity.commit_count(after: '655f04cf6ad708ab58c7b941672dce09dd369a18'), 1
       end
     end
 
     it 'commit_count_with_empty_branch' do
       with_hg_repository('hg', '') do |hg|
-        hg.scm.branch_name.must_be_nil
-        hg.activity.commit_count.must_equal 6
-        hg.activity.commit_count(after: 'b14fa4692f949940bd1e28da6fb4617de2615484').must_equal 4
-        hg.activity.commit_count(after: '655f04cf6ad708ab58c7b941672dce09dd369a18').must_equal 1
+        assert_nil hg.scm.branch_name
+        assert_equal hg.activity.commit_count, 6
+        assert_equal hg.activity.commit_count(after: 'b14fa4692f949940bd1e28da6fb4617de2615484'), 4
+        assert_equal hg.activity.commit_count(after: '655f04cf6ad708ab58c7b941672dce09dd369a18'), 1
       end
     end
 
     it 'commits' do
       with_hg_repository('hg') do |hg|
-        hg.activity.commits.map(&:token).must_equal(%w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
-                                                       b14fa4692f949940bd1e28da6fb4617de2615484
-                                                       468336c6671cbc58237a259d1b7326866afc2817
-                                                       75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                                       655f04cf6ad708ab58c7b941672dce09dd369a18
-                                                       1f45520fff3982761cfe7a0502ad0888d5783efe])
+        assert_equal hg.activity.commits.map(&:token), %w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
+                                                          b14fa4692f949940bd1e28da6fb4617de2615484
+                                                          468336c6671cbc58237a259d1b7326866afc2817
+                                                          75532c1e1f1de55c2271f6fd29d98efbe35397c4
+                                                          655f04cf6ad708ab58c7b941672dce09dd369a18
+                                                          1f45520fff3982761cfe7a0502ad0888d5783efe]
 
         after = '655f04cf6ad708ab58c7b941672dce09dd369a18'
-        hg.activity.commits(after: after).map(&:token).must_equal ['1f45520fff3982761cfe7a0502ad0888d5783efe']
+        assert_equal hg.activity.commits(after: after).map(&:token), ['1f45520fff3982761cfe7a0502ad0888d5783efe']
 
         # Check that the diffs are not populated
-        hg.activity.commits(after: '655f04cf6ad708ab58c7b941672dce09dd369a18').first.diffs.must_be :empty?
+        assert_empty hg.activity.commits(after: '655f04cf6ad708ab58c7b941672dce09dd369a18').first.diffs
 
-        hg.activity.commits(after: '1f45520fff3982761cfe7a0502ad0888d5783efe').must_be :empty?
+        assert_empty hg.activity.commits(after: '1f45520fff3982761cfe7a0502ad0888d5783efe')
       end
     end
 
     it 'commits_with_branch' do
       with_hg_repository('hg', 'develop') do |hg|
-        hg.activity.commits.map(&:token).must_equal(%w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
-                                                       b14fa4692f949940bd1e28da6fb4617de2615484
-                                                       468336c6671cbc58237a259d1b7326866afc2817
-                                                       75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                                       4d54c3f0526a1ec89214a70615a6b1c6129c665c])
+        assert_equal hg.activity.commits.map(&:token), %w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
+                                                          b14fa4692f949940bd1e28da6fb4617de2615484
+                                                          468336c6671cbc58237a259d1b7326866afc2817
+                                                          75532c1e1f1de55c2271f6fd29d98efbe35397c4
+                                                          4d54c3f0526a1ec89214a70615a6b1c6129c665c]
 
         after = '75532c1e1f1de55c2271f6fd29d98efbe35397c4'
-        hg.activity.commits(after: after).map(&:token).must_equal(['4d54c3f0526a1ec89214a70615a6b1c6129c665c'])
+        assert_equal hg.activity.commits(after: after).map(&:token), ['4d54c3f0526a1ec89214a70615a6b1c6129c665c']
 
         # Check that the diffs are not populated
-        hg.activity.commits(after: '75532c1e1f1de55c2271f6fd29d98efbe35397c4').first.diffs.must_be :empty?
+        assert_empty hg.activity.commits(after: '75532c1e1f1de55c2271f6fd29d98efbe35397c4').first.diffs
 
-        hg.activity.commits(after: '4d54c3f0526a1ec89214a70615a6b1c6129c665c').must_be :empty?
+        assert_empty hg.activity.commits(after: '4d54c3f0526a1ec89214a70615a6b1c6129c665c')
       end
     end
 
     it 'trunk_only_commit_count' do
       with_hg_repository('hg_dupe_delete') do |hg|
-        hg.activity.commit_count(trunk_only: false).must_equal 4
-        hg.activity.commit_count(trunk_only: true).must_equal 3
+        assert_equal hg.activity.commit_count(trunk_only: false), 4
+        assert_equal hg.activity.commit_count(trunk_only: true), 3
       end
     end
 
     it 'trunk_only_commits' do
       with_hg_repository('hg_dupe_delete') do |hg|
-        hg.activity.commits(trunk_only: true)
-          .map(&:token).must_equal(['73e93f57224e3fd828cf014644db8eec5013cd6b',
-                                    '732345b1d5f4076498132fd4b965b1fec0108a50',
-                                    # '525de321d8085bc1d4a3c7608fda6b4020027985', # branch
-                                    '72fe74d643bdcb30b00da3b58796c50f221017d0'])
+        assert_equal hg.activity.commits(trunk_only: true)
+                       .map(&:token), ['73e93f57224e3fd828cf014644db8eec5013cd6b',
+                                       '732345b1d5f4076498132fd4b965b1fec0108a50',
+                                       # '525de321d8085bc1d4a3c7608fda6b4020027985', # branch
+                                       '72fe74d643bdcb30b00da3b58796c50f221017d0']
       end
     end
 
@@ -111,12 +111,12 @@ describe 'Hg::Activity' do
         refute File.exist?(hg.activity.send(:log_filename)) # Make sure we cleaned up after ourselves
 
         # Verify that we got the commits in forward chronological order
-        commits.map(&:token).must_equal(%w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
-                                           b14fa4692f949940bd1e28da6fb4617de2615484
-                                           468336c6671cbc58237a259d1b7326866afc2817
-                                           75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                           655f04cf6ad708ab58c7b941672dce09dd369a18
-                                           1f45520fff3982761cfe7a0502ad0888d5783efe])
+        assert_equal commits.map(&:token), %w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
+                                              b14fa4692f949940bd1e28da6fb4617de2615484
+                                              468336c6671cbc58237a259d1b7326866afc2817
+                                              75532c1e1f1de55c2271f6fd29d98efbe35397c4
+                                              655f04cf6ad708ab58c7b941672dce09dd369a18
+                                              1f45520fff3982761cfe7a0502ad0888d5783efe]
       end
     end
 
@@ -127,11 +127,11 @@ describe 'Hg::Activity' do
         commits = hg.activity.each_commit
       end
 
-      commits.map(&:token).must_equal(%w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
-                                         b14fa4692f949940bd1e28da6fb4617de2615484
-                                         468336c6671cbc58237a259d1b7326866afc2817
-                                         75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                         4d54c3f0526a1ec89214a70615a6b1c6129c665c])
+      assert_equal commits.map(&:token), %w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
+                                            b14fa4692f949940bd1e28da6fb4617de2615484
+                                            468336c6671cbc58237a259d1b7326866afc2817
+                                            75532c1e1f1de55c2271f6fd29d98efbe35397c4
+                                            4d54c3f0526a1ec89214a70615a6b1c6129c665c]
     end
 
     it 'each_commit_after' do
@@ -140,16 +140,16 @@ describe 'Hg::Activity' do
         hg.activity.each_commit(after: '468336c6671cbc58237a259d1b7326866afc2817') do |c|
           commits << c
         end
-        commits.map(&:token).must_equal(%w[75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                           655f04cf6ad708ab58c7b941672dce09dd369a18
-                                           1f45520fff3982761cfe7a0502ad0888d5783efe])
+        assert_equal commits.map(&:token), %w[75532c1e1f1de55c2271f6fd29d98efbe35397c4
+                                              655f04cf6ad708ab58c7b941672dce09dd369a18
+                                              1f45520fff3982761cfe7a0502ad0888d5783efe]
       end
     end
 
     it 'open_log_file_encoding' do
       with_hg_repository('hg_with_invalid_encoding') do |hg|
         hg.activity.send(:open_log_file) do |io|
-          io.read.valid_encoding?.must_equal true
+          assert_equal io.read.valid_encoding?, true
         end
       end
     end
@@ -170,15 +170,15 @@ describe 'Hg::Activity' do
   describe 'head' do
     it 'hg_head_and_parents' do
       with_hg_repository('hg') do |hg|
-        hg.activity.head_token.must_equal '1f45520fff3982761cfe7a0502ad0888d5783efe'
-        hg.activity.head.token.must_equal '1f45520fff3982761cfe7a0502ad0888d5783efe'
+        assert_equal hg.activity.head_token, '1f45520fff3982761cfe7a0502ad0888d5783efe'
+        assert_equal hg.activity.head.token, '1f45520fff3982761cfe7a0502ad0888d5783efe'
         assert hg.activity.head.diffs.any? # diffs should be populated
       end
     end
 
     it 'head_with_branch' do
       with_hg_repository('hg', 'develop') do |hg|
-        hg.activity.head.token.must_equal '4d54c3f0526a1ec89214a70615a6b1c6129c665c'
+        assert_equal hg.activity.head.token, '4d54c3f0526a1ec89214a70615a6b1c6129c665c'
         assert hg.activity.head.diffs.any?
       end
     end
@@ -187,54 +187,54 @@ describe 'Hg::Activity' do
   describe 'commit_tokens' do
     it 'must work with after argument' do
       with_hg_repository('hg') do |hg|
-        hg.activity.commit_tokens.must_equal(%w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
-                                                b14fa4692f949940bd1e28da6fb4617de2615484
-                                                468336c6671cbc58237a259d1b7326866afc2817
-                                                75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                                655f04cf6ad708ab58c7b941672dce09dd369a18
-                                                1f45520fff3982761cfe7a0502ad0888d5783efe])
+        assert_equal hg.activity.commit_tokens, %w[01101d8ef3cea7da9ac6e9a226d645f4418f05c9
+                                                   b14fa4692f949940bd1e28da6fb4617de2615484
+                                                   468336c6671cbc58237a259d1b7326866afc2817
+                                                   75532c1e1f1de55c2271f6fd29d98efbe35397c4
+                                                   655f04cf6ad708ab58c7b941672dce09dd369a18
+                                                   1f45520fff3982761cfe7a0502ad0888d5783efe]
 
         after = '01101d8ef3cea7da9ac6e9a226d645f4418f05c9'
-        hg.activity.commit_tokens(after: after).must_equal(%w[b14fa4692f949940bd1e28da6fb4617de2615484
-                                                              468336c6671cbc58237a259d1b7326866afc2817
-                                                              75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                                              655f04cf6ad708ab58c7b941672dce09dd369a18
-                                                              1f45520fff3982761cfe7a0502ad0888d5783efe])
+        assert_equal hg.activity.commit_tokens(after: after), %w[b14fa4692f949940bd1e28da6fb4617de2615484
+                                                                 468336c6671cbc58237a259d1b7326866afc2817
+                                                                 75532c1e1f1de55c2271f6fd29d98efbe35397c4
+                                                                 655f04cf6ad708ab58c7b941672dce09dd369a18
+                                                                 1f45520fff3982761cfe7a0502ad0888d5783efe]
 
         after = '655f04cf6ad708ab58c7b941672dce09dd369a18'
-        hg.activity.commit_tokens(after: after).must_equal ['1f45520fff3982761cfe7a0502ad0888d5783efe']
+        assert_equal hg.activity.commit_tokens(after: after), ['1f45520fff3982761cfe7a0502ad0888d5783efe']
 
-        hg.activity.commit_tokens(after: '1f45520fff3982761cfe7a0502ad0888d5783efe').must_be :empty?
+        assert_empty hg.activity.commit_tokens(after: '1f45520fff3982761cfe7a0502ad0888d5783efe')
       end
     end
 
     it 'must work with trunk_only argument' do
       with_hg_repository('hg_dupe_delete') do |hg|
-        hg.activity.commit_tokens(trunk_only: false).must_equal(%w[73e93f57224e3fd828cf014644db8eec5013cd6b
-                                                                   732345b1d5f4076498132fd4b965b1fec0108a50
-                                                                   525de321d8085bc1d4a3c7608fda6b4020027985
-                                                                   72fe74d643bdcb30b00da3b58796c50f221017d0])
-
-        hg.activity.commit_tokens(trunk_only: true).must_equal(['73e93f57224e3fd828cf014644db8eec5013cd6b',
-                                                                '732345b1d5f4076498132fd4b965b1fec0108a50',
-                                                                # '525de321d8085bc1d4a3c7608fda6b4020027985', # branch
-                                                                '72fe74d643bdcb30b00da3b58796c50f221017d0'])
+        assert_equal hg.activity.commit_tokens(trunk_only: false), %w[73e93f57224e3fd828cf014644db8eec5013cd6b
+                                                                      732345b1d5f4076498132fd4b965b1fec0108a50
+                                                                      525de321d8085bc1d4a3c7608fda6b4020027985
+                                                                      72fe74d643bdcb30b00da3b58796c50f221017d0]
+
+        assert_equal hg.activity.commit_tokens(trunk_only: true),
+                     ['73e93f57224e3fd828cf014644db8eec5013cd6b', '732345b1d5f4076498132fd4b965b1fec0108a50',
+                      # '525de321d8085bc1d4a3c7608fda6b4020027985', # branch
+                      '72fe74d643bdcb30b00da3b58796c50f221017d0']
       end
     end
 
     it 'must work with trunk_only and after arguments' do
       with_hg_repository('hg_dupe_delete') do |hg|
         opts = { after: '73e93f57224e3fd828cf014644db8eec5013cd6b', trunk_only: false }
-        hg.activity.commit_tokens(opts).must_equal(%w[732345b1d5f4076498132fd4b965b1fec0108a50
-                                                      525de321d8085bc1d4a3c7608fda6b4020027985
-                                                      72fe74d643bdcb30b00da3b58796c50f221017d0])
+        assert_equal hg.activity.commit_tokens(opts), %w[732345b1d5f4076498132fd4b965b1fec0108a50
+                                                         525de321d8085bc1d4a3c7608fda6b4020027985
+                                                         72fe74d643bdcb30b00da3b58796c50f221017d0]
 
         opts = { after: '73e93f57224e3fd828cf014644db8eec5013cd6b', trunk_only: true }
-        hg.activity.commit_tokens(opts).must_equal(['732345b1d5f4076498132fd4b965b1fec0108a50',
-                                                    # '525de321d8085bc1d4a3c7608fda6b4020027985', # On branch
-                                                    '72fe74d643bdcb30b00da3b58796c50f221017d0'])
+        assert_equal hg.activity.commit_tokens(opts), ['732345b1d5f4076498132fd4b965b1fec0108a50',
+                                                       # '525de321d8085bc1d4a3c7608fda6b4020027985', # On branch
+                                                       '72fe74d643bdcb30b00da3b58796c50f221017d0']
 
-        hg.activity.commit_tokens(after: '72fe74d643bdcb30b00da3b58796c50f221017d0', trunk_only: true).must_be :empty?
+        assert_empty hg.activity.commit_tokens(after: '72fe74d643bdcb30b00da3b58796c50f221017d0', trunk_only: true)
       end
     end
 
@@ -242,21 +242,21 @@ describe 'Hg::Activity' do
       with_hg_repository('hg_walk') do |hg|
         commit_tokens = CommitTokensHelper.new(hg, commit_labels)
         # Full history to a commit
-        commit_tokens.between(nil, :A).must_equal %i[A]
-        commit_tokens.between(nil, :B).must_equal %i[A B]
-        commit_tokens.between(nil, :C).must_equal %i[A B G H C]
-        commit_tokens.between(nil, :D).must_equal %i[A B G H C I D]
-        commit_tokens.between(nil, :G).must_equal %i[A B G]
-        commit_tokens.between(nil, :H).must_equal %i[A B G H]
-        commit_tokens.between(nil, :I).must_equal %i[A B G H C I]
+        assert_equal commit_tokens.between(nil, :A), %i[A]
+        assert_equal commit_tokens.between(nil, :B), %i[A B]
+        assert_equal commit_tokens.between(nil, :C), %i[A B G H C]
+        assert_equal commit_tokens.between(nil, :D), %i[A B G H C I D]
+        assert_equal commit_tokens.between(nil, :G), %i[A B G]
+        assert_equal commit_tokens.between(nil, :H), %i[A B G H]
+        assert_equal commit_tokens.between(nil, :I), %i[A B G H C I]
 
         # Limited history from one commit to another
-        commit_tokens.between(:A, :A).must_be :empty?
-        commit_tokens.between(:A, :B).must_equal %i[B]
-        commit_tokens.between(:A, :C).must_equal %i[B G H C]
-        commit_tokens.between(:A, :D).must_equal %i[B G H C I D]
-        commit_tokens.between(:B, :D).must_equal %i[G H C I D]
-        commit_tokens.between(:C, :D).must_equal %i[I D]
+        assert_empty commit_tokens.between(:A, :A)
+        assert_equal commit_tokens.between(:A, :B), %i[B]
+        assert_equal commit_tokens.between(:A, :C), %i[B G H C]
+        assert_equal commit_tokens.between(:A, :D), %i[B G H C I D]
+        assert_equal commit_tokens.between(:B, :D), %i[G H C I D]
+        assert_equal commit_tokens.between(:C, :D), %i[I D]
       end
     end
 
@@ -292,9 +292,9 @@ describe 'Hg::Activity' do
         diff = OhlohScm::Diff.new(path: 'helloworld.c')
         commit = OhlohScm::Commit.new(token: '75532c1e1f1d')
         # The file was deleted in revision 468336c6671c. Check that it does not exist now, but existed in parent.
-        hg.activity.cat_file(commit, diff).must_be_nil
-        hg.activity.cat_file_parent(commit, diff).must_equal expected
-        hg.activity.cat_file(OhlohScm::Commit.new(token: '468336c6671c'), diff).must_equal expected
+        assert_nil hg.activity.cat_file(commit, diff)
+        assert_equal hg.activity.cat_file_parent(commit, diff), expected
+        assert_equal hg.activity.cat_file(OhlohScm::Commit.new(token: '468336c6671c'), diff), expected
       end
     end
 
@@ -304,7 +304,7 @@ describe 'Hg::Activity' do
         # Make a file with a problematic filename
         funny_name = '#|file_name` $(&\'")#'
         file_content = 'foobar'
-        File.open(File.join(dir, funny_name), 'w') { |f| f.write file_content }
+        File.write(File.join(dir, funny_name), file_content)
 
         # Add it to an hg repository
         `cd #{dir} && hg init && hg add * 2> /dev/null && hg commit -u tester -m test`
@@ -312,7 +312,7 @@ describe 'Hg::Activity' do
         # Confirm that we can read the file back
         hg = OhlohScm::Factory.get_core(scm_type: :hg, url: dir)
         diff = OhlohScm::Diff.new(path: funny_name)
-        hg.activity.cat_file(hg.activity.head, diff).must_equal file_content
+        assert_equal hg.activity.cat_file(hg.activity.head, diff), file_content
       end
     end
   end

data/spec/ohloh_scm/hg/scm_spec.rb

@@ -5,18 +5,18 @@ describe 'Hg::Scm' do
     with_hg_repository('hg') do |src|
       tmpdir do |dir|
         dest = OhlohScm::Factory.get_core(scm_type: :hg, url: dir)
-        dest.status.wont_be :exist?
+        assert !dest.status.exist?
 
         dest.scm.pull(src.scm, TestCallback.new)
-        dest.status.must_be :exist?
-        Dir.entries(dir).sort.must_equal ['.', '..', '.hg']
+        assert dest.status.exist?
+        assert_equal Dir.entries(dir).sort, ['.', '..', '.hg']
 
         # Commit some new code on the original and pull again
         run_p "cd '#{src.scm.url}' && touch foo && hg add foo && hg commit -u test -m test"
-        src.activity.commits.last.message.must_equal "test\n"
+        assert_equal src.activity.commits.last.message, "test\n"
 
         dest.scm.pull(src.scm, TestCallback.new)
-        Dir.entries(dir).sort.must_equal ['.', '..', '.hg']
+        assert_equal Dir.entries(dir).sort, ['.', '..', '.hg']
       end
     end
   end

data/spec/ohloh_scm/hg/validation_spec.rb

@@ -5,7 +5,7 @@ describe 'Hg::Validation' do
     it 'must handle non existent remote source' do
       core = OhlohScm::Factory.get_core(scm_type: :hg, url: 'http://www.selenic.com/repo/foobar')
       core.validate
-      core.errors.wont_be :empty?
+      refute_empty core.errors
     end
   end
 

data/spec/ohloh_scm/parser/array_writer_spec.rb

@@ -17,13 +17,13 @@ describe 'ArrayWriter' do
     LOG
 
     commits = OhlohScm::GitParser.parse(log)
-    commits.size.must_equal 1
+    assert_equal commits.size, 1
     commit = commits.first
-    commit.token.must_equal '1df547800dcd168e589bb9b26b4039bff3a7f7e4'
-    commit.author_name.must_equal 'Jason Allen'
-    commit.author_email.must_equal 'jason@ohloh.net'
-    commit.message.must_equal "moving COPYING\n"
-    commit.author_date.must_equal Time.utc(2006, 7, 14, 23, 7, 15)
-    commit.diffs.size.must_equal 1
+    assert_equal commit.token, '1df547800dcd168e589bb9b26b4039bff3a7f7e4'
+    assert_equal commit.author_name, 'Jason Allen'
+    assert_equal commit.author_email, 'jason@ohloh.net'
+    assert_equal commit.message, "moving COPYING\n"
+    assert_equal commit.author_date, Time.utc(2006, 7, 14, 23, 7, 15)
+    assert_equal commit.diffs.size, 1
   end
 end

data/spec/ohloh_scm/parser/branch_number_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'BranchNumber' do
   it 'must test basic' do
-    OhlohScm::BranchNumber.new('1.1').to_a.must_equal [1, 1]
-    OhlohScm::BranchNumber.new('1234.1234').to_a.must_equal [1234, 1234]
-    OhlohScm::BranchNumber.new('1.2.3.4').to_a.must_equal [1, 2, 3, 4]
+    assert_equal OhlohScm::BranchNumber.new('1.1').to_a, [1, 1]
+    assert_equal OhlohScm::BranchNumber.new('1234.1234').to_a, [1234, 1234]
+    assert_equal OhlohScm::BranchNumber.new('1.2.3.4').to_a, [1, 2, 3, 4]
   end
 
   it 'must test simple inherits_from' do

data/spec/ohloh_scm/parser/cvs_parser_spec.rb

@@ -3,48 +3,48 @@ require 'spec_helper'
 describe 'CvsParser' do
   describe 'parse' do
     it 'must return empty array' do
-      OhlohScm::CvsParser.parse('').must_be :empty?
+      assert_empty OhlohScm::CvsParser.parse('')
     end
 
     it 'must parse the log' do
-      revisions = OhlohScm::CvsParser.parse File.read(FIXTURES_DIR + '/basic.rlog')
+      revisions = OhlohScm::CvsParser.parse File.read("#{FIXTURES_DIR}/basic.rlog")
 
-      revisions.size.must_equal 2
+      assert_equal revisions.size, 2
 
-      revisions[0].token.must_equal '2005/07/25 17:09:59'
-      revisions[0].committer_name.must_equal 'pizzandre'
-      Time.utc(2005, 0o7, 25, 17, 9, 59).must_equal revisions[0].committer_date
-      revisions[0].message.must_equal '*** empty log message ***'
+      assert_equal revisions[0].token, '2005/07/25 17:09:59'
+      assert_equal revisions[0].committer_name, 'pizzandre'
+      assert_equal Time.utc(2005, 0o7, 25, 17, 9, 59), revisions[0].committer_date
+      assert_equal revisions[0].message, '*** empty log message ***'
 
-      revisions[1].token.must_equal '2005/07/25 17:11:06'
-      revisions[1].committer_name.must_equal 'pizzandre'
-      Time.utc(2005, 0o7, 25, 17, 11, 6).must_equal revisions[1].committer_date
-      revisions[1].message.must_equal 'Addin UNL file with using example-'
+      assert_equal revisions[1].token, '2005/07/25 17:11:06'
+      assert_equal revisions[1].committer_name, 'pizzandre'
+      assert_equal Time.utc(2005, 0o7, 25, 17, 11, 6), revisions[1].committer_date
+      assert_equal revisions[1].message, 'Addin UNL file with using example-'
     end
 
     # One file with several revisions
     it 'must test multiple revisions' do
-      revisions = OhlohScm::CvsParser.parse File.read(FIXTURES_DIR + '/multiple_revisions.rlog')
+      revisions = OhlohScm::CvsParser.parse File.read("#{FIXTURES_DIR}/multiple_revisions.rlog")
 
       # There are 9 revisions in the rlog, but some of them are close together with the same message.
       # Therefore we bin them together into only 7 revisions.
-      revisions.size.must_equal 7
+      assert_equal revisions.size, 7
 
-      revisions[0].token.must_equal '2005/07/15 11:53:30'
-      revisions[0].committer_name.must_equal 'httpd'
-      revisions[0].message.must_equal 'Initial data for the intelliglue project'
+      assert_equal revisions[0].token, '2005/07/15 11:53:30'
+      assert_equal revisions[0].committer_name, 'httpd'
+      assert_equal revisions[0].message, 'Initial data for the intelliglue project'
 
-      revisions[1].token.must_equal '2005/07/15 16:40:17'
-      revisions[1].committer_name.must_equal 'pizzandre'
-      revisions[1].message.must_equal '*** empty log message ***'
+      assert_equal revisions[1].token, '2005/07/15 16:40:17'
+      assert_equal revisions[1].committer_name, 'pizzandre'
+      assert_equal revisions[1].message, '*** empty log message ***'
 
-      revisions[5].token.must_equal '2005/07/26 20:35:13'
-      revisions[5].committer_name.must_equal 'pizzandre'
+      assert_equal revisions[5].token, '2005/07/26 20:35:13'
+      assert_equal revisions[5].committer_name, 'pizzandre'
       assert_equal "Issue number:\nObtained from:\nSubmitted by:\nReviewed by:\nAdding current milestones-",
                    revisions[5].message
 
-      revisions[6].token.must_equal '2005/07/26 20:39:16'
-      revisions[6].committer_name.must_equal 'pizzandre'
+      assert_equal revisions[6].token, '2005/07/26 20:39:16'
+      assert_equal revisions[6].committer_name, 'pizzandre'
       assert_equal "Issue number:\nObtained from:\nSubmitted by:\nReviewed by:\nCompleting and fixing milestones texts",
                    revisions[6].message
     end
@@ -52,26 +52,26 @@ describe 'CvsParser' do
     # A file is created and modified on the branch, then merged to the trunk, then deleted from the branch.
     # From the trunk's point of view, we should see only the merge event.
     it 'must test file created on branch as seen from trunk' do
-      revisions = OhlohScm::CvsParser.parse File.read(FIXTURES_DIR + '/file_created_on_branch.rlog')
-      revisions.size.must_equal 1
-      revisions[0].message.must_equal 'merged new_file.rb from branch onto the HEAD'
+      revisions = OhlohScm::CvsParser.parse File.read("#{FIXTURES_DIR}/file_created_on_branch.rlog")
+      assert_equal revisions.size, 1
+      assert_equal revisions[0].message, 'merged new_file.rb from branch onto the HEAD'
     end
 
     # A file is created on the vender branch. This causes a simultaneous checkin on HEAD
     # with a different message ('Initial revision') but same committer_name name and timestamp.
     # We should only pick up one of these checkins.
     it 'must test simultaneous checkins' do
-      revisions = OhlohScm::CvsParser.parse File.read(FIXTURES_DIR + '/simultaneous_checkins.rlog')
-      revisions.size.must_equal 1
-      revisions[0].message.must_equal 'Initial revision'
+      revisions = OhlohScm::CvsParser.parse File.read("#{FIXTURES_DIR}/simultaneous_checkins.rlog")
+      assert_equal revisions.size, 1
+      assert_equal revisions[0].message, 'Initial revision'
     end
 
     # Two different authors check in with two different messages at the exact same moment.
     # How this happens is a mystery, but I have seen it in rlogs.
     # We arbitrarily choose the first one if so.
     it 'must test simultaneous checkins_2' do
-      revisions = OhlohScm::CvsParser.parse File.read(FIXTURES_DIR + '/simultaneous_checkins_2.rlog')
-      revisions.size.must_equal 1
+      revisions = OhlohScm::CvsParser.parse File.read("#{FIXTURES_DIR}/simultaneous_checkins_2.rlog")
+      assert_equal revisions.size, 1
     end
   end
 end

data/spec/ohloh_scm/parser/git_parser_spec.rb

@@ -3,27 +3,24 @@ require 'spec_helper'
 describe 'GitParser' do
   describe 'parse' do
     it 'must be empty for blank string' do
-      OhlohScm::GitParser.parse('').must_be :empty?
+      assert_empty OhlohScm::GitParser.parse('')
     end
 
     it 'must return epoch time for log with no date' do
-      # rubocop:disable Layout/TrailingWhitespace
       sample_log = <<-SAMPLE.gsub(/^ {8}/, '')
         __BEGIN_COMMIT__
         Commit: 1df547800dcd168e589bb9b26b4039bff3a7f7e4
         Author: Jason Allen
         AuthorEmail: jason@ohloh.net
-        Date: 
+        Date:#{' '}
         __BEGIN_COMMENT__
             moving COPYING
 
         __END_COMMENT__
       SAMPLE
-      # rubocop:enable Layout/TrailingWhitespace
-
       commits = OhlohScm::GitParser.parse(sample_log)
-      commits.size.must_equal 1
-      commits[0].author_date.must_equal Time.utc(1970, 1, 1, 0, 0, 0)
+      assert_equal commits.size, 1
+      assert_equal commits[0].author_date, Time.utc(1970, 1, 1, 0, 0, 0)
     end
 
     it 'must return epoch time for log with invalid date' do
@@ -40,8 +37,8 @@ describe 'GitParser' do
       SAMPLE
 
       commits = OhlohScm::GitParser.parse(sample_log)
-      commits.size.must_equal 1
-      commits[0].author_date.must_equal Time.utc(1970, 1, 1, 0, 0, 0)
+      assert_equal commits.size, 1
+      assert_equal commits[0].author_date, Time.utc(1970, 1, 1, 0, 0, 0)
     end
 
     it 'must parse a log correctly' do
@@ -74,29 +71,29 @@ describe 'GitParser' do
 
       commits = OhlohScm::GitParser.parse(sample_log)
 
-      commits.size.must_equal 2
-
-      commits[0].token.must_equal '1df547800dcd168e589bb9b26b4039bff3a7f7e4'
-      commits[0].author_name.must_equal 'Jason Allen'
-      commits[0].author_email.must_equal 'jason@ohloh.net'
-      commits[0].message.must_equal "moving COPYING\n"
-      commits[0].author_date.must_equal Time.utc(2006, 7, 14, 23, 7, 15)
-      commits[0].diffs.size.must_equal 1
-
-      commits[0].diffs[0].action.must_equal 'A'
-      commits[0].diffs[0].path.must_equal 'COPYING'
-
-      commits[1].token.must_equal '2e9366dd7a786fdb35f211fff1c8ea05c51968b1'
-      commits[1].author_name.must_equal 'Robin Luckey'
-      commits[1].author_email.must_equal 'robin@ohloh.net'
-      commits[1].message.must_equal "added some documentation and licensing info\n"
-      commits[1].author_date.must_equal Time.utc(2006, 6, 11, 18, 34, 17)
-      commits[1].diffs.size.must_equal 2
-
-      commits[1].diffs[0].action.must_equal 'M'
-      commits[1].diffs[0].path.must_equal 'README'
-      commits[1].diffs[1].action.must_equal 'D'
-      commits[1].diffs[1].path.must_equal 'helloworld.c'
+      assert_equal commits.size, 2
+
+      assert_equal commits[0].token, '1df547800dcd168e589bb9b26b4039bff3a7f7e4'
+      assert_equal commits[0].author_name, 'Jason Allen'
+      assert_equal commits[0].author_email, 'jason@ohloh.net'
+      assert_equal commits[0].message, "moving COPYING\n"
+      assert_equal commits[0].author_date, Time.utc(2006, 7, 14, 23, 7, 15)
+      assert_equal commits[0].diffs.size, 1
+
+      assert_equal commits[0].diffs[0].action, 'A'
+      assert_equal commits[0].diffs[0].path, 'COPYING'
+
+      assert_equal commits[1].token, '2e9366dd7a786fdb35f211fff1c8ea05c51968b1'
+      assert_equal commits[1].author_name, 'Robin Luckey'
+      assert_equal commits[1].author_email, 'robin@ohloh.net'
+      assert_equal commits[1].message, "added some documentation and licensing info\n"
+      assert_equal commits[1].author_date, Time.utc(2006, 6, 11, 18, 34, 17)
+      assert_equal commits[1].diffs.size, 2
+
+      assert_equal commits[1].diffs[0].action, 'M'
+      assert_equal commits[1].diffs[0].path, 'README'
+      assert_equal commits[1].diffs[1].action, 'D'
+      assert_equal commits[1].diffs[1].path, 'helloworld.c'
     end
   end
 end