Merge pull request #117 from blackducksoftware/leverage_env

Leverage OhlohScm environment variable to pass temp folder option

Author: karthik

lib/ohloh_scm/activity.rb

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

lib/ohloh_scm/core.rb

@@ -18,9 +18,5 @@ def initialize(scm_type, url, branch_name, username, password)
       @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

lib/ohloh_scm/git_svn/activity.rb

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

lib/ohloh_scm/scm.rb

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

lib/ohloh_scm/version.rb

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

spec/ohloh_scm/activity_spec.rb

@@ -11,10 +11,11 @@
     end
 
     it 'should return temp folder path' do
+      ENV['OHLOH_SCM_TEMP_FOLDER_PATH'] = '/test'
       core = get_core(:git)
-      core.temp_dir = '/test'
       scm = OhlohScm::Activity.new(core)
       scm.log_filename.must_equal '/test/foobar.log'
+      ENV['OHLOH_SCM_TEMP_FOLDER_PATH'] = ''
     end
   end
 end