danger 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c67b44470cd2e591a3308ff21397f02ca56c39df0777856bdb124336b8f34d8
-  data.tar.gz: cb10a0fbe36d92be5346930a12dda0d20f33d093968a8bc60e821894752fe4e2
+  metadata.gz: 12728d6688a88a9852c1db80a4538bd610511388749fb76b2f774ea31a9f0517
+  data.tar.gz: bc6f5250eb2851de5537c9f9ac0755259a6e249c393617125f09665334ab3587
 SHA512:
-  metadata.gz: 636bd57417f223be9410e682d687eb109a93de82c2836884cc30d378261545f8c3ab1da15c278a893ffd2fcbf024bfadb4ad13f57d15c07bfd9386ac6ede8d59
-  data.tar.gz: 95bd7f1b50c46cb8d62033e72d75c7aab04161590d244ab539c6e96879961f337f165ac9c061514c0c7596812c0d12578d06cb870aac123afc930114cb7e9b38
+  metadata.gz: 694c5bae91efcbbc823cf42708533bed4d298ae31af50b4d3dadb3edf50e4acb6aca907eade1e4913fdee370366ad3c1ac3d90e13f2bbb4bcba09a4fb8d14efd
+  data.tar.gz: 4c62ee57532ea5ef825fc4b7c6798c7bc2496250d3b7d928e60cf392d1dd95ce4fc936a4b07ca28d337cc618450b3a3f612a37b46531aa1a4feca721e0bddc48

data/lib/danger/ci_source/azure_pipelines.rb

@@ -36,7 +36,7 @@ module Danger
     end
 
     def initialize(env)
-      self.pull_request_id = env["SYSTEM_PULLREQUEST_PULLREQUESTID"]
+      self.pull_request_id = env["SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"] || env["SYSTEM_PULLREQUEST_PULLREQUESTID"]
       self.repo_url = env["BUILD_REPOSITORY_URI"]
       self.repo_slug = env["BUILD_REPOSITORY_NAME"]
     end

data/lib/danger/ci_source/bamboo.rb

@@ -0,0 +1,41 @@
+require "set"
+
+module Danger
+  # ### CI Setup
+  #
+  # Add a Run Script task that executes `danger` (or `bundle exec danger` if you're using Bundler
+  # to manage your gems) as your as part of your Bamboo plan.
+  # The minimum supported version is Bamboo 6.9.
+  #
+  # ### Token Setup
+  #
+  # IMPORTANT: All required Bamboo environment variables will be available
+  # only if the plan is run as part of a pull request. This can be achieved by selecting:
+  # Configure plan -> Branches -> Create plan branch: "When pull request is created".
+  # Otherwise, `bamboo_repository_pr_key` and `bamboo_planRepository_repositoryUrl`
+  # will not be available.
+  #
+  class Bamboo < CI
+    def supported_request_sources
+      @supported_request_sources ||= [
+        Danger::RequestSources::BitbucketServer
+      ]
+    end
+
+    def self.validates_as_ci?(env)
+      env.key? "bamboo_buildKey"
+    end
+
+    def self.validates_as_pr?(env)
+      exists = ["bamboo_repository_pr_key", "bamboo_planRepository_repositoryUrl"].all? { |x| env[x] && !env[x].empty? }
+      exists && env["bamboo_repository_pr_key"].to_i > 0
+    end
+
+    def initialize(env)
+      self.repo_url = env["bamboo_planRepository_repositoryUrl"]
+      self.pull_request_id = env["bamboo_repository_pr_key"]
+      repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/]+?)(\.git$|$)})
+      self.repo_slug = repo_matches[2] unless repo_matches.nil?
+    end
+  end
+end

data/lib/danger/ci_source/bitrise.rb

@@ -19,6 +19,14 @@ module Danger
   #
   # Add the `DANGER_GITHUB_API_TOKEN` to your workflow's [Secret App Env Vars](https://blog.bitrise.io/anyone-even-prs-can-have-secrets).
   #
