ohloh_scm 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f4cbf7d314828522ff7a9b64256e889f2f109c7048d751c7d54d707ea085a96
-  data.tar.gz: aae75e139e32baa7a7eb2fff86a4f11d8a85edc65da8ee03519b6bcc752a2ebf
+  metadata.gz: fb6ebfb6e6f3ee258e4e3c5042c3673e3ed94101e3c84f9cdfd751373a4b0ea6
+  data.tar.gz: dd605cfd3fca5d5c0720358e71027cf3add2f4bbf4f0eebb6627d4da9efa7bd3
 SHA512:
-  metadata.gz: 5eeef15c64ca8f7eb7f0e6953dc30433854b72412a29ccb9a9bf42d136cddca3d8d900fea3cf4f48bbb13cd4b3cdf031b8ecf1fe111372650b7662687f7232c1
-  data.tar.gz: dcdb7fbbb147a63dc16d7106ab23a404ccad769f24ca96f5e91f110e776b5f368e8b50b00155dca07d2d2040c2f6009b2fbd6404d0874c5e8fc67ac8efc1d65a
+  metadata.gz: 9dcfb8c8757ecd79290c483682ab1fbaf349f4a71f54fe26a78e954cbde66584145e90eb762d45d06f8cf1b9179d11e962012a6370dbea714350d390203cb4ff
+  data.tar.gz: 712a961eec10b7346b92b4dc851be4b2bfaf1b99c6eeeee23030cb3d99cd7bc147ca1a1d13dfa29160fcbd1632d8efcf00e9cdfc60a1298ea4bb0eafa365ae34

data/Gemfile

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

data/Gemfile.lock

@@ -3,6 +3,7 @@ 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)
@@ -19,6 +20,19 @@ 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)
@@ -46,6 +60,7 @@ DEPENDENCIES
   mocha
   nokogiri
   rake
+  rspec
   rubocop (~> 0.67)
   rubocop-performance
   simplecov

data/lib/ohloh_scm/activity.rb

@@ -5,14 +5,15 @@ module OhlohScm
     include OhlohScm::System
     extend Forwardable
     def_delegators :@core, :scm, :status
-    def_delegators :scm, :url
+    def_delegators :scm, :url, :temp_dir
 
     def initialize(core)
       @core = core
     end
 
     def log_filename
-      File.join(Dir.tmpdir, url.gsub(/\W/, '') + '.log')
+      tmp_dir = temp_dir || Dir.tmpdir
+      File.join(tmp_dir, url.gsub(/\W/, '') + '.log')
     end
 
     def tags; end

data/lib/ohloh_scm/core.rb

@@ -18,5 +18,9 @@ module OhlohScm
       @status = OhlohScm.const_get(scm_class_name)::Status.new(self)
       @validation = OhlohScm.const_get(scm_class_name)::Validation.new(self)
     end
+
+    def temp_dir=(tmp_dir)
+      @scm.temp_dir = tmp_dir
+    end
   end
 end

data/lib/ohloh_scm/git/scm.rb

@@ -43,8 +43,10 @@ module OhlohScm
       end
 
       def clone_and_create_tracking_branch(remote_scm)
-        run "rm -rf '#{url}'"
-        run "git clone -q -n '#{remote_scm.url}' '#{url}'"
+        unless status.scm_dir_exist?
+          run "rm -rf '#{url}'"
+          run "git clone -q -n '#{remote_scm.url}' '#{url}'"
+        end
         create_tracking_branch(remote_scm.branch_name) # ensure the correct branch exists locally
         clean_and_checkout_branch # switch to the correct branch
       end

data/lib/ohloh_scm/git_svn/activity.rb

@@ -3,7 +3,7 @@
 module OhlohScm
   module GitSvn
     class Activity < OhlohScm::Activity
-      def_delegators :scm, :url
+      def_delegators :scm, :url, :temp_dir
 
       def commit_count(opts = {})
         cmd = "#{after_revision(opts)} | grep -E -e '^r[0-9]+.*lines$' | wc -l"
@@ -49,7 +49,8 @@ module OhlohScm
       end
 
       def log_filename
-        File.join('/tmp', url.gsub(/\W/, '') + '.log')
+        tmp_dir = temp_dir || '/tmp'
+        File.join(tmp_dir, url.gsub(/\W/, '') + '.log')
       end
 
       def after_revision(opts)

data/lib/ohloh_scm/scm.rb

@@ -6,7 +6,7 @@ module OhlohScm
     extend Forwardable
     def_delegators :@core, :status, :activity
     attr_reader :url, :username, :password
-    attr_accessor :branch_name
+    attr_accessor :branch_name, :temp_dir
 
     def initialize(core:, url:, branch_name: nil, username: nil, password: nil)
       @core = core

data/lib/ohloh_scm/version.rb

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

data/spec/ohloh_scm/activity_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Activity' do
+  describe 'log_filename' do
+    it 'should return system tmp dir path' do
+      core = get_core(:git)
+      scm = OhlohScm::Activity.new(core)
+      scm.log_filename.must_equal "#{Dir.tmpdir}/foobar.log"
+    end
+
+    it 'should return temp folder path' do
+      core = get_core(:git)
+      core.temp_dir = '/test'
+      scm = OhlohScm::Activity.new(core)
+      scm.log_filename.must_equal '/test/foobar.log'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - OpenHub Team at Synopsys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-07-24 00:00:00.000000000 Z
 dependencies: []
 description: |-
   The OpenHub source control management library for \
@@ -103,6 +103,7 @@ files:
 - spec/helpers/generic_helper.rb
 - spec/helpers/repository_helper.rb
 - spec/helpers/system_helper.rb
+- spec/ohloh_scm/activity_spec.rb
 - spec/ohloh_scm/bzr/activity_spec.rb
 - spec/ohloh_scm/bzr/scm_spec.rb
 - spec/ohloh_scm/bzr/validation_spec.rb
@@ -189,8 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Source Control Management
@@ -203,6 +203,7 @@ test_files:
 - spec/helpers/generic_helper.rb
 - spec/helpers/repository_helper.rb
 - spec/helpers/system_helper.rb
+- spec/ohloh_scm/activity_spec.rb
 - spec/ohloh_scm/bzr/activity_spec.rb
 - spec/ohloh_scm/bzr/scm_spec.rb
 - spec/ohloh_scm/bzr/validation_spec.rb