danger 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82dca74fcf8a4629e8c7fecf513fdbbd0feda54e
-  data.tar.gz: 11e28125d2bc46d16138ad84c5fdab0ade125c23
+  metadata.gz: 04df75f0e2d2102ce7e9d3024be69a756881b387
+  data.tar.gz: 76f1470a89a64bfb8b068ea8492b0a2f3c73bfa0
 SHA512:
-  metadata.gz: 47ce76196203206dd4fcc774a1483f9676b78a12445f46a5c1b3967a39893e2c6a0d1f9ead92722938fb072c8761a8fc98e31b3a80b1dbc7b0a4eae6a76369f0
-  data.tar.gz: cdea49f48ea1e7f9f0f8f4e88f595fefdd3d990801a9876063167ec435beccdbc7119093c12554b0d91ca2f03f2b9f4b12eda37955415edb163e22bf2456ab61
+  metadata.gz: 58f1c840ed23922d7d8124c32e86b95116551b882fd22dccd61576b8cc09055544b03c302cfbf08d98e01ae790ab4152a69d3668f39211c9a9ec6acbf220291a
+  data.tar.gz: 525ee057e14c71dc46e95679c2d62686c6c48a507de94b9ed3202f738f78043d6ef27fc42543f3d69e48dfecff1441194ab7db5fb9f3c9903f56ed928412b179

data/lib/danger/ci_source/jenkins.rb

@@ -62,8 +62,13 @@ module Danger
       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{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})
-      self.repo_slug = repo_matches[2] unless repo_matches.nil?
+      repo_matches = self.repo_url.match(%r{(?:[\/:])projects\/([^\/.]+)\/repos\/([^\/.]+)}) # Bitbucket Server
+      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?
+      end
     end
 
     def self.pull_request_id(env)

data/lib/danger/ci_source/support/local_pull_request.rb

@@ -3,8 +3,6 @@ module Danger
     attr_reader :pull_request_id, :sha
 
     def initialize(log_line)
-      @log_line = log_line
-
       @pull_request_id = log_line.match(/#(?<id>[0-9]+)/)[:id]
       @sha = log_line.split(" ".freeze).first
     end
@@ -12,9 +10,5 @@ module Danger
     def valid?
       pull_request_id && sha
     end
-
-    private
-
-    attr_reader :log_line
   end
 end

data/lib/danger/ci_source/support/pull_request_finder.rb

@@ -22,11 +22,7 @@ module Danger
     attr_reader :specific_pull_request_id, :git_logs, :repo_slug, :remote
 
     def to_boolean(maybe_string)
-      if ["true", "1", "yes", "y", true].include?(maybe_string)
-        true
-      else
-        false
-      end
+      ["true", "1", "yes", "y", true].include?(maybe_string)
     end
 
     def check_if_any_pull_request!

data/lib/danger/commands/local.rb

@@ -1,4 +1,6 @@
 require "danger/commands/local_helpers/http_cache"
+require "danger/commands/local_helpers/local_setup"
+require "danger/commands/local_helpers/pry_setup"
 require "faraday/http_cache"
 require "fileutils"
 require "octokit"
@@ -23,28 +25,9 @@ module Danger
 
       super
 
-      setup_pry if should_pry?(argv)
-    end
-
-    def should_pry?(argv)
-      argv.flag?("pry", false) && !@dangerfile_path.empty? && validate_pry_available
-    end
-
-    def setup_pry
-      File.delete "_Dangerfile.tmp" if File.exist? "_Dangerfile.tmp"
-      FileUtils.cp @dangerfile_path, "_Dangerfile.tmp"
-      File.open("_Dangerfile.tmp", "a") do |f|
-        f.write("binding.pry; File.delete(\"_Dangerfile.tmp\")")
+      if argv.flag?("pry", false)
+        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path)
       end
-      @dangerfile_path = "_Dangerfile.tmp"
-    end
-
-    def validate_pry_available
-      require "pry"
-    rescue LoadError
-      cork.warn "Pry was not found, and is required for 'danger local --pry'."
-      cork.print_warnings
-      abort
     end
 
     def validate!
@@ -58,58 +41,32 @@ module Danger
       ENV["DANGER_USE_LOCAL_GIT"] = "YES"
       ENV["LOCAL_GIT_PR_ID"] = @pr_num if @pr_num
 
