ohloh_scm 2.5.1 → 3.0.1

data/spec/ohloh_scm/bzr/scm_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Bzr::Scm' do
+  it 'must pull the repository correctly' do
+    with_bzr_repository('bzr') do |src|
+      tmpdir do |dest_dir|
+        core = OhlohScm::Factory.get_core(scm_type: :bzr, url: dest_dir)
+        refute core.status.exist?
+
+        core.scm.pull(src.scm, TestCallback.new)
+        assert core.status.exist?
+      end
+    end
+  end
+end

data/spec/ohloh_scm/bzr/validation_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Bzr::Validation' do
+  describe 'validate_server_connection' 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?
+    end
+  end
+
+  describe 'validate url' do
+    it 'must have errors for invalid urls' do
+      assert_url_error(:bzr, nil, '', 'foo', 'http:/', 'http:://', 'http://', 'http://a')
+      assert_url_error(:bzr, 'http://www.selenic.com/repo/hello%20world') # no encoded strings allowed
+      assert_url_error(:bzr, 'http://www.selenic.com/repo/hello world') # no spaces allowed
+      assert_url_error(:bzr, 'git://www.selenic.com/repo/hello') # git protocol not allowed
+      assert_url_error(:bzr, 'svn://www.selenic.com/repo/hello') # svn protocol not allowed
+      assert_url_error(:bzr, 'lp://foobar') # lp requires no '//' after colon
+      assert_url_error(:bzr, 'file:///home/test/bzr')
+      assert_url_error(:bzr, '/home/test/bzr')
+      assert_url_error(:bzr, 'bzr+ssh://test@localhost/home/test/bzr')
+      assert_url_error(:bzr, 'bzr+ssh://localhost/home/test/bzr')
+    end
+
+    it 'wont have errors for valid urls' do
+      assert_url_valid(:bzr, 'http://www.selenic.com/repo/hello')
+      assert_url_valid(:bzr, 'http://www.selenic.com:80/repo/hello')
+      assert_url_valid(:bzr, 'https://www.selenic.com/repo/hello')
+      assert_url_valid(:bzr, 'bzr://www.selenic.com/repo/hello')
+      assert_url_valid(:bzr, 'lp:foobar')
+      assert_url_valid(:bzr, 'lp:~foobar/bar')
+    end
+  end
+end

data/spec/ohloh_scm/cvs/activity_spec.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+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'
+  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
+
+    activity = get_core(:cvs, url: ':ext:foo:@foo.com:/cvsroot/a', branch_name: 'b').activity
+    activity.send(:protocol).must_equal :ext
+
+    activity = get_core(:cvs, url: ':pserver:ext:@foo.com:/cvsroot/a', branch_name: 'b').activity
+    activity.send(:protocol).must_equal :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']]
+    end
+  end
+
+  it 'must test export_tag' 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']
+      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']
+
+      # 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']
+
+      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']
+
+      cvs.activity.commits(after: '2006/06/29 18:52:23').collect(&:token).must_be_empty
+    end
+  end
+
+  it 'must correctly convert commits to git' do
+    with_cvs_repository('cvs', 'simple') do |cvs|
+      tmpdir do |tmp_dir|
+        git_core = OhlohScm::Factory.get_core(url: tmp_dir)
+        git_core.scm.pull(cvs.scm, TestCallback.new)
+        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
+      end
+    end
+  end
+
+  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
+      end
+    end
+  end
+
+  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
+      end
+    end
+  end
+
+  it 'commits must work with invalid_encoding' do
+    with_cvs_repository('cvs', 'invalid_utf8') do |cvs|
+      cvs.activity.commits
+    end
+  end
+end

data/spec/ohloh_scm/cvs/scm_spec.rb

