Merge pull request #105 from blackducksoftware/OTWO-5545

Fix hg(v4) use & upgrade TravisCI to ubuntu 18.04

Author: notalex

.travis.yml

@@ -1,15 +1,6 @@
-language: ruby
-env:
-  - TRAVIS_CONFIG_DIR=.travis
+language: generic
+services:
+  - docker
 before_install:
-  - cd $TRAVIS_CONFIG_DIR
-  - sh .travis_ssh_setup.sh
-install:
-  - sh .install_multiple_scms.sh
-  - sh .install_dependencies.sh
-  - gem install posix-spawn
-  - gem install nokogiri -v 1.8.1
-  - gem install test-unit -v 3.2.7
-  - sudo apt-get install expect
-before_script:
-  - cd $TRAVIS_BUILD_DIR
+  - docker pull notalex/ohloh_scm:ubuntu18
+script: docker run -P -w /home/app/ohloh_scm -v $(pwd):/home/app/ohloh_scm -ti notalex/ohloh_scm:ubuntu18 /bin/sh -c "/etc/init.d/ssh start; LANG=en_US.UTF-8 rake test 2> /dev/null"

.travis/.install_dependencies.sh

@@ -0,0 +1,31 @@
+FROM ubuntu:18.04
+MAINTAINER OpenHub <info@openhub.net>
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+RUN apt-get install -y build-essential software-properties-common locales
+RUN locale-gen en_US.UTF-8
+
+RUN apt-add-repository -y ppa:brightbox/ruby-ng
+RUN apt-get update
+RUN apt-get install -y ruby2.3 ruby2.3-dev
+
+RUN apt-get install -y ragel libxml2-dev libpcre3 libpcre3-dev swig gperf openssh-server expect
+RUN apt-get install -y git git-svn subversion cvs mercurial bzr
+
+RUN ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa
+RUN cp ~/.ssh/id_rsa.pub ~/.ssh/authorized_keys
+RUN echo 'StrictHostKeyChecking no' >> ~/.ssh/config
+
+RUN mkdir -p ~/.bazaar/plugins
+RUN cd ~/.bazaar/plugins
+RUN bzr branch lp:bzr-xmloutput ~/.bazaar/plugins/xmloutput
+
+RUN ln -s /usr/bin/cvs /usr/bin/cvsnt
+
+RUN gem install posix-spawn -v '~> 0.3'
+RUN gem install nokogiri -v '~> 1.8'
+RUN gem install rake test-unit byebug
+
+RUN mkdir -p /home/app/ohloh_scm

.travis/.install_multiple_scms.sh

@@ -1,8 +1,8 @@
-[![Ohloh SCM on Ohloh](https://www.ohloh.net/p/ohloh_scm/widgets/project_partner_badge.gif)](https://www.ohloh.net/p/ohloh_scm) [![Build Status](https://travis-ci.org/blackducksoftware/ohloh_scm.svg?branch=master)](https://travis-ci.org/blackducksoftware/ohloh_scm)
+[![Ohloh SCM on OpenHub](https://www.openhub.net/p/ohloh_scm/widgets/project_partner_badge.gif)](https://www.openhub.net/p/ohloh_scm) [![Build Status](https://travis-ci.org/blackducksoftware/ohloh_scm.svg?branch=master)](https://travis-ci.org/blackducksoftware/ohloh_scm)
 
 # Ohloh SCM
 
-The Ohloh source control management library
+The OpenHub source control management library
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License Version 2 as
@@ -24,27 +24,30 @@ Ohloh SCM is an abstraction layer for source control management systems,
 allowing an application to interoperate with various SCMs using a
 single interface.
 
-It was originally developed at Ohloh, and is used to generate
-the reports at www.ohloh.net.
+It was originally developed at OpenHub, and is used to generate
+the reports at www.openhub.net.
 
 ## System Requirements
 
-Ohloh SCM is developed on Mac OS X 10.5 and Ubuntu 6.06 LTS. Other Linux
-environments should also work, but your mileage may vary.
+One could use the bundled Dockerfile to test Ohloh SCM in a container and skip
+this section entirely. See [docker](https://github.com/blackducksoftware/ohloh_scm/#using-docker).
+
+Ohloh SCM is developed on Mac OS X 10.13.6(High Sierra) and Ubuntu 18.04 LTS.
+Other Linux environments should also work, but your mileage may vary.
 
 Ohloh SCM does not support Windows.
 
-Ohloh SCM targets Ruby 1.8.6 and Rake 0.8.1
+Ohloh SCM targets Ruby 2.3 and Rake 12.3.
 
 Ohloh SCM interfaces with CVSNT, Subversion, Git and Mercurial through the
-shell.  In order to pass the unit tests, all three systems must be installed
-and on your path. Ohloh uses the following versions, and other versions are
-totally unsupported at this time:
+shell. In order to pass the unit tests, all three systems must be installed
+and on your path. Ohloh is currently tested on the following versions:
 
-cvsnt 2.5.03  
-svn 1.4.2  
-git 1.8.2.1  
-hg 1.1.2  
+cvsnt 2.5.03
+svn 1.9.7
+git 2.17.1
+hg 4.5.3
+bzr 2.8.0
 
 If you are using CVS instead of CVSNT, you can potentially try creating
 a shell alias or symlink mapping 'cvsnt' to 'cvs'.
@@ -72,7 +75,7 @@ Ensure that cvsnt, svn, svnadmin, svnsync, git, and hg are all on your path. You
     $ mkdir plugins
     $ cd plugins
 
-Now checkout the latest version of the xmloutput plugin (0.8.8 as of 11/21/2011). 
+Now checkout the latest version of the xmloutput plugin (0.8.8 as of 11/21/2011).
 
     $ bzr branch lp:~amujumdar/bzr-xmloutput/emit_authors
 
@@ -97,9 +100,28 @@ Then you can run the unit tests:
 
 You can load the library into your own Ruby application by requiring lib/ohloh_scm.rb.
 
+## Using Docker
+
+One may use Docker to run Ohloh SCM and test changes.
+
+```sh
+$ git clone https://github.com/blackducksoftware/ohloh_scm
+$ cd ohloh_scm
+
+# To run all tests, we need to start the ssh server and set UTF-8 locale for encoding tests.
+$ cmd='/etc/init.d/ssh start; LANG=en_US.UTF-8 rake test 2> /dev/null'
+$ docker run -P -w /home/app/ohloh_scm -v $(pwd):/home/app/ohloh_scm -ti notalex/ohloh_scm:ubuntu18 /bin/sh -c "$cmd"
+# This mounts the current folder into the docker container;
+#   hence any edits made in ohloh_scm on the host machine would reflect in the container.
+
+# One may also edit the Dockerfile & build the image locally for other distros.
+$ docker build -t ohloh_scm:custom .
+$ docker run -ti ohloh_scm:custom -v $(pwd):/home/app/ohloh_scm /bin/bash
+```
+
 # Functionality
 
-For each tracked repository, Ohloh uses the SCM library to maintain a private
+For each tracked repository, OpenHub uses the SCM library to maintain a private
 local mirror. The SCM library hides the differences between source control
 systems. The SCM library manages all required updates to a mirror, and reports
 the contents of the mirror in standardized ways.
@@ -109,15 +131,15 @@ store any content it desires in that directory. Usually, it's a direct clone of
 the original repository, but in the case of CVS or some Subversion servers, it
 is a conversion of the original repository to Git.
 
-The main Ohloh application orchestrates the scheduling of all updates and
+The main OpenHub application orchestrates the scheduling of all updates and
 backups. On demand, the SCM library adapter then performs the following basic
 tasks on the local mirror:
 
 1. Pull changes -- From a remote repository URL, pull any changes to the local
 mirror. This step may involve conversion from one system to another.
-2. Push changes -- From the local mirror, push any changes to another Ohloh
+2. Push changes -- From the local mirror, push any changes to another OpenHub
 server. This is required to create backup copies and perform load balancing on
-the Ohloh cluster, and typically occurs over ssh.
+the OpenHub cluster, and typically occurs over ssh.
 3. Commit log -- Given the last known commit, report the list of new commits,
 if any, including their diffs.
 4. Cat file or parent -- Given a commit, return either the contents of a
@@ -128,10 +150,7 @@ to a specified temp directory.
 The adapter must also implement validation routines used to filter user inputs
 and confirm the presence of the remote server.
 
-# Contact Ohloh
-
-For more information visit the Ohloh website:
-[Ohloh Labs](http://labs.ohloh.net)
+# Contact OpenHub
 
-You can reach Ohloh via email at:
-[info@ohloh.net](mailto:info@ohloh.net)
+You can reach OpenHub via email at:
+[info@openhub.net](mailto:info@openhub.net)

.travis/.travis_ssh_setup.sh

@@ -26,9 +26,8 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
 end
 
-Rake::TestTask.new :unit_tests do |t|
+Rake::TestTask.new :test do |t|
 	t.test_files = FileList[File.dirname(__FILE__) + '/test/unit/**/*_test.rb']
 end
 
-task :default => :unit_tests
-
+task :default => :test

Dockerfile

@@ -14,6 +14,10 @@ def commit_tokens(opts={})
 			# Basically, we're trying very hard to make this act just like Git. The hg_rev_list_test checks this.
 			tokens = run("cd '#{self.url}' && #{ hg_log_with_opts } --template='{node}\\n'").split("\n").reverse
 
+      # Since hg v4, --follow-first does not play well with -r N:n. Using them together always returns all commits.
+      # To find trunk commits since a given revision, we get all trunk commits and drop older commits before given revision.
+      tokens = tokens.drop(tokens.index(after)) if tokens.any? && after && after != 0
+
 			# Hg returns everything after *and including* after.
 			# We want to exclude it.
 			if tokens.any? && tokens.first == after
@@ -96,13 +100,13 @@ def hg_command_builder(opts)
       up_to = opts[:up_to] || :tip
 
       options = if opts[:trunk_only]
-        "--follow-first -r #{ up_to }:#{ after }"
+        '--follow-first'
       else
-        query = "and (branch(#{ branch_name }) or ancestors(#{ branch_name }))" if branch_name && branch_name != 'default'
+        query = "and (branch(#{ branch_name_or_default }) or ancestors(#{ branch_name_or_default }))"
         "-r '#{ up_to }:#{ after } #{ query }'"
       end
 
-      ["hg log -f -v #{ options }", after]
+      ["hg log -v #{ options }", after]
     end
 	end
 end

README.md

@@ -3,7 +3,7 @@ class HgAdapter < AbstractAdapter
 		def head_token
 			# This only returns first 12 characters.
 			# How can we make it return the entire hash?
-      branch_opts = "--rev #{branch_name || :default}"
+      branch_opts = "--rev #{branch_name_or_default}"
 			token = run("hg id --debug -i -q #{url} #{branch_opts}").strip
 
 			# Recent versions of Hg now somtimes append a '+' char to the token.

Rakefile

@@ -30,5 +30,11 @@ def tags
         [tag_name, rev, Time.parse(time_string)]
       end
     end
+
+    protected
+
+    def branch_name_or_default
+      branch_name || :default
+    end
 	end
 end