-      # setup caching for Github calls to hitting the API rate limit too quickly
-      cache_file = File.join(ENV["DANGER_TMPDIR"] || Dir.tmpdir, "danger_local_cache")
-      cache = HTTPCache.new(cache_file, clear_cache: @clear_http_cache)
-      Octokit.middleware = Faraday::RackBuilder.new do |builder|
-        builder.use Faraday::HttpCache, store: cache, serializer: Marshal, shared_cache: false
-        builder.use Octokit::Response::RaiseError
-        builder.adapter Faraday.default_adapter
-      end
+      configure_octokit(ENV["DANGER_TMPDIR"] || Dir.tmpdir)
 
       env = EnvironmentManager.new(ENV, cork)
       dm = Dangerfile.new(env, cork)
-      dm.init_plugins
 
-      source = dm.env.ci_source
-      if source.nil? or source.repo_slug.empty?
-        cork.puts "danger local failed because it only works with GitHub projects at the moment. Sorry.".red
-        exit 0
+      LocalSetup.new(dm, cork).setup(verbose: verbose) do
+        dm.run(
+          Danger::EnvironmentManager.danger_base_branch,
+          Danger::EnvironmentManager.danger_head_branch,
+          @dangerfile_path,
+          nil,
+          nil
+        )
       end
+    end
 
-      gh = dm.env.request_source
-
-      cork.puts "Running your Dangerfile against this PR - https://#{gh.host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
-
-      if verbose != true
-        cork.puts "Turning on --verbose"
-        dm.verbose = true
-      end
-
-      cork.puts
-
-      # We can use tokenless here, as it's running on someone's computer
-      # and is IP locked, as opposed to on the CI.
-      gh.support_tokenless_auth = true
-
-      begin
-        gh.fetch_details
-      rescue Octokit::NotFound
-        cork.puts "Local repository was not found on GitHub. If you're trying to test a private repository please provide a valid API token through " + "DANGER_GITHUB_API_TOKEN".yellow + " environment variable."
-        return
-      end
-
-      dm.env.request_source = gh
-
-      begin
-        dm.env.fill_environment_vars
-        dm.env.ensure_danger_branches_are_setup
-        dm.env.scm.diff_for_folder(".", from: Danger::EnvironmentManager.danger_base_branch, to: Danger::EnvironmentManager.danger_head_branch)
+    private
 
-        dm.parse(Pathname.new(@dangerfile_path))
-        dm.print_results
-      ensure
-        dm.env.clean_up
+    def configure_octokit(cache_dir)
+      # setup caching for Github calls to hitting the API rate limit too quickly
+      cache_file = File.join(cache_dir, "danger_local_cache")
+      cache = HTTPCache.new(cache_file, clear_cache: @clear_http_cache)
+      Octokit.middleware = Faraday::RackBuilder.new do |builder|
+        builder.use Faraday::HttpCache, store: cache, serializer: Marshal, shared_cache: false
+        builder.use Octokit::Response::RaiseError
+        builder.adapter Faraday.default_adapter
       end
     end
   end

data/lib/danger/commands/local_helpers/local_setup.rb

@@ -0,0 +1,41 @@
+module Danger
+  class LocalSetup
+    attr_reader :dm, :cork
+
+    def initialize(dangerfile, cork)
+      @dm = dangerfile
+      @cork = cork
+    end
+
+    def setup(verbose: false)
+      source = dm.env.ci_source
+      if source.nil? or source.repo_slug.empty?
+        cork.puts "danger local failed because it only works with GitHub projects at the moment. Sorry.".red
+        exit 0
+      end
+
+      gh = dm.env.request_source
+      # We can use tokenless here, as it's running on someone's computer
+      # and is IP locked, as opposed to on the CI.
+      gh.support_tokenless_auth = true
+
+      cork.puts "Running your Dangerfile against this PR - https://#{gh.host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
+
+      unless verbose
+        cork.puts "Turning on --verbose"
+        dm.verbose = true
+      end
+
+      cork.puts
+
+      begin
+        gh.fetch_details
+      rescue Octokit::NotFound
+        cork.puts "Local repository was not found on GitHub. If you're trying to test a private repository please provide a valid API token through " + "DANGER_GITHUB_API_TOKEN".yellow + " environment variable."
+        return
+      end
+
+      yield
+    end
+  end
+end

data/lib/danger/commands/local_helpers/pry_setup.rb

@@ -0,0 +1,31 @@
+module Danger
+  class PrySetup
+    def initialize(cork)
+      @cork = cork
+    end
+
+    def setup_pry(dangerfile_path)
+      return dangerfile_path if dangerfile_path.empty?
+      validate_pry_available
+      FileUtils.cp dangerfile_path, DANGERFILE_COPY
+      File.open(DANGERFILE_COPY, "a") do |f|
+        f.write("binding.pry; File.delete(\"#{DANGERFILE_COPY}\")")
+      end
+      DANGERFILE_COPY
+    end
+
+    private
+
+    attr_reader :cork
+
+    DANGERFILE_COPY = "_Dangerfile.tmp".freeze
+
+    def validate_pry_available
+      Kernel.require "pry"
+    rescue LoadError
+      cork.warn "Pry was not found, and is required for 'danger pr --pry'."
+      cork.print_warnings
+      abort
+    end
+  end
+end

data/lib/danger/commands/pr.rb

@@ -1,4 +1,5 @@
 require "danger/commands/local_helpers/http_cache"
+require "danger/commands/local_helpers/pry_setup"
 require "faraday/http_cache"
 require "fileutils"
 require "octokit"
@@ -26,28 +27,9 @@ module Danger
 
       @dangerfile_path = dangerfile if File.exist?(dangerfile)
 
-      setup_pry if should_pry?(argv)
-    end
-
-    def should_pry?(argv)
-      argv.flag?("pry", false) && !@dangerfile_path.empty? && validate_pry_available
-    end
-
-    def setup_pry
-      File.delete "_Dangerfile.tmp" if File.exist? "_Dangerfile.tmp"
-      FileUtils.cp @dangerfile_path, "_Dangerfile.tmp"
-      File.open("_Dangerfile.tmp", "a") do |f|
-        f.write("binding.pry; File.delete(\"_Dangerfile.tmp\")")
+      if argv.flag?("pry", false)
+        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path)
       end
-      @dangerfile_path = "_Dangerfile.tmp"
-    end
-
-    def validate_pry_available
-      require "pry"
-    rescue LoadError
-      cork.warn "Pry was not found, and is required for 'danger pr --pry'."
-      cork.print_warnings
-      abort
     end
 
     def validate!
@@ -61,58 +43,32 @@ module Danger
       ENV["DANGER_USE_LOCAL_GIT"] = "YES"
       ENV["LOCAL_GIT_PR_URL"] = @pr_url if @pr_url
 
-      # setup caching for Github calls to hitting the API rate limit too quickly
-      cache_file = File.join(ENV["DANGER_TMPDIR"] || Dir.tmpdir, "danger_local_cache")
-      cache = HTTPCache.new(cache_file, clear_cache: @clear_http_cache)
-      Octokit.middleware = Faraday::RackBuilder.new do |builder|
-        builder.use Faraday::HttpCache, store: cache, serializer: Marshal, shared_cache: false
-        builder.use Octokit::Response::RaiseError
-        builder.adapter Faraday.default_adapter
-      end
+      configure_octokit(ENV["DANGER_TMPDIR"] || Dir.tmpdir)
 
       env = EnvironmentManager.new(ENV, cork)
       dm = Dangerfile.new(env, cork)
-      dm.init_plugins
 
-      source = dm.env.ci_source
-      if source.nil? or source.repo_slug.empty?
-        cork.puts "danger pr failed because it only works with GitHub projects at the moment. Sorry.".red
-        exit 0
+      LocalSetup.new(dm, cork).setup(verbose: verbose) do
+        dm.run(
+          Danger::EnvironmentManager.danger_base_branch,
+          Danger::EnvironmentManager.danger_head_branch,
+          @dangerfile_path,
+          nil,
+          nil
+        )
       end
+    end
 
-      gh = dm.env.request_source
-
-      cork.puts "Running your Dangerfile against this PR - https://#{gh.host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
-
-      if verbose != true
-        cork.puts "Turning on --verbose"
-        dm.verbose = true
-      end
-
-      cork.puts
-
-      # We can use tokenless here, as it's running on someone's computer
-      # and is IP locked, as opposed to on the CI.
-      gh.support_tokenless_auth = true
-
-      begin
-        gh.fetch_details
-      rescue Octokit::NotFound
-        cork.puts "Local repository was not found on GitHub. If you're trying to test a private repository please provide a valid API token through " + "DANGER_GITHUB_API_TOKEN".yellow + " environment variable."
-        return
-      end
-
-      dm.env.request_source = gh
-
-      begin
-        dm.env.fill_environment_vars
-        dm.env.ensure_danger_branches_are_setup
-        dm.env.scm.diff_for_folder(".", from: Danger::EnvironmentManager.danger_base_branch, to: Danger::EnvironmentManager.danger_head_branch)
+    private
 
-        dm.parse(Pathname.new(@dangerfile_path))
-        dm.print_results
-      ensure
-        dm.env.clean_up
+    def configure_octokit(cache_dir)
+      # setup caching for Github calls to hitting the API rate limit too quickly
+      cache_file = File.join(cache_dir, "danger_local_cache")
+      cache = HTTPCache.new(cache_file, clear_cache: @clear_http_cache)
+      Octokit.middleware = Faraday::RackBuilder.new do |builder|
+        builder.use Faraday::HttpCache, store: cache, serializer: Marshal, shared_cache: false
+        builder.use Octokit::Response::RaiseError
+        builder.adapter Faraday.default_adapter
       end
     end
   end

data/lib/danger/commands/runner.rb

@@ -58,7 +58,7 @@ module Danger
         ["--fail-on-errors=<true|false>", "Should always fail the build process, defaults to false"],
         ["--dangerfile=<path/to/dangerfile>", "The location of your Dangerfile"],
         ["--danger_id=<id>", "The identifier of this Danger instance"],
-        ["--new-comment", "Makes Danger post a new comment instead of editing it's previous one"]
+        ["--new-comment", "Makes Danger post a new comment instead of editing its previous one"]
       ].concat(super)
     end
 

data/lib/danger/danger_core/dangerfile.rb

@@ -274,7 +274,7 @@ module Danger
         # Push results to the API
         # Pass along the details of the run to the request source
         # to send back to the code review site.
-        post_results(danger_id, new_comment)
+        post_results(danger_id, new_comment) unless danger_id.nil?
 
         # Print results in the terminal
         print_results

data/lib/danger/helpers/comments_helper.rb

@@ -3,8 +3,6 @@ require "danger/helpers/comments_parsing_helper"
 require "danger/helpers/emoji_mapper"
 require "danger/helpers/find_max_num_violations"
 
-# rubocop:disable Metrics/ModuleLength
-
 module Danger
   module Helpers
     module CommentsHelper
@@ -56,22 +54,6 @@ module Danger
         Violation.new(html, violation.sticky, violation.file, violation.line)
       end
 
-      def parse_comment(comment)
-        tables = parse_tables_from_comment(comment)
-        violations = {}
-        tables.each do |table|
-          match = danger_table?(table)
-          next unless match
-          title = match[1]
-          kind = table_kind_from_title(title)
-          next unless kind
-
-          violations[kind] = violations_from_table(table)
-        end
-
-        violations.reject { |_, v| v.empty? }
-      end
-
       def table(name, emoji, violations, all_previous_violations, template: "github")
         content = violations
         content = content.map { |v| process_markdown(v) } unless template == "bitbucket_server"
@@ -157,21 +139,6 @@ module Danger
 
       private
 
-      GITHUB_OLD_REGEX = %r{<th width="100%"(.*?)</th>}im
-      NEW_REGEX = %r{<th.*data-danger-table="true"(.*?)</th>}im
-
-      def danger_table?(table)
-        # The old GitHub specific method relied on
-        # the width of a `th` element to find the table
-        # title and determine if it was a danger table.
-        # The new method uses a more robust data-danger-table
-        # tag instead.
-        match = GITHUB_OLD_REGEX.match(table)
-        return match if match
-
-        return NEW_REGEX.match(table)
-      end
-
       def pluralize(string, count)
         string.danger_pluralize(count)
       end

data/lib/danger/helpers/comments_parsing_helper.rb

@@ -27,8 +27,9 @@ module Danger
         tables = parse_tables_from_comment(comment)
         violations = {}
         tables.each do |table|
-          next unless table =~ %r{<th width="100%"(.*?)</th>}im
-          title = Regexp.last_match(1)
+          match = danger_table?(table)
+          next unless match
+          title = match[1]
           kind = table_kind_from_title(title)
           next unless kind
 
@@ -47,6 +48,23 @@ module Danger
           :message
         end
       end
+
+      private
+
+      GITHUB_OLD_REGEX = %r{<th width="100%"(.*?)</th>}im
+      NEW_REGEX = %r{<th.*data-danger-table="true"(.*?)</th>}im
+
+      def danger_table?(table)
+        # The old GitHub specific method relied on
+        # the width of a `th` element to find the table
+        # title and determine if it was a danger table.
+        # The new method uses a more robust data-danger-table
+        # tag instead.
+        match = GITHUB_OLD_REGEX.match(table)
+        return match if match
+
+        return NEW_REGEX.match(table)
+      end
     end
   end
 end

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

@@ -3,7 +3,8 @@ require "octokit"
 require "danger/helpers/comments_helper"
 require "danger/helpers/comment"
 require "danger/request_sources/github/github_review"
-require "danger/request_sources/github/octokit_pr_review.rb"
+require "danger/request_sources/github/github_review_unsupported"
+require "danger/request_sources/github/octokit_pr_review"
 require "danger/request_sources/support/get_ignored_violation"
 
 module Danger
@@ -66,12 +67,17 @@ module Danger
 
       def review
         return @review unless @review.nil?
-        @review = client.pull_request_reviews(ci_source.repo_slug, ci_source.pull_request_id)
-          .map { |review_json| Danger::RequestSources::GitHubSource::Review.new(client, ci_source, review_json) }
-          .select(&:generated_by_danger?)
-          .last
-        @review ||= Danger::RequestSources::GitHubSource::Review.new(client, ci_source)
-        @review
+        begin
+          @review = client.pull_request_reviews(ci_source.repo_slug, ci_source.pull_request_id)
+            .map { |review_json| Danger::RequestSources::GitHubSource::Review.new(client, ci_source, review_json) }
+            .select(&:generated_by_danger?)
+            .last
+          @review ||= Danger::RequestSources::GitHubSource::Review.new(client, ci_source)
+          @review
+        rescue Octokit::NotFound
+          @review = Danger::RequestSources::GitHubSource::ReviewUnsupported.new
+          @review
+        end
       end
 
       def setup_danger_branches
@@ -230,7 +236,7 @@ module Danger
 
         diff_lines = self.pr_diff.lines
         pr_comments = client.pull_request_comments(ci_source.repo_slug, ci_source.pull_request_id)
-        danger_comments = pr_comments.select { |comment| comment["body"].include?("generated_by_#{danger_id}") }
+        danger_comments = pr_comments.select { |comment| Comment.from_github(comment).generated_by_danger?(danger_id) }
         non_danger_comments = pr_comments - danger_comments
 
         submit_inline_comments_for_kind!("warning", warnings, diff_lines, danger_comments, previous_violations["warning"], danger_id: danger_id)

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

@@ -0,0 +1,24 @@
+# coding: utf-8
+module Danger
+  module RequestSources
+    module GitHubSource
+      class ReviewUnsupported
+        attr_reader :id, :body, :status, :review_json
+
+        def initialize; end
+
+        def start; end
+
+        def submit; end
+
+        def message(message, sticky = true, file = nil, line = nil); end
+
+        def warn(message, sticky = true, file = nil, line = nil); end
+
+        def fail(message, sticky = true, file = nil, line = nil); end
+
+        def markdown(message, file = nil, line = nil); end
+      end
+    end
+  end
+end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "4.2.1".freeze
+  VERSION = "4.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: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -391,6 +391,8 @@ files:
 - lib/danger/commands/init_helpers/interviewer.rb
 - lib/danger/commands/local.rb
 - lib/danger/commands/local_helpers/http_cache.rb
+- lib/danger/commands/local_helpers/local_setup.rb
+- lib/danger/commands/local_helpers/pry_setup.rb
 - lib/danger/commands/plugins/plugin_json.rb
 - lib/danger/commands/plugins/plugin_lint.rb
 - lib/danger/commands/plugins/plugin_readme.rb
@@ -436,6 +438,7 @@ files:
 - lib/danger/request_sources/github/github.rb
 - lib/danger/request_sources/github/github_review.rb
 - lib/danger/request_sources/github/github_review_resolver.rb
+- lib/danger/request_sources/github/github_review_unsupported.rb
 - lib/danger/request_sources/github/octokit_pr_review.rb
 - lib/danger/request_sources/gitlab.rb
 - lib/danger/request_sources/request_source.rb