ohloh_scm 3.0.17 → 3.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 376633ab1bce231fd0d3dbcb685a6270c6f90b41bb99f2e4062965a2011476b4
-  data.tar.gz: 159827abd46fd1f87d7c85cb226ea410071ba6d8a6e73c2db0a598c2f44d1465
+  metadata.gz: 9617a76fcacb0cbb50e36d0008042ed686372e29f0e101ca62d52ab7cf1e853a
+  data.tar.gz: 1c11aa29232ba00d508329f3c24c773d5e7ffa0b02fac7fff0a060d0476ec5c6
 SHA512:
-  metadata.gz: 520a3bc2a9c827959f715ad2febf37df9f63ef9f817743c0b9e82d69f486632b2cbf7b72d89c604848b1680d5ab37aa15f8b58c3408da0b90960f504a14d451a
-  data.tar.gz: a346e6eb4db5eb8e69ed3e8dbe66043c3a69350bfc8760abffbbd8202b9bb8f4e58099a8ae6279adec67a4d897be3052e822838c3eb5aa7e638ddfc63e42a791
+  metadata.gz: 148dc5b5c6a6a8b1437465abfe66081821de1347c1ee1b8bb7ea40bdd98dd73d925d0577b314044ccf9ba4042e7e1e62dd9b8c5ca8de058cd773097985779a1c
+  data.tar.gz: c8d67b1091edb45525e4022c4eb39f24845ca2c73c442fde92a137ba4e43bdbbe30cbedf54f29aa3531a843a3fde91d4ab2b36f8134db2d12a1b2b1200c2f608

data/.github/workflows/coverity.yml

@@ -0,0 +1,22 @@
+# GitHub actions workflow.
+# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
+
+# https://scan.coverity.com/projects/ohloh_scm
+name: Coverity Scan
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  coverity:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: vapier/coverity-scan-action@v1
+      with:
+        project: 'Ohloh_SCM'
+        build_language: 'other'
+        command: '--no-command --fs-capture-search ${{ github.workspace }}'
+        email: ${{ secrets.COVERITY_SCAN_EMAIL }}
+        token: ${{ secrets.COVERITY_SCAN_TOKEN }}

data/lib/ohloh_scm/data/git_ignore_list.rb

@@ -26,4 +26,5 @@ GIT_IGNORE_LIST = ['.svn',
                    '*.mov',
                    '*.qt',
                    '*.avi',
-                   '*.xbm'].freeze
+                   '*.xbm',
+                   '*.nfs*'].freeze

data/lib/ohloh_scm/git/scm.rb

@@ -60,9 +60,10 @@ module OhlohScm
       def clean_and_checkout_branch
         return unless status.scm_dir_exist?
 
-        run "cd '#{url}' && git clean -f -d -x"
+        run "cd '#{url}' && git clean -f -d -x --exclude='*.nfs*'"
         return unless status.branch?(branch_name)
 
+        run "cd '#{url}' && git reset --hard HEAD --"
         run "cd '#{url}' && git checkout #{branch_name} --"
         run "cd '#{url}' && git reset --hard heads/#{branch_name} --"
       end
@@ -78,7 +79,7 @@ module OhlohScm
       def clean_up_disk
         return unless Dir.exist?(url)
 
-        run "cd #{url} && find . -maxdepth 1 -not -name .git -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,7 @@ module OhlohScm
       def clean_up_disk
         return unless  File.exist?(url)
 
-        run "cd #{url} && find . -maxdepth 1 -not -name .git -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/scm.rb

@@ -48,7 +48,7 @@ module OhlohScm
       def clean_up_disk
         return unless FileTest.exist?(url)
 
-        run "cd #{url} && find . -maxdepth 1 -not -name .hg -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/version.rb

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

data/spec/ohloh_scm/git/scm_spec.rb

@@ -33,6 +33,42 @@ describe 'Git::Scm' do
     end
   end
 
+  it 'must checkout a branch which is behind the default' do
+    with_git_repository('git_with_multiple_branch') do |src_core|
+      tmpdir do |dest_dir|
+        core = OhlohScm::Factory.get_core(scm_type: :git, url: dest_dir, branch_name: 'master')
+        core.scm.pull(src_core.scm, TestCallback.new)
+
+        src_core.scm.branch_name = 'test'
+        core = OhlohScm::Factory.get_core(scm_type: :git, url: dest_dir, branch_name: 'test')
+        core.scm.pull(src_core.scm, TestCallback.new)
+
+        remote_master_branch_sha = `cd #{dest_dir} && git rev-parse origin/master`
+        remote_test_branch_sha = `cd #{dest_dir} && git rev-parse origin/test`
+        master_branch_sha = `cd #{dest_dir} && git rev-parse master`
+        test_branch_sha = `cd #{dest_dir} && git rev-parse test`
+
+        master_branch_sha.must_equal remote_master_branch_sha
+        test_branch_sha.must_equal remote_test_branch_sha
+      end
+    end
+  end
+
+  it 'must handle file changes in multi branch directory' do
+    with_git_repository('git_with_multiple_branch', 'test') do |src_core|
+      tmpdir do |dest_dir|
+        core = OhlohScm::Factory.get_core(scm_type: :git, url: dest_dir, branch_name: 'test')
+        refute core.status.scm_dir_exist?
+        core.scm.pull(src_core.scm, TestCallback.new)
+
+        `cd #{dest_dir} && git checkout master`
+        `echo 'new change' >> #{dest_dir}/hello.rb`
+
+        core.scm.pull(src_core.scm, TestCallback.new)
+      end
+    end
+  end
+
   it 'must update branches in local copy' do
     test_branch_name = 'test' # consider that 'test' is the current *main* branch.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.19
 platform: ruby
 authors:
 - OpenHub Team at Synopsys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-11-28 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/coverity.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"