ohloh_scm 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a355a0742b48e9e0205d3bd3c4ffb6dee5e2eafcbadf6f38104455a807f2142f
-  data.tar.gz: a33e29534f3587b6434f496d702aefae3ea203747890402380cb7ecdd7fc4ad0
+  metadata.gz: 1011282c5531aecf6d4adf8105e1bbc7fbce07012cb46aa087d6310156fc5d6d
+  data.tar.gz: bf05860e5c4118ecd595008348ca845b4b2073a2240f62a38005807ac47ce433
 SHA512:
-  metadata.gz: b3c17e75d2c59625f815d5b8b59a490b815dfcc1ec7d1031ee95040340a7b67d0be67b1b4012fc1953cd8705ea2c9289710986caacf21c6bc788800af882d8fe
-  data.tar.gz: 5d3db3fd91b90b1491b3144eee0936121394ce7e61f9f83fcc216eee3dc1a08414ba86315f3bd52a96a21d43677717cb813142aa9150e6d98ceafe967658be33
+  metadata.gz: 8985e61bb540f28626d8c92b6d47e5477a6656469e6055bf8020c702ab547229e4d739f2b216f574a87fa8a90543731789c6087038595b54b0678b0456588d45
+  data.tar.gz: 5f250e570b82f93f679ef66122de1ddb01857283377d9ad12ba25221f334dcc6bc294bd591cc0a19658ed545906a68a3803d5b6ddb7ea53b86cb8efc738fb5cc

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/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.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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - OpenHub Team at Synopsys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-10-23 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