danger 8.0.1 → 8.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a19704ff72b8d86ac14c19bed3ccd7276c0e0c724200439b5d3a39625409c09
-  data.tar.gz: a4b77b3e810f26f237b2057ca4214f21b6108630036aeb61228d3f2ae2e4f163
+  metadata.gz: 3b175fad0150fdcb243c42f37c0b9683a7dc00db8b3be4ef81d01be0103b90bb
+  data.tar.gz: d422bf7eadd533e5591f1ac43cde404f38d124a3c398469a1b9563c5338e8370
 SHA512:
-  metadata.gz: c4e2eb7edc403b2ef01c2d84cf2dabacdd79426a903084e9a22d8d3506bf0519721eebfe18cff7415d83ffce992b8cb7a416661d8c2da6880dbe0f2871d19c2a
-  data.tar.gz: 077f053cadf83b885c866329512426e0d8d7e31c6259b59c3e726532d3bddf28dca78c4aa2d760f20bed13ab7f116e4f736a276c7ab5c4793123572229fe4b0d
+  metadata.gz: d36a05ed7713cf0b50936c04feaa4cb49c8ba035b539ff265c9d7e231c2670efba007f5f4a2bf58936cab24c7aa0e09d5c9a2a9edff9714689fc5b03cc31d870
+  data.tar.gz: 611a647c06bab7c3949ded7ff12b5498b966d54f10056481ae720dfa3801f48ac27085d112f69c186feb5638b2b82b0f7583c0f020af33af8251705429fbf614

data/lib/danger/ci_source/bitrise.rb

@@ -50,16 +50,29 @@ module Danger
       self.repo_url = env["GIT_REPOSITORY_URL"]
       
       matcher_url = self.repo_url
+      self.repo_slug = repo_slug_from(self.repo_url)
+    end
 
-      #If the URL contains https:// as :// leads to inaccurate matching. So we remove it and proceed to match.
-      if repo_url.include? "https://"
-        matcher_url["https://"] = ''
+    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]
-
-      self.repo_slug = repo_matches unless repo_matches.nil?
-      
+      return repo_matches unless repo_matches.nil?
     end
   end
 end

data/lib/danger/ci_source/gitlab_ci.rb

@@ -1,5 +1,6 @@
 # http://docs.gitlab.com/ce/ci/variables/README.html
 require "uri"
+require "danger/request_sources/github/github"
 require "danger/request_sources/gitlab"
 
 module Danger
@@ -15,10 +16,13 @@ module Danger
   # ```
   # ### Token Setup
   #
-  # Add the `DANGER_GITLAB_API_TOKEN` to your pipeline env variables.
-  class GitLabCI < CI
-    attr_reader :project_url
+  # Add the `DANGER_GITLAB_API_TOKEN` to your pipeline env variables if you
+  # are hosting your code on GitLab. If you are using GitLab as a mirror
+  # for the purpose of CI/CD, while hosting your repo on GitHub, set the
+  # `DANGER_GITHUB_API_TOKEN` as well as the project repo URL to
+  # `DANGER_PROJECT_REPO_URL`.
 
+  class GitLabCI < CI
     def self.validates_as_ci?(env)
       env.key? "GITLAB_CI"
     end
@@ -28,11 +32,12 @@ module Danger
         "GITLAB_CI", "CI_PROJECT_PATH"
       ].all? { |x| env[x] }
 
-      exists && determine_merge_request_id(env).to_i > 0
+      exists && determine_pull_or_merge_request_id(env).to_i > 0
     end
 
-    def self.determine_merge_request_id(env)
+    def self.determine_pull_or_merge_request_id(env)
       return env["CI_MERGE_REQUEST_IID"] if env["CI_MERGE_REQUEST_IID"]
+      return env["CI_EXTERNAL_PULL_REQUEST_IID"] if env["CI_EXTERNAL_PULL_REQUEST_IID"]
       return 0 unless env["CI_COMMIT_SHA"]
 
       project_path = env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
@@ -54,16 +59,28 @@ module Danger
 
     def initialize(env)
       @env = env
