danger 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af48c7716089bda158a7d4fb5422684cda1cf882
-  data.tar.gz: 31bcd2dba47171bf5898a2d0954c385b7aa1e60b
+  metadata.gz: 37784ac6404c19b342dc3a50d908829d1b8e36dc
+  data.tar.gz: 476f09de2a6458bd6becf741a69879fab68187e0
 SHA512:
-  metadata.gz: 18da3b3a61540d5b8725e5d154c5f38e346af10429ef61fbbc280fe9f8bab6206b8442f0c868ca4559bbfe28a011607f1caac4aaccc234f86679c33435fa32c3
-  data.tar.gz: de5ffb844e8cd08df544bdde71411d3a2e1a2520fd626f018f3c51ffe44bde1f207a2608713c1cbb7ab134682aea672a2de83e454285b29ca9abd5e033f7e6c8
+  metadata.gz: dfc58b28a778b604f9a54a739d56ab6eb3d3f1a2c54073a6dc5a877a2b6a0936bef78dfdc11c541f353d9bc81f76492bec438a21da115c9401efe8dcd70cd1c2
+  data.tar.gz: 2dd2c369fe8cb209b38d9ca9f360906585ac3f9f4b6401e1c6a03ec1c3902bdf088a531862fb69e3aa391638683ff76fc48e86a2fdec4bc9a64317e86763cc09

data/lib/danger/ci_source/local_git_repo.rb

@@ -2,10 +2,15 @@
 
 require "git"
 require "uri"
-require "danger/ci_source/support/remote_finder"
-require "danger/ci_source/support/merged_pull_request_finder"
+
 require "danger/request_sources/github"
 
+require "danger/ci_source/support/find_repo_info_from_url"
+require "danger/ci_source/support/find_repo_info_from_logs"
+require "danger/ci_source/support/no_repo_info"
+require "danger/ci_source/support/pull_request_finder"
+require "danger/ci_source/support/commits"
+
 module Danger
   # ignore
   class LocalGitRepo < CI
@@ -31,29 +36,82 @@ module Danger
       @supported_request_sources ||= [Danger::RequestSources::GitHub]
     end
 
-    def print_repo_slug_warning
-      puts "Danger local requires a repository hosted on GitHub.com or GitHub Enterprise.".freeze
+    def initialize(env = {})
+      @env = env
+
+      self.repo_slug = remote_info.slug
+      raise_error_for_missing_remote if remote_info.kind_of?(NoRepoInfo)
+
+      self.pull_request_id = found_pull_request.pull_request_id
+
+      if sha
+        self.base_commit = commits.base
+        self.head_commit = commits.head
+      else
+        self.base_commit = found_pull_request.base
+        self.head_commit = found_pull_request.head
+      end
     end
 
-    def parents(sha)
-      @parents ||= run_git("rev-list --parents -n 1 #{sha}").strip.split(" ".freeze)
+    private
+
+    attr_reader :env
+
+    def raise_error_for_missing_remote
+      raise missing_remote_error_message
     end
 
-    def initialize(env = {})
-      repo_slug = RemoteFinder.new(
-        env["DANGER_GITHUB_HOST"] || "github.com".freeze,
-        run_git("remote show origin -n".freeze)
-      ).call
-
-      pull_request_id, sha = MergedPullRequestFinder.new(
-        env.fetch("LOCAL_GIT_PR_ID") { "" },
-        run_git("log --oneline -1000000".freeze)
-      ).call
-
-      self.repo_slug = repo_slug ? repo_slug : print_repo_slug_warning
-      self.pull_request_id = pull_request_id
-      self.base_commit = parents(sha)[0]
-      self.head_commit = parents(sha)[1]
+    def missing_remote_error_message
+      "danger cannot find your git remote, please set a remote. " \
+      "And the repository must host on GitHub.com or GitHub Enterprise."
+    end
+
+    def remote_info
+      @_remote_info ||= begin
+        remote_info = begin
+          if given_pull_request_url?
+            FindRepoInfoFromURL.new(env["LOCAL_GIT_PR_URL"]).call
+          else
+            FindRepoInfoFromLogs.new(
+              env["DANGER_GITHUB_HOST"] || "github.com".freeze,
+              run_git("remote show origin -n".freeze)
+            ).call
+          end
+        end
+
+        remote_info || NoRepoInfo.new
+      end
+    end
+
+    def found_pull_request
+      @_found_pull_request ||= begin
+        if given_pull_request_url?
+          PullRequestFinder.new(
+            remote_info.id,
+            remote_info.slug,
+            remote: true
+          ).call
+        else
+          PullRequestFinder.new(
+            env.fetch("LOCAL_GIT_PR_ID") { "".freeze },
+            remote_info.slug,
+            remote: false,
+            git_logs: run_git("log --oneline -1000000".freeze)
+          ).call
+        end
+      end
+    end
+
+    def given_pull_request_url?
+      env["LOCAL_GIT_PR_URL"] && !env["LOCAL_GIT_PR_URL"].empty?
+    end
+
+    def sha
+      @_sha ||= found_pull_request.sha
+    end
+
+    def commits
+      @_commits ||= Commits.new(run_git("rev-list --parents -n 1 #{sha}"))
     end
   end
 end

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

@@ -0,0 +1,17 @@
+class Commits
+  def initialize(base_head)
+    @base_head = base_head.strip.split(" ".freeze)
+  end
+
+  def base
+    base_head.first
+  end
+
+  def head
+    base_head.last
+  end
+
+  private
+
+  attr_reader :base_head
+end

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

@@ -0,0 +1,35 @@
+require "danger/ci_source/support/repo_info"
+
+module Danger
+  class FindRepoInfoFromLogs
+    def initialize(github_host, remote_logs)
+      @github_host = github_host
+      @remote_logs = remote_logs
+    end
+
+    def call
+      matched = remote.match(regexp)
+
+      if matched
+        RepoInfo.new(matched["repo_slug"], nil)
+      end
+    end
+
+    private
+
+    attr_reader :remote_logs, :github_host
+
+    def remote
+      remote_logs.lines.grep(/Fetch URL/)[0].split(": ".freeze, 2)[1]
+    end
+
+    def regexp
+      %r{
+        #{Regexp.escape(github_host)}
+        (:|/|(:/))
+        (?<repo_slug>[^/]+/.+?)
+        (?:\.git)?$
+      }x
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require "danger/ci_source/support/repo_info"
+
+module Danger
+  class FindRepoInfoFromURL
+    REGEXP = %r{
+      (?<slug>[^/]+/[^/]+)
+      (/(pull|merge_requests|pull-requests)/)
+      (?<id>\d+)
+    }x
+
+    def initialize(url)
+      @url = url
+    end
+
+    def call
+      matched = url.match(REGEXP)
+
+      if matched
+        RepoInfo.new(matched[:slug], matched[:id])
+      end
+    end
+
+    private
+
+    attr_reader :url
+  end
+end

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

@@ -0,0 +1,20 @@
+module Danger
+  class LocalPullRequest
+    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
+
+    def valid?
+      pull_request_id && sha
+    end
+
+    private
+
+    attr_reader :log_line
+  end
+end

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

@@ -0,0 +1,7 @@
+module Danger
+  class NoPullRequest
+    def valid?
+      false
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+module Danger
+  class NoRepoInfo
+    attr_reader :slug, :id
+  end
+end

data/lib/danger/ci_source/support/{merged_pull_request_finder.rb → pull_request_finder.rb}

@@ -1,25 +1,82 @@
+require "danger/ci_source/support/local_pull_request"
+require "danger/ci_source/support/remote_pull_request"
+require "danger/ci_source/support/no_pull_request"
+
 module Danger
-  class MergedPullRequestFinder
-    def initialize(specific_pull_request_id, git_logs)
+  class PullRequestFinder
+    def initialize(specific_pull_request_id, repo_slug = nil, remote: false, git_logs: "")
       @specific_pull_request_id = specific_pull_request_id
       @git_logs = git_logs
+      @repo_slug = repo_slug
+      @remote = to_boolean(remote)
     end
 
     def call
-      check_if_any_merged_pull_request!
+      check_if_any_pull_request!
 
-      [merged_pull_request_id, merged_pull_request_sha]
+      pull_request
     end
 
     private
 
-    attr_reader :specific_pull_request_id, :git_logs
+    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
+    end
+
+    def check_if_any_pull_request!
+      unless pull_request.valid?
+        if !specific_pull_request_id.empty?
+          raise "Could not find the Pull Request (#{specific_pull_request_id}) inside the git history for this repo."
+        else
+          raise "No recent Pull Requests found for this repo, danger requires at least one Pull Request for the local mode.".freeze
+        end
+      end
+    end
+
+    # @return [String] Log line of most recent merged Pull Request
+    def pull_request
+      @pull_request ||= begin
+        return if pull_request_ref.empty?
+
+        if both_present?
+          LocalPullRequest.new(pick_the_most_recent_one_from_two_matches)
+        elsif only_merged_pull_request_present?
+          LocalPullRequest.new(most_recent_merged_pull_request)
+        elsif only_squash_and_merged_pull_request_present?
+          LocalPullRequest.new(most_recent_squash_and_merged_pull_request)
+        elsif remote && remote_pull_request
+          RemotePullRequest.new(
+            remote_pull_request.number.to_s,
+            remote_pull_request.head.sha,
+            remote_pull_request.base.sha
+          )
+        else
+          NoPullRequest.new
+        end
+      end
+    end
 
     # @return [String] "#42"
     def pull_request_ref
       !specific_pull_request_id.empty? ? "##{specific_pull_request_id}" : "#\\d+".freeze
     end
 
+    def remote_pull_request
+      @_remote_pull_request ||= begin
+        client.pull_request(repo_slug, specific_pull_request_id)
+      end
+    end
+
+    def both_present?
+      most_recent_merged_pull_request && most_recent_squash_and_merged_pull_request
+    end
+
     # @return [String] Log line of format: "Merge pull request #42"
     def most_recent_merged_pull_request
       @most_recent_merged_pull_request ||= begin
@@ -34,23 +91,17 @@ module Danger
       end
     end
 
-    # @return [String] Log line of most recent merged Pull Request
-    def merged_pull_request
-      return if pull_request_ref.empty?
+    def pick_the_most_recent_one_from_two_matches
+      merged_index = git_logs.lines.index(most_recent_merged_pull_request)
+      squash_and_merged_index = git_logs.lines.index(most_recent_squash_and_merged_pull_request)
 
-      if both_present?
-        pick_the_most_recent_one_from_two_matches
-      elsif only_merged_pull_request_present?
-        most_recent_merged_pull_request
-      elsif only_squash_and_merged_pull_request_present?
+      if merged_index > squash_and_merged_index # smaller index is more recent
         most_recent_squash_and_merged_pull_request
+      else
+        most_recent_merged_pull_request
       end
     end
 
-    def both_present?
-      most_recent_merged_pull_request && most_recent_squash_and_merged_pull_request
-    end
-
     def only_merged_pull_request_present?
       return false if most_recent_squash_and_merged_pull_request
 
@@ -63,33 +114,9 @@ module Danger
       !most_recent_squash_and_merged_pull_request.nil? && !most_recent_squash_and_merged_pull_request.empty?
     end
 
