danger 4.2.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04df75f0e2d2102ce7e9d3024be69a756881b387
-  data.tar.gz: 76f1470a89a64bfb8b068ea8492b0a2f3c73bfa0
+  metadata.gz: 5e66eb8a455c065afa135919c09e81892a2fb371
+  data.tar.gz: c94bb59d445c9c37c840fb5cb3982870173f96eb
 SHA512:
-  metadata.gz: 58f1c840ed23922d7d8124c32e86b95116551b882fd22dccd61576b8cc09055544b03c302cfbf08d98e01ae790ab4152a69d3668f39211c9a9ec6acbf220291a
-  data.tar.gz: 525ee057e14c71dc46e95679c2d62686c6c48a507de94b9ed3202f738f78043d6ef27fc42543f3d69e48dfecff1441194ab7db5fb9f3c9903f56ed928412b179
+  metadata.gz: 82f6fe2e92a1ab9c069f86184768a9f78257e88a05e3a187057e685e7b05299db66adc773a76e074b34d688b01a7ceb53a3824ecc4e673510ee559dc13aef678
+  data.tar.gz: 5df07d5e39a8daf9463f872e17acd4e5e8ba0d818ddc8b0590919d0ea9a4344c22b8b87b63b46831f242653745566b16d7bba7921510679fc14b931ea75150f0

data/lib/danger/ci_source/jenkins.rb

@@ -66,8 +66,8 @@ module Danger
       if repo_matches
         self.repo_slug = "#{repo_matches[1]}/#{repo_matches[2]}"
       else
-        repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})
-        self.repo_slug = repo_matches[2] unless repo_matches.nil?
+        repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/]+)$})
+        self.repo_slug = repo_matches[2].gsub(/\.git$/, "") unless repo_matches.nil?
       end
     end
 

data/lib/danger/commands/init.rb

@@ -177,7 +177,7 @@ module Danger
 
     def uses_travis
       danger = "bundle exec danger".yellow
-      config = YAML.load(File.read(".travis.yml"))
+      config = YAML.load(File.read(".travis.yml")) # rubocop:disable Security/YAMLLoad
       if config.kind_of?(Hash) && config["script"]
         ui.say "Add " + "- ".yellow + danger + " as a new step in the " + "script".yellow + " section of your .travis.yml file."
       else
@@ -190,7 +190,7 @@ module Danger
 
     def uses_circle
       danger = "- bundle exec danger".yellow
-      config = YAML.load(File.read("circle.yml"))
+      config = YAML.load(File.read("circle.yml")) # rubocop:disable Security/YAMLLoad
 
       if config.kind_of?(Hash) && config["test"]
         if config["test"]["post"]

data/lib/danger/commands/local.rb

@@ -20,9 +20,15 @@ module Danger
     end
 
     def initialize(argv)
+      show_help = true if argv.arguments == ["-h"]
+
       @pr_num = argv.option("use-merged-pr")
       @clear_http_cache = argv.flag?("clear-http-cache", false)
 
+      # Currently CLAide doesn't support short option like -h https://github.com/CocoaPods/CLAide/pull/60
+      # when user pass in -h, mimic the behavior of passing in --help.
+      argv = CLAide::ARGV.new ["--help"] if show_help
+
       super
 
       if argv.flag?("pry", false)

data/lib/danger/commands/pr.rb

@@ -19,10 +19,16 @@ module Danger
     end
 
     def initialize(argv)
+      show_help = true if argv.arguments == ["-h"]
+
       @pr_url = argv.shift_argument
       @clear_http_cache = argv.flag?("clear-http-cache", false)
       dangerfile = argv.option("dangerfile", "Dangerfile")
 
+      # Currently CLAide doesn't support short option like -h https://github.com/CocoaPods/CLAide/pull/60
+      # when user pass in -h, mimic the behavior of passing in --help.
+      argv = CLAide::ARGV.new ["--help"] if show_help
+
       super
 
       @dangerfile_path = dangerfile if File.exist?(dangerfile)

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

@@ -224,6 +224,16 @@ module Danger
       paths.first(paths.count - 1).join(", ") + " & " + paths.last
     end
 
+    # @!group GitHub Misc
+    # Use to ignore inline messages which lay outside a diff's range, thereby not posting them in the main comment.
+    # @param    [Bool] dismiss
+    #           Ignore out of range inline messages, defaults to `true`
+    #
+    # @return   [void]
+    def dismiss_out_of_range_messages(dismiss: true)
+      @github.dismiss_out_of_range_messages = dismiss == true
+    end
+
     [:title, :body, :author, :labels, :json].each do |suffix|
       alias_method "mr_#{suffix}".to_sym, "pr_#{suffix}".to_sym
     end

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

@@ -16,6 +16,9 @@ module Danger
   # via the return value for the danger command. If you have linters with errors for this call
   # you can use `messaging.fail` instead.
   #
+  # You can optionally add `file` and `line` to provide inline feedback on a PR in GitHub, note that
+  # only feedback inside the PR's diff will show up inline. Others will appear inside the main comment.
+  #
   # It is possible to have Danger ignore specific warnings or errors by writing `Danger: Ignore "[warning/error text]"`.
   #
   # Sidenote: Messaging is the only plugin which adds functions to the root of the Dangerfile.

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

@@ -12,7 +12,7 @@ module Danger
     class GitHub < RequestSource
       include Danger::Helpers::CommentsHelper
 
-      attr_accessor :pr_json, :issue_json, :support_tokenless_auth
+      attr_accessor :pr_json, :issue_json, :support_tokenless_auth, :dismiss_out_of_range_messages
 
       def self.env_vars
         ["DANGER_GITHUB_API_TOKEN"]
@@ -26,6 +26,7 @@ module Danger
         self.ci_source = ci_source
         self.environment = environment
         self.support_tokenless_auth = false
+        self.dismiss_out_of_range_messages = false
 
         @token = @environment["DANGER_GITHUB_API_TOKEN"]
       end
@@ -134,12 +135,6 @@ module Danger
           previous_violations = parse_comment(last_comment.body)
         end
 
-        main_violations = (warnings + errors + messages + markdowns).reject(&:inline?)
-        if previous_violations.empty? && main_violations.empty?
-          # Just remove the comment, if there's nothing to say.
-          delete_old_comments!(danger_id: danger_id)
-        end
-
         cmp = proc do |a, b|
           next -1 unless a.file
           next 1 unless b.file
@@ -162,6 +157,12 @@ module Danger
                       previous_violations: previous_violations,
                                 danger_id: danger_id)
 