@@ -0,0 +1,112 @@
+require 'spec_helper'
+
+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'
+
+    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'
+
+    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'
+
+    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'
+  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 ''
+
+    # 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'
+
+    # 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'
+
+    # 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'
+  end
+
+  it 'must test guess_forge' do
+    scm = get_core(:cvs, url: nil).scm
+    scm.send(:guess_forge).must_be_nil
+
+    scm = get_core(:cvs, url: 'garbage_in_garbage_out').scm
+    scm.send(:guess_forge).must_be_nil
+
+    scm = get_core(:cvs, url: ':pserver:anonymous:@boost.cvs.sourceforge.net:/cvsroot/boost').scm
+    scm.send(:guess_forge).must_equal 'sourceforge.net'
+
+    scm = get_core(:cvs, url: ':pserver:guest:@cvs.dev.java.net:/cvs').scm
+    scm.send(:guess_forge).must_equal 'java.net'
+
+    scm = get_core(:cvs, url: ':PSERVER:ANONCVS:@CVS.DEV.JAVA.NET:/cvs').scm
+    scm.send(:guess_forge).must_equal 'java.net'
+
+    scm = get_core(:cvs, url: ':pserver:guest:@colorchooser.dev.java.net:/cvs').scm
+    scm.send(:guess_forge).must_equal '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'
+  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'
+  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'
+  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']
+  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.size.must_equal 4
+    list.must_equal ['', 'foo', 'hello', 'foo/bar']
+  end
+end

