danger 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12728d6688a88a9852c1db80a4538bd610511388749fb76b2f774ea31a9f0517
-  data.tar.gz: bc6f5250eb2851de5537c9f9ac0755259a6e249c393617125f09665334ab3587
+  metadata.gz: 7fc0e933daf60c17871113311a2ff2fb180248a22f0574b2b9c00f7d60705107
+  data.tar.gz: 3a94095eaf6b2c14acc45e50f1b3ca6b9ea61814e551dbb2fc088f59425166be
 SHA512:
-  metadata.gz: 694c5bae91efcbbc823cf42708533bed4d298ae31af50b4d3dadb3edf50e4acb6aca907eade1e4913fdee370366ad3c1ac3d90e13f2bbb4bcba09a4fb8d14efd
-  data.tar.gz: 4c62ee57532ea5ef825fc4b7c6798c7bc2496250d3b7d928e60cf392d1dd95ce4fc936a4b07ca28d337cc618450b3a3f612a37b46531aa1a4feca721e0bddc48
+  metadata.gz: 0cbc8d6e42a7b0e8bb1e89883f5206cade8543de3cf197e9cc8c26fa66cb0fcf37f498531fd5afe14170a720576271f5e5361d8d51212410a57152b7887a2550
+  data.tar.gz: 909bc0705e6ee02713f49666f70bb4d4b05e7c6fd65badf000bbe5fe4f234a9cb1a9c5862189e556c8d8a0b569fdd23eecafacd9073bf2575346f09d0395a324

data/lib/danger/ci_source/bitbucket_pipelines.rb

@@ -7,9 +7,9 @@ module Danger
   #     - bundle exec danger --verbose
   # ```
   #
-  # #### Token Setup
+  # ### Token Setup
   #
-  # Add `DANGER_BITBUCKETCLOUD_USERNAME` and `DANGER_BITBUCKETCLOUD_USERNAME` to your pipeline repository variable
+  # Add `DANGER_BITBUCKETCLOUD_USERNAME` and `DANGER_BITBUCKETCLOUD_PASSWORD` to your pipeline repository variable
   # or instead using `DANGER_BITBUCKETCLOUD_OAUTH_KEY` and `DANGER_BITBUCKETCLOUD_OAUTH_SECRET`.
   #
   # You can find them in Settings > Pipelines > Repository Variables

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

@@ -17,4 +17,4 @@
 <%# the previous line has to be aligned far to the left, otherwise markdown can break easily %>
 <%- end -%>
 
-Generated by [Danger](https://danger.systems/ "generated_by_<%= @danger_id %>")
+Generated by :no_entry_sign: [Danger](https://danger.systems/ "generated_by_<%= @danger_id %>")

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

@@ -0,0 +1,15 @@
+<%- @tables.each do |table| -%>
+  <%- table[:content].each do |violation| -%>
+<%= @emoji_mapper.map(table[:emoji]) if table[:emoji] %> <%= violation.message %>
+  <%- end -%>
+  <%- table[:resolved].each do |message| -%>
+<%= @emoji_mapper.map("white_check_mark") %> <%= message %>
+  <%- 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/helpers/comments_helper.rb

@@ -104,7 +104,7 @@ module Danger
         )
       end
 
-      def generate_inline_comment_body(emoji, message, danger_id: "danger", resolved: false, template: "github")
+      def generate_inline_comment_body(emoji, message, danger_id: "danger", resolved: [], template: "github")
         apply_template(
           tables: [{ content: [message], resolved: resolved, emoji: emoji }],
           danger_id: danger_id,
@@ -120,11 +120,12 @@ module Danger
         )
       end
 
-      def generate_description(warnings: nil, errors: nil)
+      def generate_description(warnings: nil, errors: nil, template: "github")
+        emoji_mapper = EmojiMapper.new(template)
         if errors.empty? && warnings.empty?
           return "All green. #{random_compliment}"
         else
-          message = "⚠️ "
+          message = "#{emoji_mapper.map('warning')} "
           message += "#{'Error'.danger_pluralize(errors.count)}. " unless errors.empty?
           message += "#{'Warning'.danger_pluralize(warnings.count)}. " unless warnings.empty?
           message += "Don't worry, everything is fixable."

data/lib/danger/helpers/emoji_mapper.rb

@@ -8,15 +8,16 @@ module Danger
         "white_check_mark" => "✅"
       },
       "bitbucket_server" => {
-        "no_entry_sign"    => "\u274C",
-        "warning"          => "⚠️",
-        "book"             => "\u2728",
-        "white_check_mark" => "\u2705"
+        "no_entry_sign"    => ":no_entry_sign:",
+        "warning"          => ":warning:",
+        "book"             => ":book:",
+        "white_check_mark" => ":white_check_mark:"
       }
     }.freeze
 
     def initialize(template)
-      @template = DATA.include?(template) ? template : "github"
+      template.sub!('_inline', '')
+      @template = DATA.has_key?(template) ? template : "github"
     end
 
     def map(emoji)

data/lib/danger/request_sources/bitbucket_cloud.rb

@@ -71,21 +71,52 @@ module Danger
       def update_pull_request!(warnings: [], errors: [], messages: [], markdowns: [], danger_id: "danger", new_comment: false, remove_previous_comments: false)
         delete_old_comments(danger_id: danger_id) if !new_comment || remove_previous_comments
 
-        comment = generate_description(warnings: warnings, errors: errors)
+        comment = generate_description(warnings: warnings, errors: errors, template: "bitbucket_server")
         comment += "\n\n"
+
+        warnings = update_inline_comments_for_kind!(:warnings, warnings, danger_id: danger_id)
+        errors = update_inline_comments_for_kind!(:errors, errors, danger_id: danger_id)
+        messages = update_inline_comments_for_kind!(:messages, messages, danger_id: danger_id)
+        markdowns = update_inline_comments_for_kind!(:markdowns, markdowns, danger_id: danger_id)
+
         comment += generate_comment(warnings: warnings,
-                                     errors: errors,
-                                   messages: messages,
-                                  markdowns: markdowns,
-                        previous_violations: {},
-                                  danger_id: danger_id,
-                                   template: "bitbucket_server")
+                                    errors: errors,
+                                    messages: messages,
+                                    markdowns: markdowns,
+                                    previous_violations: {},
+                                    danger_id: danger_id,
+                                    template: "bitbucket_server")
 
         @api.post_comment(comment)
       end
 
+      def update_inline_comments_for_kind!(kind, messages, danger_id: "danger")
+        emoji = { warnings: "warning", errors: "no_entry_sign", messages: "book" }[kind]
+
+        messages.reject do |message|
+          next false unless message.file && message.line
+
+          body = ""
+
+          if kind == :markdown
+            body = generate_inline_markdown_body(message,
+                                                danger_id: danger_id,
+                                                template: "bitbucket_server")
+          else
+            body = generate_inline_comment_body(emoji, message,
+                                                danger_id: danger_id,
+                                                template: "bitbucket_server")
+          end
+
+          @api.post_comment(body, file: message.file, line: message.line)
+
+          true
+        end
+      end
+
       def delete_old_comments(danger_id: "danger")
         @api.fetch_last_comments.each do |c|
+          next if c[:user][:uuid] != @api.my_uuid
           @api.delete_comment(c[:id]) if c[:content][:raw] =~ /generated_by_#{danger_id}/
         end
       end

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -30,6 +30,11 @@ module Danger
         @username && !@username.empty? && @password && !@password.empty?
       end
 
+      def my_uuid
+        uri = URI("https://api.bitbucket.org/2.0/users/#{@username}")
+        @my_uuid ||= fetch_json(uri)[:uuid]
+      end
+
       def pull_request(*)
         fetch_pr_json
       end
@@ -39,9 +44,16 @@ module Danger
         fetch_json(uri)
       end
 
-      def fetch_last_comments
-        uri = URI("#{pr_api_endpoint}/activity?limit=1000")
-        fetch_json(uri)[:values].select { |v| v[:comment] }.map { |v| v[:comment] }
+      def fetch_comments
+        values = []
+        # TODO: use a url parts encoder to encode the query
+        uri = "#{pr_api_endpoint}/comments?pagelen=100&q=deleted+%7E+false+AND+user.username+%7E+%22#{@username}%22"
+        while(uri)
+          json = fetch_json(URI(uri))
+          values += json[:values]
+          uri = json[:next]
+          values
+        end
       end
 
       def delete_comment(id)
@@ -49,14 +61,16 @@ module Danger
         delete(uri)
       end
 
-      def post_comment(text)
+      def post_comment(text, file: nil, line: nil)
         uri = URI("#{pr_api_endpoint}/comments")
         body = {
-          content: { 
+          content: {
             raw: text
           }
-        }.to_json
-        post(uri, body)
+        }
+        body.merge!(inline: { path: file, to: line }) if file && line
+
+        post(uri, body.to_json)
       end
 
       private
@@ -83,15 +97,15 @@ module Danger
         oauth_secret = environment["DANGER_BITBUCKETCLOUD_OAUTH_SECRET"]
         return nil if oauth_key.nil?
         return nil if oauth_secret.nil?
-        
+
         uri = URI.parse("https://bitbucket.org/site/oauth2/access_token")
         req = Net::HTTP::Post.new(uri.request_uri, { "Content-Type" => "application/json" })
         req.basic_auth oauth_key, oauth_secret
         req.set_form_data({'grant_type' => 'client_credentials'})
         res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-            http.request(req)
+          http.request(req)
         end
-    
+
         JSON.parse(res.body, symbolize_names: true)[:access_token]
       end
 
@@ -129,13 +143,13 @@ module Danger
 
       def delete(uri)
         raise credentials_not_available unless credentials_given?
-        
+
         req = Net::HTTP::Delete.new(uri.request_uri, { "Content-Type" => "application/json" })
         if access_token.nil?
           req.basic_auth @username, @password
         else
           req["Authorization"] = "Bearer #{access_token}"
-        end        
+        end
         Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(req)
         end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.2.0".freeze
+  VERSION = "6.2.1".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: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: colored2
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,7 @@ files:
 - lib/danger/commands/runner.rb
 - lib/danger/commands/systems.rb
 - lib/danger/comment_generators/bitbucket_server.md.erb
+- lib/danger/comment_generators/bitbucket_server_inline.md.erb
 - lib/danger/comment_generators/github.md.erb
 - lib/danger/comment_generators/github_inline.md.erb
 - lib/danger/comment_generators/gitlab.md.erb
@@ -319,8 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.