ohloh_scm 3.0.13 → 3.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0cce0039d7ed0c71c841edf71fed33eb962093d88c149dd6c75a29b8f05425
-  data.tar.gz: 900243a6614515e950e68cc8e2bfdbe790fa9651113d50bbb8a06b1d7ee76bae
+  metadata.gz: a9497b7b0c42cdc606034e2b8aa0307dae5da9cfe6be3f371fb8043e6c4001d2
+  data.tar.gz: 822e2cc571a191231fd441519ba059c86494977bb7403edc83605d7f3d8dd221
 SHA512:
-  metadata.gz: b3cd4508600d221c9b3456f054e5845392d23e2483609d560afc3eeb137b16a786164d92df3a935b0fd5939f318f6f48844f84a32b247ac3ab094dec2abb7715
-  data.tar.gz: c4649e65d09e9639876344ab6e9ed89ba81396809a80fa26278b0488ec43c81fcc4d44db093fdeceed9a42cfbd9b2360e2bb1db3861691881088fe7b47a80651
+  metadata.gz: 1303a8d011f502ac2c962467e1c1593093255cd31c4ef567a4bbabf89eef10fdcaf409ae30388494c39feb885894de2c991b8e4de7bb6ebc02f954b2794ab930
+  data.tar.gz: 4c5d7fbae432815703ddcb0eade08d19a4c41c163366c3d957672aeca3d82eb34348735ea00b4dc5a02c24fcc13ed492be0e3c3cf451cf62d6a3c0d60fe6f794

data/README.md

@@ -1,4 +1,4 @@
-[![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 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
 
@@ -20,17 +20,13 @@ One may use Docker to run Ohloh SCM and test changes.
 ```sh
 $ git clone https://github.com/blackducksoftware/ohloh_scm
 $ cd ohloh_scm
-$ git checkout -b v3
+$ docker build -t ohloh_scm:foobar .
 
 # 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 -v $(pwd):/home/app/ohloh_scm -ti ohdeployer/ohloh_scm:ubuntu18 /bin/sh -c "$cmd"
+$ docker run --rm -P -v $(pwd):/home/app/ohloh_scm -ti ohloh_scm:foobar /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 -P -v $(pwd):/home/app/ohloh_scm -ti ohloh_scm:custom /bin/bash
 ```
 
 ## Development Setup

data/lib/ohloh_scm/bzr/activity.rb

@@ -75,8 +75,7 @@ module OhlohScm
       end
 
       def head_token
-        run("cd '#{url}' && 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

data/lib/ohloh_scm/git/scm.rb

@@ -66,12 +66,13 @@ module OhlohScm
         return if branch_name.to_s.empty?
         return if activity.branches.include?(branch_name)
 
-        run "cd '#{url}' && 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)
+        sleep 1
 
         run "cd #{url} && find . -maxdepth 1 -not -name .git -not -name . -print0"\
               ' | xargs -0 rm -rf --'

data/lib/ohloh_scm/git_svn/scm.rb

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

data/lib/ohloh_scm/hg/scm.rb

@@ -42,6 +42,7 @@ module OhlohScm
 
       def clean_up_disk
         return unless FileTest.exist?(url)
+        sleep 1
 
         run "cd #{url} && find . -maxdepth 1 -not -name .hg -not -name . -print0"\
               ' | xargs -0 rm -rf --'

data/lib/ohloh_scm/version.rb

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

data/spec/ohloh_scm/git/scm_spec.rb

@@ -33,6 +33,27 @@ describe 'Git::Scm' do
     end
   end
 
+  it 'must update branches in local copy' do
+    test_branch_name = 'test' # consider that 'test' is the current *main* branch.
+
+    with_git_repository('git_with_multiple_branch', test_branch_name) do |src_core|
+      tmpdir do |dest_dir|
+        core = OhlohScm::Factory.get_core(scm_type: :git, url: dest_dir, branch_name: test_branch_name)
+        core.scm.pull(src_core.scm, TestCallback.new)
+
+        # Emulate a scenario where the local copy doesn't have the current *main* branch.
+        `cd #{dest_dir} && git checkout master && git branch -D test`
+
+        local_branch_cmd = "cd #{dest_dir} && git branch | grep '\*' | sed 's/^\* //'"
+        `#{ local_branch_cmd }`.chomp.must_equal 'master'
+
+        # On doing a refetch, our local copy will now have the updated *main* branch.
+        core.scm.pull(src_core.scm, TestCallback.new)
+        `#{ local_branch_cmd }`.chomp.must_equal test_branch_name
+      end
+    end
+  end
+
   it 'must test the basic conversion to git' do
     with_cvs_repository('cvs', 'simple') do |src_core|
       tmpdir do |dest_dir|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 3.0.13
+  version: 3.0.16
 platform: ruby
 authors:
 - OpenHub Team at Synopsys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies: []
 description: |-
   The OpenHub source control management library for \