ohloh_scm 3.0.6 → 3.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a355a0742b48e9e0205d3bd3c4ffb6dee5e2eafcbadf6f38104455a807f2142f
-  data.tar.gz: a33e29534f3587b6434f496d702aefae3ea203747890402380cb7ecdd7fc4ad0
+  metadata.gz: cb22e846629bf5c28b1fe9cff788eaf8911e2fff2084909bdade85271540822c
+  data.tar.gz: 15337965a2be09e7bb21a3cac07d5124f9142dee4bb34aee3c9f55b008010f3e
 SHA512:
-  metadata.gz: b3c17e75d2c59625f815d5b8b59a490b815dfcc1ec7d1031ee95040340a7b67d0be67b1b4012fc1953cd8705ea2c9289710986caacf21c6bc788800af882d8fe
-  data.tar.gz: 5d3db3fd91b90b1491b3144eee0936121394ce7e61f9f83fcc216eee3dc1a08414ba86315f3bd52a96a21d43677717cb813142aa9150e6d98ceafe967658be33
+  metadata.gz: c50fdce652b21742d4d73e0ec8c800cdbca176f9e464d5ad2ad9ca7c85bff6cb44581cbe7ad8996d481999ac30a2ace6a860054f8a4d09bb29ee1a5f0a34bacf
+  data.tar.gz: 1bfc619bb9eb7b43d11c6403ba763a1e1878b02c849067226fd42773e81a822625002f595814105f84c9826a633cb352fd715c9edc2d3b6e769512f2821df42d

data/Gemfile

@@ -11,5 +11,4 @@ group :development do
   gem 'rubocop', '~> 0.67'
   gem 'rubocop-performance'
   gem 'simplecov'
-  gem 'rspec'
 end

data/Gemfile.lock

@@ -3,7 +3,6 @@ GEM
   specs:
     ast (2.4.0)
     byebug (11.0.1)
-    diff-lcs (1.3)
     docile (1.3.1)
     jaro_winkler (1.5.2)
     json (2.2.0)
@@ -20,19 +19,6 @@ GEM
     psych (3.1.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
     rubocop (0.67.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -60,7 +46,6 @@ DEPENDENCIES
   mocha
   nokogiri
   rake
-  rspec
   rubocop (~> 0.67)
   rubocop-performance
   simplecov

data/lib/ohloh_scm/bzr/activity.rb

@@ -23,7 +23,7 @@ module OhlohScm
       # rubocop:enable Metrics/MethodLength
 
       def export_tag(dest_dir, tag_name)
-        run "cd '#{path}' && bzr export -r #{tag_name} #{dest_dir}"
+        run "cd '#{url}' && bzr export -r #{tag_name} #{dest_dir}"
       end
 
       def export(dest_dir, token = head_token)

data/lib/ohloh_scm/git/scm.rb

@@ -2,7 +2,7 @@
 
 module OhlohScm
   module Git
-    class Scm < OhlohScm::Scm # rubocop:disable Metrics/ClassLength
+    class Scm < OhlohScm::Scm
       def initialize(core:, url:, branch_name:, username:, password:)
         super
         @branch_name = branch_name || 'master'
@@ -27,7 +27,7 @@ module OhlohScm
 
       def clone_or_fetch(remote_scm, callback)
         callback.update(0, 1)
-        if status.branch?(branch_name)
+        if status.exist? && status.branch?(branch_name)
           clean_and_checkout_branch # must be on correct branch, but we want to be careful.
           fetch_new_commits(remote_scm)
         else
@@ -43,7 +43,7 @@ module OhlohScm
       end
 
       def clone_and_create_tracking_branch(remote_scm)
-        unless status.scm_dir_exist?
+        unless status.scm_dir_exist? || status.exist?
           run "rm -rf '#{url}'"
           run "git clone -q -n '#{remote_scm.url}' '#{url}'"
         end
@@ -54,16 +54,12 @@ module OhlohScm
       # We need very high reliability and this sequence gets the job done every time.
       def clean_and_checkout_branch
         return unless status.scm_dir_exist?
-        return unless status.branch?(branch_name)
 
         run "cd '#{url}' && git clean -f -d -x"
-        clean_git_lock_file
-        run "cd '#{url}' && git reset --hard HEAD"
-        run "cd '#{url}' && git checkout #{branch_name} --"
-      end
+        return unless status.branch?(branch_name)
 
-      def clean_git_lock_file
-        run "rm #{url}/.git/index.lock" if File.exist?("#{url}/.git/index.lock")
+        run "cd '#{url}' && git checkout #{branch_name} --"
+        run "cd '#{url}' && git reset --hard heads/#{branch_name} --"
       end
 
       def create_tracking_branch(branch_name)

data/lib/ohloh_scm/git/validation.rb

@@ -3,10 +3,16 @@
 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. Is the URL correct?"
+        msg = "The server did not respond to the 'git-ls-remote' command."
+        msg << ' Are the URL and Branch fields correct?'
         @errors << [:failed, msg] unless status.exist?
       end
 

data/lib/ohloh_scm/git_svn/activity.rb

@@ -40,6 +40,10 @@ module OhlohScm
         cat("#{git_commit(commit)}^", diff.path)
       end
 
+      def git_commit(commit)
+        run("cd #{url} && git svn find-rev r#{commit.token}").strip
+      end
+
       private
 
       def open_log_file(opts = {})
@@ -72,10 +76,6 @@ module OhlohScm
         run("cd #{url} && git show #{revision}:#{file_path.shellescape}").strip
       end
 
-      def git_commit(commit)
-        run("cd #{url} && git svn find-rev r#{commit.token}").strip
-      end
-
       def git_svn_log_cmd
         "cd #{url} && git svn log"
       end

data/lib/ohloh_scm/version.rb

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

data/spec/ohloh_scm/git/scm_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'byebug'
 
 describe 'Git::Scm' do
   it 'must pull git repository' do

data/spec/ohloh_scm/git/validation_spec.rb

@@ -7,6 +7,10 @@ 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?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.11
 platform: ruby
 authors:
 - OpenHub Team at Synopsys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies: []
 description: |-
   The OpenHub source control management library for \
@@ -190,7 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Source Control Management