ohloh_scm 3.0.21 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3bc5fee4822aa9fdb23808cf18333cf2439fb67beba337281b19e5e29162d60
-  data.tar.gz: e6617dc6ce992273abc6b51321ff3092086e27c87821a9175d4551c2b8f9ce3c
+  metadata.gz: 8809bbfd25b951cbd16c88eaefec1c70bbc2f255f1b0bb7d3d67380e9e107aed
+  data.tar.gz: 6f27491d2f3b158f19f290bdd4f1c1d988ce1c067f79c3c5846c72174e5af920
 SHA512:
-  metadata.gz: 177ba8662a8b8cba0370393061af014fd6061e8c58268d8b61c463eb1a4c441967bea7c07f788a03f4ec32dcc878b97d6a51601818bbd644b48a21bd40648122
-  data.tar.gz: 481ef3fad98f4418fddae8e43b2cefb10d4cab68da6eb5646ffef32a459b13e6f00ee6ba7290184f8ab131e8d2f18ed5a0f20a3de13e8315e3f752ca7012f2b6
+  metadata.gz: 7793a60e5457ccd198a9be366b4d9e02926a472f874428328d724baba8c6a228da5eb42030db850d19d981a8844d23c69b5972c0b9c724d42493be6b37696e60
+  data.tar.gz: cbe7febaf85256dfce20c7ef059bf1e58952ee3dac0556da0fbb821b3e5d2cac8803f1764126eec2ee0c5ee668b185389f52b9ca46e59f2f603d76d294ce18d9

data/.github/workflows/ci.yml

@@ -16,5 +16,5 @@ jobs:
     - name: Run rubocop and tests
       run: |
         docker pull ohdeployer/ohloh_scm:latest
-        cmd='/etc/init.d/ssh start; rubocop; LANG=en_US.UTF-8 rake test 2> /dev/null'
+        cmd='/etc/init.d/ssh start; bundle exec rubocop; rake test 2> /dev/null'
         docker run --rm -P -v $(pwd):/home/app/ohloh_scm -i ohdeployer/ohloh_scm:latest /bin/sh -c "$cmd"

data/.ruby-version

@@ -1 +1 @@
-2.5.3
+2.6.9

data/Dockerfile

@@ -1,36 +1,49 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 MAINTAINER OpenHub <info@openhub.net>
 
-ENV DEBIAN_FRONTEND=noninteractive
+ENV HOME /home
+ENV LC_ALL en_US.UTF-8
+ENV APP_HOME $HOME/app/ohloh_scm
+ENV DEBIAN_FRONTEND noninteractive
+ENV PATH $HOME/.rbenv/shims:$HOME/.rbenv/bin:$HOME/.rbenv/plugins/ruby-build/bin:$PATH
 
 RUN apt-get update
-RUN apt-get install -y build-essential software-properties-common locales
+RUN apt-get install -y build-essential software-properties-common locales ragel \
+  libxml2-dev libpcre3 libpcre3-dev swig gperf openssh-server expect libreadline-dev \
+  zlib1g-dev git git-svn subversion cvs ca-certificates
+
+RUN apt-get install -y python2.7 python2-dev python-pip \
+  && ln -s /usr/bin/python2.7 /usr/local/bin/python
+
 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.5 ruby2.5-dev
+RUN cd $HOME \
+  && git clone https://github.com/rbenv/rbenv.git $HOME/.rbenv \
+  && git clone https://github.com/sstephenson/ruby-build.git $HOME/.rbenv/plugins/ruby-build \
+  && echo 'eval "$(rbenv init -)"' >> $HOME/.bashrc \
+  && echo 'gem: --no-rdoc --no-ri' >> $HOME/.gemrc \
+  && echo 'export PATH="$HOME/.rbenv/shims:$HOME/.rbenv/bin:/home/.rbenv/plugins/ruby-build/bin:$PATH"' >> $HOME/.bash_profile \
+  && rbenv install 2.6.9 && rbenv global 2.6.9
 
-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 git config --global --add safe.directory '*'
 
-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 ssh-keygen -q -t rsa -N '' -f /root/.ssh/id_rsa \
+  && cp /root/.ssh/id_rsa.pub /root/.ssh/authorized_keys \
+  && echo 'StrictHostKeyChecking no' >> /root/.ssh/config
 
-RUN mkdir -p ~/.bazaar/plugins
-RUN cd ~/.bazaar/plugins
-RUN bzr branch lp:bzr-xmloutput ~/.bazaar/plugins/xmloutput
+RUN pip2 install bzr "mercurial==4.9.1"
+RUN mkdir -p ~/.bazaar/plugins \
+  && cd ~/.bazaar/plugins \
+  && bzr branch lp:bzr-xmloutput ~/.bazaar/plugins/xmloutput
 
 RUN ln -s /usr/bin/cvs /usr/bin/cvsnt
 