+  # ### bitbucket server and bitrsie
+  #
+  # Danger will read the environemnt variable GIT_REPOSITORY_URL to construct the Bitbucket Server API URL 
+  # finding the project and repo slug in the GIT_REPOSITORY_URL variable. This GIT_REPOSITORY_URL variable 
+  # comes from the App Settings tab for your Bitrsie App. If you are manually setting a repo URL in the 
+  # Git Clone Repo step, you may need to set adjust this propery in the settings tab, maybe even fake it.
+  # The pattern used is `(%r{([\/:])(([^\/]+\/){1,2}[^\/]+?)(\.git$|$)}`.
+  #
   class Bitrise < CI
     def self.validates_as_ci?(env)
       env.key? "BITRISE_IO"

data/lib/danger/ci_source/code_build.rb

@@ -16,8 +16,7 @@ module Danger
     end
 
     def self.validates_as_pr?(env)
-      return false unless url = self.extract_pr_url(env)
-      url
+      !!self.extract_pr_url(env)
     end
 
     def supported_request_sources
@@ -26,32 +25,33 @@ module Danger
 
     def initialize(env)
       self.repo_slug = self.class.extract_repo_slug(env)
-      self.pull_request_id = env["CODEBUILD_SOURCE_VERSION"].split("/")[1]
+      self.pull_request_id = env["CODEBUILD_SOURCE_VERSION"].split("/")[1].to_i
       self.repo_url = self.class.extract_repo_url(env)
     end
 
-    private
-      def self.extract_repo_slug(env)
-        return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
+    def self.extract_repo_slug(env)
+      return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
 
-        env["CODEBUILD_SOURCE_REPO_URL"].gsub(/^.*?github\.com\/(.*?)\.git$/, '\1')
-      end
+      gh_host = env["DANGER_GITHUB_HOST"] || "github.com"
 
-      def self.extract_repo_url(env)
-        return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
+      env["CODEBUILD_SOURCE_REPO_URL"].gsub(%r{^.*?#{Regexp.escape(gh_host)}\/(.*?)(\.git)?$}, '\1')
+    end
+
+    def self.extract_repo_url(env)
+      return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
 
-        env["CODEBUILD_SOURCE_REPO_URL"].gsub(/\.git$/, "")
-      end
+      env["CODEBUILD_SOURCE_REPO_URL"].gsub(/\.git$/, "")
+    end
 
-      def self.extract_pr_url(env)
-        return nil unless env.key? "CODEBUILD_SOURCE_VERSION"
-        return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
-        return nil unless env["CODEBUILD_SOURCE_VERSION"].split("/").length == 2
+    def self.extract_pr_url(env)
+      return nil unless env.key? "CODEBUILD_SOURCE_VERSION"
+      return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
+      return nil unless env["CODEBUILD_SOURCE_VERSION"].split("/").length == 2
 
-        source_origin, pr_number = env["CODEBUILD_SOURCE_VERSION"].split("/")
-        github_repo_url = env["CODEBUILD_SOURCE_REPO_URL"].gsub(/\.git$/, "")
+      _source_origin, pr_number = env["CODEBUILD_SOURCE_VERSION"].split("/")
+      github_repo_url = env["CODEBUILD_SOURCE_REPO_URL"].gsub(/\.git$/, "")
 
-        "#{github_repo_url}/pull/#{pr_number}"
-      end
+      "#{github_repo_url}/pull/#{pr_number}"
+    end
   end
 end

data/lib/danger/ci_source/semaphore.rb

@@ -1,4 +1,4 @@
-# https://semaphoreci.com/docs/available-environment-variables.html
+# https://docs.semaphoreci.com/article/12-environment-variables
 require "danger/request_sources/github/github"
 
 module Danger
@@ -18,7 +18,10 @@ module Danger
     end
 
     def self.validates_as_pr?(env)
-      ["SEMAPHORE_REPO_SLUG", "PULL_REQUEST_NUMBER"].all? { |x| env[x] && !env[x].empty? }
+      one = ["SEMAPHORE_REPO_SLUG", "PULL_REQUEST_NUMBER"].all? { |x| env[x] && !env[x].empty? }
+      two = ["SEMAPHORE_GIT_REPO_SLUG", "SEMAPHORE_GIT_PR_NUMBER"].all? { |x| env[x] && !env[x].empty? }
+
+      one || two
     end
 
     def supported_request_sources
@@ -26,9 +29,9 @@ module Danger
     end
 
     def initialize(env)
-      self.repo_slug = env["SEMAPHORE_REPO_SLUG"]
-      self.pull_request_id = env["PULL_REQUEST_NUMBER"]
-      self.repo_url = GitRepo.new.origins # Semaphore doesn't provide a repo url env variable :/
+      self.repo_slug = env["SEMAPHORE_GIT_REPO_SLUG"] || env["SEMAPHORE_REPO_SLUG"]
+      self.pull_request_id = env["SEMAPHORE_GIT_PR_NUMBER"] || env["PULL_REQUEST_NUMBER"]
+      self.repo_url = env["SEMAPHORE_GIT_URL"] || GitRepo.new.origins
     end
   end
 end

data/lib/danger/danger_core/dangerfile.rb

@@ -257,7 +257,7 @@ module Danger
 
     def setup_for_running(base_branch, head_branch)
       env.ensure_danger_branches_are_setup
-      env.scm.diff_for_folder(".".freeze, from: base_branch, to: head_branch)
+      env.scm.diff_for_folder(".".freeze, from: base_branch, to: head_branch, lookup_top_level: true)
     end
 
     def run(base_branch, head_branch, dangerfile_path, danger_id, new_comment, remove_previous_comments)

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

@@ -192,6 +192,17 @@ module Danger
       @gitlab.client
     end
 
+    # @!group GitLab Misc
+    # Returns the web_url of the source project.
+    # @return [String]
+    #
+    def repository_web_url
+      @repository_web_url ||= begin
+        project = api.project(mr_json["source_project_id"])
+        project.web_url
+      end
+    end
+
     # @!group GitLab Misc
     # Returns a list of HTML anchors for a file, or files in the head repository. An example would be:
     # `<a href='https://gitlab.com/artsy/eigen/blob/561827e46167077b5e53515b4b7349b8ae04610b/file.txt'>file.txt</a>`. It returns a string of multiple anchors if passed an array.
@@ -209,7 +220,7 @@ module Danger
       paths = paths.map do |path|
         url_path = path.start_with?("/") ? path : "/#{path}"
         text = full_path ? path : File.basename(path)
-        create_link("#{env.ci_source.project_url}/blob/#{commit}#{url_path}", text)
+        create_link("#{repository_web_url}/blob/#{commit}#{url_path}", text)
       end
 
       return paths.first if paths.count < 2

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

@@ -9,7 +9,7 @@ module Danger
   # @example Check that added lines contains agreed form of words 
   #
   #       git.diff.each do |chunk|
-  #         chunk.patch.lines.grep(/^+/).each do |added_line|
+  #         chunk.patch.lines.grep(/^\+/).each do |added_line|
   #           if added_line.gsub!(/(?<cancel>cancel)(?<rest>[^l[[:space:]][[:punct:]]]+)/i, '>>\k<cancel>-l-\k<rest><<')
   #             fail "Single 'L' for cancellation-alike words in '#{added_line}'" 
   #           end

data/lib/danger/scm_source/git_repo.rb

@@ -6,9 +6,15 @@ module Danger
   class GitRepo
     attr_accessor :diff, :log, :folder
 
-    def diff_for_folder(folder, from: "master", to: "HEAD")
+    def diff_for_folder(folder, from: "master", to: "HEAD", lookup_top_level: false)
       self.folder = folder
-      repo = Git.open self.folder
+      git_top_level = folder
+      if lookup_top_level
+        Dir.chdir(folder) do
+          git_top_level = exec("rev-parse --show-toplevel")
+        end
+      end
+      repo = Git.open git_top_level
 
       ensure_commitish_exists!(from)
       ensure_commitish_exists!(to)

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.1.0".freeze
+  VERSION = "6.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: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -196,6 +196,7 @@ files:
 - lib/danger/ci_source/appcenter.rb
 - lib/danger/ci_source/appveyor.rb
 - lib/danger/ci_source/azure_pipelines.rb
+- lib/danger/ci_source/bamboo.rb
 - lib/danger/ci_source/bitbucket_pipelines.rb
 - lib/danger/ci_source/bitrise.rb
 - lib/danger/ci_source/buddybuild.rb
@@ -318,7 +319,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.