ohloh_scm 3.0.11 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb22e846629bf5c28b1fe9cff788eaf8911e2fff2084909bdade85271540822c
-  data.tar.gz: 15337965a2be09e7bb21a3cac07d5124f9142dee4bb34aee3c9f55b008010f3e
+  metadata.gz: f5de328f7aa2d702317d87536410bc62dbe5ea5c9a88f9b617fc5739eb6b8847
+  data.tar.gz: 181c2b2ce676bae8f60f718a39106273f359fb07deb013a102c27f1585dfefd4
 SHA512:
-  metadata.gz: c50fdce652b21742d4d73e0ec8c800cdbca176f9e464d5ad2ad9ca7c85bff6cb44581cbe7ad8996d481999ac30a2ace6a860054f8a4d09bb29ee1a5f0a34bacf
-  data.tar.gz: 1bfc619bb9eb7b43d11c6403ba763a1e1878b02c849067226fd42773e81a822625002f595814105f84c9826a633cb352fd715c9edc2d3b6e769512f2821df42d
+  metadata.gz: 2418c9ed3f8cd9e239e2f965793ee0c77cdd8c10e5384d6c91419873c90f5e3f4ee3f2ac3cd80305c1557af2340ac1e1d52cc68de595e905ef4eedff9ed5dbd7
+  data.tar.gz: 17148569eb0a811ecb1943d8f0e2639ba278828a28c14923da77d5970512cdf841be66e031967b81fe636ab80943d27aa02edb71f06d6bfe5529d589ce189aed

data/README.md

@@ -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,7 +66,7 @@ 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.

data/lib/ohloh_scm/git/validation.rb

@@ -3,16 +3,10 @@
 module OhlohScm
   module Git
     class Validation < OhlohScm::Validation
-      def validate
-        super
-        @errors << [:branch_name, 'Invalid Branch Name.'] if scm.branch_name.to_s.empty?
-      end
-
       private
 
       def validate_server_connection
-        msg = "The server did not respond to the 'git-ls-remote' command."
-        msg << ' Are the URL and Branch fields correct?'
+        msg = "The server did not respond to the 'git-ls-remote' command. Is the URL correct?"
         @errors << [:failed, msg] unless status.exist?
       end
 

data/lib/ohloh_scm/git_svn/activity.rb

@@ -73,7 +73,8 @@ module OhlohScm
 
       def cat(revision, file_path)
         file_path = file_path.to_s
-        run("cd #{url} && git show #{revision}:#{file_path.shellescape}").strip
+        run("cd #{url} && git show #{revision}:#{file_path.shellescape} | #{string_encoder_path}")
+          .strip
       end
 
       def git_svn_log_cmd

data/lib/ohloh_scm/version.rb

@@ -2,7 +2,7 @@
 
 module OhlohScm
   module Version
-    STRING = '3.0.11'
+    STRING = '3.0.15'
     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|

data/spec/ohloh_scm/git/validation_spec.rb

@@ -7,10 +7,6 @@ describe 'Git::Validation' do
     core.errors.must_be :empty?
   end
 
-  it 'must have errors for no branch_name' do
-    get_core(:git, branch_name: '').validation.send(:branch_name_errors).wont_be :empty?
-  end
-
   it 'must have errors for invalid branch_name' do
     get_core(:git, branch_name: 'x' * 81).validation.send(:branch_name_errors).wont_be :empty?
     get_core(:git, branch_name: 'foo@bar').validation.send(:branch_name_errors).wont_be :empty?

data/spec/ohloh_scm/git_svn/activity_spec.rb

@@ -60,7 +60,7 @@ describe 'GitSvn::Activity' do
 
     it 'cat_file_with_invalid_filename' do
       with_git_svn_repository('git_svn') do |git_svn|
-        -> { git_svn.activity.cat_file(commit_1, OhlohScm::Diff.new(path: 'invalid')) }.must_raise(RuntimeError)
+        assert git_svn.activity.cat_file(commit_1, OhlohScm::Diff.new(path: 'invalid')).must_be_empty
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 3.0.11
+  version: 3.0.15
 platform: ruby
 authors:
 - OpenHub Team at Synopsys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies: []
 description: |-
   The OpenHub source control management library for \