dragnet 5.4.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e401f3864f8d30d24e60a21ad9d8751e6be22cf0b82e8defecd49e3b019bd9f3
-  data.tar.gz: ad197e8038918748dd9deee612a89acdfe99f12776e56bf6bdb9f105139659c5
+  metadata.gz: f7d753aca8090f87852e9d4e85f021c6ce0a8500210385337651316119b52c44
+  data.tar.gz: 8feb400e7bc41e1f41bc8987d1777273ee8dd7075a8c6ffcbc3d7d5091e01a8b
 SHA512:
-  metadata.gz: 93c72bfe1da3aaf68bc674953ff8201a99a6f1fbc5677e401ca215c0d005641b782634fdb5b9225b321601fae6642802275094b781d2549b695d096b2f896999
-  data.tar.gz: 2243730c112f9319941b95939b424f83b1be678b51d3fe90276c6a577d6a156c270583818dc9971fde2cda98984694c0751d4b04383e5e11b074cc63f38dd653
+  metadata.gz: 76d385680a7d5a5610f8d959f23e1e3c9f73fd4adf8dca34aa8ab82b7dd65ded853aa20b7361f93443d02626e954079784d5ee036694ee8de2076bbeb18d2df5
+  data.tar.gz: fce543298fcc34525a61abbc2c268b86eb971a95cd842a5cce5f0bc503b38cfa36310ebffb642957c5b2706b55d54d21437f23ba2f5f212339b2d482618fab79

data/.github/workflows/release.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Ruby 2.7
+    - name: Set up Ruby 3.1
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.7
+        ruby-version: 3.1.0
     - name: Build
       run: |
         bundler install

data/.github/workflows/ruby-linters.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: '3.1'
     - name: Install Gems
       run: |
         bundler install

data/.github/workflows/ruby-tests.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0']
+        ruby-version: ['3.1']
 
     steps:
     - uses: actions/checkout@v4

data/.github/workflows/sphinx-doc.yml

@@ -25,7 +25,7 @@ jobs:
       # uses: ruby/setup-ruby@v1
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.7
+        ruby-version: 3.1.0
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Test Results and Coverage
       run:

data/.github/workflows/verify-requirements.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: '3.1'
     - name: Install Gems
       run: |
         bundler install

data/.ruby-version

@@ -1 +1 @@
-2.7.7
+3.1.0

data/CHANGELOG.md

@@ -8,6 +8,17 @@ Please mark backwards incompatible changes with an exclamation mark at the start
 
 ## [Unreleased]
 
+## [6.0.0] - 2025-09-23
+
+### Changed
+- ! Updated the `git` gem dependency from `~> 1.8` to `~> 3`
+- ! Set the minimum Ruby version requirement to `3.1.0`
+
+## [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/README.md

@@ -43,7 +43,7 @@ any platform or use one of the official Docker images.
 
 ## Requirements
 
-* Ruby >= 2.7.0 (MRI)
+* Ruby >= 3.1.0 (MRI)
 * Bundler >= 2.4.0
 * Git >= 2.0.0
 

data/dragnet.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
                        'performed.'
   spec.homepage      = 'https://github.com/esrlabs/dragnet'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0')
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '~> 7'
   spec.add_runtime_dependency 'colorize', '~> 0.8'
-  spec.add_runtime_dependency 'git', '~> 1.8'
+  spec.add_runtime_dependency 'git', '~> 3'
   spec.add_runtime_dependency 'thor', '~> 1.1'
 
   # Specify which files should be added to the gem when it is released.

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 = '6.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragnet
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 6.0.0
 platform: ruby
 authors:
 - ESR Labs GmbH
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-23 00:00:00.000000000 Z
+date: 2025-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -177,14 +178,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A gem to verify, validate and analyse MTR (Manual Test Record) files.