danger 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7d4a2f3dba7e7c7716c8bfd06cf69cb3b2fc806
-  data.tar.gz: cd388804d6549cb3df870445343ffdff0a008b62
+  metadata.gz: f983a96eaf1ae2a10009156c9b9be097912057a4
+  data.tar.gz: 13651a9f71c8abfc8b38cd0bf068d935d3c963c3
 SHA512:
-  metadata.gz: 1bbd1d8e01a1d333b806cee6ba786da604306d9f3f20a6ded0fb9c4b203b2e43d155d2df182c32a50ec68c83b0b5c23a88d6a5fe6c951492bbf6bf39f19d80a9
-  data.tar.gz: ae645782a231cb94129e93f709e193b055fa453e6b4698973d413230e21bb6a27e755329e022f3d2a6040ccdce07ce0bb6f24ba129f32d70bfba7eec12f88e8b
+  metadata.gz: 7e7234f33564197cb0b0d92f528b64e0ce66a4c328c6298ace6d33a3f2a1474c7e8e5766ae862f61e529f490f3a54867b7c81b17ddfc346909bef1f99ae086c9
+  data.tar.gz: 5b4f0190b920e7c1033f9226ea92cf98ce47b64676ad1bcf2566e528ba24094e128c56d65ca8fdd50a88fcf4cd3eea7ebb0cab05613289ef7663555472005eda

data/lib/danger/ci_source/xcode_server.rb

@@ -27,7 +27,10 @@ module Danger
     end
 
     def supported_request_sources
-      @supported_request_sources ||= [Danger::RequestSources::GitHub]
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::BitbucketServer
+      ]
     end
 
     def initialize(env)

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

@@ -3,10 +3,10 @@
 | | <%= table[:count] %> <%= table[:name] %><%= "s" unless table[:count] == 1 %> |
 |---|---|
     <%- table[:content].each do |violation| -%>
-| <%= character_from_emoji(table[:emoji]) %> | <%= violation.message %> |
+| <%= @emoji_mapper.map(table[:emoji]) %> | <%= violation.message %> |
     <%- end -%>
     <%- table[:resolved].each do |message| -%>
-| :white_check_mark: | <%= message %> |
+| @emoji_mapper.map("white_check_mark") | <%= message %> |
     <%- end -%>
 
   <%- end -%>
@@ -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 [danger](https://danger.systems/ "generated_by_<%= @danger_id %>")

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

@@ -140,8 +140,10 @@ module Danger
     end
 
     # @!group Bitbucket Server Misc
-    # Returns a list of HTML anchors for a file, or files in the head repository.
+    # Returns a list of Markdown links for a file, or files in the head repository.
     # It returns a string of multiple anchors if passed an array.
+    # @note     Atlassian [disabled inline HTML support](https://jira.atlassian.com/browse/BSERV-7147).
+    #           This method method left for backward compatibility.
     # @param    [String or Array<String>] paths
     #           A list of strings to convert to github anchors
     # @param    [Bool] full_path
@@ -150,7 +152,7 @@ module Danger
     # @return [String]
     #
     def html_link(paths, full_path: true)
-      create_link(paths, full_path) { |href, text| create_html_link(href, text) }
+      markdown_link(paths, full_path: full_path)
     end
 
     # @!group Bitbucket Server Misc
@@ -187,10 +189,6 @@ module Danger
       paths.first(paths.count - 1).join(", ") + " & " + paths.last
     end
 
-    def create_html_link(href, text)
-      "<a href='#{href}'>#{text}</a>"
-    end
-
     def create_markdown_link(href, text)
       "[#{text}](#{href})"
     end

data/lib/danger/helpers/comments_helper.rb

@@ -1,5 +1,6 @@
 require "kramdown"
 require "danger/helpers/comments_parsing_helper"
+require "danger/helpers/emoji_mapper"
 
 # rubocop:disable Metrics/ModuleLength
 
@@ -70,8 +71,9 @@ module Danger
         violations.reject { |_, v| v.empty? }
       end
 
-      def table(name, emoji, violations, all_previous_violations)
-        content = violations.map { |v| process_markdown(v) }
+      def table(name, emoji, violations, all_previous_violations, template: "github")
+        content = violations
+        content = content.map { |v| process_markdown(v) } unless template == "bitbucket_server"
 
         kind = table_kind_from_title(name)
         previous_violations = all_previous_violations[kind] || []
@@ -101,6 +103,7 @@ module Danger
         @tables = tables
         @markdowns = markdowns.map(&:message)
         @danger_id = danger_id
+        @emoji_mapper = EmojiMapper.new(template)
 
         return ERB.new(File.read(md_template), 0, "-").result(binding)
       end
@@ -108,9 +111,9 @@ module Danger
       def generate_comment(warnings: [], errors: [], messages: [], markdowns: [], previous_violations: {}, danger_id: "danger", template: "github")
         apply_template(
           tables: [
-            table("Error", "no_entry_sign", errors, previous_violations),
-            table("Warning", "warning", warnings, previous_violations),
-            table("Message", "book", messages, previous_violations)
+            table("Error", "no_entry_sign", errors, previous_violations, template: template),
+            table("Warning", "warning", warnings, previous_violations, template: template),
+            table("Message", "book", messages, previous_violations, template: template)
           ],
           markdowns: markdowns,
           danger_id: danger_id,
@@ -138,7 +141,7 @@ module Danger
         if errors.empty? && warnings.empty?
           return "All green. #{random_compliment}"
         else
-          message = "⚠ "
+          message = "⚠️ "
           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."
@@ -151,19 +154,6 @@ module Danger
          "Yay.", "Jolly good show.", "Good on 'ya.", "Nice work."].sample
       end
 
-      def character_from_emoji(emoji)
-        emoji.delete! ":"
-        if emoji == "no_entry_sign"
-          "🚫"
-        elsif emoji == "warning"
-          "⚠️"
-        elsif emoji == "book"
-          "📖"
-        elsif emoji == "white_check_mark"
-          "✅"
-        end
-      end
-
       private
 
       GITHUB_OLD_REGEX = %r{<th width="100%"(.*?)</th>}im

data/lib/danger/helpers/emoji_mapper.rb

@@ -0,0 +1,31 @@
+module Danger
+  class EmojiMapper
+    DATA = {
+      "github" => {
+        "no_entry_sign"    => "🚫",
+        "warning"          => "⚠️",
+        "book"             => "📖",
+        "white_check_mark" => "✅"
+      },
+      "bitbucket_server" => {
+        "no_entry_sign"    => "\u274C",
+        "warning"          => "⚠️",
+        "book"             => "\u2728",
+        "white_check_mark" => "\u2705"
+      }
+    }.freeze
+
+    def initialize(template)
+      @template = DATA.include?(template) ? template : "github"
+    end
+
+    def map(emoji)
+      emoji.delete! ":"
+      DATA[template][emoji]
+    end
+
+    private
+
+    attr_reader :template
+  end
+end

data/lib/danger/plugin_support/gems_resolver.rb

@@ -0,0 +1,70 @@
+require "bundler"
+
+module Danger
+  class GemsResolver
+    def initialize(gem_names)
+      @gem_names = gem_names
+      @dir = Dir.mktmpdir # We want it to persist until OS cleans it on reboot
+    end
+
+    # Returns an Array of paths (plugin lib file paths) and gems (of metadata)
+    def call
+      Bundler.with_clean_env do
+        Dir.chdir(dir) do
+          create_gemfile_from_gem_names
+          `bundle install --path vendor/gems`
+        end
+      end
+
+      return paths, gems
+    end
+
+    private
+
+    attr_reader :gem_names, :dir
+
+    def create_gemfile_from_gem_names
+      gemfile = File.new("Gemfile", "w")
+      gemfile.write "source 'https://rubygems.org'"
+
+      gem_names.each do |plugin|
+        gemfile.write "\ngem '#{plugin}'"
+      end
+
+      gemfile.close
+    end
+
+    # The paths are relative to dir.
+    def paths
+      relative_paths = gem_names.flat_map do |plugin|
+        Dir.glob("vendor/gems/ruby/*/gems/#{plugin}*/lib/**/**/**/**.rb")
+      end
+
+      relative_paths.map { |path| File.join(dir, path) }
+    end
+
+    def gems
+      real_gems.map { |gem| gem_metadata(gem) }
+    end
+
+    def real_gems
+      spec_paths = gem_names.flat_map do |plugin|
+        Dir.glob("vendor/gems/ruby/*/specifications/#{plugin}*.gemspec").first
+      end
+
+      spec_paths.map { |path| Gem::Specification.load path }
+    end
+
+    def gem_metadata(gem)
+      {
+        name: gem.name,
+        gem: gem.name,
+        author: gem.authors,
+        url: gem.homepage,
+        description: gem.summary,
+        license: gem.license || "Unknown",
+        version: gem.version.to_s
+      }
+    end
+  end
+end

data/lib/danger/plugin_support/plugin_file_resolver.rb

@@ -1,6 +1,4 @@
-require "bundler"
-require "pathname"
-require "fileutils"
+require "danger/plugin_support/gems_resolver"
 
 module Danger
   class PluginFileResolver
@@ -10,57 +8,23 @@ module Danger
       @refs = references
     end
 
+    # When given existing paths, map to absolute & existing paths
+    # When given a list of gems, resolve for list of gems
+    # When empty, imply you want to test the current lib folder as a plugin
     def resolve
-      # When given existing paths, map to absolute & existing paths
-      if !@refs.nil? and @refs.select { |ref| File.file? ref }.any?
-        paths = @refs.select { |ref| File.file? ref }.map { |path| File.expand_path(path) }
-        { paths: paths, gems: [] }
-
-      # When given a list of gems
-      elsif @refs and @refs.kind_of? Array
-        Bundler.with_clean_env do
-          # We don't use the block syntax as we want it to persist until the OS cleans it on reboot
-          # or whatever, it needs to persist outside this scope.
-          dir = Dir.mktmpdir
-
-          Dir.chdir(dir) do
-            gem_names = @refs
-            gemfile = File.new("Gemfile", "w")
-            gemfile.write "source 'https://rubygems.org'"
-
-            gem_names.each do |plugin|
-              gemfile.write "\ngem '#{plugin}'"
-            end
-
-            gemfile.close
-            `bundle install --path vendor/gems`
-
-            # the paths are relative to our current Chdir
-            relative_paths = gem_names.flat_map { |plugin| Dir.glob("vendor/gems/ruby/*/gems/#{plugin}*/lib/**/**/**/**.rb") }
-            paths = relative_paths.map { |path| File.join(dir, path) }
-
-            spec_paths = gem_names.flat_map { |plugin| Dir.glob("vendor/gems/ruby/*/specifications/#{plugin}*.gemspec").first }
-            real_gems = spec_paths.map { |path| Gem::Specification.load path }
-
-            plugin_metadata = real_gems.map do |gem|
-              {
-                name: gem.name,
-                gem: gem.name,
-                author: gem.authors,
-                url: gem.homepage,
-                description: gem.summary,
-                license: gem.license || "Unknown",
-                version: gem.version.to_s
-              }
-            end
-            { paths: paths, gems: plugin_metadata }
-          end
-        end
-      # When empty, imply you want to test the current lib folder as a plugin
+      if !refs.nil? and refs.select { |ref| File.file? ref }.any?
+        paths = refs.select { |ref| File.file? ref }.map { |path| File.expand_path(path) }
+      elsif refs and refs.kind_of? Array
+        paths, gems = GemsResolver.new(refs).call
       else
         paths = Dir.glob(File.join(".", "lib/**/*.rb")).map { |path| File.expand_path(path) }
-        { paths: paths, gems: [] }
       end
+
+      { paths: paths, gems: gems || [] }
     end
+
+    private
+
+    attr_reader :refs
   end
 end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "4.0.1".freeze
+  VERSION = "4.0.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: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -421,6 +421,8 @@ files:
 - lib/danger/helpers/comment.rb
 - lib/danger/helpers/comments_helper.rb
 - lib/danger/helpers/comments_parsing_helper.rb
+- lib/danger/helpers/emoji_mapper.rb
+- lib/danger/plugin_support/gems_resolver.rb
 - lib/danger/plugin_support/plugin.rb
 - lib/danger/plugin_support/plugin_file_resolver.rb
 - lib/danger/plugin_support/plugin_linter.rb
@@ -458,7 +460,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.