ohloh_scm 3.0.19 → 3.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9617a76fcacb0cbb50e36d0008042ed686372e29f0e101ca62d52ab7cf1e853a
-  data.tar.gz: 1c11aa29232ba00d508329f3c24c773d5e7ffa0b02fac7fff0a060d0476ec5c6
+  metadata.gz: a3bc5fee4822aa9fdb23808cf18333cf2439fb67beba337281b19e5e29162d60
+  data.tar.gz: e6617dc6ce992273abc6b51321ff3092086e27c87821a9175d4551c2b8f9ce3c
 SHA512:
-  metadata.gz: 148dc5b5c6a6a8b1437465abfe66081821de1347c1ee1b8bb7ea40bdd98dd73d925d0577b314044ccf9ba4042e7e1e62dd9b8c5ca8de058cd773097985779a1c
-  data.tar.gz: c8d67b1091edb45525e4022c4eb39f24845ca2c73c442fde92a137ba4e43bdbbe30cbedf54f29aa3531a843a3fde91d4ab2b36f8134db2d12a1b2b1200c2f608
+  metadata.gz: 177ba8662a8b8cba0370393061af014fd6061e8c58268d8b61c463eb1a4c441967bea7c07f788a03f4ec32dcc878b97d6a51601818bbd644b48a21bd40648122
+  data.tar.gz: 481ef3fad98f4418fddae8e43b2cefb10d4cab68da6eb5646ffef32a459b13e6f00ee6ba7290184f8ab131e8d2f18ed5a0f20a3de13e8315e3f752ca7012f2b6

data/.github/workflows/ci.yml

@@ -0,0 +1,20 @@
+name: CI Pipeline
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+  push:
+    branches: [main]
+
+jobs:
+  ci_task:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - 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'
+        docker run --rm -P -v $(pwd):/home/app/ohloh_scm -i ohdeployer/ohloh_scm:latest /bin/sh -c "$cmd"

data/.rubocop.yml

@@ -11,3 +11,6 @@ Documentation:
 
 Style/RegexpLiteral:
   Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false

data/Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get install -y ruby2.5 ruby2.5-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 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

data/README.md

@@ -1,4 +1,6 @@
-[![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=main)](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)
+![Coverity Scan Build](https://github.com/blackducksoftware/ohloh_scm/actions/workflows/coverity.yml/badge.svg?branch=main)
+![Build Status](https://github.com/blackducksoftware/ohloh_scm/actions/workflows/ci.yml/badge.svg?branch=main)
 
 # Ohloh SCM
 

data/lib/ohloh_scm/bzr/activity.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ClassLength
 module OhlohScm
   module Bzr
     class Activity < OhlohScm::Activity
@@ -75,7 +74,8 @@ module OhlohScm
       end
 
       def head_token
-        run("bzr log --limit 1 --show-id #{url} 2> /dev/null | grep ^revision-id | cut -f2 -d' '").strip
+        run("bzr log --limit 1 --show-id #{url} 2> /dev/null"\
+            " | grep ^revision-id | cut -f2 -d' '").strip
       end
 
       def head
@@ -187,4 +187,3 @@ module OhlohScm
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/ohloh_scm/git/activity.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'ohloh_scm/data/git_ignore_list'
-
-# rubocop:disable Metrics/ClassLength
 module OhlohScm
   module Git
     class Activity < OhlohScm::Activity
@@ -314,4 +312,3 @@ module OhlohScm
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/ohloh_scm/git/scm.rb

@@ -57,6 +57,7 @@ module OhlohScm
       end
 
       # We need very high reliability and this sequence gets the job done every time.
+      # rubocop:disable Metrics/AbcSize
       def clean_and_checkout_branch
         return unless status.scm_dir_exist?
 
@@ -67,19 +68,22 @@ module OhlohScm
         run "cd '#{url}' && git checkout #{branch_name} --"
         run "cd '#{url}' && git reset --hard heads/#{branch_name} --"
       end
+      # rubocop:enable Metrics/AbcSize
 
       def create_tracking_branch(branch_name)
         return if branch_name.to_s.empty?
         return if activity.branches.include?(branch_name)
 
-        run "cd '#{url}' && git remote update && git branch -f #{branch_name} origin/#{branch_name}"
+        run("cd '#{url}' && git remote update && "\
+            "git branch -f #{branch_name} origin/#{branch_name}")
       end
 
       # Deletes everything but the *.git* folder in the working directory.
       def clean_up_disk
         return unless Dir.exist?(url)
 
-        run "cd #{url} && find . -maxdepth 1 -not -name .git -not -name '*.nfs*' -not -name . -print0"\
+        run "cd #{url} && "\
+              "find . -maxdepth 1 -not -name .git -not -name '*.nfs*' -not -name . -print0"\
               ' | xargs -0 rm -rf --'
       end
 

data/lib/ohloh_scm/git_svn/scm.rb

@@ -88,7 +88,8 @@ module OhlohScm
       def clean_up_disk
         return unless  File.exist?(url)
 
-        run "cd #{url} && find . -maxdepth 1 -not -name .git -not -name '*.nfs*' -not -name . -print0"\
+        run "cd #{url} && "\
+              "find . -maxdepth 1 -not -name .git -not -name '*.nfs*' -not -name . -print0"\
               ' | xargs -0 rm -rf --'
       end
     end

data/lib/ohloh_scm/hg/activity.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'shellwords'
-
-# rubocop:disable Metrics/ClassLength
 module OhlohScm
   module Hg
     class Activity < OhlohScm::Activity
@@ -185,4 +183,3 @@ module OhlohScm
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/ohloh_scm/hg/scm.rb

@@ -19,7 +19,7 @@ module OhlohScm
       end
 
       def checkout_files(names)
-        pattern = "(#{ names.join('|') })"
+        pattern = "(#{names.join('|')})"
         run "cd #{url} && hg revert $(hg manifest | grep -P '#{pattern}')"
       end
 
@@ -48,7 +48,8 @@ module OhlohScm
       def clean_up_disk
         return unless FileTest.exist?(url)
 
-        run "cd #{url} && find . -maxdepth 1 -not -name .hg -not -name '*.nfs*' -not -name . -print0"\
+        run "cd #{url} && "\
+              "find . -maxdepth 1 -not -name .hg -not -name '*.nfs*' -not -name . -print0"\
               ' | xargs -0 rm -rf --'
       end
     end

data/lib/ohloh_scm/parser/cvs_parser.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ClassLength
 module OhlohScm
   class CvsParser < Parser
     class << self
@@ -158,4 +157,3 @@ module OhlohScm
     end
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/ohloh_scm/version.rb

@@ -2,7 +2,7 @@
 
 module OhlohScm
   module Version
-    STRING = '3.0.19'
+    STRING = '3.0.21'
     GIT = '2.17.1'
     SVN = '1.9.7'
     CVSNT = '2.5.04'

data/spec/ohloh_scm/git/activity_spec.rb

@@ -7,8 +7,8 @@ describe 'Git::Activity' 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']
+        entries = [".", "..", ".gitignore", "COPYING", "Gemfile.lock", "Godeps", "README", "helloworld.c", "makefile", "nested", "ohloh_token"]
+        Dir.entries(dir).sort.must_equal entries
       end
     end
   end
@@ -79,8 +79,8 @@ describe 'Git::Activity' do
   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'
+      git.activity.head_token.must_equal 'a2690f4471a0852723f0f0e95d97f7f1f3981639'
+      git.activity.head.token.must_equal 'a2690f4471a0852723f0f0e95d97f7f1f3981639'
       assert git.activity.head.diffs.any?
     end
   end
@@ -93,9 +93,9 @@ describe 'Git::Activity' do
 
   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
+      git.activity.commit_count.must_equal 5
+      git.activity.commit_count(after: 'b6e9220c3cabe53a4ed7f32952aeaeb8a822603d').must_equal 3
+      git.activity.commit_count(after: '1df547800dcd168e589bb9b26b4039bff3a7f7e4').must_equal 1
     end
   end
 
@@ -104,12 +104,13 @@ describe 'Git::Activity' do
       git.activity.commit_tokens.must_equal %w[089c527c61235bd0793c49109b5bd34d439848c6
                                                b6e9220c3cabe53a4ed7f32952aeaeb8a822603d
                                                2e9366dd7a786fdb35f211fff1c8ea05c51968b1
-                                               1df547800dcd168e589bb9b26b4039bff3a7f7e4]
+                                               1df547800dcd168e589bb9b26b4039bff3a7f7e4
+                                               a2690f4471a0852723f0f0e95d97f7f1f3981639]
 
       git.activity.commit_tokens(after: '2e9366dd7a786fdb35f211fff1c8ea05c51968b1')
-         .must_equal ['1df547800dcd168e589bb9b26b4039bff3a7f7e4']
+         .must_equal %w[1df547800dcd168e589bb9b26b4039bff3a7f7e4 a2690f4471a0852723f0f0e95d97f7f1f3981639]
 
-      git.activity.commit_tokens(after: '1df547800dcd168e589bb9b26b4039bff3a7f7e4').must_be :empty?
+      git.activity.commit_tokens(after: 'a2690f4471a0852723f0f0e95d97f7f1f3981639').must_be :empty?
     end
   end
 
@@ -118,12 +119,13 @@ describe 'Git::Activity' do
       git.activity.commits.collect(&:token).must_equal %w[089c527c61235bd0793c49109b5bd34d439848c6
                                                           b6e9220c3cabe53a4ed7f32952aeaeb8a822603d
                                                           2e9366dd7a786fdb35f211fff1c8ea05c51968b1
-                                                          1df547800dcd168e589bb9b26b4039bff3a7f7e4]
+                                                          1df547800dcd168e589bb9b26b4039bff3a7f7e4
+                                                          a2690f4471a0852723f0f0e95d97f7f1f3981639]
 
       git.activity.commits(after: '2e9366dd7a786fdb35f211fff1c8ea05c51968b1').collect(&:token)
-         .must_equal ['1df547800dcd168e589bb9b26b4039bff3a7f7e4']
+         .must_equal %w[1df547800dcd168e589bb9b26b4039bff3a7f7e4 a2690f4471a0852723f0f0e95d97f7f1f3981639]
 
-      git.activity.commits(after: '1df547800dcd168e589bb9b26b4039bff3a7f7e4').must_be :empty?
+      git.activity.commits(after: 'a2690f4471a0852723f0f0e95d97f7f1f3981639').must_be :empty?
     end
   end
 

data/spec/ohloh_scm/hg/activity_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe 'Hg::Activity' do
   it 'must fetch tags' do
     with_hg_repository('hg') do |hg|
-      time = Time.parse('Fri Jul 22 18:00:18 2016 +0530')
-      hg.activity.tags.first.must_equal ['tip', '5', time]
+      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']
     end
   end
@@ -13,7 +13,8 @@ describe 'Hg::Activity' do
     with_hg_repository('hg') do |hg|
       Dir.mktmpdir do |dir|
         hg.activity.export(dir)
-        Dir.entries(dir).sort.must_equal ['.', '..', 'README', 'makefile', 'two']
+        entries = [".", "..", ".hgtags", "Gemfile.lock", "Godeps", "README", "makefile", "nested", "two"]
+        Dir.entries(dir).sort.must_equal entries
       end
     end
   end
@@ -21,18 +22,18 @@ describe 'Hg::Activity' do
   describe 'commits' do
     it 'commit_count' do
       with_hg_repository('hg') do |hg|
-        hg.activity.commit_count.must_equal 5
-        hg.activity.commit_count(after: 'b14fa4692f949940bd1e28da6fb4617de2615484').must_equal 3
-        hg.activity.commit_count(after: '655f04cf6ad708ab58c7b941672dce09dd369a18').must_equal 0
+        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
       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 5
-        hg.activity.commit_count(after: 'b14fa4692f949940bd1e28da6fb4617de2615484').must_equal 3
-        hg.activity.commit_count(after: '655f04cf6ad708ab58c7b941672dce09dd369a18').must_equal 0
+        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
       end
     end
 
@@ -42,15 +43,16 @@ describe 'Hg::Activity' do
                                                        b14fa4692f949940bd1e28da6fb4617de2615484
                                                        468336c6671cbc58237a259d1b7326866afc2817
                                                        75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                                       655f04cf6ad708ab58c7b941672dce09dd369a18])
+                                                       655f04cf6ad708ab58c7b941672dce09dd369a18
+                                                       1f45520fff3982761cfe7a0502ad0888d5783efe])
 
-        after = '75532c1e1f1de55c2271f6fd29d98efbe35397c4'
-        hg.activity.commits(after: after).map(&:token).must_equal ['655f04cf6ad708ab58c7b941672dce09dd369a18']
+        after = '655f04cf6ad708ab58c7b941672dce09dd369a18'
+        hg.activity.commits(after: after).map(&:token).must_equal ['1f45520fff3982761cfe7a0502ad0888d5783efe']
 
         # Check that the diffs are not populated
-        hg.activity.commits(after: '75532c1e1f1de55c2271f6fd29d98efbe35397c4').first.diffs.must_be :empty?
+        hg.activity.commits(after: '655f04cf6ad708ab58c7b941672dce09dd369a18').first.diffs.must_be :empty?
 
-        hg.activity.commits(after: '655f04cf6ad708ab58c7b941672dce09dd369a18').must_be :empty?
+        hg.activity.commits(after: '1f45520fff3982761cfe7a0502ad0888d5783efe').must_be :empty?
       end
     end
 
@@ -113,7 +115,8 @@ describe 'Hg::Activity' do
                                            b14fa4692f949940bd1e28da6fb4617de2615484
                                            468336c6671cbc58237a259d1b7326866afc2817
                                            75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                           655f04cf6ad708ab58c7b941672dce09dd369a18])
+                                           655f04cf6ad708ab58c7b941672dce09dd369a18
+                                           1f45520fff3982761cfe7a0502ad0888d5783efe])
       end
     end
 
@@ -138,7 +141,8 @@ describe 'Hg::Activity' do
           commits << c
         end
         commits.map(&:token).must_equal(%w[75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                           655f04cf6ad708ab58c7b941672dce09dd369a18])
+                                           655f04cf6ad708ab58c7b941672dce09dd369a18
+                                           1f45520fff3982761cfe7a0502ad0888d5783efe])
       end
     end
 
@@ -166,8 +170,8 @@ 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 '655f04cf6ad708ab58c7b941672dce09dd369a18'
-        hg.activity.head.token.must_equal '655f04cf6ad708ab58c7b941672dce09dd369a18'
+        hg.activity.head_token.must_equal '1f45520fff3982761cfe7a0502ad0888d5783efe'
+        hg.activity.head.token.must_equal '1f45520fff3982761cfe7a0502ad0888d5783efe'
         assert hg.activity.head.diffs.any? # diffs should be populated
       end
     end
@@ -187,18 +191,20 @@ describe 'Hg::Activity' do
                                                 b14fa4692f949940bd1e28da6fb4617de2615484
                                                 468336c6671cbc58237a259d1b7326866afc2817
                                                 75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                                655f04cf6ad708ab58c7b941672dce09dd369a18])
+                                                655f04cf6ad708ab58c7b941672dce09dd369a18
+                                                1f45520fff3982761cfe7a0502ad0888d5783efe])
 
         after = '01101d8ef3cea7da9ac6e9a226d645f4418f05c9'
         hg.activity.commit_tokens(after: after).must_equal(%w[b14fa4692f949940bd1e28da6fb4617de2615484
                                                               468336c6671cbc58237a259d1b7326866afc2817
                                                               75532c1e1f1de55c2271f6fd29d98efbe35397c4
-                                                              655f04cf6ad708ab58c7b941672dce09dd369a18])
+                                                              655f04cf6ad708ab58c7b941672dce09dd369a18
+                                                              1f45520fff3982761cfe7a0502ad0888d5783efe])
 
-        after = '75532c1e1f1de55c2271f6fd29d98efbe35397c4'
-        hg.activity.commit_tokens(after: after).must_equal ['655f04cf6ad708ab58c7b941672dce09dd369a18']
+        after = '655f04cf6ad708ab58c7b941672dce09dd369a18'
+        hg.activity.commit_tokens(after: after).must_equal ['1f45520fff3982761cfe7a0502ad0888d5783efe']
 
-        hg.activity.commit_tokens(after: '655f04cf6ad708ab58c7b941672dce09dd369a18').must_be :empty?
+        hg.activity.commit_tokens(after: '1f45520fff3982761cfe7a0502ad0888d5783efe').must_be :empty?
       end
     end
 

data/spec/ohloh_scm/parser/hg_parser_spec.rb

@@ -161,31 +161,31 @@ describe 'HgParser' do
     protected
 
     def assert_styled_commits(commits, with_diffs = false)
-      commits.size.must_equal 5
+      commits.size.must_equal 6
 
-      commits[1].token.must_equal '75532c1e1f1de55c2271f6fd29d98efbe35397c4'
-      commits[1].committer_name.must_equal 'Robin Luckey'
-      commits[1].committer_email.must_equal 'robin@ohloh.net'
+      commits[1].token.must_equal '655f04cf6ad708ab58c7b941672dce09dd369a18'
+      commits[1].committer_name.must_equal 'Alex'
+      commits[1].committer_email.must_equal 'alex@example.com'
       assert Time.utc(2009, 1, 20, 19, 34, 53) - commits[1].committer_date < 1 # Don't care about milliseconds
-      commits[1].message.must_equal "deleted helloworld.c\n"
+      commits[1].message.must_equal "Adding file two\n"
 
       if with_diffs
         commits[1].diffs.size.must_equal 1
-        commits[1].diffs[0].action.must_equal 'D'
-        commits[1].diffs[0].path.must_equal 'helloworld.c'
+        commits[1].diffs[0].action.must_equal 'A'
+        commits[1].diffs[0].path.must_equal 'two'
       else
         commits[1].diffs.must_equal []
       end
 
-      commits[2].token.must_equal '468336c6671cbc58237a259d1b7326866afc2817'
+      commits[2].token.must_equal '75532c1e1f1de55c2271f6fd29d98efbe35397c4'
       assert Time.utc(2009, 1, 20, 19, 34, 4) - commits[2].committer_date < 1
 
       if with_diffs
-        commits[2].diffs.size.must_equal 2
-        commits[2].diffs[0].action.must_equal 'M'
-        commits[2].diffs[0].path.must_equal 'helloworld.c'
-        commits[2].diffs[1].action.must_equal 'A'
-        commits[2].diffs[1].path.must_equal 'README'
+        commits[3].diffs.size.must_equal 2
+        commits[3].diffs[0].action.must_equal 'M'
+        commits[3].diffs[0].path.must_equal 'helloworld.c'
+        commits[3].diffs[1].action.must_equal 'A'
+        commits[3].diffs[1].path.must_equal 'README'
       else
         commits[0].diffs.must_equal []
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.21
 platform: ruby
 authors:
 - OpenHub Team at Synopsys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies: []
 description: |-
   The OpenHub source control management library for \
@@ -25,6 +25,7 @@ files:
 - ".bin/run-tests"
 - ".bin/string_encoder"
 - ".git_hooks/pre-commit"
+- ".github/workflows/ci.yml"
 - ".github/workflows/coverity.yml"
 - ".gitignore"
 - ".rubocop.yml"