dependabot-common 0.98.0 → 0.98.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b9715a5eff25d90329037d9795fd5b70caa291b21afb05e391e7afb9a471de4
-  data.tar.gz: 494ea20c6a9ced844cefae976481e37eec1730e1b259d5b7eb7f599e4f8b72b1
+  metadata.gz: af88340953e2c0c2f588be50c2873402ef72c9ef5b967194fdca84f4e3bdc6f2
+  data.tar.gz: 9254e40cfb4cecc8f7336b360940bb171a3dcfc050b17beade51ee229ffa7e0a
 SHA512:
-  metadata.gz: dbe2142c2fee28dfb359d0e42d994cef1c14ba82d5833281d8ee938dc6ec06172aa67ae5c61d070dcf0951145a1a99becc98d7cbabe9c26a8f5164f50493e39c
-  data.tar.gz: 86a503b9660278f27fec7ecdb0febceb52ed2d833feefa1e9c11f51dc10a3f438e09f0ce41f7cfce69c11e67bb3797f97d1b6a67f36ce43c0ce698f47b883aa7
+  metadata.gz: f38581b3619becfd94601abb326065fca0ca9f1ab06919e32d6a200df70c5c3deece14ea4f72ba9923b295cd2facb2cd4804f0c6507cfbd063e086d4bdb98095
+  data.tar.gz: 6003395dd7b980a8887a0a89b97e9be7f69463442e6fc36f7c0517f91bb013c1b7f4c6e39a01bdcdf7e7e406cdb580105f125a09687457bb3b2a2895e8d69251

data/lib/dependabot/dependency_file.rb

@@ -26,7 +26,8 @@ module Dependabot
         "name" => name,
         "content" => content,
         "directory" => directory,
-        "type" => type
+        "type" => type,
+        "support_file" => support_file
       }
     end
 
@@ -35,7 +36,11 @@ module Dependabot
     end
 
     def ==(other)
-      other.instance_of?(self.class) && to_h == other.to_h
+      return false unless other.instance_of?(self.class)
+
+      my_hash = to_h.reject { |k| k == "support_file" }
+      their_hash = other.to_h.reject { |k| k == "support_file" }
+      my_hash == their_hash
     end
 
     def hash

data/lib/dependabot/pull_request_creator/message_builder.rb

@@ -61,7 +61,7 @@ module Dependabot
         message = commit_subject + "\n\n"
         message += commit_message_intro
         message += metadata_links
-        message += "\n\n" + signoff_message if signoff_message
+        message += "\n\n" + message_trailers if message_trailers
         message
       end
 
@@ -89,6 +89,12 @@ module Dependabot
         "\n\n#{pr_message_footer}"
       end
 
+      def message_trailers
+        return unless on_behalf_of_message || signoff_message
+
+        [on_behalf_of_message, signoff_message].compact.join("\n")
+      end
+
       def signoff_message
         return unless author_details.is_a?(Hash)
         return unless author_details[:name] && author_details[:email]
@@ -96,6 +102,14 @@ module Dependabot
         "Signed-off-by: #{author_details[:name]} <#{author_details[:email]}>"
       end
 
+      def on_behalf_of_message
+        return unless author_details.is_a?(Hash)
+        return unless author_details[:org_name] && author_details[:org_email]
+
+        "On-behalf-of: @#{author_details[:org_name]} "\
+        "<#{author_details[:org_email]}>"
+      end
+
       def library_pr_name
         pr_name = pr_name_prefix
 

data/lib/dependabot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dependabot
-  VERSION = "0.98.0"
+  VERSION = "0.98.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-common
 version: !ruby/object:Gem::Version
-  version: 0.98.0
+  version: 0.98.1
 platform: ruby
 authors:
 - Dependabot