danger 8.2.1 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3930680bc519ec86948df5375ea6ffad444929619c7faf3190e204eee827767b
-  data.tar.gz: 6ca8c826a895e9d0ef6bf66343e70110026a8a77fafddc6e72f26b129c37801d
+  metadata.gz: ffff51d2ba87391b59163fab3e28e65c45c6bd4bbdcd00055aaebbe00e409937
+  data.tar.gz: 03da4383110a4a4342e007da66df17de7fc658a5b0490e669c969f5d92827cb5
 SHA512:
-  metadata.gz: '0267983777b8a27f5d90f6221655d18657a0c4ed6276e475631e4984eabbe2f5329ec8df774100052dfd1e6368082b9865fd1bd87956b538fa032042f1e1538d'
-  data.tar.gz: 700097f2571dd5cb9cac5b9f74d034a53a00e73f747d3aa489cb9cae83b86b85908281a3c910bec25a2299fd828449c9eb82f796d8865f84a0742a46488d2dd3
+  metadata.gz: bee965c2c6bd5eebc756894c1eb6cfbb750c2b9a50e4b81f54af83fc2ac8916d4b76c49b98a95153c2f9e6a4447a4943ca195f4d3d555fde098d93cd3fb3899d
+  data.tar.gz: dec6c9a3b90fbc27d6389795d1836ea1b4d2c25428dd4b467f18879b550158754195fc068ce90ab400f9e8865033efa175d89629196d8572a405bafedf8ce5b4

data/lib/danger/ci_source/azure_pipelines.rb

@@ -19,7 +19,11 @@ module Danger
   #
   class AzurePipelines < CI
     def self.validates_as_ci?(env)
-      env.key? "AGENT_ID"
+      # AGENT_ID is being used by AppCenter as well, so checking here to make sure AppCenter CI doesn't get a false positive for AzurePipelines
+      # Anyone working with AzurePipelines could provide a better/truly unique env key to avoid checking for AppCenter
+      !Danger::Appcenter::validates_as_ci?(env) &&
+      env.key?("AGENT_ID") &&
+      env["BUILD_REPOSITORY_PROVIDER"] != "TfsGit"
     end
 
     def self.validates_as_pr?(env)

data/lib/danger/ci_source/codemagic.rb

@@ -0,0 +1,58 @@
+# https://docs.codemagic.io/building/environment-variables/
+
+module Danger
+  # ### CI Setup
+  #
+  # Add a script step to your workflow:
+  #
+  # ```
+  # - name: Running Danger
+  #   script: |
+  #     bundle install
+  #     bundle exec danger
+  # ```
+  #
+  # ### Token Setup
+  #
+  # Add the following environment variables to your workflow's environment configuration.
+  # https://docs.codemagic.io/getting-started/yaml/
+  #
+  # #### GitHub
+  # Add the `DANGER_GITHUB_API_TOKEN` to your build user's ENV.
+  #
+  # #### GitLab
+  # Add the `DANGER_GITLAB_API_TOKEN` to your build user's ENV.
+  #
+  # #### Bitbucket Cloud
+  # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+  # to your build user's ENV.
+  #
+  # #### Bitbucket server
+  # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+  # and `DANGER_BITBUCKETSERVER_HOST` to your build user's ENV.
+  #
+  class Codemagic < CI
+    def self.validates_as_ci?(env)
+      env.key? "FCI_PROJECT_ID"
+    end
+
+    def self.validates_as_pr?(env)
+      return !env["FCI_PULL_REQUEST_NUMBER"].to_s.empty?
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab,
+        Danger::RequestSources::BitbucketServer,
+        Danger::RequestSources::BitbucketCloud
+      ]
+    end
+
+    def initialize(env)
+      self.pull_request_id = env["FCI_PULL_REQUEST_NUMBER"]
+      self.repo_slug = env["FCI_REPO_SLUG"]
+      self.repo_url = GitRepo.new.origins # Codemagic doesn't provide a repo url env variable for n
+    end
+  end
+end

data/lib/danger/ci_source/gitlab_ci.rb

@@ -46,10 +46,17 @@ module Danger
       base_commit = env["CI_COMMIT_SHA"]
       client = RequestSources::GitLab.new(nil, env).client
 
-      if (Gem::Version.new(client.version.version) >= Gem::Version.new("10.7"))
+      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
         # (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"))
+          # Gitlab 13.8.0 started returning merge requests for merge commits and squashed commits
+          # By checking for merge_request.state, we can ensure danger only comments on MRs which are open
+          return 0 if merge_request.nil?
+          return 0 unless merge_request.state == "opened"
+        end
       else
         merge_requests = client.merge_requests(project_path, state: :opened)
         merge_request = merge_requests.auto_paginate.find do |mr|

data/lib/danger/ci_source/jenkins.rb

@@ -133,7 +133,7 @@ module Danger
           matches = change_url.match(%r{(.+)\/pull\/[0-9]+})
           matches[1] unless matches.nil?
         when %r{\/merge_requests\/} # GitLab
-          matches = change_url.match(%r{(.+)\/merge_requests\/[0-9]+})
+          matches = change_url.match(%r{(.+?)(\/-)?\/merge_requests\/[0-9]+})
           matches[1] unless matches.nil?
         when %r{\/pull-requests\/} # Bitbucket
           matches = change_url.match(%r{(.+)\/pull-requests\/[0-9]+})

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

@@ -1,17 +1,19 @@
-class Commits
-  def initialize(base_head)
-    @base_head = base_head.strip.split(" ".freeze)
-  end
+module Danger
+  class Commits
+    def initialize(base_head)
+      @base_head = base_head.strip.split(" ".freeze)
+    end
 
-  def base
-    base_head.first
-  end
+    def base
+      base_head.first
+    end
 
-  def head
-    base_head.last
-  end
+    def head
+      base_head.last
+    end
 
-  private
+    private
 
-  attr_reader :base_head
+    attr_reader :base_head
+  end
 end

data/lib/danger/ci_source/xcode_cloud.rb

@@ -0,0 +1,38 @@
+module Danger
+  # ### CI Setup
+  #
+  # In order to work with Xcode Cloud and Danger, you will need to add `bundle exec danger` to 
+  # the `ci_scripts/ci_post_xcodebuild.sh` (Xcode Cloud's expected filename for a post-action build script).
+  # More details and documentation on Xcode Cloud configuration can be found [here](https://developer.apple.com/documentation/xcode/writing-custom-build-scripts).
+  # 
+  # ### Token Setup
+  #
+  # You will need to add the `DANGER_GITHUB_API_TOKEN` to your build environment. 
+  # If running on GitHub Enterprise, make sure you also set the expected values for 
+  # both `DANGER_GITHUB_API_HOST` and `DANGER_GITHUB_HOST`.
+  #  
+  class XcodeCloud < CI
+    def self.validates_as_ci?(env)
+      env.key? "CI_XCODEBUILD_ACTION"
+    end
+
+    def self.validates_as_pr?(env)
+      env.key? "CI_PULL_REQUEST_NUMBER"
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab, 
+        Danger::RequestSources::BitbucketCloud, 
+        Danger::RequestSources::BitbucketServer
+      ]
+    end
+
+    def initialize(env)
+      self.repo_slug = env["CI_PULL_REQUEST_SOURCE_REPO"]
+      self.pull_request_id = env["CI_PULL_REQUEST_NUMBER"]
+      self.repo_url = env["CI_PULL_REQUEST_HTML_URL"]
+    end
+  end
+end

data/lib/danger/commands/dangerfile/init.rb

@@ -4,7 +4,7 @@ require "danger/danger_core/dangerfile_generator"
 
 module Danger
   class DangerfileCommand < Runner
-    self.summary = "Easily create you Dangerfiles."
+    self.summary = "Easily create your Dangerfiles."
     self.command = "dangerfile"
 
     self.abstract_command = true

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

@@ -17,10 +17,5 @@
 <%= current %>
 <%# the previous line has to be aligned far to the left, otherwise markdown can break easily %>
 <%- end -%>
-<%# We need to add the generated_by_ to identify comments from danger. But with inlines %>
-<%# it might be a little annoying, so we set on the table, but if we have markdown we add the footer anyway %>
-<%- if @markdowns.count > 0 -%>
-<p align="right" data-meta="generated_by_<%= @danger_id %>">
-  Generated by :no_entry_sign: <a href="http://danger.systems/">Danger</a>
-</p>
-<%- end -%>
+<%# Add the generated_by_ as a html coment to identify comments from danger. %>
+<!-- "generated_by_<%= @danger_id %>" -->

data/lib/danger/danger_core/dangerfile.rb

@@ -49,22 +49,26 @@ module Danger
     # However, as we're using using them in the DSL, they won't
     # get method_missing called correctly without overriding them.
 
-    def warn(*args, &blk)
-      method_missing(:warn, *args, &blk)
+    def warn(*args, **kargs, &blk)
+      method_missing(:warn, *args, **kargs, &blk)
     end
 
-    def fail(*args, &blk)
-      method_missing(:fail, *args, &blk)
+    def fail(*args, **kargs, &blk)
+      method_missing(:fail, *args, **kargs, &blk)
     end
 
     # When an undefined method is called, we check to see if it's something
     # that the core DSLs have, then starts looking at plugins support.
 
     # rubocop:disable Style/MethodMissing
-    def method_missing(method_sym, *arguments, &_block)
+    def method_missing(method_sym, *arguments, **keyword_arguments, &_block)
       @core_plugins.each do |plugin|
         if plugin.public_methods(false).include?(method_sym)
-          return plugin.send(method_sym, *arguments)
+          if keyword_arguments.empty?
+            return plugin.send(method_sym, *arguments)
+          else
+            return plugin.send(method_sym, *arguments, **keyword_arguments)
+          end
         end
       end
       super

data/lib/danger/danger_core/environment_manager.rb

@@ -90,6 +90,8 @@ module Danger
         RequestSources::GitLab
       elsif repo_url =~ /bitbucket\.(org|com)/i
         RequestSources::BitbucketCloud
+      elsif repo_url =~ /dev\.azure\.com/i
+        RequestSources::VSTS
       end
     end
 

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

@@ -143,6 +143,14 @@ module Danger
       @github.issue_json["labels"].map { |l| l[:name] }
     end
 
+    # @!group PR Metadata
+    # Whether the PR is a Draft.
+    # @return [Boolean]
+    #
+    def pr_draft?
+      pr_json["mergeable_state"] == "draft"
+    end
+
     # @!group PR Commit Metadata
     # The branch to which the PR is going to be merged into.
     # @return [String]

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

@@ -131,6 +131,22 @@ module Danger
       @gitlab.mr_diff
     end
 
+    # @!group MR Changes
+    # The array of changes
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    #
+    def mr_changes
+      @gitlab.mr_changes.changes
+    end
+
+    # @!group MR Closes issues
+    # The array of issues that this MR closes
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    #
+    def mr_closes_issues
+      @gitlab.mr_closes_issues
+    end
+
     # @!group MR Commit Metadata
     # The branch to which the MR is going to be merged into
     # @deprecated Please use {#branch_for_base} instead

data/lib/danger/helpers/comments_helper.rb

@@ -148,7 +148,7 @@ module Danger
       def generate_description(warnings: nil, errors: nil, template: "github")
         emoji_mapper = EmojiMapper.new(template)
         if errors.empty? && warnings.empty?
-          return "All green. #{random_compliment}"
+          return ENV['DANGER_SUCCESS_MESSAGE'] || "All green. #{random_compliment}"
         else
           message = "#{emoji_mapper.map('warning')} "
           message += "#{'Error'.danger_pluralize(errors.count)}. " unless errors.empty?

data/lib/danger/plugin_support/plugin.rb

@@ -19,8 +19,12 @@ module Danger
     # We need to redirect the self calls to the Dangerfile
 
     # rubocop:disable Style/MethodMissing
-    def method_missing(method_sym, *arguments, &block)
-      @dangerfile.send(method_sym, *arguments, &block)
+    def method_missing(method_sym, *arguments, **keyword_arguments, &block)
+      if keyword_arguments.empty?
+        @dangerfile.send(method_sym, *arguments, &block)
+      else
+        @dangerfile.send(method_sym, *arguments, **keyword_arguments, &block)
+      end
     end
 
     def self.all_plugins

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -95,12 +95,13 @@ module Danger
         "#{base_url(2)}/#{pull_request_id}"
       end
 
-      def prs_api_endpoint(branch_name)
-        "#{base_url(2)}?q=source.branch.name=\"#{branch_name}\""
+      def prs_api_url(branch_name)
+        encoded_branch_name = URI.encode_www_form_component(branch_name)
+        "#{base_url(2)}?q=source.branch.name=\"#{encoded_branch_name}\""
       end
 
       def fetch_pr_from_branch(branch_name)
-        uri = URI(URI.escape(prs_api_endpoint(branch_name)))
+        uri = URI(prs_api_url(branch_name))
         fetch_json(uri)[:values][0][:id]
       end
 

data/lib/danger/request_sources/gitlab.rb

@@ -85,7 +85,7 @@ module Danger
           if supports_inline_comments
             @raw_comments = mr_discussions
               .auto_paginate
-              .flat_map { |discussion| discussion.notes.map { |note| note.merge({"discussion_id" => discussion.id}) } }
+              .flat_map { |discussion| discussion.notes.map { |note| note.to_h.merge({"discussion_id" => discussion.id}) } }
             @raw_comments
               .map { |comment| Comment.from_gitlab(comment) }
           else
@@ -130,6 +130,12 @@ module Danger
         end
       end
 
+      def mr_closes_issues
+        @mr_closes_issues ||= begin
+          client.merge_request_closes_issues(ci_source.repo_slug, ci_source.pull_request_id)
+        end
+      end
+
       def setup_danger_branches
         # we can use a GitLab specific feature here:
         base_branch = self.mr_json.source_branch
@@ -359,7 +365,7 @@ module Danger
       def submit_inline_comments!(warnings: [], errors: [], messages: [], markdowns: [], previous_violations: [], danger_id: "danger")
         comments = mr_discussions
           .auto_paginate
-          .flat_map { |discussion| discussion.notes.map { |note| note.merge({"discussion_id" => discussion.id}) } }
+          .flat_map { |discussion| discussion.notes.map { |note| note.to_h.merge({"discussion_id" => discussion.id}) } }
           .select { |comment| Comment.from_gitlab(comment).inline? }
 
         danger_comments = comments.select { |comment| Comment.from_gitlab(comment).generated_by_danger?(danger_id) }
@@ -410,7 +416,7 @@ module Danger
           next false unless m.file && m.line
           # Reject if it's out of range and in dismiss mode
           next true if dismiss_out_of_range_messages_for(kind) && is_out_of_range(mr_changes.changes, m)
-          
+
           # Once we know we're gonna submit it, we format it
           if is_markdown_content
             body = generate_inline_markdown_body(m, danger_id: danger_id, template: "gitlab")
@@ -531,10 +537,10 @@ module Danger
       end
 
       def is_out_of_range(changes, message)
-        change = changes.find { |c| c["new_path"] == message.file }  
+        change = changes.find { |c| c["new_path"] == message.file }
         # If there is no changes or rename only or deleted, return out of range.
         return true if change.nil? || change["diff"].empty? || change["deleted_file"]
-        
+
         # If new file then return in range
         return false if change["new_file"]
 
@@ -544,7 +550,7 @@ module Danger
         return true
       end
 
-      def generate_addition_lines(diff) 
+      def generate_addition_lines(diff)
         range_header_regexp = /@@ -(?<old>[0-9]+)(,([0-9]+))? \+(?<new>[0-9]+)(,([0-9]+))? @@.*/
         addition_lines = []
         line_number = 0

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "8.2.1".freeze
+  VERSION = "8.4.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.2.1
+  version: 8.4.0
 platform: ruby
 authors:
 - Orta Therox
 - Juanito Fatas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -147,16 +147,22 @@ dependencies:
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: cork
   requirement: !ruby/object:Gem::Requirement
@@ -213,6 +219,7 @@ files:
 - lib/danger/ci_source/cirrus.rb
 - lib/danger/ci_source/code_build.rb
 - lib/danger/ci_source/codefresh.rb
+- lib/danger/ci_source/codemagic.rb
 - lib/danger/ci_source/codeship.rb
 - lib/danger/ci_source/concourse.rb
 - lib/danger/ci_source/dotci.rb
@@ -237,6 +244,7 @@ files:
 - lib/danger/ci_source/teamcity.rb
 - lib/danger/ci_source/travis.rb
 - lib/danger/ci_source/vsts.rb
+- lib/danger/ci_source/xcode_cloud.rb
 - lib/danger/ci_source/xcode_server.rb
 - lib/danger/clients/rubygems_client.rb
 - lib/danger/commands/dangerfile/gem.rb
@@ -319,7 +327,7 @@ homepage: https://github.com/danger/danger
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -334,8 +342,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.
 test_files: []