-    def pick_the_most_recent_one_from_two_matches
-      merged_index = git_logs.lines.index(most_recent_merged_pull_request)
-      squash_and_merged_index = git_logs.lines.index(most_recent_squash_and_merged_pull_request)
-
-      if merged_index > squash_and_merged_index # smaller index is more recent
-        most_recent_squash_and_merged_pull_request
-      else
-        most_recent_merged_pull_request
-      end
-    end
-
-    def check_if_any_merged_pull_request!
-      if merged_pull_request.to_s.empty?
-        if !specific_pull_request_id.empty?
-          raise "Could not find the Pull Request (#{specific_pull_request_id}) inside the git history for this repo."
-        else
-          raise "No recent Pull Requests found for this repo, danger requires at least one Pull Request for the local mode.".freeze
-        end
-      end
-    end
-
-    def merged_pull_request_id
-      merged_pull_request.match(/#(?<id>[0-9]+)/)[:id]
-    end
-
-    def merged_pull_request_sha
-      merged_pull_request.split(" ".freeze).first
+    def client
+      require "octokit"
+      Octokit::Client.new(access_token: ENV["DANGER_GITHUB_API_TOKEN"])
     end
   end
 end

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

@@ -0,0 +1,15 @@
+module Danger
+  class RemotePullRequest
+    attr_reader :pull_request_id, :sha, :head, :base
+
+    def initialize(pull_request_id, head, base)
+      @pull_request_id = pull_request_id
+      @head = head
+      @base = base
+    end
+
+    def valid?
+      pull_request_id && head && base
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Danger
+  class RepoInfo
+    attr_reader :slug, :id
+
+    def initialize(slug, id)
+      @slug = slug
+      @id = id
+    end
+  end
+end

data/lib/danger/commands/pr.rb

@@ -0,0 +1,116 @@
+require "danger/commands/local_helpers/http_cache"
+require "faraday/http_cache"
+require "fileutils"
+require "octokit"
+require "tmpdir"
+
+module Danger
+  class PR < Runner
+    self.summary = "Run the Dangerfile against Pull Requests (works with forks, too).".freeze
+    self.command = "pr".freeze
+
+    def self.options
+      [
+        ["--use-pr=[#id]", "The URL of the Pull Request for the command to run."],
+        ["--clear-http-cache", "Clear the local http cache before running Danger locally."],
+        ["--pry", "Drop into a Pry shell after evaluating the Dangerfile."]
+      ]
+    end
+
+    def initialize(argv)
+      @pr_url = argv.option("use-pr")
+      @clear_http_cache = argv.flag?("clear-http-cache", false)
+
+      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\")")
+      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!
+      super
+      unless @dangerfile_path
+        help! "Could not find a Dangerfile."
+      end
+    end
+
+    def run
+      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
+
+      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
+      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)
+
+        dm.parse(Pathname.new(@dangerfile_path))
+        dm.print_results
+      ensure
+        dm.env.clean_up
+      end
+    end
+  end
+end

data/lib/danger/commands/runner.rb

@@ -3,6 +3,7 @@ module Danger
     require "danger/commands/init"
     require "danger/commands/local"
     require "danger/commands/systems"
+    require "danger/commands/pr"
 
     # manually set claide plugins as a subcommand
     require "claide_plugin"

data/lib/danger/commands/systems.rb

@@ -16,10 +16,12 @@ module Danger
       require "yard"
       # Pull out all the Danger::CI subclasses docs
       registry = YARD::Registry.load(ci_source_paths, true)
-      ci_sources = registry.all(:class)
-                           .select { |klass| klass.inheritance_tree.map(&:name).include? :CI }
-                           .reject { |source| source.name == :CI }
-                           .reject { |source| source.name == :LocalGitRepo }
+      ci_sources = begin
+        registry.all(:class)
+          .select { |klass| klass.inheritance_tree.map(&:name).include? :CI }
+          .reject { |source| source.name == :CI }
+          .reject { |source| source.name == :LocalGitRepo }
+      end
 
       # Fail if anything is added and not documented
       cis_without_docs = ci_sources.select { |source| source.base_docstring.empty? }

data/lib/danger/request_sources/github.rb

@@ -98,8 +98,10 @@ module Danger
       end
 
       def issue_comments
-        @comments ||= client.issue_comments(ci_source.repo_slug, ci_source.pull_request_id)
-                            .map { |comment| Comment.from_github(comment) }
+        @comments ||= begin
+          client.issue_comments(ci_source.repo_slug, ci_source.pull_request_id)
+            .map { |comment| Comment.from_github(comment) }
+        end
       end
 
       # Sending data to GitHub

data/lib/danger/request_sources/gitlab.rb

@@ -55,13 +55,17 @@ module Danger
       end
 
       def mr_comments
-        @comments ||= client.merge_request_comments(escaped_ci_slug, ci_source.pull_request_id)
-                            .map { |comment| Comment.from_gitlab(comment) }
+        @comments ||= begin
+          client.merge_request_comments(escaped_ci_slug, ci_source.pull_request_id)
+            .map { |comment| Comment.from_gitlab(comment) }
+        end
       end
 
       def mr_diff
-        @mr_diff ||= client.merge_request_changes(escaped_ci_slug, ci_source.pull_request_id)
-                           .changes.map { |change| change["diff"] }.join("\n")
+        @mr_diff ||= begin
+          client.merge_request_changes(escaped_ci_slug, ci_source.pull_request_id)
+            .changes.map { |change| change["diff"] }.join("\n")
+        end
       end
 
       def escaped_ci_slug

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "3.5.0".freeze
+  VERSION = "3.5.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: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -385,8 +385,15 @@ files:
 - lib/danger/ci_source/jenkins.rb
 - lib/danger/ci_source/local_git_repo.rb
 - lib/danger/ci_source/semaphore.rb
-- lib/danger/ci_source/support/merged_pull_request_finder.rb
-- lib/danger/ci_source/support/remote_finder.rb
+- lib/danger/ci_source/support/commits.rb
+- lib/danger/ci_source/support/find_repo_info_from_logs.rb
+- lib/danger/ci_source/support/find_repo_info_from_url.rb
+- lib/danger/ci_source/support/local_pull_request.rb
+- lib/danger/ci_source/support/no_pull_request.rb
+- lib/danger/ci_source/support/no_repo_info.rb
+- lib/danger/ci_source/support/pull_request_finder.rb
+- lib/danger/ci_source/support/remote_pull_request.rb
+- lib/danger/ci_source/support/repo_info.rb
 - lib/danger/ci_source/surf.rb
 - lib/danger/ci_source/teamcity.rb
 - lib/danger/ci_source/travis.rb
@@ -401,6 +408,7 @@ files:
 - lib/danger/commands/plugins/plugin_json.rb
 - lib/danger/commands/plugins/plugin_lint.rb
 - lib/danger/commands/plugins/plugin_readme.rb
+- lib/danger/commands/pr.rb
 - lib/danger/commands/runner.rb
 - lib/danger/commands/systems.rb
 - lib/danger/comment_generators/bitbucket_server.md.erb
@@ -461,7 +469,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.

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

@@ -1,26 +0,0 @@
-module Danger
-  class RemoteFinder
-    def initialize(github_host, remote_logs)
-      @github_host = github_host
-      @remote_logs = remote_logs
-    end
-
-    def call
-      remote_url_matches && remote_url_matches["repo_slug"]
-    end
-
-    private
-
-    attr_reader :remote_logs, :github_host
-
-    # @return [String] The remote URL
-    def remote
-      @remote ||= remote_logs.lines.grep(/Fetch URL/)[0].split(": ".freeze, 2)[1]
-    end
-
-    # @return [nil / MatchData] MatchData object or nil if not matched
-    def remote_url_matches
-      remote.match(%r{#{Regexp.escape github_host}(:|/)(?<repo_slug>.+/.+?)(?:\.git)?$})
-    end
-  end
-end