danger 9.6.0 → 9.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c20de89d82a1a32f926300a84b0a1313a7d3c1d5c35c91b4eed2667eec5788c
-  data.tar.gz: 208508f00a6542efe5c5f7357a87f943e50384b7c999771e669c9c585df4e3a7
+  metadata.gz: 7a5bfbaf66471158ce892fa4c3bb62a2246bbfd18e59959bde58ed70d037dec1
+  data.tar.gz: 1c2d3f7a4d5b9018133941057e44b004d5068ca8a52e0f7ec4033290228399a3
 SHA512:
-  metadata.gz: bc94ca5d7d28214e3cf4166dce28369a1a22e7173eee2d5c1c0a34a826c32c97c7d58e37ba66a9e87a2ea3540ffe6674ea64be705e0ca920166df856b7bcd116
-  data.tar.gz: 3929c665775cf4af212c36a9ea898b9850dc3358d79597707fdd4b166d4b605777d85c793b54eeb72ac8e3207be217b17be602a3d395c2a749962d076bc5aaf1
+  metadata.gz: f9ed54db89a5ff27acd7988ff2e5bcdcf076b2b05dfa7dafda7ba58a70c2715615d1efaf5a53c8b23199f6ef4cd0952eba3778c63eafae434e4eeb9bcd6389a1
+  data.tar.gz: 5eb45a8cae70a997e3d9cd105320e234297a88db2d548205bfd96a15fd503be8e5f4afbacdfe1b79bd7fb8635f3093713f3f7d5afeee8c48466bded169d656ff

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

@@ -122,7 +122,9 @@ module Danger
     # @return [Git::Log] from the gem `git`
     #
     def commits
-      @git.log.to_a
+      log = @git.log
+      # git 6 removed Enumerable from Git::Log; #execute returns the commits.
+      (log.respond_to?(:execute) ? log.execute : log).to_a
     end
 
     # @!group Git Metadata

data/lib/danger/scm_source/git_repo.rb

@@ -192,12 +192,22 @@ module Danger
   end
 end
 
-module Git
-  class Base
-    # Use git-merge-base https://git-scm.com/docs/git-merge-base to
-    # find as good common ancestors as possible for a merge
-    def merge_base(commit1, commit2, *other_commits)
-      Open3.popen2("git", "merge-base", commit1, commit2, *other_commits) { |_stdin, stdout, _wait_thr| stdout.read.rstrip }
+module Danger
+  class GitRepo
+    module MergeBase
+      # Use git-merge-base https://git-scm.com/docs/git-merge-base to
+      # find as good common ancestors as possible for a merge
+      def merge_base(commit1, commit2, *other_commits)
+        Open3.popen2("git", "merge-base", commit1, commit2, *other_commits) { |_stdin, stdout, _wait_thr| stdout.read.rstrip }
+      end
     end
   end
 end
+
+# Git::Base became a compatibility module included in Git::Repository in git 5.0.
+# Prepend Danger's extension to the concrete repository class in either version.
+if defined?(Git::Base) && Git::Base.kind_of?(Class)
+  Git::Base.prepend(Danger::GitRepo::MergeBase)
+else
+  Git::Repository.prepend(Danger::GitRepo::MergeBase)
+end

data/lib/danger/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Danger
-  VERSION = "9.6.0"
+  VERSION = "9.6.2"
   DESCRIPTION = "Like Unit Tests, but for your Team Culture."
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 9.6.0
+  version: 9.6.2
 platform: ruby
 authors:
 - Orta Therox
@@ -110,16 +110,22 @@ dependencies:
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement