danger 9.1.0 → 9.2.0

data/lib/danger/request_sources/gitlab.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require "uri"
 require "danger/helpers/comments_helper"
 require "danger/helpers/comment"
@@ -72,20 +71,18 @@ module Danger
       def mr_comments
         # @raw_comments contains what we got back from the server.
         # @comments contains Comment objects (that have less information)
-        @comments ||= begin
-          if supports_inline_comments
-            @raw_comments = mr_discussions
-              .auto_paginate
-              .flat_map { |discussion| discussion.notes.map { |note| note.to_h.merge({"discussion_id" => discussion.id}) } }
-            @raw_comments
-              .map { |comment| Comment.from_gitlab(comment) }
-          else
-            @raw_comments = client.merge_request_comments(ci_source.repo_slug, ci_source.pull_request_id, per_page: 100)
-              .auto_paginate
-            @raw_comments
-              .map { |comment| Comment.from_gitlab(comment) }
-          end
-        end
+        @comments ||= if supports_inline_comments
+                        @raw_comments = mr_discussions
+                          .auto_paginate
+                          .flat_map { |discussion| discussion.notes.map { |note| note.to_h.merge({ "discussion_id" => discussion.id }) } }
+                        @raw_comments
+                          .map { |comment| Comment.from_gitlab(comment) }
+                      else
+                        @raw_comments = client.merge_request_comments(ci_source.repo_slug, ci_source.pull_request_id, per_page: 100)
+                          .auto_paginate
+                        @raw_comments
+                          .map { |comment| Comment.from_gitlab(comment) }
+                      end
       end
 
       def mr_discussions
@@ -96,10 +93,10 @@ module Danger
         @mr_diff ||= begin
           diffs = mr_changes.changes.map do |change|
             diff = change["diff"]
-            if diff.start_with?('--- a/')
+            if diff.start_with?("--- a/")
               diff
             else
-              "--- a/#{change["old_path"]}\n+++ b/#{change["new_path"]}\n#{diff}"
+              "--- a/#{change['old_path']}\n+++ b/#{change['new_path']}\n#{diff}"
             end
           end
           diffs.join("\n")
@@ -107,24 +104,18 @@ module Danger
       end
 
       def mr_changed_paths
-        @mr_changed_paths ||= begin
-          mr_changes
-            .changes.map { |change| change["new_path"] }
-        end
+        @mr_changed_paths ||= mr_changes
+          .changes.map { |change| change["new_path"] }
 
         @mr_changed_paths
       end
 
       def mr_changes
-        @mr_changes ||= begin
-          client.merge_request_changes(ci_source.repo_slug, ci_source.pull_request_id)
-        end
+        @mr_changes ||= client.merge_request_changes(ci_source.repo_slug, ci_source.pull_request_id)
       end
 
       def mr_closes_issues
-        @mr_closes_issues ||= begin
-          client.merge_request_closes_issues(ci_source.repo_slug, ci_source.pull_request_id)
-        end
+        @mr_closes_issues ||= client.merge_request_closes_issues(ci_source.repo_slug, ci_source.pull_request_id)
       end
 
       def setup_danger_branches
@@ -154,16 +145,14 @@ module Danger
       end
 
       def supports_inline_comments
-        @supports_inline_comments ||= begin
-          # If we can't check GitLab's version, we assume we don't support inline comments
-          if Gem.loaded_specs["gitlab"].version < FIRST_GITLAB_GEM_WITH_VERSION_CHECK
-            false
-          else
-            current_version = Gem::Version.new(client.version.version)
+        # If we can't check GitLab's version, we assume we don't support inline comments
+        @supports_inline_comments ||= if Gem.loaded_specs["gitlab"].version < FIRST_GITLAB_GEM_WITH_VERSION_CHECK
+                                        false
+                                      else
+                                        current_version = Gem::Version.new(client.version.version)
 
-            current_version >= FIRST_VERSION_WITH_INLINE_COMMENTS
-          end
-        end
+                                        current_version >= FIRST_VERSION_WITH_INLINE_COMMENTS
+                                      end
       end
 
       def update_pull_request!(warnings: [], errors: [], messages: [], markdowns: [], danger_id: "danger", new_comment: false, remove_previous_comments: false)
@@ -253,11 +242,11 @@ module Danger
           delete_old_comments!(danger_id: danger_id)
         else
           body = generate_comment(warnings: warnings,
-                                    errors: errors,
+                                  errors: errors,
                                   messages: messages,
-                                 markdowns: markdowns,
-                       previous_violations: previous_violations,
-                                 danger_id: danger_id,
+                                  markdowns: markdowns,
+                                  previous_violations: previous_violations,
+                                  danger_id: danger_id,
                                   template: "gitlab")
 
           if editable_comments.empty? or should_create_new_comment
@@ -278,11 +267,10 @@ module Danger
 
       def delete_old_comments!(except: nil, danger_id: "danger")
         @raw_comments.each do |raw_comment|
-
           comment = Comment.from_gitlab(raw_comment)
           next unless comment.generated_by_danger?(danger_id)
           next if comment.id == except
-          next unless raw_comment.is_a?(Hash) && raw_comment["position"].nil?
+          next unless raw_comment.kind_of?(Hash) && raw_comment["position"].nil?
 
           begin
             client.delete_merge_request_comment(
@@ -290,7 +278,7 @@ module Danger
               ci_source.pull_request_id,
               comment.id
             )
-          rescue
+          rescue StandardError
           end
         end
       end
@@ -298,7 +286,7 @@ module Danger
       def markdown_link_to_message(message, _)
         "#{message.file}#L#{message.line}: "
       end
-      
+
       # @return [String] The organisation name, is nil if it can't be detected
       def organisation
         nil # TODO: Implement this
@@ -315,12 +303,12 @@ module Danger
       end
 
       # @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'
+      def file_url(organisation: nil, repository: nil, ref: nil, branch: nil, path: nil)
+        ref ||= (branch || "master")
         # 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=#{ref}&private_token=#{@token}"
       end
 
       def regular_violations_group(warnings: [], errors: [], messages: [], markdowns: [])
@@ -338,6 +326,7 @@ module Danger
           next 1 unless b.file && b.line
 
           next a.line <=> b.line if a.file == b.file
+
           next a.file <=> b.file
         end
 
@@ -359,7 +348,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.to_h.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) }
@@ -401,7 +390,7 @@ module Danger
         }
       end
 
-      def submit_inline_comments_for_kind!(kind, messages, diff_lines, danger_comments, previous_violations, danger_id: "danger")
+      def submit_inline_comments_for_kind!(kind, messages, _diff_lines, danger_comments, previous_violations, danger_id: "danger")
         previous_violations ||= []
         is_markdown_content = kind == :markdown
         emoji = { warning: "warning", error: "no_entry_sign", message: "book" }[kind]
@@ -440,7 +429,7 @@ module Danger
             params = {
               body: body,
               position: {
-                position_type: 'text',
+                position_type: "text",
                 new_path: m.file,
                 new_line: m.line,
                 old_path: old_position[:path],
@@ -550,20 +539,19 @@ module Danger
         line_number = 0
         diff.each_line do |line|
           if line.match range_header_regexp
-            line = line.split('+').last
-            line = line.split(' ').first
-            range_string = line.split(',')
+            line = line.split("+").last
+            line = line.split(" ").first
+            range_string = line.split(",")
             line_number = range_string[0].to_i - 1
-          elsif line.start_with?('+')
+          elsif line.start_with?("+")
             addition_lines.push(line_number)
-          elsif line.start_with?('-')
-            line_number=line_number-1
+          elsif line.start_with?("-")
+            line_number -= 1
           end
-          line_number=line_number+1
+          line_number += 1
         end
         addition_lines
       end
-
     end
   end
 end

data/lib/danger/request_sources/local_only.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require "danger/helpers/comments_helper"
 require "danger/helpers/comment"
 

data/lib/danger/request_sources/request_source.rb

@@ -85,12 +85,12 @@ module Danger
         raise "Subclass and overwrite organisation"
       end
 
-      def file_url(_organisation: nil, _repository: nil, _branch: "master", _path: nil)
+      def file_url(_organisation: nil, _repository: nil, _ref: nil, _branch: nil, _path: nil)
         raise "Subclass and overwrite file_url"
       end
-      
-      def update_build_status(status)
-          raise "Subclass and overwrite update_build_status"
+
+      def update_build_status(_status)
+        raise "Subclass and overwrite update_build_status"
       end
     end
   end

data/lib/danger/request_sources/support/get_ignored_violation.rb

@@ -1,5 +1,5 @@
 class GetIgnoredViolation
-  IGNORE_REGEXP = />*\s*danger\s*:\s*ignore\s*"(?<error>[^"]*)"/i
+  IGNORE_REGEXP = />*\s*danger\s*:\s*ignore\s*"(?<error>[^"]*)"/i.freeze
 
   def initialize(body)
     @body = body

data/lib/danger/request_sources/vsts.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require "danger/helpers/comments_helper"
 require "danger/request_sources/vsts_api"
 
@@ -25,14 +23,13 @@ module Danger
       def initialize(ci_source, environment)
         self.ci_source = ci_source
 
-        @is_vsts_git = environment["BUILD_REPOSITORY_PROVIDER"] == "TfsGit"
+        @is_vsts_ci = environment.key? "DANGER_VSTS_HOST"
 
-        project, slug = ci_source.repo_slug.split("/")
-        @api = VSTSAPI.new(project, slug, ci_source.pull_request_id, environment)
+        @api = VSTSAPI.new(ci_source.repo_slug, ci_source.pull_request_id, environment)
       end
 
       def validates_as_ci?
-        @is_vsts_git
+        @is_vsts_ci
       end
 
       def validates_as_api_source?
@@ -132,6 +129,7 @@ module Danger
           next unless comment_content.include?("generated_by_#{danger_id}")
           # Skip the comment if it's an inline comment
           next unless c[:threadContext].nil?
+
           # Updated the danger posted comment
           @api.update_comment(thread_id, comment_id, new_comment)
           comment_updated = true
@@ -205,9 +203,9 @@ module Danger
 
           matching_threads = danger_threads.select do |comment_data|
             if comment_data.key?(:threadContext) && !comment_data[:threadContext].nil? &&
-              comment_data[:threadContext][:filePath] == m.file &&
-              comment_data[:threadContext].key?(:rightFileStart) &&
-              comment_data[:threadContext][:rightFileStart][:line] == m.line
+               comment_data[:threadContext][:filePath] == m.file &&
+               comment_data[:threadContext].key?(:rightFileStart) &&
+               comment_data[:threadContext][:rightFileStart][:line] == m.line
               # Parse it to avoid problems with strikethrough
               violation = violations_from_table(comment_data[:comments].first[:content]).first
               if violation
@@ -257,6 +255,7 @@ module Danger
           next 1 unless b.file && b.line
 
           next a.line <=> b.line if a.file == b.file
+
           next a.file <=> b.file
         end
 
@@ -274,7 +273,6 @@ module Danger
           accumulator.merge(group) { |_, old, fresh| old + fresh }
         end
       end
-
     end
   end
 end

data/lib/danger/request_sources/vsts_api.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# coding: utf-8
 
 require "base64"
 require "danger/helpers/comments_helper"
@@ -9,7 +8,7 @@ module Danger
     class VSTSAPI
       attr_accessor :host, :pr_api_endpoint, :min_api_version_for_comments
 
-      def initialize(_project, slug, pull_request_id, environment)
+      def initialize(slug, pull_request_id, environment)
         self.min_api_version_for_comments = "3.0"
 
         user_name = ""
@@ -45,6 +44,10 @@ module Danger
         @token && !@token.empty?
       end
 
+      def pull_request(*)
+        fetch_pr_json
+      end
+
       def fetch_pr_json
         uri = URI("#{pr_api_endpoint}?api-version=#{@api_version}")
         fetch_json(uri)

data/lib/danger/version.rb

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

data/lib/danger.rb

@@ -25,6 +25,7 @@ module Danger
     if Gem::Specification.find_all_by_name(GEM_NAME).empty?
       raise "Couldn't find gem directory for 'danger'"
     end
+
     return Gem::Specification.find_by_name(GEM_NAME).gem_dir
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2023-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -40,33 +40,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: git
+  name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: colored2
+  name: cork
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
@@ -102,95 +102,95 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: kramdown-parser-gfm
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: no_proxy_fix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: cork
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: no_proxy_fix
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Stop Saying 'You Forgot To…' in Code Review
 email:
 - orta.therox@gmail.com
@@ -244,7 +244,6 @@ 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_cloud.rb
 - lib/danger/ci_source/xcode_server.rb
 - lib/danger/clients/rubygems_client.rb

data/lib/danger/ci_source/vsts.rb

@@ -1,73 +0,0 @@
-require "danger/request_sources/github/github"
-require "danger/request_sources/vsts"
-
-module Danger
-  # ### CI Setup
-  #
-  # You need to go to your project's build definition. 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