danger 8.4.4 → 8.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6589f95cac1cde709e42711cf14e8b9962af6497276e8f52b8d12d95819de27
-  data.tar.gz: d8598e4cd15a64b8210b40a9a0096a98c25e1e5c793fe123c534eb3b19d1be82
+  metadata.gz: 55ca17556aed4215f86219bcdca5271049b481a1bd349e35211b4f9e509c2b15
+  data.tar.gz: b2b1fb228f4325ce12ac2ff9c7a753d1b056966f0e8078bdce392a4fb9334b32
 SHA512:
-  metadata.gz: 555b54a82c456622d139464246feb78ac9dec12045910fde3f70a0d54601aff2189a015bf7e69fb554ff7825851903e8b677ad76584307db16c462e1809db678
-  data.tar.gz: 50bc63fdefed60b93535c8baa484a48895545eb735656d2672dd4718a92854f24ced6e2ad96267b4570a3137f83d630c591624e166dddbba56a15b2702b9e52c
+  metadata.gz: f2769209f205e40a84f24426e4ce93b3681cbe8f4d57970114b0238d0a3f4c5bb8ff75bbd69936635abb7a8c64f933aaf1e18c4c2a0355ef18630d8365b99c60
+  data.tar.gz: c260a71c30a49e4b6fad9975986324f795fc07750edd082e0e364f6c4975fc69e68619d7bd083bb48dac24f514f14a102d7cb7b95509de1c1b664608fbc63421

data/lib/danger/ci_source/codefresh.rb

@@ -31,23 +31,17 @@ module Danger
       @supported_request_sources ||= [Danger::RequestSources::GitHub]
     end
 
-    def repo_slug
-      return "" if @env["CF_REPO_OWNER"].to_s.empty?
-      return "" if @env["CF_REPO_NAME"].to_s.empty?
-      "#{@env['CF_REPO_OWNER']}/#{@env['CF_REPO_NAME']}".downcase!
-    end
-
-    def repo_url
-      return "" if @env["CF_COMMIT_URL"].to_s.empty?
-      @env["CF_COMMIT_URL"].gsub(/\/commit.+$/, "")
-    end
+    def self.slug_from(env)
+      return "" if env["CF_REPO_OWNER"].to_s.empty?
+      return "" if env["CF_REPO_NAME"].to_s.empty?
 
-    def pull_request_id
-      @env["CF_PULL_REQUEST_NUMBER"]
+      "#{env['CF_REPO_OWNER']}/#{env['CF_REPO_NAME']}".downcase!
     end
 
     def initialize(env)
-      @env = env
+      self.repo_url = env["CF_COMMIT_URL"].to_s.gsub(/\/commit.+$/, "")
+      self.repo_slug = self.class.slug_from(env)
+      self.pull_request_id = env["CF_PULL_REQUEST_NUMBER"]
     end
   end
 end

data/lib/danger/ci_source/local_git_repo.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # For more info see: https://github.com/schacon/ruby-git
 
 require "git"
@@ -37,8 +38,8 @@ module Danger
     end
 
     def initialize(env = {})
-      @env = env
-
+      @remote_info = find_remote_info(env)
+      @found_pull_request = find_pull_request(env)
       self.repo_slug = remote_info.slug
       raise_error_for_missing_remote if remote_info.kind_of?(NoRepoInfo)
 
@@ -55,7 +56,7 @@ module Danger
 
     private
 
-    attr_reader :env
+    attr_reader :remote_info, :found_pull_request
 
     def raise_error_for_missing_remote
       raise missing_remote_error_message
@@ -66,45 +67,36 @@ module Danger
       "And the repository must host on GitHub.com or GitHub Enterprise."
     end
 
-    def remote_info
-      @_remote_info ||= begin
-        remote_info = begin
-          if given_pull_request_url?
-            FindRepoInfoFromURL.new(env["LOCAL_GIT_PR_URL"]).call
-          else
-            FindRepoInfoFromLogs.new(
-              env["DANGER_GITHUB_HOST"] || "github.com".freeze,
-              run_git("remote show origin -n".freeze)
-            ).call
-          end
-        end
-
-        remote_info || NoRepoInfo.new
-      end
+    def find_remote_info(env)
+      if given_pull_request_url?(env)
+        FindRepoInfoFromURL.new(env["LOCAL_GIT_PR_URL"]).call
+      else
+        FindRepoInfoFromLogs.new(
+          env["DANGER_GITHUB_HOST"] || "github.com",
+          run_git("remote show origin -n")
+        ).call
+      end || NoRepoInfo.new
     end
 
-    def found_pull_request
-      @_found_pull_request ||= begin
-        if given_pull_request_url?
-          PullRequestFinder.new(
-            remote_info.id,
-            remote_info.slug,
-            remote: true,
-            remote_url: env["LOCAL_GIT_PR_URL"],
-            env: env
-          ).call
-        else
-          PullRequestFinder.new(
-            env.fetch("LOCAL_GIT_PR_ID") { "".freeze },
-            remote_info.slug,
-            remote: false,
-            git_logs: run_git("log --oneline -1000000".freeze)
-          ).call
-        end
+    def find_pull_request(env)
+      if given_pull_request_url?(env)
+        PullRequestFinder.new(
+          remote_info.id,
+          remote_info.slug,
+          remote: true,
+          remote_url: env["LOCAL_GIT_PR_URL"]
+        ).call(env: env)
+      else
+        PullRequestFinder.new(
+          env.fetch("LOCAL_GIT_PR_ID") { "" },
+          remote_info.slug,
+          remote: false,
+          git_logs: run_git("log --oneline -1000000")
+        ).call(env: env)
       end
     end
 
-    def given_pull_request_url?
+    def given_pull_request_url?(env)
       env["LOCAL_GIT_PR_URL"] && !env["LOCAL_GIT_PR_URL"].empty?
     end
 

data/lib/danger/ci_source/local_only_git_repo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "git"
 require "danger/request_sources/local_only"
 
@@ -9,8 +11,8 @@ module Danger
   #
   class LocalOnlyGitRepo < CI
     attr_accessor :base_commit, :head_commit
-    HEAD_VAR = "DANGER_LOCAL_HEAD".freeze
-    BASE_VAR = "DANGER_LOCAL_BASE".freeze
+    HEAD_VAR = "DANGER_LOCAL_HEAD"
+    BASE_VAR = "DANGER_LOCAL_BASE"
 
     def self.validates_as_ci?(env)
       env.key? "DANGER_USE_LOCAL_ONLY_GIT"
@@ -33,15 +35,9 @@ module Danger
     end
 
     def initialize(env = {})
-      @env = env
-
       # expects --base/--head specified OR origin/master to be base and HEAD head
       self.base_commit = env[BASE_VAR] || run_git("rev-parse --abbrev-ref origin/master")
       self.head_commit = env[HEAD_VAR] || run_git("rev-parse --abbrev-ref HEAD")
     end
-
-    private
-
-    attr_reader :env
   end
 end

data/lib/danger/ci_source/support/pull_request_finder.rb

@@ -1,67 +1,65 @@
+# frozen_string_literal: true
+
 require "danger/ci_source/support/local_pull_request"
 require "danger/ci_source/support/remote_pull_request"
 require "danger/ci_source/support/no_pull_request"
 
 module Danger
   class PullRequestFinder
-    def initialize(specific_pull_request_id, repo_slug = nil, remote: false, git_logs: "", remote_url: "", env: nil)
+    def initialize(specific_pull_request_id, repo_slug = nil, remote: false, git_logs: "", remote_url: "")
       @specific_pull_request_id = specific_pull_request_id
       @git_logs = git_logs
       @repo_slug = repo_slug
       @remote = to_boolean(remote)
       @remote_url = remote_url
-      @env = env
     end
 
-    def call
-      check_if_any_pull_request!
-
-      pull_request
+    def call(env: nil)
+      find_pull_request(env).tap do |pull_request|
+        raise_pull_request_not_found!(pull_request) unless pull_request.valid?
+      end
     end
 
     private
 
-    attr_reader :specific_pull_request_id, :git_logs, :repo_slug, :remote, :remote_url, :env
+    attr_reader :specific_pull_request_id, :git_logs, :repo_slug, :remote, :remote_url
 
     def to_boolean(maybe_string)
       ["true", "1", "yes", "y", true].include?(maybe_string)
     end
 
-    def check_if_any_pull_request!
-      unless pull_request.valid?
-        if !specific_pull_request_id.empty?
-          raise "Could not find the Pull Request (#{specific_pull_request_id}) inside the git history for this repo."
-        else
-          raise "No recent Pull Requests found for this repo, danger requires at least one Pull Request for the local mode.".freeze
-        end
+    def raise_pull_request_not_found!(pull_request)
+      if specific_pull_request_id.empty?
+        raise "No recent Pull Requests found for this repo, danger requires at least one Pull Request for the local mode."
+      else
+        raise "Could not find the Pull Request (#{specific_pull_request_id}) inside the git history for this repo."
       end
     end
 
     # @return [String] Log line of most recent merged Pull Request
-    def pull_request
-      @pull_request ||= begin
-        return if pull_request_ref.empty?
-
-        if both_present?
-          LocalPullRequest.new(pick_the_most_recent_one_from_two_matches)
-        elsif only_merged_pull_request_present?
-          LocalPullRequest.new(most_recent_merged_pull_request)
-        elsif only_squash_and_merged_pull_request_present?
-          LocalPullRequest.new(most_recent_squash_and_merged_pull_request)
-        elsif remote && remote_pull_request
-          generate_remote_pull_request
-        else
-          NoPullRequest.new
-        end
+    def find_pull_request(env)
+      return if pull_request_ref.empty?
+
+      if both_present?
+        LocalPullRequest.new(pick_the_most_recent_one_from_two_matches)
+      elsif only_merged_pull_request_present?
+        LocalPullRequest.new(most_recent_merged_pull_request)
+      elsif only_squash_and_merged_pull_request_present?
+        LocalPullRequest.new(most_recent_squash_and_merged_pull_request)
+      elsif remote
+        remote_pull_request = find_remote_pull_request(env)
+        remote_pull_request ? generate_remote_pull_request(remote_pull_request) : NoPullRequest.new
+      else
+        NoPullRequest.new
       end
     end
 
     # @return [String] "#42"
     def pull_request_ref
-      !specific_pull_request_id.empty? ? "##{specific_pull_request_id}" : "#\\d+".freeze
+      !specific_pull_request_id.empty? ? "##{specific_pull_request_id}" : "#\\d+"
     end
 
-    def generate_remote_pull_request
+    def generate_remote_pull_request(remote_pull_request)
       scm_provider = find_scm_provider(remote_url)
 
       case scm_provider
@@ -88,10 +86,8 @@ module Danger
       end
     end
 
-    def remote_pull_request
-      @_remote_pull_request ||= begin
-        client.pull_request(repo_slug, specific_pull_request_id)
-      end
+    def find_remote_pull_request(env)
+      client(env).pull_request(repo_slug, specific_pull_request_id)
     end
 
     def both_present?
@@ -135,7 +131,7 @@ module Danger
       !most_recent_squash_and_merged_pull_request.nil? && !most_recent_squash_and_merged_pull_request.empty?
     end
 
-    def client
+    def client(env)
       scm_provider = find_scm_provider(remote_url)
 
       case scm_provider
@@ -168,7 +164,7 @@ module Danger
     def api_url
       ENV.fetch("DANGER_GITHUB_API_HOST") do
         ENV.fetch("DANGER_GITHUB_API_BASE_URL") do
-          "https://api.github.com/".freeze
+          "https://api.github.com/"
         end
       end
     end

data/lib/danger/request_sources/bitbucket_cloud.rb

@@ -24,7 +24,6 @@ module Danger
 
       def initialize(ci_source, environment)
         self.ci_source = ci_source
-        self.environment = environment
 
         @api = BitbucketCloudAPI.new(ci_source.repo_slug, ci_source.pull_request_id, nil, environment)
       end

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 require "danger/helpers/comments_helper"
@@ -32,9 +33,8 @@ module Danger
       def inspect
         inspected = super
 
-        if @password
-          inspected = inspected.sub! @password, "********".freeze
-        end
+        inspected.gsub!(@password, "********") if @password
+        inspected.gsub!(@access_token, "********") if @access_token
 
         inspected
       end

data/lib/danger/request_sources/bitbucket_server.rb

@@ -31,7 +31,6 @@ module Danger
 
       def initialize(ci_source, environment)
         self.ci_source = ci_source
-        self.environment = environment
 
         project, slug = ci_source.repo_slug.split("/")
         @api = BitbucketServerAPI.new(project, slug, ci_source.pull_request_id, environment)

data/lib/danger/request_sources/bitbucket_server_api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 require "openssl"
@@ -12,7 +13,7 @@ module Danger
         @username = environment["DANGER_BITBUCKETSERVER_USERNAME"]
         @password = environment["DANGER_BITBUCKETSERVER_PASSWORD"]
         self.host = environment["DANGER_BITBUCKETSERVER_HOST"]
-        self.verify_ssl = environment["DANGER_BITBUCKETSERVER_VERIFY_SSL"] == "false" ? false : true
+        self.verify_ssl = environment["DANGER_BITBUCKETSERVER_VERIFY_SSL"] != "false"
         if self.host && !(self.host.include? "http://") && !(self.host.include? "https://")
           self.host = "https://" + self.host
         end
@@ -24,9 +25,7 @@ module Danger
       def inspect
         inspected = super
 
-        if @password
-          inspected = inspected.sub! @password, "********".freeze
-        end
+        inspected.gsub!(@password, "********") if @password
 
         inspected
       end

data/lib/danger/request_sources/code_insights_api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 module Danger
@@ -26,9 +27,7 @@ module Danger
       def inspect
         inspected = super
 
-        if @password
-          inspected = inspected.sub! @password, "********".freeze
-        end
+        inspected.gsub!(@password, "********") if @password
 
         inspected
       end

data/lib/danger/request_sources/github/github.rb

@@ -14,7 +14,7 @@ module Danger
     class GitHub < RequestSource
       include Danger::Helpers::CommentsHelper
 
-      attr_accessor :pr_json, :issue_json, :support_tokenless_auth, :dismiss_out_of_range_messages
+      attr_accessor :pr_json, :issue_json, :use_local_git, :support_tokenless_auth, :dismiss_out_of_range_messages, :host, :api_url, :verify_ssl
 
       def self.env_vars
         ["DANGER_GITHUB_API_TOKEN", "DANGER_GITHUB_BEARER_TOKEN"]
@@ -26,12 +26,22 @@ module Danger
 
       def initialize(ci_source, environment)
         self.ci_source = ci_source
-        self.environment = environment
+        self.use_local_git = environment["DANGER_USE_LOCAL_GIT"]
         self.support_tokenless_auth = false
         self.dismiss_out_of_range_messages = false
+        self.host = environment.fetch("DANGER_GITHUB_HOST", "github.com")
+        # `DANGER_GITHUB_API_HOST` is the old name kept for legacy reasons and
+        # backwards compatibility. `DANGER_GITHUB_API_BASE_URL` is the new
+        # correctly named variable.
+        self.api_url = environment.fetch("DANGER_GITHUB_API_HOST") do
+          environment.fetch("DANGER_GITHUB_API_BASE_URL") do
+            "https://api.github.com/".freeze
+          end
+        end
+        self.verify_ssl = environment["DANGER_OCTOKIT_VERIFY_SSL"] != "false"
 
-        @access_token = @environment["DANGER_GITHUB_API_TOKEN"]
-        @bearer_token = @environment["DANGER_GITHUB_BEARER_TOKEN"]
+        @access_token = environment["DANGER_GITHUB_API_TOKEN"]
+        @bearer_token = environment["DANGER_GITHUB_BEARER_TOKEN"]
       end
 
       def get_pr_from_branch(repo_name, branch_name, owner)
@@ -46,32 +56,13 @@ module Danger
       end
 
       def validates_as_api_source?
-        valid_bearer_token? || valid_access_token? || self.environment["DANGER_USE_LOCAL_GIT"]
+        valid_bearer_token? || valid_access_token? || use_local_git
       end
 
       def scm
         @scm ||= GitRepo.new
       end
 
-      def host
-        @host = @environment["DANGER_GITHUB_HOST"] || "github.com"
-      end
-
-      def verify_ssl
-        @environment["DANGER_OCTOKIT_VERIFY_SSL"] == "false" ? false : true
-      end
-
-      # `DANGER_GITHUB_API_HOST` is the old name kept for legacy reasons and
-      # backwards compatibility. `DANGER_GITHUB_API_BASE_URL` is the new
-      # correctly named variable.
-      def api_url
-        @environment.fetch("DANGER_GITHUB_API_HOST") do
-          @environment.fetch("DANGER_GITHUB_API_BASE_URL") do
-            "https://api.github.com/".freeze
-          end
-        end
-      end
-
       def client
         raise "No API token given, please provide one using `DANGER_GITHUB_API_TOKEN` or `DANGER_GITHUB_BEARER_TOKEN`" if !valid_access_token? && !valid_bearer_token? && !support_tokenless_auth
         @client ||= begin

data/lib/danger/request_sources/gitlab.rb

@@ -8,7 +8,7 @@ module Danger
   module RequestSources
     class GitLab < RequestSource
       include Danger::Helpers::CommentsHelper
-      attr_accessor :mr_json, :commits_json, :dismiss_out_of_range_messages
+      attr_accessor :mr_json, :commits_json, :dismiss_out_of_range_messages, :endpoint, :host
 
       FIRST_GITLAB_GEM_WITH_VERSION_CHECK = Gem::Version.new("4.6.0")
       FIRST_VERSION_WITH_INLINE_COMMENTS = Gem::Version.new("10.8.0")
@@ -23,20 +23,19 @@ module Danger
 
       def initialize(ci_source, environment)
         self.ci_source = ci_source
-        self.environment = environment
         self.dismiss_out_of_range_messages = false
-
-        @token = @environment["DANGER_GITLAB_API_TOKEN"]
+        @endpoint = environment["DANGER_GITLAB_API_BASE_URL"] || environment.fetch("CI_API_V4_URL", "https://gitlab.com/api/v4")
+        @host = environment.fetch("DANGER_GITLAB_HOST", URI.parse(endpoint).host) || "gitlab.com"
+        @token = environment["DANGER_GITLAB_API_TOKEN"]
       end
 
       def client
-        token = @environment["DANGER_GITLAB_API_TOKEN"]
-        raise "No API token given, please provide one using `DANGER_GITLAB_API_TOKEN`" unless token
+        raise "No API token given, please provide one using `DANGER_GITLAB_API_TOKEN`" unless @token
 
         # The require happens inline so that it won't cause exceptions when just using the `danger` gem.
         require "gitlab"
 
-        @client ||= Gitlab.client(endpoint: endpoint, private_token: token)
+        @client ||= Gitlab.client(endpoint: endpoint, private_token: @token)
       rescue LoadError => e
         if e.path == "gitlab"
           puts "The GitLab gem was not installed, you will need to change your Gem from `danger` to `danger-gitlab`.".red
@@ -48,7 +47,7 @@ module Danger
       end
 
       def validates_as_ci?
-        includes_port = self.host.include? ":"
+        includes_port = host.include? ":"
         raise "Port number included in `DANGER_GITLAB_HOST`, this will fail with GitLab CI Runners" if includes_port
 
         # We don't call super because in some cases the Git remote doesn't match the GitLab instance host.
@@ -66,14 +65,6 @@ module Danger
         @scm ||= GitRepo.new
       end
 
-      def endpoint
-        @endpoint ||= @environment["DANGER_GITLAB_API_BASE_URL"] || @environment["CI_API_V4_URL"] || "https://gitlab.com/api/v4"
-      end
-
-      def host
-        @host ||= @environment["DANGER_GITLAB_HOST"] || URI.parse(endpoint).host || "gitlab.com"
-      end
-
       def base_commit
         @base_commit ||= self.mr_json.diff_refs.base_sha
       end
@@ -326,11 +317,10 @@ module Danger
       # @return [String] A URL to the specific file, ready to be downloaded
       def file_url(organisation: nil, repository: nil, branch: nil, path: nil)
         branch ||= 'master'
-        token = @environment["DANGER_GITLAB_API_TOKEN"]
         # According to GitLab Repositories API docs path and id(slug) should be encoded.
         path = URI.encode_www_form_component(path)
         repository = URI.encode_www_form_component(repository)
-        "#{endpoint}/projects/#{repository}/repository/files/#{path}/raw?ref=#{branch}&private_token=#{token}"
+        "#{endpoint}/projects/#{repository}/repository/files/#{path}/raw?ref=#{branch}&private_token=#{@token}"
       end
 
       def regular_violations_group(warnings: [], errors: [], messages: [], markdowns: [])

data/lib/danger/request_sources/local_only.rb

@@ -13,9 +13,8 @@ module Danger
         ["DANGER_LOCAL_ONLY"]
       end
 
-      def initialize(ci_source, environment)
+      def initialize(ci_source, _environment)
         self.ci_source = ci_source
-        self.environment = environment
       end
 
       def validates_as_ci?

data/lib/danger/request_sources/request_source.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Danger
   module RequestSources
     class RequestSource
-      DANGER_REPO_NAME = "danger".freeze
+      DANGER_REPO_NAME = "danger"
 
-      attr_accessor :ci_source, :environment, :scm, :host, :ignored_violations
+      attr_accessor :ci_source, :scm, :host, :ignored_violations
 
       def self.env_vars
         raise "Subclass and overwrite self.env_vars"
@@ -23,12 +25,12 @@ module Danger
       end
 
       def self.source_name
-        to_s.sub("Danger::RequestSources::".freeze, "".freeze)
+        to_s.sub("Danger::RequestSources::", "")
       end
 
       def self.available_source_names_and_envs
         available_request_sources.map do |klass|
-          " - #{klass.source_name}: #{klass.env_vars.join(', '.freeze).yellow}"
+          " - #{klass.source_name}: #{klass.env_vars.join(', ').yellow}"
         end
       end
 
@@ -36,6 +38,16 @@ module Danger
         raise "Subclass and overwrite initialize"
       end
 
+      def inspect
+        inspected = super
+
+        inspected.gsub!(@token, "********") if @token
+        inspected.gsub!(@access_token, "********") if @access_token
+        inspected.gsub!(@bearer_token, "********") if @bearer_token
+
+        inspected
+      end
+
       # @return [Boolean] whether scm.origins is a valid git repository or not
       def validates_as_ci?
         !!self.scm.origins.match(%r{#{Regexp.escape self.host}(:|/)(.+/.+?)(?:\.git)?$})

data/lib/danger/request_sources/vsts.rb

@@ -24,7 +24,6 @@ module Danger
 
       def initialize(ci_source, environment)
         self.ci_source = ci_source
-        self.environment = environment
 
         @is_vsts_git = environment["BUILD_REPOSITORY_PROVIDER"] == "TfsGit"
 

data/lib/danger/request_sources/vsts_api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # coding: utf-8
 
 require "base64"
@@ -35,9 +36,7 @@ module Danger
       def inspect
         inspected = super
 
-        if @token
-          inspected = inspected.sub! @token, "********".freeze
-        end
+        inspected.gsub!(@token, "********") if @token
 
         inspected
       end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "8.4.4".freeze
+  VERSION = "8.4.5".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 8.4.4
+  version: 8.4.5
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide