danger 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051a1eff59fbb30ef3a90f379783241daaee7aa8
-  data.tar.gz: 4fdf31bea14978875ae00a72816044a227cb868b
+  metadata.gz: 48231f5c4a008b745dd304f7906936fd7891a456
+  data.tar.gz: dfce17a735b94f29ee7c25e66929ffe701a95b61
 SHA512:
-  metadata.gz: 4ce2b6b94273078e83bdd4dc97677794bff34379bcdf41b9fc95d3f6ed9f8036a743388aec2573582c804f87bd8b57d22de788d973b94000bb86b4a30a2348c3
-  data.tar.gz: 88cf6322df304ed625c0c60d31ac4939152e6dee19cca469ac14e1333ff39d188fc2ef6ce6d9aa679c8599f9833ff00afb12e489f1f040a2ccb67600bdfa39c2
+  metadata.gz: db0bbe283f6ee56778c04c69cbd75de99331d1ad2b63c6f095d72cd0c3ab04177e2623c91d852e196825ef0a656b01369c045db93e878ebf971f87bf52a45648
+  data.tar.gz: 6ae09d8f4dfef272f7d2b28983c31f75b11a99436634f8db5ae5e5b41d2fc548ead0835e173e6805df7bdfbf014358c73535d8afe845a2a8c30d29b014de9bf8

data/lib/danger/ci_source/dotci.rb

@@ -0,0 +1,52 @@
+require "danger/request_sources/github/github"
+
+module Danger
+  # https://groupon.github.io/DotCi
+
+  # ### CI Setup
+  # DotCi is a layer on top of jenkins. So, if you're using DotCi, you're hosting your own environment.
+  #
+  # ### Token Setup
+  #
+  # #### GitHub
+  # As you own the machine, it's up to you to add the environment variable for the `DANGER_GITHUB_API_TOKEN`.
+  #
+  class DotCi < CI
+    def self.validates_as_ci?(env)
+      env.key? "DOTCI"
+    end
+
+    def self.validates_as_pr?(env)
+      !env["DOTCI_PULL_REQUEST"].nil? && !env["DOTCI_PULL_REQUEST"].match(/^[0-9]+$/).nil?
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= begin
+        [
+          Danger::RequestSources::GitHub
+        ]
+      end
+    end
+
+    def initialize(env)
+      self.repo_url = self.class.repo_url(env)
+      self.pull_request_id = self.class.pull_request_id(env)
+      repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/]+)$})
+      self.repo_slug = repo_matches[2].gsub(/\.git$/, "") unless repo_matches.nil?
+    end
+
+    def self.pull_request_id(env)
+      env["DOTCI_PULL_REQUEST"]
+    end
+
+    def self.repo_url(env)
+      if env["DOTCI_INSTALL_PACKAGES_GIT_CLONE_URL"]
+        env["DOTCI_INSTALL_PACKAGES_GIT_CLONE_URL"]
+      elsif env["DOTCI_DOCKER_COMPOSE_GIT_CLONE_URL"]
+        env["DOTCI_DOCKER_COMPOSE_GIT_CLONE_URL"]
+      else
+        env["GIT_URL"]
+      end
+    end
+  end
+end

data/lib/danger/danger_core/dangerfile.rb

@@ -278,6 +278,10 @@ module Danger
 
         # Print results in the terminal
         print_results
+      rescue DSLError => ex
+        # Push exception to the API and re-raise
+        post_exception(ex, danger_id, new_comment) unless danger_id.nil?
+        raise
       ensure
         # Makes sure that Danger specific git branches are cleaned
         env.clean_up
@@ -310,5 +314,13 @@ module Danger
         "#{line}\n"
       end
     end
+
+    def post_exception(ex, danger_id, new_comment)
+      env.request_source.update_pull_request!(
+        danger_id: danger_id,
+        new_comment: new_comment,
+        markdowns: [ex.to_markdown]
+      )
+    end
   end
 end

data/lib/danger/danger_core/standard_error.rb

@@ -62,42 +62,69 @@ module Danger
     #
     def message
       @message ||= begin
-        trace_line, description = parse_line_number_from_description
-        latest_version = Danger.danger_outdated?
-
-        m = "\n[!] "
-        m << description
-        if latest_version
-          m << upgrade_message(latest_version)
-        end
-        m = m.red if m.respond_to?(:red)
-
-        return m unless backtrace && dsl_path && contents
-
-        trace_line = backtrace.find { |l| l.include?(dsl_path.to_s) } || trace_line
-        return m unless trace_line
-        line_numer = trace_line.split(":")[1].to_i - 1
-        return m unless line_numer
-
-        lines      = contents.lines
-        indent     = " #  "
-        indicator  = indent.tr("#", ">")
-        first_line = line_numer.zero?
-        last_line  = (line_numer == (lines.count - 1))
-
-        m << "\n"
-        m << "#{indent}from #{trace_line.gsub(/:in.*$/, '')}\n"
-        m << "#{indent}-------------------------------------------\n"
-        m << "#{indent}#{lines[line_numer - 1]}" unless first_line
-        m << "#{indicator}#{lines[line_numer]}"
-        m << "#{indent}#{lines[line_numer + 1]}" unless last_line
-        m << "\n" unless m.end_with?("\n")
-        m << "#{indent}-------------------------------------------\n"
+        description, stacktrace = parse.values_at(:description, :stacktrace)
+
+        msg = description
+        msg = msg.red if msg.respond_to?(:red)
+        msg << stacktrace if stacktrace
+        msg
+      end
+    end
+
+    def to_markdown
+      @markdown ||= begin
+        description, stacktrace = parse.values_at(:description, :stacktrace)
+
+        # Highlight failed method in markdown
+        description = description.tr("'", "`")
+
+        # Escape markdown brackets
+        description = description.gsub(/<|>/) { |bracket| "\\#{bracket}" }
+
+        md = "## Danger has errored"
+        md << "#{description}\n"
+        md << "```#{stacktrace}```" if stacktrace
+
+        Markdown.new(md, nil, nil)
       end
     end
 
     private
 
+    def parse
+      result = {}
+
+      trace_line, description = parse_line_number_from_description
+      latest_version = Danger.danger_outdated?
+
+      result[:description] = "\n[!] #{description}"
+      result[:description] << upgrade_message(latest_version) if latest_version
+
+      return result unless backtrace && dsl_path && contents
+
+      trace_line = backtrace.find { |l| l.include?(dsl_path.to_s) } || trace_line
+      return result unless trace_line
+      line_numer = trace_line.split(":")[1].to_i - 1
+      return result unless line_numer
+
+      lines      = contents.lines
+      indent     = " #  "
+      indicator  = indent.tr("#", ">")
+      first_line = line_numer.zero?
+      last_line  = (line_numer == (lines.count - 1))
+
+      result[:stacktrace] = "\n"
+      result[:stacktrace] << "#{indent}from #{trace_line.gsub(/:in.*$/, '')}\n"
+      result[:stacktrace] << "#{indent}-------------------------------------------\n"
+      result[:stacktrace] << "#{indent}#{lines[line_numer - 1]}" unless first_line
+      result[:stacktrace] << "#{indicator}#{lines[line_numer]}"
+      result[:stacktrace] << "#{indent}#{lines[line_numer + 1]}" unless last_line
+      result[:stacktrace] << "\n" unless result[:stacktrace].end_with?("\n")
+      result[:stacktrace] << "#{indent}-------------------------------------------\n"
+
+      result
+    end
+
     def parse_line_number_from_description
       description = self.description
       if dsl_path && description =~ /((#{Regexp.quote File.expand_path(dsl_path)}|#{Regexp.quote dsl_path.to_s}):\d+)/

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.1.1".freeze
+  VERSION = "5.2.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: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -367,6 +367,7 @@ files:
 - lib/danger/ci_source/ci_source.rb
 - lib/danger/ci_source/circle.rb
 - lib/danger/ci_source/circle_api.rb
+- lib/danger/ci_source/dotci.rb
 - lib/danger/ci_source/drone.rb
 - lib/danger/ci_source/gitlab_ci.rb
 - lib/danger/ci_source/jenkins.rb