danger 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6408840e4167a8092819c1b40d3c409b61df856b
-  data.tar.gz: 036b9a85309a45403d2649949f7f63b2722d5a50
+  metadata.gz: fc585b3a42ead8015e789fab0a20800043436033
+  data.tar.gz: 5568de8b9b97cdf2296ff8ef386286a4dc03096d
 SHA512:
-  metadata.gz: decc456c54fc15961a5f73c92b8cf131a784bffb01842d05f97dff361f36ece7a0dbc1443e9d74fde21acd40a3c83fa070e0cc17dfc33745788f7a68441d1ead
-  data.tar.gz: 56c7fe3cf50c9d0b8d7fb91f2e70f195970f10c7ec1f813768c357626eac43212edde7697ccf4e6ee1b2225f76b0d3628cfaa803893dc228c5cd6eba1458909d
+  metadata.gz: c955e1a1a81c272e25e6abdb5b3d8e51630f2f2850ef4c696acda0e5348f37211ced89910af612a592fab1c492c4ddc6bb3ccc9c0d704a49c23330ee0d628528
+  data.tar.gz: 8d88d1ad781ff5705e44d3f8780191786ccbb19012fc845c062c58b3412bf6a504f2c11b73a4a8052ab43d4a243e85920deba3c76564a561009cf98d3f385c6f

data/lib/danger/ci_source/bitrise.rb

@@ -13,7 +13,8 @@ module Danger
   # ```
   # ### Token Setup
   #
-  # Add the `DANGER_GITHUB_API_TOKEN` to your workflow's Secret Env Vars
+  # Add the `DANGER_GITHUB_API_TOKEN` to your workflow's App Env Vars.
+  # Warning: adding the token as a Secret Env Var will not work for PR builds, as [Bitrise does not expose secret vars to PRs](https://bitrise.uservoice.com/forums/235233-general/suggestions/11701587-make-secret-env-variables-available-for-prs-from-t).
   #
   class Bitrise < CI
     def self.validates_as_ci?(env)

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](http://example.com/ "generated_by_<%= @danger_id %>")
+Generated by 🚫 [danger](https://danger.systems/ "generated_by_<%= @danger_id %>")

data/lib/danger/danger_core/dangerfile.rb

@@ -125,7 +125,7 @@ module Danger
 
           else
             value = plugin.send(method)
-            value = value.scan(/.{,80}/).to_a.each(&:strip!).join("\n") if value.kind_of?(String)
+            value = wrap_text(value) if value.kind_of?(String)
             # So that we either have one value per row
             # or we have [] for an empty array
             value = value.join("\n") if value.kind_of?(Array) && value.count > 0
@@ -247,5 +247,12 @@ module Danger
         end
       end unless rows.empty?
     end
+
+    def wrap_text(text, width = 80)
+      text.gsub(/.{,#{width}}/) do |line|
+        line.strip!
+        "#{line}\n"
+      end
+    end
   end
 end

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

@@ -150,6 +150,26 @@ module Danger
     # @return [String]
     #
     def html_link(paths, full_path: true)
+      create_link(paths, full_path) { |href, text| create_html_link(href, text) }
+    end
+
+    # @!group Bitbucket Server Misc
+    # Returns a list of Markdown links for a file, or files in the head repository.
+    # It returns a string of multiple links if passed an array.
+    # @param    [String or Array<String>] paths
+    #           A list of strings to convert to Markdown links
+    # @param    [Bool] full_path
+    #           Shows the full path as the link's text, defaults to `true`.
+    #
+    # @return [String]
+    #
+    def markdown_link(paths, full_path: true)
+      create_link(paths, full_path) { |href, text| create_markdown_link(href, text) }
+    end
+
+    private
+
+    def create_link(paths, full_path)
       paths = [paths] unless paths.kind_of?(Array)
       commit = head_commit
       repo = pr_json[:fromRef][:repository][:links][:self].flat_map { |l| l[:href] }.first
@@ -160,17 +180,19 @@ module Danger
         text = full_path ? path : File.basename(path)
         url_path.gsub!(" ", "%20")
         line_ref = line ? "##{line}" : ""
-        create_link("#{repo}/browse/#{url_path}?at=#{commit}#{line_ref}", text)
+        yield("#{repo}#{url_path}?at=#{commit}#{line_ref}", text)
       end
 
       return paths.first if paths.count < 2
       paths.first(paths.count - 1).join(", ") + " & " + paths.last
     end
 
-    private
-
-    def create_link(href, text)
+    def create_html_link(href, text)
       "<a href='#{href}'>#{text}</a>"
     end
+
+    def create_markdown_link(href, text)
+      "[#{text}](#{href})"
+    end
   end
 end

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

@@ -192,9 +192,9 @@ module Danger
     def html_link(paths, full_path: true)
       paths = [paths] unless paths.kind_of?(Array)
       commit = head_commit
-      same_repo = mr_json[:project_id] == mr_json[:source_project_id]
-      sender_repo = ci_source.repo_slug.split("/").first + "/" + mr_json[:author][:username]
-      repo = same_repo ? ci_source.repo_slug : sender_repo
+      same_repo = mr_json["project_id"] == mr_json["source_project_id"]
+      sender_repo = env.ci_source.repo_slug.split("/").first + "/" + mr_author
+      repo = same_repo ? env.ci_source.repo_slug : sender_repo
       host = @gitlab.host
 
       paths = paths.map do |path|

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "3.2.1".freeze
+  VERSION = "3.2.2".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: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-04 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide