danger 8.6.1 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 691f7a26ea0a29f107e6f848bdf7450d2043dc15f5c385c136c1a9d818120c3f
-  data.tar.gz: d5f84a85ec8419dbbfbdcb742ffb15b5fe075d3bf1f676859152a0bb7b466633
+  metadata.gz: 8fc4bd35f1d805c6e3ef5b0467cd59281f0251c10b0580ebb138002e3b370e62
+  data.tar.gz: 29df2722f598ead34bee294304b60b3f6343c6147cce87054772aac2b40f1f2b
 SHA512:
-  metadata.gz: b712f8566113397b952ebd93e33d1d42b38d1b1a9d04e678971c35feb46a5bfb057236b0ccffc250560df6b1da001fe31f848024de318850c93ecb6af6eb0994
-  data.tar.gz: c89ab31d3afe5d668046629643d65858d6eeeea3d5f67006170af38e9a8c31673789de472501d37ff923c41fb538193cce767ae9567ef4a9a474aca96cf4aad4
+  metadata.gz: 304581c49ae31baa62f135883e006536e993a824a6cea8a920a37d58b232ea3118eccf773ffc760281c8a49b70446b51b955c952379e9d41e12e9d9e9842a4d7
+  data.tar.gz: d68b392bcb4075b852cc988fdaa3e9e2fd3df080417dd31d1cb314bf9ec1a4f3af5fdf759f7f106e5071b60e48ae4affb78750ae58a43ecadb94d533d9e80d83

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-present Orta, Felix Krause
+Copyright (c) 2015-present Orta, Felix Krause
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/danger/ci_source/appcircle.rb

@@ -0,0 +1,83 @@
+# https://docs.appcircle.io/environment-variables/managing-variables
+# https://docs.appcircle.io/build/build-profile-configuration#environment-variables-configuration
+require "danger/request_sources/github/github"
+require "danger/request_sources/gitlab"
+module Danger
+    # ### CI Setup
+    #
+    # Add a Custom Script step to your workflow and set it as a bash:
+    #
+    # ```shell
+    #   cd $AC_REPOSITORY_DIR  
+    #   bundle install
+    #   bundle exec danger
+    # ```
+    # ### Token Setup
+    #
+    # Login to Appcircle and select your build profile. Go to your *Config* and
+    # choose *Environment Variables*.
+    # https://docs.appcircle.io/environment-variables/managing-variables
+    #
+    # #### GitHub
+    # Add the `DANGER_GITHUB_API_TOKEN` to your profile's ENV.
+    #
+    # #### GitLab
+    # Add the `DANGER_GITLAB_API_TOKEN` to your profile's ENV.
+    #
+    # #### Bitbucket Cloud
+    # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+    # to your profile's ENV.
+    #
+    # #### Bitbucket server
+    # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+    # and `DANGER_BITBUCKETSERVER_HOST` to your profile's ENV.
+    #
+    class Appcircle < CI
+        def self.validates_as_ci?(env)
+        env.key? "AC_APPCIRCLE"
+      end
+  
+      def self.validates_as_pr?(env)
+        return false unless env.key? "AC_PULL_NUMBER"
+        env["AC_PULL_NUMBER"].to_i > 0
+      end
+
+      def supported_request_sources
+        @supported_request_sources ||= [
+          Danger::RequestSources::GitHub,
+          Danger::RequestSources::BitbucketCloud,
+          Danger::RequestSources::BitbucketServer,
+          Danger::RequestSources::GitLab
+        ]
+      end
+
+      def initialize(env)
+        self.pull_request_id = env["AC_PULL_NUMBER"]
+        self.repo_url = env["AC_GIT_URL"]
+        self.repo_slug = repo_slug_from(self.repo_url)
+      end
+  
+      def repo_slug_from(url)
+        if url =~ URI::regexp
+          # Try to parse the URL as a valid URI. This should cover the cases of http/https/ssh URLs.
+          begin
+            uri = URI.parse(url)
+            return uri.path.sub(/^(\/)/,'').sub(/(.git)$/,'')
+          rescue URI::InvalidURIError
+            # In case URL could not be parsed fallback to git URL parsing.
+            repo_slug_asgiturl(url)
+          end
+        else
+          # In case URL could not be parsed fallback to git URL parsing. git@github.com:organization/repo.git
+          repo_slug_asgiturl(url)
+        end
+      end
+  
+      def repo_slug_asgiturl(url)
+        matcher_url = url
+        repo_matches = matcher_url.match(%r{([\/:])(([^\/]+\/)+[^\/]+?)(\.git$|$)})[2]
+        return repo_matches unless repo_matches.nil?
+      end
+    end
+  end
+  

data/lib/danger/ci_source/bitrise.rb

@@ -19,13 +19,13 @@ module Danger
   #
   # Add the `DANGER_GITHUB_API_TOKEN` to your workflow's [Secret App Env Vars](https://blog.bitrise.io/anyone-even-prs-can-have-secrets).
   #
-  # ### bitbucket server and bitrsie
+  # ### bitbucket server and bitrise
   #
-  # Danger will read the environment variable GIT_REPOSITORY_URL to construct the Bitbucket Server API URL 
-  # finding the project and repo slug in the GIT_REPOSITORY_URL variable. This GIT_REPOSITORY_URL variable 
-  # comes from the App Settings tab for your Bitrsie App. If you are manually setting a repo URL in the 
-  # Git Clone Repo step, you may need to set adjust this propery in the settings tab, maybe even fake it.
-  # The patterns used are `(%r{\.com/(.*)})` and `(%r{\.com:(.*)})` and .split(/\.git$|$/) to remove ".git" if the URL contains it.  
+  # Danger will read the environment variable GIT_REPOSITORY_URL to construct the Bitbucket Server API URL
+  # finding the project and repo slug in the GIT_REPOSITORY_URL variable. This GIT_REPOSITORY_URL variable
+  # comes from the App Settings tab for your Bitrise App. If you are manually setting a repo URL in the
+  # Git Clone Repo step, you may need to set adjust this property in the settings tab, maybe even fake it.
+  # The patterns used are `(%r{\.com/(.*)})` and `(%r{\.com:(.*)})` and .split(/\.git$|$/) to remove ".git" if the URL contains it.
   #
   class Bitrise < CI
     def self.validates_as_ci?(env)
@@ -48,7 +48,7 @@ module Danger
     def initialize(env)
       self.pull_request_id = env["BITRISE_PULL_REQUEST"]
       self.repo_url = env["GIT_REPOSITORY_URL"]
-      
+
       matcher_url = self.repo_url
       self.repo_slug = repo_slug_from(self.repo_url)
     end

data/lib/danger/ci_source/circle.rb

@@ -31,7 +31,7 @@ module Danger
   # to retrieve PR metadata, which will require an API token.
   #
   # 1. Go to your project > Settings > API Permissions. Create a token with scope "view-builds" and a label like "DANGER_CIRCLE_CI_API_TOKEN".
-  # 2. Settings > Environement Variables. Add the token as a CircleCI environment variable, which exposes it to the Danger process.
+  # 2. Settings > Environment Variables. Add the token as a CircleCI environment variable, which exposes it to the Danger process.
   #
   # There is no difference here for OSS vs Closed, both scenarios will need this environment variable.
   #

data/lib/danger/ci_source/code_build.rb

@@ -5,6 +5,7 @@ module Danger
   # ### CI Setup
   #
   # In CodeBuild, make sure to correctly forward CODEBUILD_BUILD_ID, CODEBUILD_SOURCE_VERSION, CODEBUILD_SOURCE_REPO_URL and DANGER_GITHUB_API_TOKEN.
+  # In CodeBuild with batch builds, make sure to correctly forward CODEBUILD_BUILD_ID, CODEBUILD_WEBHOOK_TRIGGER, CODEBUILD_SOURCE_REPO_URL, CODEBUILD_BATCH_BUILD_IDENTIFIER and DANGER_GITHUB_API_TOKEN.
   #
   # ### Token Setup
   #
@@ -25,7 +26,11 @@ module Danger
 
     def initialize(env)
       self.repo_slug = self.class.extract_repo_slug(env)
-      self.pull_request_id = env["CODEBUILD_SOURCE_VERSION"].split("/")[1].to_i
+      if env["CODEBUILD_BATCH_BUILD_IDENTIFIER"]
+        self.pull_request_id = env["CODEBUILD_WEBHOOK_TRIGGER"].split("/")[1].to_i
+      else
+        self.pull_request_id = env["CODEBUILD_SOURCE_VERSION"].split("/")[1].to_i
+      end
       self.repo_url = self.class.extract_repo_url(env)
     end
 
@@ -44,11 +49,20 @@ module Danger
     end
 
     def self.extract_pr_url(env)
-      return nil unless env.key? "CODEBUILD_SOURCE_VERSION"
-      return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
-      return nil unless env["CODEBUILD_SOURCE_VERSION"].split("/").length == 2
+      if env["CODEBUILD_BATCH_BUILD_IDENTIFIER"]
+        return nil unless env.key? "CODEBUILD_WEBHOOK_TRIGGER"
+        return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
+        return nil unless env["CODEBUILD_WEBHOOK_TRIGGER"].split("/").length == 2
+
+        event_type, pr_number = env["CODEBUILD_WEBHOOK_TRIGGER"].split("/")
+        return nil unless event_type == "pr"
+      else
+        return nil unless env.key? "CODEBUILD_SOURCE_VERSION"
+        return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
+        return nil unless env["CODEBUILD_SOURCE_VERSION"].split("/").length == 2
 
-      _source_origin, pr_number = env["CODEBUILD_SOURCE_VERSION"].split("/")
+        _source_origin, pr_number = env["CODEBUILD_SOURCE_VERSION"].split("/")
+      end
       github_repo_url = env["CODEBUILD_SOURCE_REPO_URL"].gsub(/\.git$/, "")
 
       "#{github_repo_url}/pull/#{pr_number}"

data/lib/danger/ci_source/gitlab_ci.rb

@@ -48,7 +48,7 @@ module Danger
 
       client_version = Gem::Version.new(client.version.version)
       if (client_version >= Gem::Version.new("10.7"))
-        #Use the 'list merge requests associated with a commit' API, for speeed
+        #Use the 'list merge requests associated with a commit' API, for speed
         # (GET /projects/:id/repository/commits/:sha/merge_requests) available for GitLab >= 10.7
         merge_request = client.commit_merge_requests(project_path, base_commit, state: :opened).first
         if (client_version >= Gem::Version.new("13.8"))

data/lib/danger/ci_source/jenkins.rb

@@ -31,7 +31,7 @@ module Danger
   #
   # #### General
   #
-  # People occasionally see issues with Danger not classing your CI runs as a PR, to give you visibilty
+  # People occasionally see issues with Danger not classing your CI runs as a PR, to give you visibility
   # the Jenkins side of Danger expects to see one of these env vars:
   # - ghprbPullId
   # - CHANGE_ID

data/lib/danger/comment_generators/gitlab_inline.md.erb

@@ -17,5 +17,5 @@
 <%= current %>
 <%# the previous line has to be aligned far to the left, otherwise markdown can break easily %>
 <%- end -%>
-<%# Add the generated_by_ as a html coment to identify comments from danger. %>
+<%# Add the generated_by_ as a html comment to identify comments from danger. %>
 <!-- "generated_by_<%= @danger_id %>" -->

data/lib/danger/danger_core/dangerfile.rb

@@ -308,7 +308,7 @@ module Danger
     private
 
     def eval_file(contents, path)
-      eval(contents, nil, path.to_s) # rubocop:disable Eval
+      eval(contents, nil, path.to_s) # rubocop:disable Security/Eval
     end
 
     def print_list(title, rows)

data/lib/danger/danger_core/plugins/dangerfile_danger_plugin.rb

@@ -132,7 +132,7 @@ module Danger
     #
     def import_dangerfile_from_path(path)
       raise "`import_dangerfile_from_path` requires a string" unless path.kind_of?(String)
-      local_path = File.join(path, "Dangerfile")
+      local_path = File.file?(path) ? path : File.join(path, "Dangerfile")
       @dangerfile.parse(Pathname.new(local_path))
     end
 

data/lib/danger/danger_core/plugins/dangerfile_local_only_plugin.rb

@@ -3,7 +3,7 @@ require "danger/plugin_support/plugin"
 # Danger
 module Danger
   # Handles interacting with local only plugin inside a Dangerfile.
-  # It is support pluggin for dry_run command and does not expose any methods.
+  # It is support plugin for dry_run command and does not expose any methods.
   # But you can still use other plugins like git
   #
   # @example Check that added lines contains agreed form of words 

data/lib/danger/request_sources/bitbucket_server.rb

@@ -9,7 +9,7 @@ module Danger
   module RequestSources
     class BitbucketServer < RequestSource
       include Danger::Helpers::CommentsHelper
-      attr_accessor :pr_json
+      attr_accessor :pr_json, :dismiss_out_of_range_messages
 
       def self.env_vars
         [
@@ -25,12 +25,14 @@ module Danger
           "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_TITLE",
           "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_DESCRIPTION",
           "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_LOGO_URL",
-          "DANGER_BITBUCKETSERVER_VERIFY_SSL"
+          "DANGER_BITBUCKETSERVER_VERIFY_SSL",
+          "DANGER_BITBUCKETSERVER_DISMISS_OUT_OF_RANGE_MESSAGES"
         ]
       end
 
       def initialize(ci_source, environment)
         self.ci_source = ci_source
+        self.dismiss_out_of_range_messages = environment["DANGER_BITBUCKETSERVER_DISMISS_OUT_OF_RANGE_MESSAGES"] == 'true'
 
         project, slug = ci_source.repo_slug.split("/")
         @api = BitbucketServerAPI.new(project, slug, ci_source.pull_request_id, environment)
@@ -58,6 +60,10 @@ module Danger
         self.pr_json = @api.fetch_pr_json
       end
 
+      def pr_diff
+        @pr_diff ||= @api.fetch_pr_diff
+      end
+
       def setup_danger_branches
         base_branch = self.pr_json[:toRef][:id].sub("refs/heads/", "")
         base_commit = self.pr_json[:toRef][:latestCommit]
@@ -134,12 +140,22 @@ module Danger
       end
 
       def main_violations_group(warnings: [], errors: [], messages: [], markdowns: [])
-        {
-          warnings: warnings.reject(&:inline?),
-          errors: errors.reject(&:inline?),
-          messages: messages.reject(&:inline?),
-          markdowns: markdowns.reject(&:inline?)
-        }
+        if dismiss_out_of_range_messages
+          {
+            warnings: warnings.reject(&:inline?),
+            errors: errors.reject(&:inline?),
+            messages: messages.reject(&:inline?),
+            markdowns: markdowns.reject(&:inline?)
+          }
+        else
+          in_diff = proc { |a| find_position_in_diff?(a.file, a.line) }
+          {
+            warnings: warnings.reject(&in_diff),
+            errors: errors.reject(&in_diff),
+            messages: messages.reject(&in_diff),
+            markdowns: markdowns.reject(&in_diff)
+          }
+        end
       end
 
       def inline_violations_group(warnings: [], errors: [], messages: [], markdowns: [])
@@ -168,6 +184,30 @@ module Danger
         puts self.pr_json.to_json
         @api.update_pr_build_status(status, changeset, build_job_link, description)
       end
+
+      def find_position_in_diff?(file, line)
+        return nil if file.nil? || line.nil?
+        return nil if file.empty?
+        added_lines(file).include?(line)
+      end
+
+      def file_diff(file)
+        self.pr_diff[:diffs].find{|diff| diff[:destination] && diff[:destination][:toString] == file } || {:hunks => []}
+      end
+
+      def added_lines(file)
+        @added_lines ||= {}
+        @added_lines[file] ||= begin
+          file_diff(file)[:hunks].map do |hunk|
+            hunk[:segments].select{|segment| segment[:type] == 'ADDED' }.map do |segment|
+              segment[:lines].map do |line|
+                line[:destination]
+              end
+            end
+          end.flatten
+        end
+      end
+
     end
   end
 end

data/lib/danger/request_sources/bitbucket_server_api.rb

@@ -43,6 +43,11 @@ module Danger
         fetch_json(uri)
       end
 
+      def fetch_pr_diff
+        uri = URI("#{pr_api_endpoint}/diff?withComments=false")
+        fetch_json(uri)
+      end
+
       def fetch_last_comments
         uri = URI("#{pr_api_endpoint}/activities?limit=1000")
         fetch_json(uri)[:values].select { |v| v[:action] == "COMMENTED" }.map { |v| v[:comment] }

data/lib/danger/request_sources/vsts.rb

@@ -195,7 +195,7 @@ module Danger
             body = generate_inline_markdown_body(m, danger_id: danger_id, template: "vsts")
           else
             # Hide the inline link behind a span
-            m.message.gsub!("\n", "<br />")
+            m.message = m.message.gsub("\n", "<br />")
             m = process_markdown(m, true)
             body = generate_inline_comment_body(emoji, m, danger_id: danger_id, template: "vsts")
             # A comment might be in previous_violations because only now it's part of the unified diff

data/lib/danger/request_sources/vsts_api.rb

@@ -28,9 +28,9 @@ module Danger
 
       def supports_comments?
         major_version = @api_version.split(".").first.to_i
-        minimun_version_for_comments = self.min_api_version_for_comments.split(".").first.to_i
+        minimum_version_for_comments = self.min_api_version_for_comments.split(".").first.to_i
 
-        major_version >= minimun_version_for_comments
+        major_version >= minimum_version_for_comments
       end
 
       def inspect

data/lib/danger/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 8.6.1
+  version: 9.1.0
 platform: ruby
 authors:
 - Orta Therox
 - Juanito Fatas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,7 @@ files:
 - lib/assets/DangerfileTemplate
 - lib/danger.rb
 - lib/danger/ci_source/appcenter.rb
+- lib/danger/ci_source/appcircle.rb
 - lib/danger/ci_source/appveyor.rb
 - lib/danger/ci_source/azure_pipelines.rb
 - lib/danger/ci_source/bamboo.rb
@@ -328,7 +329,7 @@ homepage: https://github.com/danger/danger
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -336,15 +337,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.7.6.2
+signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.
 test_files: []