moab-versioning 6.1.0 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ac9a723ffc977aa08ff80ac3222a5edac9007f34516b269e53323119a129646
-  data.tar.gz: df5e62f7a0c6b1a328676063f08da78977465505bcafa933273f4964dab7f239
+  metadata.gz: 7ee90f0940591133476bcd8eb26fd6d210dac5927c1ade040b94056a0a271521
+  data.tar.gz: f105d5e796fb41f0ab8c38afc70c983b30ac5840868285731af13ca0e844934a
 SHA512:
-  metadata.gz: 188bdd57026ac1bcdc431ce8266927414dcb4b3539ddc8b0f733240adb888bbd564f3469d6346c8948af5fcf072fb3ebde5a0cc894d65539acddfe104522e43b
-  data.tar.gz: c00a2aa7923f9138b34afd7d2a212dc0c9a9cd4b70a953217771fe46c4cbb2f6013d9ba4632e121a95c6238c1242fedfeba2ba8a4883775afab2558e86ad3fdd
+  metadata.gz: 18e970e6f03a4ef17112ba603579f8dc4eae8e4a53dc952cd6ef55f5ab66670d21a58b6df94c3827a1e0660b4786802ffc0a7f7db094f6fc13196f5b64624df0
+  data.tar.gz: 6ee40f28548c85fa09d5a702ce2e50fb869eb81e40901830b3738ba30af7d7cb1759ca8cef58e082704f84fd106479f2eb1fd176c327e8ff0efcd3bb8e7ad6f6

data/lib/moab/bagger.rb

@@ -67,14 +67,7 @@ module Moab
     # @return [NilClass] Delete the bagit files
     def delete_bag
       # make sure this looks like a bag before deleting
-      if bag_pathname.join('bagit.txt').exist?
-        if bag_pathname.join('data').exist?
-          bag_pathname.rmtree
-        else
-          bag_pathname.children.each(&:delete)
-          bag_pathname.rmdir
-        end
-      end
+      bag_pathname.rmtree if bag_pathname.join('bagit.txt').exist?
       nil
     end
 
@@ -234,12 +227,12 @@ module Moab
         manifest_file[type] = manifest_pathname[type].open('w')
       end
       bag_pathname.children.each do |file|
-        unless file.directory? || file.basename.to_s[0, 11] == 'tagmanifest'
-          signature = FileSignature.new.signature_from_file(file)
-          fixity = signature.fixity
-          DEFAULT_CHECKSUM_TYPES.each do |type|
-            manifest_file[type].puts("#{fixity[type]} #{file.basename}") if fixity[type]
-          end
+        next unless include_in_tagfile_manifests?(file)
+
+        signature = FileSignature.new.signature_from_file(file)
+        fixity = signature.fixity
+        DEFAULT_CHECKSUM_TYPES.each do |type|
+          manifest_file[type].puts("#{fixity[type]} #{file.basename}") if fixity[type]
         end
       end
     ensure
@@ -252,6 +245,13 @@ module Moab
       end
     end
 
+    def include_in_tagfile_manifests?(file)
+      basename = file.basename.to_s
+      return false if file.directory? || basename.start_with?('tagmanifest') || basename.match?(/\A\.nfs\w+\z/)
+
+      true
+    end
+
     # @return [Boolean] Create a tar file containing the bag
     def create_tarfile(tar_pathname = nil)
       bag_name = bag_pathname.basename

data/lib/moab/config.rb

@@ -8,8 +8,8 @@ module Moab
       @checksum_algos = [:md5, :sha1, :sha256]
     end
 
-    def configure(&block)
-      instance_eval(&block)
+    def configure(...)
+      instance_eval(...)
     end
 
     def storage_roots(new_value = nil)

data/lib/moab/file_group.rb

@@ -38,7 +38,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total number of data files (dynamically calculated)
-    attribute :file_count, Integer, tag: 'fileCount', on_save: proc { |i| i.to_s }
+    attribute :file_count, Integer, tag: 'fileCount', on_save: proc(&:to_s)
 
     def file_count
       files.inject(0) { |sum, manifestation| sum + manifestation.file_count }
@@ -46,7 +46,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total size (in bytes) of all data files (dynamically calculated)
-    attribute :byte_count, Integer, tag: 'byteCount', on_save: proc { |i| i.to_s }
+    attribute :byte_count, Integer, tag: 'byteCount', on_save: proc(&:to_s)
 
     def byte_count
       files.inject(0) { |sum, manifestation| sum + manifestation.byte_count }
@@ -54,7 +54,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total disk usage (in 1 kB blocks) of all data files (estimating du -k result) (dynamically calculated)
-    attribute :block_count, Integer, tag: 'blockCount', on_save: proc { |i| i.to_s }
+    attribute :block_count, Integer, tag: 'blockCount', on_save: proc(&:to_s)
 
     def block_count
       files.inject(0) { |sum, manifestation| sum + manifestation.block_count }

data/lib/moab/file_group_difference.rb

@@ -64,7 +64,7 @@ module Moab
     # @attribute
     # @return [Integer] the total number of differences found between the two inventories that were
     #   compared  (dynamically calculated)
-    attribute :difference_count, Integer, tag: 'differenceCount', on_save: proc { |i| i.to_s }
+    attribute :difference_count, Integer, tag: 'differenceCount', on_save: proc(&:to_s)
 
     def difference_count
       count = 0
@@ -76,49 +76,49 @@ module Moab
 
     # @attribute
     # @return [Integer] How many files were unchanged
-    attribute :identical, Integer, on_save: proc { |n| n.to_s }
+    attribute :identical, Integer, on_save: proc(&:to_s)
     def identical
       subset_hash[:identical].count
     end
 
     # @attribute
     # @return [Integer] How many duplicate copies of files were added
-    attribute :copyadded, Integer, on_save: proc { |n| n.to_s }
+    attribute :copyadded, Integer, on_save: proc(&:to_s)
     def copyadded
       subset_hash[:copyadded].count
     end
 
     # @attribute
     # @return [Integer] How many duplicate copies of files were deleted
-    attribute :copydeleted, Integer, on_save: proc { |n| n.to_s }
+    attribute :copydeleted, Integer, on_save: proc(&:to_s)
     def copydeleted
       subset_hash[:copydeleted].count
     end
 
     # @attribute
     # @return [Integer] How many files were renamed
-    attribute :renamed, Integer, on_save: proc { |n| n.to_s }
+    attribute :renamed, Integer, on_save: proc(&:to_s)
     def renamed
       subset_hash[:renamed].count
     end
 
     # @attribute
     # @return [Integer] How many files were modified
-    attribute :modified, Integer, on_save: proc { |n| n.to_s }
+    attribute :modified, Integer, on_save: proc(&:to_s)
     def modified
       subset_hash[:modified].count
     end
 
     # @attribute
     # @return [Integer] How many files were added
-    attribute :added, Integer, on_save: proc { |n| n.to_s }
+    attribute :added, Integer, on_save: proc(&:to_s)
     def added
       subset_hash[:added].count
     end
 
     # @attribute
     # @return [Integer] How many files were deleted
-    attribute :deleted, Integer, on_save: proc { |n| n.to_s }
+    attribute :deleted, Integer, on_save: proc(&:to_s)
     def deleted
       subset_hash[:deleted].count
     end
@@ -256,7 +256,7 @@ module Moab
         basis_only_paths = basis_paths - other_paths
         other_only_paths = other_paths - basis_paths
         maxsize = [basis_only_paths.size, other_only_paths.size].max
-        (0..maxsize - 1).each do |n|
+        (0..maxsize - 1).each do |n| # rubocop:disable Lint/AmbiguousRange
           fid = FileInstanceDifference.new
           fid.basis_path = basis_only_paths[n]
           fid.other_path = other_only_paths[n]
@@ -364,7 +364,7 @@ module Moab
       end
       # Are any of the filenames the same in set of oldnames and set of newnames?
       intersection = oldnames & newnames
-      intersection.count > 0
+      intersection.any?
     end
 
     # @param [Array<Array<String>>] filepairs The set of oldname, newname pairs for all files being renamed

data/lib/moab/file_group_difference_subset.rb

@@ -30,7 +30,7 @@ module Moab
 
     # @attribute
     # @return [Integer] How many files were changed
-    attribute :count, Integer, on_save: proc { |n| n.to_s }
+    attribute :count, Integer, on_save: proc(&:to_s)
 
     def count
       files.size

data/lib/moab/file_instance_difference.rb

@@ -38,11 +38,11 @@ module Moab
 
     # @attribute
     # @return [String] The file's path in the basis inventory (usually for an old version)
-    attribute :basis_path, String, tag: 'basisPath', on_save: proc { |s| s.to_s }
+    attribute :basis_path, String, tag: 'basisPath', on_save: proc(&:to_s)
 
     # @attribute
     # @return [String] The file's path in the other inventory (usually for an new version) compared against the basis
-    attribute :other_path, String, tag: 'otherPath', on_save: proc { |s| s.to_s }
+    attribute :other_path, String, tag: 'otherPath', on_save: proc(&:to_s)
 
     # @attribute
     # @return [Array<FileSignature>] The fixity data of the file manifestation(s) (plural if change was a content modification)

data/lib/moab/file_inventory.rb

@@ -50,7 +50,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The ordinal version number
-    attribute :version_id, Integer, tag: 'versionId', key: true, on_save: proc { |n| n.to_s }
+    attribute :version_id, Integer, tag: 'versionId', key: true, on_save: proc(&:to_s)
 
     # @return [String] The unique identifier concatenating digital object id with version id
     def composite_key
@@ -71,7 +71,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total number of data files in the inventory (dynamically calculated)
-    attribute :file_count, Integer, tag: 'fileCount', on_save: proc { |t| t.to_s }
+    attribute :file_count, Integer, tag: 'fileCount', on_save: proc(&:to_s)
 
     def file_count
       groups.inject(0) { |sum, group| sum + group.file_count }
@@ -79,7 +79,7 @@ module Moab
 
      # @attribute
     # @return [Integer] The total size (in bytes) in all files of all files in the inventory (dynamically calculated)
-    attribute :byte_count, Integer, tag: 'byteCount', on_save: proc { |t| t.to_s }
+    attribute :byte_count, Integer, tag: 'byteCount', on_save: proc(&:to_s)
 
     def byte_count
       groups.inject(0) { |sum, group| sum + group.byte_count }
@@ -87,7 +87,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total disk usage (in 1 kB blocks) of all data files (estimating du -k result) (dynamically calculated)
-    attribute :block_count, Integer, tag: 'blockCount', on_save: proc { |t| t.to_s }
+    attribute :block_count, Integer, tag: 'blockCount', on_save: proc(&:to_s)
 
     def block_count
       groups.inject(0) { |sum, group| sum + group.block_count }
@@ -161,7 +161,7 @@ module Moab
     # @return [String] Returns either the version ID (if inventory is a version manifest) or the name of the directory
     #  that was harvested to create the inventory
     def data_source
-      data_source = (groups.collect { |g| g.data_source.to_s }).join('|')
+      data_source = groups.collect { |g| g.data_source.to_s }.join('|')
       if data_source.start_with?('contentMetadata')
         version_id ? "v#{version_id}-#{data_source}" : "new-#{data_source}"
       else

data/lib/moab/file_inventory_difference.rb

@@ -34,7 +34,7 @@ module Moab
 
     # @attribute
     # @return [Integer] the number of differences found between the two inventories that were compared (dynamically calculated)
-    attribute :difference_count, Integer, tag: 'differenceCount', on_save: proc { |i| i.to_s }
+    attribute :difference_count, Integer, tag: 'differenceCount', on_save: proc(&:to_s)
 
     def difference_count
       @group_differences.inject(0) { |sum, group| sum + group.difference_count }

data/lib/moab/file_signature.rb

@@ -46,19 +46,19 @@ module Moab
 
     # @attribute
     # @return [String] The size of the file in bytes (can be empty)
-    attribute :size, Integer, on_save: proc { |n| n.to_s }
+    attribute :size, Integer, on_save: proc(&:to_s)
 
     # @attribute
     # @return [String] The MD5 checksum value of the file (can be empty)
-    attribute :md5, String, on_save: proc { |n| n.to_s }
+    attribute :md5, String, on_save: proc(&:to_s)
 
     # @attribute
     # @return [String] The SHA1 checksum value of the file (can be empty)
-    attribute :sha1, String, on_save: proc { |n| n.to_s }
+    attribute :sha1, String, on_save: proc(&:to_s)
 
     # @attribute
     # @return [String] The SHA256 checksum value of the file (can be empty)
-    attribute :sha256, String, on_save: proc { |n| n.to_s }
+    attribute :sha256, String, on_save: proc(&:to_s)
 
     KNOWN_ALGOS = {
       md5: proc { Digest::MD5.new },

data/lib/moab/signature_catalog.rb

@@ -43,7 +43,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The ordinal version number
-    attribute :version_id, Integer, tag: 'versionId', key: true, on_save: proc { |n| n.to_s }
+    attribute :version_id, Integer, tag: 'versionId', key: true, on_save: proc(&:to_s)
 
     # @return [String] The unique identifier concatenating digital object id with version id
     def composite_key
@@ -64,7 +64,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total number of data files (dynamically calculated)
-    attribute :file_count, Integer, tag: 'fileCount', on_save: proc { |t| t.to_s }
+    attribute :file_count, Integer, tag: 'fileCount', on_save: proc(&:to_s)
 
     def file_count
       entries.size
@@ -72,7 +72,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total size (in bytes) of all data files (dynamically calculated)
-    attribute :byte_count, Integer, tag: 'byteCount', on_save: proc { |t| t.to_s }
+    attribute :byte_count, Integer, tag: 'byteCount', on_save: proc(&:to_s)
 
     def byte_count
       entries.inject(0) { |sum, entry| sum + entry.signature.size.to_i }
@@ -80,7 +80,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total disk usage (in 1 kB blocks) of all data files (estimating du -k result) (dynamically calculated)
-    attribute :block_count, Integer, tag: 'blockCount', on_save: proc { |t| t.to_s }
+    attribute :block_count, Integer, tag: 'blockCount', on_save: proc(&:to_s)
 
     def block_count
       block_size = 1024

data/lib/moab/signature_catalog_entry.rb

@@ -25,7 +25,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The ordinal version number
-    attribute :version_id, Integer, tag: 'originalVersion', key: true, on_save: proc { |n| n.to_s }
+    attribute :version_id, Integer, tag: 'originalVersion', key: true, on_save: proc(&:to_s)
 
     # @attribute
     # @return [String] The name of the file group

data/lib/moab/storage_object_validator.rb

@@ -75,7 +75,7 @@ module Moab
 
     def check_correctly_named_version_dirs
       errors = []
-      errors << result_hash(MISSING_DIR, 'no versions exist') unless version_directories.count > 0
+      errors << result_hash(MISSING_DIR, 'no versions exist') unless version_directories.any?
       version_directories.each do |version_dir|
         errors << result_hash(VERSION_DIR_BAD_FORMAT, version_dir) unless VERSION_DIR_PATTERN.match?(version_dir)
       end

data/lib/moab/verification_result.rb

@@ -31,7 +31,7 @@ module Moab
     # @return [VerificationResult] The result of comparing the expected and found values
     def self.verify_value(entity, expected, found)
       details = { 'expected' => expected, 'found' => found }
-      new(entity, (expected == found), details)
+      new(entity, (expected == found), details) # rubocop:disable Style/RedundantParentheses
     end
 
     # @deprecated Just use the constructor

data/lib/moab/version_metadata_entry.rb

@@ -24,7 +24,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The object version number (A sequential integer)
-    attribute :version_id, Integer, tag: 'versionId', key: true, on_save: proc { |n| n.to_s }
+    attribute :version_id, Integer, tag: 'versionId', key: true, on_save: proc(&:to_s)
 
     # @attribute
     # @return [String] "an external version label that increments the most significant digit for major revisions,

data/lib/stanford/storage_services.rb

@@ -19,6 +19,10 @@ module Stanford
       @@repository
     end
 
+    # NOTE: `ShelvingService.content_diff` in dor-services-app implements similar logic, but in a way that
+    # uses XML retrieved via preservation-client instead of reading the XML from disk.  This allows DSA to
+    # perform the potentially time expensive diff without requiring access to preservation disk mounts.
+    # See https://github.com/sul-dlss/dor-services-app/pull/4492 and https://github.com/sul-dlss/dor-services-app/issues/4359
     # @param new_content_metadata [String] The content metadata to be compared to the base
     # @param object_id [String] The digital object identifier of the object whose version inventory is the basis of the
     #  comparison

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moab-versioning
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.2
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,10 +9,9 @@ authors:
 - Tony Zanella
 - Mike Giarlo
 - John Martin
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2025-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: druid-tools
@@ -84,20 +83,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -144,16 +129,16 @@ dependencies:
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +200,6 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -230,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby implementation of digital object versioning toolkit used by Stanford
   University Libraries