+        main_violations = comment_warnings + comment_errors + comment_messages + comment_markdowns
+        if previous_violations.empty? && main_violations.empty?
+          # Just remove the comment, if there's nothing to say.
+          delete_old_comments!(danger_id: danger_id)
+        end
+
         # If there are still violations to show
         unless main_violations.empty?
           body = generate_comment(warnings: comment_warnings,
@@ -232,7 +233,7 @@ module Danger
 
       def submit_inline_comments!(warnings: [], errors: [], messages: [], markdowns: [], previous_violations: [], danger_id: "danger")
         # Avoid doing any fetchs if there's no inline comments
-        return if (warnings + errors + messages).select(&:inline?).empty?
+        return if (warnings + errors + messages + markdowns).select(&:inline?).empty?
 
         diff_lines = self.pr_diff.lines
         pr_comments = client.pull_request_comments(ci_source.repo_slug, ci_source.pull_request_id)
@@ -282,8 +283,8 @@ module Danger
 
           position = find_position_in_diff diff_lines, m
 
-          # Keep the change if it's line is not in the diff
-          next false if position.nil?
+          # Keep the change if it's line is not in the diff and not in dismiss mode
+          next self.dismiss_out_of_range_messages if position.nil?
 
           # Once we know we're gonna submit it, we format it
           if is_markdown_content
@@ -332,7 +333,7 @@ module Danger
 
       def find_position_in_diff(diff_lines, message)
         range_header_regexp = /@@ -([0-9]+),([0-9]+) \+(?<start>[0-9]+)(,(?<end>[0-9]+))? @@.*/
-        file_header_regexp = %r{ a/.*}
+        file_header_regexp = %r{^diff --git a/.*}
 
         pattern = "+++ b/" + message.file + "\n"
         file_start = diff_lines.index(pattern)
@@ -343,6 +344,9 @@ module Danger
         file_line = nil
 
         diff_lines.drop(file_start).each do |line|
+          # If we found the start of another file diff, we went too far
+          break if line.match file_header_regexp
+
           match = line.match range_header_regexp
 
           # file_line is set once we find the hunk the line is in
@@ -359,9 +363,6 @@ module Danger
 
           next unless match
 
-          # If we found the start of another file diff, we went too far
-          break if line.match file_header_regexp
-
           range_start = match[:start].to_i
           if match[:end]
             range_end = match[:end].to_i + range_start
@@ -381,7 +382,7 @@ module Danger
 
       # See the tests for examples of data coming in looks like
       def parse_message_from_row(row)
-        message_regexp = %r{(<(a |span data-)href="https://github.com/#{ci_source.repo_slug}/blob/[0-9a-z]+/(?<file>[^#]+)#L(?<line>[0-9]+)"(>[^<]*</a> - |/>))?(?<message>.*?)}im
+        message_regexp = %r{(<(a |span data-)href="https://#{host}/#{ci_source.repo_slug}/blob/[0-9a-z]+/(?<file>[^#]+)#L(?<line>[0-9]+)"(>[^<]*</a> - |/>))?(?<message>.*?)}im
         match = message_regexp.match(row)
 
         if match[:line]
@@ -393,7 +394,7 @@ module Danger
       end
 
       def markdown_link_to_message(message, hide_link)
-        url = "https://github.com/#{ci_source.repo_slug}/blob/#{pr_json['head']['sha']}/#{message.file}#L#{message.line}"
+        url = "https://#{host}/#{ci_source.repo_slug}/blob/#{pr_json['head']['sha']}/#{message.file}#L#{message.line}"
 
         if hide_link
           "<span data-href=\"#{url}\"/>"

data/lib/danger/request_sources/gitlab.rb

@@ -66,22 +66,18 @@ module Danger
 
       def mr_comments
         @comments ||= begin
-          client.merge_request_comments(escaped_ci_slug, ci_source.pull_request_id)
+          client.merge_request_comments(ci_source.repo_slug, ci_source.pull_request_id)
             .map { |comment| Comment.from_gitlab(comment) }
         end
       end
 
       def mr_diff
         @mr_diff ||= begin
-          client.merge_request_changes(escaped_ci_slug, ci_source.pull_request_id)
+          client.merge_request_changes(ci_source.repo_slug, ci_source.pull_request_id)
             .changes.map { |change| change["diff"] }.join("\n")
         end
       end
 
-      def escaped_ci_slug
-        @escaped_ci_slug ||= CGI.escape(ci_source.repo_slug)
-      end
-
       def setup_danger_branches
         head_commit = self.scm.head_commit
 
@@ -96,8 +92,8 @@ module Danger
       end
 
       def fetch_details
-        self.mr_json = client.merge_request(escaped_ci_slug, self.ci_source.pull_request_id)
-        self.commits_json = client.merge_request_commits(escaped_ci_slug, self.ci_source.pull_request_id)
+        self.mr_json = client.merge_request(ci_source.repo_slug, self.ci_source.pull_request_id)
+        self.commits_json = client.merge_request_commits(ci_source.repo_slug, self.ci_source.pull_request_id)
         self.ignored_violations = ignored_violations_from_pr
       end
 
@@ -131,12 +127,12 @@ module Danger
 
           if editable_comments.empty?
             client.create_merge_request_comment(
-              escaped_ci_slug, ci_source.pull_request_id, body
+              ci_source.repo_slug, ci_source.pull_request_id, body
             )
           else
             original_id = editable_comments.first.id
             client.edit_merge_request_comment(
-              escaped_ci_slug, ci_source.pull_request_id, original_id, body
+              ci_source.repo_slug, ci_source.pull_request_id, original_id, body
             )
           end
         end
@@ -147,7 +143,7 @@ module Danger
           next unless comment.generated_by_danger?(danger_id)
           next if comment.id == except
           client.delete_merge_request_comment(
-            escaped_ci_slug,
+            ci_source.repo_slug,
             ci_source.pull_request_id,
             comment.id
           )

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "4.2.2".freeze
+  VERSION = "4.3.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: 4.2.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -465,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.