dragnet 5.4.1 → 5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e401f3864f8d30d24e60a21ad9d8751e6be22cf0b82e8defecd49e3b019bd9f3
-  data.tar.gz: ad197e8038918748dd9deee612a89acdfe99f12776e56bf6bdb9f105139659c5
+  metadata.gz: 0afbf1f0898c9d691cefe979ea56584e95e53e906fb51a8e2a08fd791a315692
+  data.tar.gz: 1bf496f3e00cd91eb73e884c1784cc360c4aed4941ae2e6b31f9de920b51e15d
 SHA512:
-  metadata.gz: 93c72bfe1da3aaf68bc674953ff8201a99a6f1fbc5677e401ca215c0d005641b782634fdb5b9225b321601fae6642802275094b781d2549b695d096b2f896999
-  data.tar.gz: 2243730c112f9319941b95939b424f83b1be678b51d3fe90276c6a577d6a156c270583818dc9971fde2cda98984694c0751d4b04383e5e11b074cc63f38dd653
+  metadata.gz: d56cb80c40e58f608b32eeda1b3e24b4fa7b95b5c572e62dc25e9e98c6a57f6e147170905e9e84f0fd41215849c57cdd484b9812f9383a3c922af5c63b7f5e4e
+  data.tar.gz: 98ac6e7a2efc349c2dedd5b321c2bb2ed1e3d3f6300b61d8241b682d382446efee560d1068036fae1b59b52d2eb75c0d8b13ceaae41613138f75b2dc80f36c8f

data/CHANGELOG.md

@@ -8,6 +8,11 @@ Please mark backwards incompatible changes with an exclamation mark at the start
 
 ## [Unreleased]
 
+## [5.4.2] - 2025-05-22
+
+### Fixed
+- Dragnet no longer crashes when an invalid / non-existing SHA1 is used in a MTR.
+
 ## [5.4.1] - 2025-04-23
 
 ### Fixed

data/lib/dragnet/verifiers/changes_verifier.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 require_relative '../verification_result'
+require_relative 'mixins/git_error_handling'
 require_relative 'repository_verifier'
 
 module Dragnet
   module Verifiers
     # Checks for changes in the repository since the creation of the MTR Record
     class ChangesVerifier < Dragnet::Verifiers::RepositoryVerifier
+      include ::Dragnet::Verifiers::Mixins::GitErrorHandling
+
       attr_reader :test_records
 
       # @param [Dragnet::TestRecord] test_record The +TestRecord+ object to
@@ -33,6 +36,8 @@ module Dragnet
         return unless diff.size.positive?
 
         find_changes(diff)
+      rescue Git::FailedError => e
+        result_from_git_error(e)
       end
 
       private
@@ -44,7 +49,7 @@ module Dragnet
       #   the details of the changes found in the repository, or +nil+ if no
       #   changes were found.
       def find_changes(diff)
-        diff.stats[:files].each do |file, _changes|
+        diff.stats[:files].each_key do |file|
           next if mtr_files.include?(file) # Changes to MTR files are ignored.
 
           return Dragnet::VerificationResult.new(

data/lib/dragnet/verifiers/files_verifier.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../verification_result'
+require_relative 'mixins/git_error_handling'
 require_relative 'repository_verifier'
 
 module Dragnet
@@ -8,6 +9,8 @@ module Dragnet
     # Checks if any of the files listed in the MTR have changed since the MTR
     # was created.
     class FilesVerifier < Dragnet::Verifiers::RepositoryVerifier
+      include ::Dragnet::Verifiers::Mixins::GitErrorHandling
+
       # Executes the verification process.
       # Checks the changes in the repository. If a change in one of the files
       # is detected a +:result+ key is added to the MTR, including the detected
@@ -26,6 +29,8 @@ module Dragnet
         end
 
         result_from(changes) if changes.any?
+      rescue Git::FailedError => e
+        result_from_git_error(e)
       end
 
       private

data/lib/dragnet/verifiers/mixins/git_error_handling.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Dragnet
+  module Verifiers
+    module Mixins
+      # A mixin that provides methods to gracefully handle errors during Git's
+      # execution.
+      module GitErrorHandling
+        private
+
+        # @param [Git::FailedError] error The error that occurred during the
+        #   verification.
+        # @return [Dragnet::VerificationResult] A +VerificationResult+ object that
+        #   encapsulates the occurred error so that it can be presented to the
+        #   user.
+        def result_from_git_error(error)
+          Dragnet::VerificationResult.new(
+            status: :failed,
+            reason: "Unable to diff the revisions: #{shorten_sha1(sha1)}..#{shorten_sha1(repository.head.sha)}: " \
+              "#{error.result.stdout}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/dragnet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dragnet
-  VERSION = '5.4.1'
+  VERSION = '5.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragnet
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.2
 platform: ruby
 authors:
 - ESR Labs GmbH
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-23 00:00:00.000000000 Z
+date: 2025-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,6 +155,7 @@ files:
 - lib/dragnet/verifiers.rb
 - lib/dragnet/verifiers/changes_verifier.rb
 - lib/dragnet/verifiers/files_verifier.rb
+- lib/dragnet/verifiers/mixins/git_error_handling.rb
 - lib/dragnet/verifiers/repos_verifier.rb
 - lib/dragnet/verifiers/repository_verifier.rb
 - lib/dragnet/verifiers/result_verifier.rb