ohloh_scm 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f538e2a92d3ffd83e0aa764ee8bc326d052f5a6dcb506f43161fb98caf47da1
-  data.tar.gz: 4cbefaed2f73fc9df835b2ed99ac09aae1bda3ddbae8beaafea543517ce578fa
+  metadata.gz: 8a2809f103f847130e35e67a70e1d8faf67a411a1fa94833bdb31c96bc771333
+  data.tar.gz: 180fdb5edbb2bfee8ce634aa00a8ea870c4c079f9680eabe2eb99c10a8bf9c2e
 SHA512:
-  metadata.gz: cac9e0147efe5bb98038fa0b957b8dae365af35349075046b32345bc448afdbb7047233fa36da9b85eb3e9a38a0213acb04273535c4dd9f72280f84a0c8dce8c
-  data.tar.gz: 7658681a1a5cbe76e3cf29dc712313affb063cdc6aaf99330fee177a8b91039bf446b0a421425b3cffa9ec21b84000c0a940dd3777a07a3914ca6f352abd9755
+  metadata.gz: 80f56ed86d0187d93893d69125369a822f09fa3635d7e386639bfb4d114ce326dad5b0cfd489e38d6cc57feee717dffd78d658cee70bfe11f4fce5944a4d5fd4
+  data.tar.gz: 95828cac55d0d3ed5e57e7b3b067e94bdfab59f3f9365f6f3cd95dfbd622ddb020002ffba8c7652c2120a91630312a5dee21d07e8b3b71a36a7419d59b2996b4

data/lib/ohloh_scm/git/activity.rb

@@ -58,9 +58,15 @@ module OhlohScm
         # For OpenHub, this is fine because OpenHub ignores merge diffs anyway.
         previous = nil
         safe_open_log_file(opts) do |io|
-          OhlohScm::GitParser.parse(io) do |e|
-            yield fixup_null_merge(e) unless previous && previous.token == e.token
-            previous = e
+          if ENV['EXPENSIVE_COMMIT_COUNT'] && commit_count(opts) > ENV['EXPENSIVE_COMMIT_COUNT'].to_i
+            io.each do |commit_sha|
+              yield verbose_commit(commit_sha.chomp)
+            end
+          else
+            OhlohScm::GitParser.parse(io) do |e|
+              yield fixup_null_merge(e) unless previous && previous.token == e.token
+              previous = e
+            end
           end
         end
       end
@@ -177,8 +183,13 @@ module OhlohScm
       end
 
       def open_log_file(opts)
-        run "#{rev_list_command(opts)} | xargs -n 1 #{OhlohScm::GitParser.whatchanged}"\
-              " | #{string_encoder_path} > #{log_filename}"
+        if ENV['EXPENSIVE_COMMIT_COUNT'] && commit_count(opts) > ENV['EXPENSIVE_COMMIT_COUNT'].to_i
+          cmd = "#{rev_list_command(opts)} > #{log_filename}"
+        else
+          cmd = "#{rev_list_command(opts)} | xargs -n 1 #{OhlohScm::GitParser.whatchanged}"\
+                " | #{string_encoder_path} > #{log_filename}"
+        end
+        run(cmd)
         File.open(log_filename, 'r') { |io| yield io }
       ensure
         File.delete(log_filename) if File.exist?(log_filename)

data/lib/ohloh_scm/git/scm.rb

@@ -5,7 +5,7 @@ module OhlohScm
     class Scm < OhlohScm::Scm
       def initialize(core:, url:, branch_name:, username:, password:)
         super
-        @branch_name = branch_name || 'master'
+        @branch_name = branch_name
       end
 
       # == Example:
@@ -28,6 +28,10 @@ module OhlohScm
         run "cd #{url} && git checkout $(git ls-files #{filenames})"
       end
 
+      def branch_name_or_default
+        branch_name || 'master'
+      end
+
       private
 
       def clone_or_fetch(remote_scm, callback)

data/lib/ohloh_scm/git/status.rb

@@ -8,6 +8,13 @@ module OhlohScm
 
         activity.branches.include?(name)
       end
+
+      def default_branch
+        return scm.branch_name_or_default unless exist?
+
+        name = run("git remote show '#{scm.url}' | grep 'HEAD branch' | awk '{print $3}'").strip
+        name.to_s.empty? ? scm.branch_name_or_default : name
+      end
     end
   end
 end

data/lib/ohloh_scm/status.rb

@@ -21,5 +21,7 @@ module OhlohScm
     def scm_dir_exist?
       Dir.exist?(scm.vcs_path)
     end
+
+    def default_branch; end
   end
 end

data/lib/ohloh_scm/version.rb

@@ -2,7 +2,7 @@
 
 module OhlohScm
   module Version
-    STRING = '4.0.2'
+    STRING = '4.0.4'
     GIT = '2.34.1'
     SVN = '1.14.1'
     CVSNT = '1.12.13'

data/spec/helpers/repository_helper.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 module RepositoryHelper
-  %w[git svn git_svn cvs hg bzr].each do |scm_type|
+  %w[svn git_svn cvs hg bzr].each do |scm_type|
     define_method("with_#{scm_type}_repository") do |name, branch_name = nil, &block|
       with_repository(scm_type, name, branch_name) { |core| block.call(core) }
     end
   end
 
+  def with_git_repository(name, branch_name = 'master', &block)
+    with_repository('git', name, branch_name) { |core| block.call(core) }
+  end
+
   private
 
   def with_repository(scm_type, name, branch_name = nil)

data/spec/ohloh_scm/cvs/activity_spec.rb

@@ -59,7 +59,7 @@ describe 'Cvs::Activity' do
   it 'must correctly convert commits to git' do
     with_cvs_repository('cvs', 'simple') do |cvs|
       tmpdir do |tmp_dir|
-        git_core = OhlohScm::Factory.get_core(url: tmp_dir)
+        git_core = OhlohScm::Factory.get_core(url: tmp_dir, branch_name: 'master')
         git_core.scm.pull(cvs.scm, TestCallback.new)
         utc_dates = ['2006-06-29 16:21:07 UTC', '2006-06-29 18:14:47 UTC',
                      '2006-06-29 18:45:29 UTC', '2006-06-29 18:48:54 UTC',

data/spec/ohloh_scm/git/activity_spec.rb

@@ -329,7 +329,7 @@ describe 'Git::Activity' do
 
     it 'must commit all changes in the working directory' do
       tmpdir do |dir|
-        core = OhlohScm::Factory.get_core(scm_type: :git, url: dir)
+        core = OhlohScm::Factory.get_core(scm_type: :git, branch_name: 'master', url: dir)
 
         core.activity.send(:init_db)
         refute core.activity.send(:anything_to_commit?)
@@ -356,7 +356,7 @@ describe 'Git::Activity' do
 
     it 'must test that no token returns nil' do
       tmpdir do |dir|
-        core = OhlohScm::Factory.get_core(scm_type: :git, url: dir)
+        core = OhlohScm::Factory.get_core(scm_type: :git, branch_name: 'master', url: dir)
         refute core.activity.read_token
         core.activity.send(:init_db)
         refute core.activity.read_token
@@ -365,7 +365,7 @@ describe 'Git::Activity' do
 
     it 'must test write and read token' do
       tmpdir do |dir|
-        core = OhlohScm::Factory.get_core(scm_type: :git, url: dir)
+        core = OhlohScm::Factory.get_core(scm_type: :git, branch_name: 'master', url: dir)
         core.activity.send(:init_db)
         core.activity.send(:write_token, 'FOO')
         refute core.activity.read_token # Token not valid until committed
@@ -376,7 +376,7 @@ describe 'Git::Activity' do
 
     it 'must test that commit_all includes write token' do
       tmpdir do |dir|
-        core = OhlohScm::Factory.get_core(scm_type: :git, url: dir)
+        core = OhlohScm::Factory.get_core(scm_type: :git, branch_name: 'master', url: dir)
         core.activity.send(:init_db)
         c = OhlohScm::Commit.new
         c.token = 'BAR'

data/spec/ohloh_scm/git/scm_spec.rb

@@ -93,7 +93,7 @@ describe 'Git::Scm' do
   it 'must test the basic conversion to git' do
     with_cvs_repository('cvs', 'simple') do |src_core|
       tmpdir do |dest_dir|
-        core = OhlohScm::Factory.get_core(scm_type: :git, url: dest_dir)
+        core = OhlohScm::Factory.get_core(scm_type: :git, branch_name: 'master', url: dest_dir)
         refute core.status.scm_dir_exist?
         core.scm.pull(src_core.scm, TestCallback.new)
         assert core.status.scm_dir_exist?
@@ -126,4 +126,9 @@ describe 'Git::Scm' do
       assert system("ls #{dir}/Godeps/Godeps.json > /dev/null")
     end
   end
+
+  it 'must return master when branch_name is null' do
+    core = OhlohScm::Factory.get_core(scm_type: :git, url: 'foobar')
+    _(core.scm.branch_name_or_default).must_equal 'master'
+  end
 end

data/spec/ohloh_scm/git/status_spec.rb

@@ -4,8 +4,22 @@ describe 'Git::Status' do
   it 'branch?' do
     with_git_repository('git') do |git|
       git.activity.send(:branches).must_equal %w[develop master]
-      assert git.status.branch? # checks master.
+      assert git.status.branch?('master')
       assert git.status.branch?('develop')
     end
   end
+
+  describe 'default_branch' do
+    it 'must return default branch when repository doesnt exist' do
+      git = OhlohScm::Factory.get_core(scm_type: :git, url: 'foobar')
+      git.status.stubs(:exist?)
+      _(git.status.default_branch).must_equal 'master'
+    end
+
+    it 'must return default branch when no HEAD branch is found in remote' do
+      git = OhlohScm::Factory.get_core(scm_type: :git, url: 'foobar')
+      git.status.stubs(:exist?).returns(true)
+      git.status.default_branch.must_equal 'master'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.4
 platform: ruby
 authors:
 - OpenHub Team at Synopsys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies: []
 description: |-
   The OpenHub source control management library for \