-RUN gem install rake
-RUN gem install bundler -v '~> 1.17'
-
-RUN mkdir -p /home/app/ohloh_scm
-WORKDIR /home/app/ohloh_scm
-ADD . /home/app/ohloh_scm
+# Run bundle install before copying source to keep this step cached.
+RUN mkdir -p $APP_HOME
+COPY Gemfile* $APP_HOME/
+RUN gem install rake bundler:1.17.3 \
+  && bundle config --global silence_root_warning 1 \
+  && cd $APP_HOME && bundle install
 
-RUN bundle config --global silence_root_warning 1
-RUN bundle install
+ADD . $APP_HOME
+WORKDIR $APP_HOME

data/lib/ohloh_scm/py_bridge/hg_server.py

@@ -10,13 +10,20 @@ class HglibPipeServer:
     self.repository = hg.repository(self.ui, repository_url)
 
   def get_file_content(self, filename, revision):
-    c = self.repository.changectx(revision)
+    c = self.changectx(revision)
     fc = c[filename]
     contents = fc.data()
     return contents
 
+  def changectx(self, revision):
+    if hasattr(self.repository, 'changectx'):
+      return self.repository.changectx(revision)
+    else:
+      rev_no = self.repository.revs(revision).first()
+      return self.repository[rev_no]
+
   def get_parent_tokens(self, revision):
-    c = self.repository.changectx(revision)
+    c = self.changectx(revision)
     parents = [p.hex() for p in c.parents() if p.hex() != '0000000000000000000000000000000000000000']
     return parents
 

data/lib/ohloh_scm/version.rb

@@ -2,11 +2,11 @@
 
 module OhlohScm
   module Version
-    STRING = '3.0.21'
-    GIT = '2.17.1'
-    SVN = '1.9.7'
-    CVSNT = '2.5.04'
-    HG = '4.5.3'
-    BZR = '2.8.0'
+    STRING = '4.0.1'
+    GIT = '2.34.1'
+    SVN = '1.14.1'
+    CVSNT = '1.12.13'
+    HG = '4.9.1'
+    BZR = '2.7.0'
   end
 end

data/spec/ohloh_scm/git/activity_spec.rb

@@ -7,7 +7,8 @@ describe 'Git::Activity' do
     with_git_repository('git') do |git|
       tmpdir do |dir|
         git.activity.export(dir)
-        entries = [".", "..", ".gitignore", "COPYING", "Gemfile.lock", "Godeps", "README", "helloworld.c", "makefile", "nested", "ohloh_token"]
+        entries = ['.', '..', '.gitignore', 'COPYING', 'Gemfile.lock', 'Godeps', 'README',
+                   'helloworld.c', 'makefile', 'nested', 'ohloh_token']
         Dir.entries(dir).sort.must_equal entries
       end
     end

data/spec/ohloh_scm/hg/activity_spec.rb

@@ -13,7 +13,7 @@ describe 'Hg::Activity' do
     with_hg_repository('hg') do |hg|
       Dir.mktmpdir do |dir|
         hg.activity.export(dir)
-        entries = [".", "..", ".hgtags", "Gemfile.lock", "Godeps", "README", "makefile", "nested", "two"]
+        entries = ['.', '..', '.hgtags', 'Gemfile.lock', 'Godeps', 'README', 'makefile', 'nested', 'two']
         Dir.entries(dir).sort.must_equal entries
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 3.0.21
+  version: 4.0.1
 platform: ruby
 authors:
 - OpenHub Team at Synopsys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-08 00:00:00.000000000 Z
+date: 2023-08-31 00:00:00.000000000 Z
 dependencies: []
 description: |-
   The OpenHub source control management library for \
@@ -175,8 +175,8 @@ homepage: https://github.com/blackducksoftware/ohloh_scm/
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: Ohloh SCM is depending on Git 2.17.1, SVN 1.9.7, CVSNT 2.5.04,
-  Mercurial 4.5.3 and Bazaar 2.8.0. If the installed version is different, Ohloh SCM
+post_install_message: Ohloh SCM is depending on Git 2.34.1, SVN 1.14.1, CVSNT 1.12.13,
+  Mercurial 4.9.1 and Bazaar 2.7.0. If the installed version is different, Ohloh SCM
   may not operate as expected.
 rdoc_options: []
 require_paths: