danger 5.3.3 → 5.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c4f4e43ea259c3203e6be2c3990d24e64b1eb87
-  data.tar.gz: 8a78dfd71a3b65200988fe21e7fab9ee2a6da163
+  metadata.gz: fd328f55fb2fe6ee6a1e0620c24e030dbb6186ca
+  data.tar.gz: ce734963c70c59a01bc08d615a01a1e398a484a0
 SHA512:
-  metadata.gz: 611c401f519dec25f89a8ea35cb5b21cb48c618690c8595b2788b91b00e1b2c8d5585a191a2cc2551a8c43992116af841767b009c590963926fb4b2edc930fcf
-  data.tar.gz: 4b8e80af258bd44d48f1cfed63559a0405d1fdda0d0ad5d35eb6e73fe1e46c77d5dee0be3c887276dad1cab498e1660f48a01906800ea6f56299d3822be9611f
+  metadata.gz: cb16654b5163a1852a4ef3a371c799398fdd1d84944da4de149ba9ba4b2cdcf492500713ba51558469fe2a23e0324fa5a6f0186037ef3497671b2bd12d67fa1f
+  data.tar.gz: 15f2f3a72bce7776860936abd2a2e3dd0b1bc43a3b3d84fc2baf2a0bce40a265f75e79b6fb3ac1ed13dc9865f6662942b09bd1e34713f5a4fbcc6ae77b52bffc

data/lib/danger/ci_source/bitrise.rb

@@ -6,13 +6,15 @@ module Danger
   # ### CI Setup
   #
   # Add a script step to your workflow:
-  # ``` yml
+  #
+  # ```yml
   # - script@1.1.2:
   #     inputs:
   #    - content: |-
   #        bundle install
   #        bundle exec danger
   # ```
+  #
   # ### Token Setup
   #
   # Add the `DANGER_GITHUB_API_TOKEN` to your workflow's App Env Vars.

data/lib/danger/ci_source/buddybuild.rb

@@ -1,35 +1,62 @@
 module Danger
   # ### CI Setup
   #
-  # Buddybuild has an integration for Danger already built-in.
-  # What you need to do is to upload your `Gemfile` and `Dangerfile` to
-  # the server and you should be all set-up. However, if you want to use
-  # different bot for Danger, you can do it with token setup described below.
+  # Read how you can setup Danger on the buddybuild blog:
+  # https://www.buddybuild.com/blog/using-danger-with-buddybuild/
   #
   # ### Token Setup
   #
   # Login to buddybuild and select your app. Go to your *App Settings* and
   # in the *Build Settings* menu on the left, choose *Environment Variables*.
+  # http://docs.buddybuild.com/docs/environment-variables
   #
   # #### 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.
+  #
+  # ### Running Danger
+  #
+  # Once the environment variables are all available, create a custom build step
+  # to run Danger as part of your build process:
+  # http://docs.buddybuild.com/docs/custom-prebuild-and-postbuild-steps
   class Buddybuild < CI
-    def self.validates_as_ci?(_)
-      false
+    #######################################################################
+    def self.validates_as_ci?(env)
+      value = env["BUDDYBUILD_BUILD_ID"]
+      return !value.nil? && !env["BUDDYBUILD_BUILD_ID"].empty?
     end
 
-    def self.validates_as_pr?(_)
-      false
+    #######################################################################
+    def self.validates_as_pr?(env)
+      value = env["BUDDYBUILD_PULL_REQUEST"]
+      return !value.nil? && !env["BUDDYBUILD_PULL_REQUEST"].empty?
     end
 
-    def initialize(_) end
-
+    #######################################################################
     def supported_request_sources
-      @supported_request_sources ||= []
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab,
+        Danger::RequestSources::BitbucketServer,
+        Danger::RequestSources::BitbucketCloud
+      ]
+    end
+
+    #######################################################################
+    def initialize(env)
+      self.repo_slug = env["BUDDYBUILD_REPO_SLUG"]
+      self.pull_request_id = env["BUDDYBUILD_PULL_REQUEST"]
+      self.repo_url = GitRepo.new.origins # Buddybuild doesn't provide a repo url env variable for now
     end
   end
 end

data/lib/danger/ci_source/gitlab_ci.rb

@@ -4,30 +4,54 @@ require "danger/request_sources/gitlab"
 
 module Danger
   # ### CI Setup
-  # GitLab CI is currently not supported because GitLab's runners don't expose
-  # the required values in the environment. Namely CI_MERGE_REQUEST_ID does not
-  # exist as of yet, however there is an
-  # [MR](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5698) fixing this.
-  # If that has been merged and you are using either gitlab.com or a release
-  # with that change this CISource will work.
   #
+  # Install dependencies and add a danger step to your .gitlab-ci.yml:
+  # ``` yml
+  # before_script:
+  #  - bundle install
+  # danger:
+  #   script:
+  #    - bundle exec danger
+  # ```
+  # ### Token Setup
+  #
+  # Add the `DANGER_GITHUB_API_TOKEN` to your pipeline env variables.
   class GitLabCI < CI
     def self.validates_as_ci?(env)
       env.key? "GITLAB_CI"
     end
 
     def self.validates_as_pr?(env)
-      exists = ["CI_MERGE_REQUEST_ID", "CI_PROJECT_ID", "GITLAB_CI"].all? { |x| env[x] }
-      exists && env["CI_MERGE_REQUEST_ID"].to_i > 0
+      exists = [
+        "GITLAB_CI", "CI_PROJECT_ID"
+      ].all? { |x| env[x] }
+
+      exists && determine_merge_request_id(env).to_i > 0
     end
 
-    def supported_request_sources
-      @supported_request_sources ||= [Danger::RequestSources::GitLab]
+    def self.determine_merge_request_id(env)
+      return env["CI_MERGE_REQUEST_ID"] if env["CI_MERGE_REQUEST_ID"]
+      return 0 unless env["CI_COMMIT_SHA"]
+
+      project_id = env["CI_PROJECT_ID"]
+      base_commit = env["CI_COMMIT_SHA"]
+      client = RequestSources::GitLab.new(nil, env).client
+
+      merge_requests = client.merge_requests(project_id, state: :opened)
+      merge_request = merge_requests.auto_paginate.bsearch do |mr|
+        mr.sha == base_commit
+      end
+
+      merge_request.nil? ? 0 : merge_request.iid
     end
 
     def initialize(env)
       self.repo_slug = env["CI_PROJECT_ID"]
-      self.pull_request_id = env["CI_MERGE_REQUEST_ID"]
+      self.pull_request_id = self.class.determine_merge_request_id(env)
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [Danger::RequestSources::GitLab]
     end
   end
 end

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

@@ -12,6 +12,14 @@ module Danger
   # when `true` means that the message will be crossed out instead of being removed.
   # If it's not called again on subsequent runs.
   #
+  # Each of `message`, `warn`, `fail` and `markdown` support multiple passed arguments
+  # @example
+  #
+  # message 'Hello', 'World', file: "Dangerfile", line: 1
+  # warn ['This', 'is', 'warning'], file: "Dangerfile", line: 1
+  # fail 'Ooops', 'bad bad error', sticky: false
+  # markdown '# And', '# Even', '# Markdown', file: "Dangerfile", line: 1
+  #
   # By default, using `fail` would fail the corresponding build. Either via an API call, or
   # via the return value for the danger command. If you have linters with errors for this call
   # you can use `messaging.fail` instead.
@@ -26,6 +34,8 @@ module Danger
   # @example Failing a build
   #
   #          fail "This build didn't pass tests"
+  #          fail "Ooops!", "Something bad happend"
+  #          fail ["This is example", "with array"]
   #
   # @example Failing a build, and note that on subsequent runs
   #
@@ -34,6 +44,8 @@ module Danger
   # @example Passing a warning
   #
   #          warn "This build didn't pass linting"
+  #          warn "Hm...", "This is not really good"
+  #          warn ["Multiple warnings", "via array"]
   #
   # @example Displaying a markdown table
   #
@@ -43,6 +55,9 @@ module Danger
   #          message << "20 | No documentation | Error \n"
   #          markdown message
   #
+  #          markdown "### First issue", "### Second issue"
+  #          markdown ["### First issue", "### Second issue"]
+  #
   # @example Adding an inline warning to a file
   #
   #          warn("You shouldn't use puts in your Dangerfile", file: "Dangerfile", line: 10)
@@ -72,7 +87,7 @@ module Danger
     # @!group Core
     # Print markdown to below the table
     #
-    # @param    [String] message
+    # @param    [String, Array<String>] message
     #           The markdown based message to be printed below the table
     # @param    [String] file
     #           Optional. Path to the file that the message is for.
@@ -80,14 +95,19 @@ module Danger
     #           Optional. The line in the file to present the message in.
     # @return   [void]
     #
-    def markdown(message, file: nil, line: nil)
-      @markdowns << Markdown.new(message, file, line)
+    def markdown(*markdowns, **options)
+      file = options.fetch(:file, nil)
+      line = options.fetch(:line, nil)
+
+      markdowns.flatten.each do |markdown|
+        @markdowns << Markdown.new(markdown, file, line)
+      end
     end
 
     # @!group Core
     # Print out a generate message on the PR
     #
-    # @param    [String] message
+    # @param    [String, Array<String> message
     #           The message to present to the user
     # @param    [Boolean] sticky
     #           Whether the message should be kept after it was fixed,
@@ -98,14 +118,20 @@ module Danger
     #           Optional. The line in the file to present the message in.
     # @return   [void]
     #
-    def message(message, sticky: false, file: nil, line: nil)
-      @messages << Violation.new(message, sticky, file, line)
+    def message(*messages, **options)
+      sticky = options.fetch(:sticky, false)
+      file = options.fetch(:file, nil)
+      line = options.fetch(:line, nil)
+
+      messages.flatten.each do |message|
+        @messages << Violation.new(message, sticky, file, line)
+      end
     end
 
     # @!group Core
     # Specifies a problem, but not critical
     #
-    # @param    [String] message
+    # @param    [String, Array<String> message
     #           The message to present to the user
     # @param    [Boolean] sticky
     #           Whether the message should be kept after it was fixed,
@@ -116,15 +142,21 @@ module Danger
     #           Optional. The line in the file to present the message in.
     # @return   [void]
     #
-    def warn(message, sticky: false, file: nil, line: nil)
-      return if should_ignore_violation(message)
-      @warnings << Violation.new(message, sticky, file, line)
+    def warn(*warnings, **options)
+      sticky = options.fetch(:sticky, false)
+      file = options.fetch(:file, nil)
+      line = options.fetch(:line, nil)
+
+      warnings.flatten.each do |warning|
+        next if should_ignore_violation(warning)
+        @warnings << Violation.new(warning, sticky, file, line)
+      end
     end
 
     # @!group Core
     # Declares a CI blocking error
     #
-    # @param    [String] message
+    # @param    [String, Array<String> message
     #           The message to present to the user
     # @param    [Boolean] sticky
     #           Whether the message should be kept after it was fixed,
@@ -135,9 +167,15 @@ module Danger
     #           Optional. The line in the file to present the message in.
     # @return   [void]
     #
-    def fail(message, sticky: false, file: nil, line: nil)
-      return if should_ignore_violation(message)
-      @errors << Violation.new(message, sticky, file, line)
+    def fail(*failures, **options)
+      sticky = options.fetch(:sticky, false)
+      file = options.fetch(:file, nil)
+      line = options.fetch(:line, nil)
+
+      failures.flatten.each do |failure|
+        next if should_ignore_violation(failure)
+        @errors << Violation.new(failure, sticky, file, line)
+      end
     end
 
     # @!group Reporting

data/lib/danger/request_sources/gitlab.rb

@@ -33,10 +33,7 @@ module Danger
         # The require happens inline so that it won't cause exceptions when just using the `danger` gem.
         require "gitlab"
 
-        params = { private_token: token }
-        params[:endpoint] = endpoint
-
-        @client ||= Gitlab.client(params)
+        @client ||= Gitlab.client(endpoint: endpoint, private_token: token)
       rescue LoadError
         puts "The GitLab gem was not installed, you will need to change your Gem from `danger` to `danger-gitlab`.".red
         puts "\n - See https://github.com/danger/danger/blob/master/CHANGELOG.md#400"
@@ -52,7 +49,8 @@ module Danger
       end
 
       def endpoint
-        @endpoint ||= @environment["DANGER_GITLAB_API_BASE_URL"] || "https://gitlab.com/api/v3"
+        @endpoint ||= @environment["DANGER_GITLAB_API_BASE_URL"] ||
+                      "https://gitlab.com/api/v4"
       end
 
       def host
@@ -135,7 +133,10 @@ module Danger
           else
             original_id = editable_comments.first.id
             client.edit_merge_request_comment(
-              ci_source.repo_slug, ci_source.pull_request_id, original_id, body
+              ci_source.repo_slug,
+              ci_source.pull_request_id,
+              original_id,
+              { body: body }
             )
           end
         end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.3.3".freeze
+  VERSION = "5.3.4".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: 5.3.3
+  version: 5.3.4
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide