feat: updating to listen to new config file structure

Author: isabel-anastasiadis-boost

lib/codeclimate_diff/downloader.rb

@@ -9,13 +9,14 @@ def self.refresh_baseline_if_configured
       return unless should_download
 
       puts "Downloading baseline file from gitlab"
-      branch_name = CodeclimateDiff.configuration["gitlab"]["main_branch_name"]
+      branch_name = CodeclimateDiff.configuration["main_branch_name"]
       project_id = CodeclimateDiff.configuration["gitlab"]["project_id"]
       host = CodeclimateDiff.configuration["gitlab"]["host"]
-      personal_access_token = CodeclimateDiff.configuration["gitlab"]["personal_access_token"]
+      baseline_filename = CodeclimateDiff.configuration["gitlab"]["baseline_filename"]
+      personal_access_token = ENV.fetch("CODECLIMATE_DIFF_GITLAB_PERSONAL_ACCESS_TOKEN")
 
       # curl --output codeclimate_diff_baseline.json --header "PRIVATE-TOKEN: MYTOKEN" "https://gitlab.digitalnz.org/api/v4/projects/85/jobs/artifacts/main/raw/codeclimate_diff_baseline.json?job=code_quality"
-      url = "#{host}/api/v4/projects/#{project_id}/jobs/artifacts/#{branch_name}/raw/codeclimate_diff_baseline.json?job=code_quality"
+      url = "#{host}/api/v4/projects/#{project_id}/jobs/artifacts/#{branch_name}/raw/#{baseline_filename}?job=code_quality"
       response = RestClient.get(url, { "PRIVATE-TOKEN": personal_access_token })
       File.write("codeclimate_diff_baseline.json", response.body)
     rescue StandardError => e

lib/codeclimate_diff/runner.rb

@@ -12,8 +12,10 @@ class Runner
     def self.calculate_changed_filenames(pattern)
       extra_grep_filter = pattern ? " | grep '#{pattern}'" : ""
       branch_name = CodeclimateDiff.configuration["gitlab"]["main_branch_name"]
-      files_changed = `git diff --name-only #{branch_name} | grep --invert-match spec/ | grep --extended-regexp '.js$|.rb$'#{extra_grep_filter}`
-      files_changed.split("\n")
+      files_changed_str = `git diff --name-only #{branch_name} | grep --invert-match spec/ | grep --extended-regexp '.js$|.rb$'#{extra_grep_filter}`
+      puts "Files changed on branch: #{files_changed_str}"
+
+      files_changed_str.split("\n")
     end
 
     def self.calculate_issues_in_changed_files(changed_filenames)