data/spec/ohloh_scm/cvs/validation_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe 'Cvs::Validation' do
+  describe 'validate_server_connection' do
+    it 'must handle non existent remote source' 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?
+    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?
+  end
+
+  it 'must test rejected urls' do
+    assert_url_error(:cvs, nil, '', 'foo', 'http:/', 'http:://', 'http://', 'http://a')
+    assert_url_error(:cvs, ':pserver') # that's not enough
+    assert_url_error(:cvs, ':pserver:anonymous') # still not enough
+    assert_url_error(:cvs, ':pserver:anonymous:@ipodder.cvs.sourceforge.net') # missing the path
+    assert_url_error(:cvs, ':pserver:anonymous:::@ipodder.cvs.sourceforge.net:/cvsroot/ipodder') # too many colons
+    assert_url_error(:cvs, ':pserver@ipodder.cvs.sourceforge.net:/cvsroot/ipodder') # not enough colons
+    # hostname and path not separated by colon
+    assert_url_error(:cvs, ':pserver:anonymous:@ipodder.cvs.sourceforge.net/cvsroot/ipodder')
+    assert_url_error(:cvs, ':pserver:anonymous:@ipodder.cvs.source/forge.net:/cvsroot/ipodder') # slash in hostname
+    assert_url_error(:cvs, ':pserver:anonymous:ipodder.cvs.sourceforge.net:/cvsroot/ipodder') # missing @
+    # path does not begin at root
+    assert_url_error(:cvs, ':pserver:anonymous:@ipodder.cvs.sourceforge.net:cvsroot/ipodder')
+    # no encoded chars allowed
+    assert_url_error(:cvs, ':pserver:anonymous:@ipodder.cvs.sourceforge.net:/cvsr%23oot/ipodder')
+    assert_url_error(:cvs, ':pserver:anonymous:@ipodder.cvs.sourceforge.net:/cvsroot/ipodder;asdf') # no ; in url
+    # spaces not allowed
+    assert_url_error(:cvs, ':pserver:anonymous:@ipodder.cvs.sourceforge.net:/cvsroot/ipodder malicious code')
+    assert_url_error(:cvs, 'sourceforge.net/svn/project/trunk') # missing a protocol prefix
+    assert_url_error(:cvs, 'file:///home/robin/cvs') # file protocol is not allowed
+    assert_url_error(:cvs, 'http://svn.sourceforge.net') # http protocol is not allowed
+    assert_url_error(:cvs, 'git://kernel.org/whatever/linux.git') # git protocol is not allowed
+    assert_url_error(:cvs, 'ext@kernel.org/whatever/linux.git')
+  end
+
+  it 'must test accepted urls' do
+    assert_url_valid(:cvs, ':pserver:anonymous:@ipodder.cvs.sourceforge.net:/cvsroot/ipodder')
+    assert_url_valid(:cvs, ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot')
+    assert_url_valid(:cvs, ':pserver:anonymous:@cvs-mirror.mozilla.org:/cvsroot')
+    assert_url_valid(:cvs, ':pserver:guest:@cvs.dev.java.net:/shared/data/ccvs/repository')
+    assert_url_valid(:cvs, ':pserver:anoncvs:password@anoncvs.postgresql.org:/projects/cvsroot')
+    assert_url_valid(:cvs, ':pserver:anonymous:@rubyeclipse.cvs.sourceforge.net:/cvsroot/rubyeclipse')
+    assert_url_valid(:cvs, ':pserver:cvs:cvs@cvs.winehq.org:/home/wine')
+    assert_url_valid(:cvs, ':pserver:tcpdump:anoncvs@cvs.tcpdump.org:/tcpdump/master')
+    assert_url_valid(:cvs, ':pserver:anonymous:@user-mode-linux.cvs.sourceforge.net:/cvsroot/user-mode-linux')
+    assert_url_valid(:cvs, ':pserver:anonymous:@sc2.cvs.sourceforge.net:/cvsroot/sc2')
+    # Hyphen should be OK in username
+    assert_url_valid(:cvs, ':pserver:cool-dev:@sc2.cvs.sourceforge.net:/cvsroot/sc2')
+    # Underscores should be ok in path
+    assert_url_valid(:cvs, ':pserver:cvs_anon:@cvs.scms.waikato.ac.nz:/usr/local/global-cvs/ml_cvs')
+    # Pluses should be OK
+    assert_url_valid(:cvs, ':pserver:anonymous:freefem++@idared.ann.jussieu.fr:/Users/pubcvs/cvs')
+    assert_url_valid(:cvs, ':ext:anoncvs@opensource.conformal.com:/anoncvs/scrotwm')
+  end
+
+  it 'must test rejected branch_names' do
+    assert_branch_name_error(:cvs, nil, '', '%', ';', '&', "\n", "\t")
+  end
+
+  it 'must test accepted branch_names' do
+    assert_branch_name_valid(:cvs, 'myproject')
+    assert_branch_name_valid(:cvs, 'my/project')
+    assert_branch_name_valid(:cvs, 'my/project/2.0')
+    assert_branch_name_valid(:cvs, 'my_project')
+    assert_branch_name_valid(:cvs, '0')
+    assert_branch_name_valid(:cvs, 'My .Net Module')
+    assert_branch_name_valid(:cvs, 'my-module')
+    assert_branch_name_valid(:cvs, 'my-module++')
+  end
+end

data/spec/ohloh_scm/factory_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Factory' do
+  it 'must provide access to scm, activity and status functions' 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.activity.method(:commits)
+    assert core.status.method(:exist?)
+    assert core.validation.method(:validate)
+  end
+end

data/spec/ohloh_scm/git/activity_spec.rb

@@ -0,0 +1,402 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Git::Activity' do
+  it 'must export contents of a repository' do
+    with_git_repository('git') do |git|
+      tmpdir do |dir|
+        git.activity.export(dir)
+        Dir.entries(dir).sort.must_equal ['.', '..', '.gitignore', 'COPYING', 'README',
+                                          'helloworld.c', 'makefile', 'ohloh_token']
+      end
+    end
+  end
+
+  it 'export must work the same for tag or commit_sha' do
+    with_git_repository('git') do |git|
+      tag_sha = 'f6e5a894ac4173f8f2a200f2c36df38a1e61121a'
+      commit_sha = `cd #{ git.scm.url } && git show #{ tag_sha }`.slice(/commit (.+)$/, 1)
+
+      Dir.mktmpdir('oh_scm_tag_') do |tag_dir|
+        git.activity.export(tag_dir, tag_sha)
+
+        Dir.mktmpdir('oh_scm_commit_') do |commit_dir|
+          git.activity.export(commit_dir, commit_sha)
+          `diff -rq #{ tag_dir } #{ commit_dir }`.must_be :empty?
+          Dir.entries(commit_dir).sort.must_equal ['.', '..', '.gitignore', 'helloworld.c',
+                                                   'makefile', 'ohloh_token']
+        end
+      end
+    end
+  end
+
+  it 'must encode branch names correctly' do
+    with_git_repository('git_with_invalid_encoding') do |git|
+      assert git.activity.send(:branches).all?(&:valid_encoding?)
+    end
+  end
+
+  describe 'tags' do
+    it 'scm test fixture must have dereferenced tags' do
+      with_git_repository('git') do |git|
+        tag_shas = `cd #{git.scm.url} && git tag --format='%(objectname)' | sed 's/refs\\/tags\\///'`.split(/\n/)
+        assert(tag_shas.any? { |sha| !git.activity.commit_tokens.include?(sha) })
+      end
+    end
+
+    it 'must return repository tags' do
+      with_git_repository('git') do |git|
+        git.activity.tags.must_equal(
+          [['v1.0.0', 'b6e9220c3cabe53a4ed7f32952aeaeb8a822603d', Time.parse('2016-07-31T07:58:30+05:30')],
+           ['v1.1.0-lw', '2e9366dd7a786fdb35f211fff1c8ea05c51968b1', Time.parse('2006-06-11T11:34:17-07:00')],
+           ['v2.1.0', '1df547800dcd168e589bb9b26b4039bff3a7f7e4', Time.parse('2006-07-14T16:07:15-07:00')]]
+        )
+      end
+    end
+
+    it 'must reference valid commits' do
+      with_git_repository('git') do |git|
+        tag_shas = git.activity.tags.map { |list| list[1] }
+        assert(tag_shas.all? { |sha| git.activity.commit_tokens.include?(sha) })
+      end
+    end
+
+    it 'must be empty for repository with no tags' do
+      with_git_repository('git_walk') do |git|
+        git.activity.tags.must_be :empty?
+      end
+    end
+
+    it 'must work for a tag named master' do
+      with_git_repository('git_with_master_tag') do |git|
+        git.activity.tags.must_equal [['master', '4e95717ac8cff8cdb10d83398d3ac667a2cca341',
+                                       Time.parse('2018-02-01T12:56:48+0530')]]
+      end
+    end
+  end
+
+  it 'must return correct head' do
+    with_git_repository('git') do |git|
+      assert git.status.exist?
+      git.activity.head_token.must_equal '1df547800dcd168e589bb9b26b4039bff3a7f7e4'
+      git.activity.head.token.must_equal '1df547800dcd168e589bb9b26b4039bff3a7f7e4'
+      assert git.activity.head.diffs.any?
+    end
+  end
+
+  it 'head_token must work with invalid encoding' do
+    with_git_repository('git_with_invalid_encoding') do |git|
+      git.activity.head_token
+    end
+  end
+
+  it 'commit_count' do
+    with_git_repository('git') do |git|
+      git.activity.commit_count.must_equal 4
+      git.activity.commit_count(after: 'b6e9220c3cabe53a4ed7f32952aeaeb8a822603d').must_equal 2
+      git.activity.commit_count(after: '1df547800dcd168e589bb9b26b4039bff3a7f7e4').must_equal 0
+    end
+  end
+
+  it 'commit_tokens' do
+    with_git_repository('git') do |git|
+      git.activity.commit_tokens.must_equal %w[089c527c61235bd0793c49109b5bd34d439848c6
+                                               b6e9220c3cabe53a4ed7f32952aeaeb8a822603d
+                                               2e9366dd7a786fdb35f211fff1c8ea05c51968b1
+                                               1df547800dcd168e589bb9b26b4039bff3a7f7e4]
+
+      git.activity.commit_tokens(after: '2e9366dd7a786fdb35f211fff1c8ea05c51968b1')
+         .must_equal ['1df547800dcd168e589bb9b26b4039bff3a7f7e4']
+
+      git.activity.commit_tokens(after: '1df547800dcd168e589bb9b26b4039bff3a7f7e4').must_be :empty?
+    end
+  end
+
+  it 'commits' do
+    with_git_repository('git') do |git|
+      git.activity.commits.collect(&:token).must_equal %w[089c527c61235bd0793c49109b5bd34d439848c6
+                                                          b6e9220c3cabe53a4ed7f32952aeaeb8a822603d
+                                                          2e9366dd7a786fdb35f211fff1c8ea05c51968b1
+                                                          1df547800dcd168e589bb9b26b4039bff3a7f7e4]
+
+      git.activity.commits(after: '2e9366dd7a786fdb35f211fff1c8ea05c51968b1').collect(&:token)
+         .must_equal ['1df547800dcd168e589bb9b26b4039bff3a7f7e4']
+
+      git.activity.commits(after: '1df547800dcd168e589bb9b26b4039bff3a7f7e4').must_be :empty?
+    end
+  end
+
+  it 'commits for branch' do
+    with_git_repository('git', 'develop') do |git|
+      git.activity.commits.map(&:token).must_equal %w[089c527c61235bd0793c49109b5bd34d439848c6
+                                                      b6e9220c3cabe53a4ed7f32952aeaeb8a822603d
+                                                      2e9366dd7a786fdb35f211fff1c8ea05c51968b1
+                                                      b4046b9a80fead62fa949232f2b87b0cb78fffcc]
+
+      git.activity.commits(after: '2e9366dd7a786fdb35f211fff1c8ea05c51968b1')
+         .map(&:token).must_equal ['b4046b9a80fead62fa949232f2b87b0cb78fffcc']
+
+      git.activity.commits(after: 'b4046b9a80fead62fa949232f2b87b0cb78fffcc').must_be :empty?
+    end
+  end
+
+  it 'wont track submodule commits and diffs' do
+    with_git_repository('git_with_submodules') do |git|
+      submodule_commits = %w[240375de181498b9a34d4bd328f2c87d2ade79f9
+                             b6a80291e49dc540bb78526f9b1aab1123c9fb0e]
+
+      (git.activity.commit_tokens & submodule_commits).must_be :empty?
+
+      diffs = git.activity.commits.map(&:diffs).reject(&:empty?).flatten
+      diffs.map(&:path).must_equal ['A']
+      diffs.map(&:sha1).must_equal ['f70f10e4db19068f79bc43844b49f3eece45c4e8']
+    end
+  end
+
+  it 'commit_count for trunk commits' do
+    with_git_repository('git_dupe_delete') do |git|
+      git.activity.commit_count(trunk_only: false).must_equal 4
+      git.activity.commit_count(trunk_only: true).must_equal 3
+    end
+  end
+
+  it 'commit tokens for trunk commits' do
+    with_git_repository('git_dupe_delete') do |git|
+      git.activity.commit_tokens(trunk_only: false).must_equal ['a0a2b8623941562031a7d7f95d984feb4a2d719c',
+                                                                'ad6bb43112706c462e53a9a8a8cd3b05f8e9260f',
+                                                                '6126337d2497806528fd8657181d5d4afadd72a4', # On branch
+                                                                '41c4b1044ebffc968d363e5f5e883134e624f846']
+
+      git.activity.commit_tokens(trunk_only: true).must_equal ['a0a2b8623941562031a7d7f95d984feb4a2d719c',
+                                                               'ad6bb43112706c462e53a9a8a8cd3b05f8e9260f',
+                                                               # '6126337d2497806528fd8657181d5d4afadd72a4' # On branch
+                                                               '41c4b1044ebffc968d363e5f5e883134e624f846']
+    end
+  end
+
+  it 'commit tokens for trunk commits using after' do
+    with_git_repository('git_dupe_delete') do |git|
+      git.activity.commit_tokens(after: 'a0a2b8623941562031a7d7f95d984feb4a2d719c',
+                                 trunk_only: true).must_equal %w[ad6bb43112706c462e53a9a8a8cd3b05f8e9260f
+                                                                 41c4b1044ebffc968d363e5f5e883134e624f846]
+
+      # All trunk commit_tokens, with :after == HEAD
+      git.activity.commit_tokens(after: '41c4b1044ebffc968d363e5f5e883134e624f846',
+                                 trunk_only: true).must_be :empty?
+    end
+  end
+
+  it 'split renamed file diff into add and delete diffs' do
+    # `git mv foo bar` results in a single R diff. Split it into A & D diffs.
+    with_git_repository('git_with_mv') do |git|
+      r_commit = git.activity.commits[-2]
+      r_commit.message.strip.must_equal 'Ran: git mv foo bar'
+      r_commit.diffs.map(&:action).must_equal %w[D A]
+      r_commit.diffs.map(&:path).must_equal %w[foo bar]
+
+      r_commit = git.activity.commits.last
+      r_commit.message.strip.must_equal 'Ran: echo B >> bar; mv bar rab'
+      r_commit.diffs.map(&:action).must_equal %w[D A]
+      r_commit.diffs.map(&:path).must_equal %w[bar rab]
+    end
+  end
+
+  it 'trunk only commits' do
+    with_git_repository('git_dupe_delete') do |git|
+      git.activity.commits(trunk_only: true).collect(&:token).must_equal ['a0a2b8623941562031a7d7f95d984feb4a2d719c',
+                                                                          'ad6bb43112706c462e53a9a8a8cd3b05f8e9260f',
+                                                                          # on a branch, hence excluded.
+                                                                          # '6126337d2497806528fd8657181d5d4afadd72a4',
+                                                                          '41c4b1044ebffc968d363e5f5e883134e624f846']
+    end
+  end
+
+  # In rare cases, a merge commit's resulting tree is identical to its first parent's tree.
+  # I believe this is a result of developer trickery, and not a common situation.
+  #
+  # When this happens, `git whatchanged` will omit the changes relative to the first parent,
+  # and instead output only the changes relative to the second parent.
+  #
+  # Our commit parser became confused by this, assuming that these changes relative to the
+  # second parent were in fact the missing changes relative to the first.
+  #
+  # This is bug OTWO-623. This test confirms the fix.
+  it 'verbose commit with null merge' do
+    with_git_repository('git_with_null_merge') do |git|
+      c = git.activity.verbose_commit('d3bd0bedbf4b197b2c4eb827e1ec4c35b834482f')
+      # This commit's tree is identical to its parent's. Thus it should contain no diffs.
+      c.diffs.must_equal []
+    end
+  end
+
+  it 'each commit with null merge' do
+    with_git_repository('git_with_null_merge') do |git|
+      git.activity.each_commit do |c|
+        c.diffs.must_equal [] if c.token == 'd3bd0bedbf4b197b2c4eb827e1ec4c35b834482f'
+      end
+    end
+  end
+
+  it 'verbose_commit must have valid encoding' do
+    with_git_repository('git_with_invalid_encoding') do |git|
+      assert git.activity.verbose_commit('8d03f4ea64fcd10966fb3773a212b141ada619e1').message.valid_encoding?
+    end
+  end
+
+  it 'safe_open_log_file must return text with valid encoding' do
+    with_git_repository('git_with_invalid_encoding') do |git|
+      git.activity.send(:safe_open_log_file) do |io|
+        io.read.valid_encoding?.must_equal true
+      end
+    end
+  end
+
+  it 'commit count when there is a tag named master' do
+    with_git_repository('git_with_master_tag') do |git|
+      git.activity.commit_count.must_equal 3
+    end
+  end
+
+  it 'commit tokens when there is a tag named master' do
+    with_git_repository('git_with_master_tag') do |git|
+      git.activity.commit_tokens.must_equal %w[57b2bd30b7bae970cb3b374a0c05fd6ec3088ebf
+                                               4e95717ac8cff8cdb10d83398d3ac667a2cca341
+                                               34b8a99e6e5dd39bc36893f71e0ab1685668731f]
+    end
+  end
+
+  it 'must cat file correctly' do
+    with_git_repository('git') do |core|
+      diff = OhlohScm::Diff.new(sha1: '4c734ad53b272c9b3d719f214372ac497ff6c068')
+      core.activity.cat_file(nil, diff).must_equal <<-EXPECTED.gsub(/^ {8}/, '')
+        /* Hello, World! */
+        #include <stdio.h>
+        main()
+        {
+        	printf("Hello, World!\\n");
+        }
+      EXPECTED
+    end
+  end
+
+  describe 'commit_tokens' do
+    it 'must return commit tokens within range' do
+      with_git_repository('git_walk') do |git|
+        commit_tokens = CommitTokensHelper.new(git, 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 G]
+        commit_tokens.between(nil, :H).must_equal %i[A G H]
+        commit_tokens.between(nil, :I).must_equal %i[A G H I]
+        commit_tokens.between(nil, :J).must_equal %i[A G H I J]
+
+        # 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]
+        commit_tokens.between(:G, :J).must_equal %i[H I J]
+      end
+    end
+
+    it 'must return trunk commit tokens within range' do
+      with_git_repository('git_walk') do |git|
+        commit_tokens = CommitTokensHelper.new(git, commit_labels, trunk_only: true)
+        # 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 C]
+        commit_tokens.between(nil, :D).must_equal %i[A B C D]
+
+        # 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 C]
+        commit_tokens.between(:A, :D).must_equal %i[B C D]
+        commit_tokens.between(:B, :D).must_equal %i[C D]
+        commit_tokens.between(:C, :D).must_equal %i[D]
+      end
+    end
+
+    it 'must commit all changes in the working directory' do
+      tmpdir do |dir|
+        core = OhlohScm::Factory.get_core(scm_type: :git, url: dir)
+
+        core.activity.send(:init_db)
+        refute core.activity.send(:anything_to_commit?)
+
+        File.open(File.join(dir, 'README'), 'w') {}
+        assert core.activity.send(:anything_to_commit?)
+
+        c = OhlohScm::Commit.new
+        c.author_name = 'John Q. Developer'
+        c.message = 'Initial checkin.'
+        core.activity.commit_all(c)
+        refute core.activity.send(:anything_to_commit?)
+
+        core.activity.commits.size.must_equal 1
+
+        core.activity.commits.first.author_name.must_equal c.author_name
+        # Depending on version of Git used, we may or may not have trailing \n.
+        # We don't really care, so just compare the stripped versions.
+        core.activity.commits.first.message.strip.must_equal c.message.strip
+
+        assert_equal ['.gitignore', 'README'], core.activity.commits.first.diffs.collect(&:path).sort
+      end
+    end
+
+    it 'must test that no token returns nil' do
+      tmpdir do |dir|
+        core = OhlohScm::Factory.get_core(scm_type: :git, url: dir)
+        refute core.activity.read_token
+        core.activity.send(:init_db)
+        refute core.activity.read_token
+      end
+    end
+
+    it 'must test write and read token' do
+      tmpdir do |dir|
+        core = OhlohScm::Factory.get_core(scm_type: :git, url: dir)
+        core.activity.send(:init_db)
+        core.activity.send(:write_token, 'FOO')
+        refute core.activity.read_token # Token not valid until committed
+        core.activity.commit_all(OhlohScm::Commit.new)
+        core.activity.read_token.must_equal 'FOO'
+      end
+    end
+
+    it 'must test that commit_all includes write token' do
+      tmpdir do |dir|
+        core = OhlohScm::Factory.get_core(scm_type: :git, url: dir)
+        core.activity.send(:init_db)
+        c = OhlohScm::Commit.new
+        c.token = 'BAR'
+        core.activity.commit_all(c)
+        c.token.must_equal core.activity.read_token
+      end
+    end
+
+    it 'must test read_token encoding' do
+      with_git_repository('git_with_invalid_encoding') do |core|
+        core.activity.read_token
+      end
+    end
+
+    def commit_labels
+      { A: '886b62459ef1ffd01a908979d4d56776e0c5ecb2',
+        B: 'db77c232f01f7a649dd3a2216199a29cf98389b7',
+        C: 'f264fb40c340a415b305ac1f0b8f12502aa2788f',
+        D: '57fedf267adc31b1403f700cc568fe4ca7975a6b',
+        G: '97b80cb9743948cf302b6e21571ff40721a04c8d',
+        H: 'b8291f0e89567de3f691afc9b87a5f1908a6f3ea',
+        I: 'd067161caae2eeedbd74976aeff5c4d8f1ccc946',
+        J: 'b49aeaec003cf8afb18152cd9e292816776eecd6' }
+    end
+  end
+end