danger 5.3.5 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a125bab695ff0f61f64ca3ecb36d6e63b096b9d
-  data.tar.gz: 157d76ea80c2eebe6c747cd31d4d23e39dbec3df
+  metadata.gz: 06752bbffec806b31893a0befbc36c7a9fdb2fae
+  data.tar.gz: a040e75f604c3efaa4fef0f9a4ef5525986d56f6
 SHA512:
-  metadata.gz: bf6c4041c36f6a2af052b02608f709db4fc1cb48a17b69c255ee87f9d72824a62f5058cd2aa01e4ce9f5493b43085c2371881b6d5ccbd2f5e52e5823ac993e5a
-  data.tar.gz: 3d91b2f6304630f93b8ab6819a501d659866d8f031896a9eb939ce64e5c5501cc472217cfebb457eb40dc98603309b2dd1d4bd629f915faab235304f0909d7fe
+  metadata.gz: f67e7ec2195c040f6005238e1dc522b0be4e7976972aa110b3f91c213e420436ad3dcc1ab4d720aa5dc34c0242d321d4bdb69ce3c4b41353ce25a498e0696946
+  data.tar.gz: b510818c68d7ff4a88152158f1254b84d02e9daa07c2d612c424a6b127561a2aec8b982b52786c453aa7692ca5d8d32726daba85c5c7f97062585e1938b41e95

data/lib/danger/ci_source/gitlab_ci.rb

@@ -39,7 +39,7 @@ module Danger
 
       merge_requests = client.merge_requests(project_id, state: :opened)
       merge_request = merge_requests.auto_paginate.bsearch do |mr|
-        mr.sha == base_commit
+        mr.sha >= base_commit
       end
 
       merge_request.nil? ? 0 : merge_request.iid

data/lib/danger/ci_source/vsts.rb

@@ -0,0 +1,73 @@
+require "danger/request_sources/github/github"
+require "danger/request_sources/vsts"
+
+module Danger
+  # ### CI Setup
+  #
+  # You need to go to your project's build definiton. Then add a "Command Line" Task with the "Tool" field set to  "bundle"
+  # and the "Arguments" field set to "exec danger".
+  #
+  # ### Token Setup
+  #
+  # #### GitHub
+  #
+  # You need to add the `DANGER_GITHUB_API_TOKEN` environment variable, to do this, go to your build definition's variables tab.
+  #
+  # Make sure that `DANGER_GITHUB_API_TOKEN` is not set to secret since vsts does not expose secret variables while building.
+  #
+  # #### VSTS
+  #
+  # You need to add the `DANGER_VSTS_API_TOKEN` and `DANGER_VSTS_HOST` environment variable, to do this,
+  # go to your build definition's variables tab. The `DANGER_VSTS_API_TOKEN` is your vsts personal access token.
+  # Instructions for creating a personal access token can be found [here](https://www.visualstudio.com/en-us/docs/setup-admin/team-services/use-personal-access-tokens-to-authenticate).
+  # For the `DANGER_VSTS_HOST` variable the suggested value is `$(System.TeamFoundationCollectionUri)$(System.TeamProject)`
+  # which will automatically get your vsts domain and your project name needed for the vsts api.
+  #
+  # Make sure that `DANGER_VSTS_API_TOKEN` is not set to secret since vsts does not expose secret variables while building.
+  #
+  class VSTS < CI
+    class << self
+      def github_slug(env)
+        env["BUILD_REPOSITORY_NAME"]
+      end
+
+      def vsts_slug(env)
+        project_name = env["SYSTEM_TEAMPROJECT"]
+        repo_name = env["BUILD_REPOSITORY_NAME"]
+
+        "#{project_name}/#{repo_name}"
+      end
+    end
+
+    def self.validates_as_ci?(env)
+      has_all_variables = ["SYSTEM_TEAMFOUNDATIONCOLLECTIONURI", "BUILD_REPOSITORY_PROVIDER"].all? { |x| env[x] && !env[x].empty? }
+
+      is_support_source_control = ["GitHub", "TfsGit"].include?(env["BUILD_REPOSITORY_PROVIDER"])
+
+      has_all_variables && is_support_source_control
+    end
+
+    def self.validates_as_pr?(env)
+      has_all_variables = ["BUILD_SOURCEBRANCH", "BUILD_REPOSITORY_URI", "BUILD_REASON", "BUILD_REPOSITORY_NAME"].all? { |x| env[x] && !env[x].empty? }
+
+      has_all_variables && env["BUILD_REASON"] == "PullRequest"
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [Danger::RequestSources::GitHub, Danger::RequestSources::VSTS]
+    end
+
+    def initialize(env)
+      case env["BUILD_REPOSITORY_PROVIDER"]
+      when "GitHub"
+        self.repo_slug = self.class.github_slug(env)
+      when "TfsGit"
+        self.repo_slug = self.class.vsts_slug(env)
+      end
+
+      repo_matches = env["BUILD_SOURCEBRANCH"].match(%r{refs\/pull\/([0-9]+)\/merge})
+      self.pull_request_id = repo_matches[1] unless repo_matches.nil?
+      self.repo_url = env["BUILD_REPOSITORY_URI"]
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+<%- @tables.each do |table| -%>
+  <%- if table[:content].any? || table[:resolved].any? -%>
+| | <%= table[:count] %> <%= table[:name] %><%= "s" unless table[:count] == 1 %> |
+|---|---|
+    <%- table[:content].each do |violation| -%>
+| <%= @emoji_mapper.map(table[:emoji]) %> | <%= violation.message %> |
+    <%- end -%>
+    <%- table[:resolved].each do |message| -%>
+| @emoji_mapper.map("white_check_mark") | <%= message %> |
+    <%- end -%>
+
+  <%- end -%>
+<%- end -%>
+
+<%- @markdowns.each do |current| -%>
+<%= current %>
+<%# the previous line has to be aligned far to the left, otherwise markdown can break easily %>
+<%- end -%>
+
+Generated by :no_entry_sign: [Danger](https://danger.systems/ "generated_by_<%= @danger_id %>")

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

@@ -105,6 +105,8 @@ module Danger
         :bitbucket_server
       when Danger::RequestSources::BitbucketCloud
         :bitbucket_cloud
+      when Danger::RequestSources::VSTS
+        :vsts
       else
         :unknown
       end

data/lib/danger/helpers/comments_helper.rb

@@ -56,7 +56,7 @@ module Danger
 
       def table(name, emoji, violations, all_previous_violations, template: "github")
         content = violations
-        content = content.map { |v| process_markdown(v) } unless template == "bitbucket_server"
+        content = content.map { |v| process_markdown(v) } unless ["bitbucket_server", "vsts"].include?(template)
 
         kind = table_kind_from_title(name)
         previous_violations = all_previous_violations[kind] || []

data/lib/danger/request_sources/vsts.rb

@@ -0,0 +1,106 @@
+# coding: utf-8
+
+require "danger/helpers/comments_helper"
+require "danger/request_sources/vsts_api"
+
+module Danger
+  module RequestSources
+    class VSTS < RequestSource
+      include Danger::Helpers::CommentsHelper
+      attr_accessor :pr_json
+
+      def self.env_vars
+        [
+          "DANGER_VSTS_API_TOKEN",
+          "DANGER_VSTS_HOST"
+        ]
+      end
+
+      def self.optional_env_vars
+        [
+          "DANGER_VSTS_API_VERSION"
+        ]
+      end
+
+      def initialize(ci_source, environment)
+        self.ci_source = ci_source
+        self.environment = environment
+
+        @is_vsts_git = environment["BUILD_REPOSITORY_PROVIDER"] == "TfsGit"
+
+        project, slug = ci_source.repo_slug.split("/")
+        @api = VSTSAPI.new(project, slug, ci_source.pull_request_id, environment)
+      end
+
+      def validates_as_ci?
+        @is_vsts_git
+      end
+
+      def validates_as_api_source?
+        @api.credentials_given?
+      end
+
+      def scm
+        @scm ||= GitRepo.new
+      end
+
+      def host
+        @host ||= @api.host
+      end
+
+      def fetch_details
+        self.pr_json = @api.fetch_pr_json
+      end
+
+      def setup_danger_branches
+        base_commit = self.pr_json[:lastMergeTargetCommit][:commitId]
+        head_commit = self.pr_json[:lastMergeSourceCommit][:commitId]
+
+        # Next, we want to ensure that we have a version of the current branch at a known location
+        scm.ensure_commitish_exists! base_commit
+        self.scm.exec "branch #{EnvironmentManager.danger_base_branch} #{base_commit}"
+
+        # OK, so we want to ensure that we have a known head branch, this will always represent
+        # the head of the PR ( e.g. the most recent commit that will be merged. )
+        scm.ensure_commitish_exists! head_commit
+        self.scm.exec "branch #{EnvironmentManager.danger_head_branch} #{head_commit}"
+      end
+
+      def organisation
+        nil
+      end
+
+      def update_pull_request!(warnings: [], errors: [], messages: [], markdowns: [], danger_id: "danger", new_comment: false)
+        unless @api.supports_comments?
+          return
+        end
+
+        comment = generate_description(warnings: warnings, errors: errors)
+        comment += "\n\n"
+        comment += generate_comment(warnings: warnings,
+                                     errors: errors,
+                                   messages: messages,
+                                  markdowns: markdowns,
+                        previous_violations: {},
+                                  danger_id: danger_id,
+                                   template: "vsts")
+        if new_comment
+          @api.post_comment(comment)
+        else
+          update_old_comment(comment, danger_id: danger_id)
+        end
+      end
+
+      def update_old_comment(new_comment, danger_id: "danger")
+        @api.fetch_last_comments.each do |c|
+          thread_id = c[:id]
+          comment = c[:comments].first
+          comment_id = comment[:id]
+          comment_content = comment[:content].nil? ? "" : comment[:content]
+
+          @api.update_comment(thread_id, comment_id, new_comment) if comment_content.include?("generated_by_#{danger_id}")
+        end
+      end
+    end
+  end
+end

data/lib/danger/request_sources/vsts_api.rb

@@ -0,0 +1,138 @@
+# coding: utf-8
+
+require "base64"
+require "danger/helpers/comments_helper"
+
+module Danger
+  module RequestSources
+    class VSTSAPI
+      attr_accessor :host, :pr_api_endpoint, :min_api_version_for_comments
+
+      def initialize(_project, slug, pull_request_id, environment)
+        self.min_api_version_for_comments = "3.0"
+
+        user_name = ""
+        personal_access_token = environment["DANGER_VSTS_API_TOKEN"]
+
+        @token = Base64.strict_encode64("#{user_name}:#{personal_access_token}")
+        @api_version = environment["DANGER_VSTS_API_VERSION"] ||= self.min_api_version_for_comments
+
+        self.host = environment["DANGER_VSTS_HOST"]
+        if self.host && !(self.host.include? "http://") && !(self.host.include? "https://")
+          self.host = "https://" + self.host
+        end
+
+        self.pr_api_endpoint = "#{host}/_apis/git/repositories/#{slug}/pullRequests/#{pull_request_id}"
+      end
+
+      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
+
+        major_version >= minimun_version_for_comments
+      end
+
+      def inspect
+        inspected = super
+
+        if @token
+          inspected = inspected.sub! @token, "********".freeze
+        end
+
+        inspected
+      end
+
+      def credentials_given?
+        @token && !@token.empty?
+      end
+
+      def fetch_pr_json
+        uri = URI("#{pr_api_endpoint}?api-version=#{@api_version}")
+        fetch_json(uri)
+      end
+
+      def fetch_last_comments
+        uri = URI("#{pr_api_endpoint}/threads?api-version=#{@api_version}")
+        fetch_json(uri)[:value]
+      end
+
+      def post_comment(text)
+        uri = URI("#{pr_api_endpoint}/threads?api-version=#{@api_version}")
+        body = {
+          "comments" => [
+            {
+              "parentCommentId" => 0,
+              "content" => text,
+              "commentType" => 1
+            }
+          ],
+          "properties" => {
+            "Microsoft.TeamFoundation.Discussion.SupportsMarkdown" => {
+              "type" => "System.Int32",
+              "value" => 1
+            }
+          },
+          "status" => 1
+        }.to_json
+        post(uri, body)
+      end
+
+      def update_comment(thread, id, new_comment)
+        uri = URI("#{pr_api_endpoint}/threads/#{thread}/comments/#{id}?api-version=#{@api_version}")
+        body = {
+          "content" => new_comment
+        }.to_json
+        patch(uri, body)
+      end
+
+      private
+
+      def use_ssl
+        return self.pr_api_endpoint.include? "https://"
+      end
+
+      def fetch_json(uri)
+        req = Net::HTTP::Get.new(uri.request_uri, { "Content-Type" => "application/json", "Authorization" => "Basic #{@token}" })
+        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: use_ssl) do |http|
+          http.request(req)
+        end
+        JSON.parse(res.body, symbolize_names: true)
+      end
+
+      def post(uri, body)
+        req = Net::HTTP::Post.new(uri.request_uri, { "Content-Type" => "application/json", "Authorization" => "Basic #{@token}" })
+        req.body = body
+
+        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: use_ssl) do |http|
+          http.request(req)
+        end
+
+        # show error to the user when VSTS returned an error
+        case res
+        when Net::HTTPClientError, Net::HTTPServerError
+          # HTTP 4xx - 5xx
+          abort "\nError posting comment to VSTS: #{res.code} (#{res.message})\n\n"
+        end
+      end
+
+      def patch(uri, body)
+        puts uri
+        puts body
+
+        req = Net::HTTP::Patch.new(uri.request_uri, { "Content-Type" => "application/json", "Authorization" => "Basic #{@token}" })
+        req.body = body
+
+        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: use_ssl) do |http|
+          http.request(req)
+        end
+
+        # show error to the user when VSTS returned an error
+        case res
+        when Net::HTTPClientError, Net::HTTPServerError
+          # HTTP 4xx - 5xx
+          abort "\nError updating comment on VSTS: #{res.code} (#{res.message})\n\n"
+        end
+      end
+    end
+  end
+end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.3.5".freeze
+  VERSION = "5.4.0".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.5
+  version: 5.4.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -399,6 +399,7 @@ files:
 - lib/danger/ci_source/surf.rb
 - lib/danger/ci_source/teamcity.rb
 - lib/danger/ci_source/travis.rb
+- lib/danger/ci_source/vsts.rb
 - lib/danger/ci_source/xcode_server.rb
 - lib/danger/clients/rubygems_client.rb
 - lib/danger/commands/dangerfile/gem.rb
@@ -419,6 +420,7 @@ files:
 - lib/danger/comment_generators/github.md.erb
 - lib/danger/comment_generators/github_inline.md.erb
 - lib/danger/comment_generators/gitlab.md.erb
+- lib/danger/comment_generators/vsts.md.erb
 - lib/danger/core_ext/file_list.rb
 - lib/danger/core_ext/string.rb
 - lib/danger/danger_core/dangerfile.rb
@@ -459,6 +461,8 @@ files:
 - lib/danger/request_sources/gitlab.rb
 - lib/danger/request_sources/request_source.rb
 - lib/danger/request_sources/support/get_ignored_violation.rb
+- lib/danger/request_sources/vsts.rb
+- lib/danger/request_sources/vsts_api.rb
 - lib/danger/scm_source/git_repo.rb
 - lib/danger/version.rb
 homepage: https://github.com/danger/danger