-      @repo_slug = env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
-      @project_url = env["CI_MERGE_REQUEST_PROJECT_URL"] || env["CI_PROJECT_URL"]
+      @repo_slug = slug_from(env)
     end
 
     def supported_request_sources
-      @supported_request_sources ||= [Danger::RequestSources::GitLab]
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab
+      ]
     end
 
     def pull_request_id
-      @pull_request_id ||= self.class.determine_merge_request_id(@env)
+      @pull_request_id ||= self.class.determine_pull_or_merge_request_id(@env)
+    end
+
+    private
+
+    def slug_from(env)
+      if env["DANGER_PROJECT_REPO_URL"]
+        env["DANGER_PROJECT_REPO_URL"].split('/').last(2).join('/')
+      else
+        env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
+      end
     end
   end
 end

data/lib/danger/ci_source/teamcity.rb

@@ -27,6 +27,8 @@ module Danger
   # branch="%teamcity.build.branch%"
   # export GITHUB_PULL_REQUEST_ID=(${branch//\// })
   # ```
+  # Or if you are using the pull request feature you can set an environment parameter called `GITHUB_PULL_REQUEST_ID`
+  # to the value of: `%teamcity.pullRequest.number`
   #
   # #### GitLab
   #

data/lib/danger/core_ext/file_list.rb

@@ -9,7 +9,7 @@ module Danger
     def include?(pattern)
       self.each do |current|
         unless current.nil?
-          return true if File.fnmatch(pattern, current) || pattern == current
+          return true if File.fnmatch(pattern, current, File::FNM_EXTGLOB) || pattern == current
         end
       end
       return false

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

@@ -227,6 +227,23 @@ module Danger
       paths.first(paths.count - 1).join(", ") + " & " + paths.last
     end
 
+    # @!group Gitlab Misc
+    # Use to ignore inline messages which lay outside a diff's range, thereby not posting the comment.
+    # You can set hash to change behavior per each kinds. (ex. `{warning: true, error: false}`)
+    # @param    [Bool] or [Hash<Symbol, Bool>] dismiss
+    #           Ignore out of range inline messages, defaults to `true`
+    #
+    # @return   [void]
+    def dismiss_out_of_range_messages(dismiss = true)
+      if dismiss.kind_of?(Hash)
+        @gitlab.dismiss_out_of_range_messages = dismiss
+      elsif dismiss.kind_of?(TrueClass)
+        @gitlab.dismiss_out_of_range_messages = true
+      elsif dismiss.kind_of?(FalseClass)
+        @gitlab.dismiss_out_of_range_messages = false
+      end
+    end
+
     %i(title body author labels json diff).each do |suffix|
       alias_method "pr_#{suffix}".to_sym, "mr_#{suffix}".to_sym
     end

data/lib/danger/helpers/comments_helper.rb

@@ -11,7 +11,7 @@ module Danger
       include Danger::Helpers::CommentsParsingHelper
 
       def markdown_parser(text)
-        Kramdown::Document.new(text, input: "GFM")
+        Kramdown::Document.new(text, input: "GFM", smart_quotes: %w[apos apos quot quot])
       end
 
       # !@group Extension points
@@ -49,8 +49,8 @@ module Danger
         message = "#{markdown_link_to_message(violation, hide_link)}#{message}" if violation.file && violation.line
 
         html = markdown_parser(message).to_html
-        # Remove the outer `<p>`, the -5 represents a newline + `</p>`
-        html = html[3...-5] if html.start_with? "<p>"
+        # Remove the outer `<p>` and `</p>`.
+        html = html.strip.sub(%r{\A<p>(.*)</p>\z}m, '\1')
         Violation.new(html, violation.sticky, violation.file, violation.line)
       end
 

data/lib/danger/request_sources/github/github.rb

@@ -40,6 +40,10 @@ module Danger
         end
       end
 
+      def validates_as_ci?
+        true
+      end
+
       def validates_as_api_source?
         (@token && !@token.empty?) || self.environment["DANGER_USE_LOCAL_GIT"]
       end

data/lib/danger/request_sources/gitlab.rb

@@ -8,7 +8,7 @@ module Danger
   module RequestSources
     class GitLab < RequestSource
       include Danger::Helpers::CommentsHelper
-      attr_accessor :mr_json, :commits_json
+      attr_accessor :mr_json, :commits_json, :dismiss_out_of_range_messages
 
       FIRST_GITLAB_GEM_WITH_VERSION_CHECK = Gem::Version.new("4.6.0")
       FIRST_VERSION_WITH_INLINE_COMMENTS = Gem::Version.new("10.8.0")
@@ -24,6 +24,7 @@ module Danger
       def initialize(ci_source, environment)
         self.ci_source = ci_source
         self.environment = environment
+        self.dismiss_out_of_range_messages = false
 
         @token = @environment["DANGER_GITLAB_API_TOKEN"]
       end
@@ -208,7 +209,7 @@ module Danger
         rest_inline_violations = submit_inline_comments!({
           danger_id: danger_id,
           previous_violations: previous_violations
-        }.merge(inline_violations))
+        }.merge(**inline_violations))
 
         main_violations = merge_violations(
           regular_violations, rest_inline_violations
@@ -227,7 +228,7 @@ module Danger
             template: "gitlab",
             danger_id: danger_id,
             previous_violations: previous_violations
-          }.merge(main_violations))
+          }.merge(**main_violations))
 
           comment_result =
             if should_create_new_comment
@@ -302,6 +303,16 @@ module Danger
         nil # TODO: Implement this
       end
 
+      def dismiss_out_of_range_messages_for(kind)
+        if self.dismiss_out_of_range_messages.kind_of?(Hash) && self.dismiss_out_of_range_messages[kind]
+          self.dismiss_out_of_range_messages[kind]
+        elsif self.dismiss_out_of_range_messages == true
+          self.dismiss_out_of_range_messages
+        else
+          false
+        end
+      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'
@@ -397,10 +408,9 @@ module Danger
 
         messages.reject do |m|
           next false unless m.file && m.line
-
-          # Keep the change it's in a file changed in this diff
-          next if !mr_changed_paths.include?(m.file)
-
+          # 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")
@@ -473,7 +483,6 @@ module Danger
         range_header_regexp = /@@ -(?<old>[0-9]+)(,([0-9]+))? \+(?<new>[0-9]+)(,([0-9]+))? @@.*/
 
         change = changes.find { |c| c["new_path"] == message.file }
-
         # If there is no changes or rename only or deleted, return nil.
         return nil if change.nil? || change["diff"].empty? || change["deleted_file"]
 
@@ -520,6 +529,41 @@ module Danger
           line: current_old_line - current_new_line + message.line.to_i
         }
       end
+
+      def is_out_of_range(changes, message)
+        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"]
+
+        addition_lines = generate_addition_lines(change["diff"])
+        return false if addition_lines.include?(message.line.to_i)
+
+        return true
+      end
+
+      def generate_addition_lines(diff) 
+        range_header_regexp = /@@ -(?<old>[0-9]+)(,([0-9]+))? \+(?<new>[0-9]+)(,([0-9]+))? @@.*/
+        addition_lines = []
+        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_number = range_string[0].to_i - 1
+          elsif line.start_with?('+')
+            addition_lines.push(line_number)
+          elsif line.start_with?('-')
+            line_number=line_number-1
+          end
+          line_number=line_number+1
+        end
+        addition_lines
+      end
+
     end
   end
 end

data/lib/danger/scm_source/git_repo.rb

@@ -135,7 +135,7 @@ module Danger
       git_in_depth_fetch
       possible_merge_base = possible_merge_base(repo, from, to)
 
-      raise "Cannot find a merge base between #{from} and #{to}." unless possible_merge_base
+      raise "Cannot find a merge base between #{from} and #{to}. If you are using shallow clone/fetch, try increasing the --depth" unless possible_merge_base
 
       possible_merge_base
     end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "8.0.1".freeze
+  VERSION = "8.0.6".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: 8.0.1
+  version: 8.0.6
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement