feat: reads branch name for all the code

Author: isabel-anastasiadis-boost

Gemfile

@@ -7,8 +7,8 @@ gemspec
 
 gem "colorize"
 gem "json"
+gem "pry"
 gem "rake", "~> 13.0"
 gem "rest-client"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.21"
-gem "pry"

codeclimate_diff.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
+  spec.add_dependency("colorize")
   spec.add_dependency("json")
   spec.add_dependency("optparse")
   spec.add_dependency("rest-client")
-  spec.add_dependency("colorize")
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

lib/codeclimate_diff.rb

@@ -1,34 +1,12 @@
 # frozen_string_literal: true
 
 require_relative "codeclimate_diff/version"
+require "yaml"
 
 module CodeclimateDiff
-  class Configuration
-    attr_accessor :gitlab,
-                  :github
-
-    def initialize
-      @gitlab = {
-        main_branch_name: "main",
-        download_baseline_from_pipeline: false,
-        project_id: nil,
-        host: nil,
-        personal_access_token: nil
-      }
-
-      @github = {
-        # TODO: Add GitHub requirements
-      }
-    end
-  end
-
   class << self
     def configuration
-      @configuration ||= Configuration.new
-    end
-
-    def configure
-      yield(configuration)
+      YAML.load_file("./.codeclimate_diff.yml")
     end
   end
 end

lib/codeclimate_diff/downloader.rb

@@ -1,25 +1,18 @@
 # frozen_string_literal: true
 
 require "rest-client"
-require "yaml"
 
 module CodeclimateDiff
   class Downloader
-
     def self.refresh_baseline_if_configured
-
-      config = YAML.load_file("./.codeclimate_diff.yml")
-
-      puts config
-
-      should_download = config['gitlab']['download_baseline_for_pipeline']
+      should_download = CodeclimateDiff.configuration["gitlab"]["download_baseline_for_pipeline"]
       return unless should_download
 
-      puts "downloading baseline file from gitlab"
-      branch_name = config['gitlab']['main_branch_name']
-      project_id = config['gitlab']['project_id']
-      host = config['gitlab']['host']
-      personal_access_token = config['gitlab']['personal_access_token']
+      puts "Downloading baseline file from gitlab"
+      branch_name = CodeclimateDiff.configuration["gitlab"]["main_branch_name"]
+      project_id = CodeclimateDiff.configuration["gitlab"]["project_id"]
+      host = CodeclimateDiff.configuration["gitlab"]["host"]
+      personal_access_token = CodeclimateDiff.configuration["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"

lib/codeclimate_diff/runner.rb

@@ -11,7 +11,8 @@ module CodeclimateDiff
   class Runner
     def self.calculate_changed_filenames(pattern)
       extra_grep_filter = pattern ? " | grep '#{pattern}'" : ""
-      files_changed = `git diff --name-only main | grep --invert-match spec/ | grep --extended-regexp '.js$|.rb$'#{extra_grep_filter}`
+      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")
     end