bagit 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94cc64f9a3a9193d68ed54cdee5dce6dd6f645388eb8224499a73cb71e20ebcb
-  data.tar.gz: e92f1c0acf2881e9ceb15a21b85fa08068e00b0f119eb0f00fd49c45be9f8559
+  metadata.gz: e8a18a014f06a83e944facc05aa938c8ea7f41144467187f2aac4b837f53b903
+  data.tar.gz: 5c67d9dd7be23e5a01c2f43cf20731ee5de4002dde56f4444ff448c966f63149
 SHA512:
-  metadata.gz: '080f9b88a1f78604d802ca085809889562d1659a7d538db49d90b86effe5b3d6b70abe12f7257ad9bf685d5578ab6963d79f37636c97b44318db437af024291d'
-  data.tar.gz: 936250ded0d415be65eaa95b421bbf647537fff92354b1b7de33d440a66254fe6dc6dea67e6899ad022fdb10edba1717afe052425bfed244e42ac38bd17ff7f8
+  metadata.gz: a9873a147b372cd47176a25712166287598138bd6fd4cf763351108b230d6cb20932a714bd573a7900878adc51904cc262092c9ad51fff1cc96fd2b9df6c2ec1
+  data.tar.gz: 82d34834c6f6ceb653a3255cb3a1b275bc4896d174afd8e42476408e786520d21275324092a9e625f6648ed72a5426a2239c24ef1a0997a041207f6387091fc3

data/Gemfile

@@ -3,3 +3,7 @@
 source "https://rubygems.org"
 
 gemspec
+
+group :development do
+  gem "rdoc"
+end

data/bagit.gemspec

@@ -14,10 +14,11 @@ Gem::Specification.new do |spec|
   spec.authors = ["Tom Johnson, Francesco Lazzarino, Jamie Little"]
   spec.license = "MIT"
 
-  spec.required_ruby_version = ">= 2.0", "< 3.4"
+  spec.required_ruby_version = ">= 2.7", "< 4.1"
 
   spec.add_dependency "validatable", "~> 1.6"
   spec.add_dependency "docopt", "~> 0.5.0"
+  spec.add_dependency "logger", "~> 1.7"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"
@@ -29,6 +30,5 @@ Gem::Specification.new do |spec|
 
   spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 end

data/lib/bagit/fetch.rb

@@ -21,7 +21,7 @@ module BagIt
           (url, _length, path) = line.chomp.split(/\s+/, 3)
 
           add_file(path) do |file_io|
-            file_io.write URI.open(url)
+            file_io.write URI.parse(url).open
           end
         end
       end

data/lib/bagit/info.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 module BagIt
   module Info
     @@bag_info_headers = {
@@ -73,7 +71,7 @@ module BagIt
     def write_info_file(file, hash)
       dups = hash.keys.inject(Set.new) { |acc, key|
         a = hash.keys.grep(/#{key}/i)
-        acc + (a.size > 1 ? a : [])
+        acc + ((a.size > 1) ? a : [])
       }
 
       raise "Multiple labels (#{dups.to_a.join ", "}) in #{file}" unless dups.empty?

data/lib/bagit/manifest.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "pathname"
 require "digest/sha1"
 require "digest/md5"
 
@@ -8,17 +7,15 @@ module BagIt
   # Requires response to bag_dir, tag_files, bag_files
   module Manifest
     def encode_filename(s)
-      s = s.gsub(/\r/, "%0D")
-      s = s.gsub(/\n/, "%0A")
-      s
+      s = s.gsub("\r", "%0D")
+      s.gsub("\n", "%0A")
     end
 
     # All tag files that are bag manifest files (manifest-[algorithm].txt)
     def manifest_files
-      files = Dir[File.join(@bag_dir, "*")].select { |f|
+      Dir[File.join(@bag_dir, "*")].select { |f|
         File.file?(f) && File.basename(f) =~ /^manifest-.*.txt$/
       }
-      files
     end
 
     # A path to a manifest file of the specified algorithm
@@ -78,10 +75,9 @@ module BagIt
 
     # All tag files that are bag manifest files (tagmanifest-[algorithm].txt)
     def tagmanifest_files
-      files = Dir[File.join(@bag_dir, "*")].select { |f|
+      Dir[File.join(@bag_dir, "*")].select { |f|
         File.file?(f) && File.basename(f) =~ /^tagmanifest-.*.txt$/
       }
-      files
     end
 
     # A path to a tagmanifest file of the specified algorithm
@@ -134,7 +130,7 @@ module BagIt
         raise "Tag file already exists, will not overwrite: #{path}\n Use add_tag_file(path) to add an existing tag file."
       end
 
-      data = File.open(f, &:read)
+      data = File.read(f)
       rel_path = Pathname.new(f).relative_path_from(Pathname.new(bag_dir)).to_s
 
       # sha1
@@ -169,12 +165,12 @@ module BagIt
         mf =~ /manifest-(.+).txt$/
 
         algo = case Regexp.last_match(1)
-               when /sha1/i
-                 Digest::SHA1
-               when /md5/i
-                 Digest::MD5
-               else
-                 :unknown
+        when /sha1/i
+          Digest::SHA1
+        when /md5/i
+          Digest::MD5
+        else
+          :unknown
         end
 
         # check it, an unknown algorithm is always true

data/lib/bagit/string.rb

@@ -8,7 +8,7 @@ class String
     s = gsub(/\s+/, " ").strip
 
     if s.length > width
-      s[0...width] + '\n' + s[width..-1].wrap(width)
+      s[0...width] + '\n' + s[width..].wrap(width)
     else
       s
     end

data/lib/bagit/valid.rb

@@ -8,6 +8,7 @@ require "logger"
 module BagIt
   class Bag
     include Validatable
+
     validates_true_for :consistency, logic: proc { consistent? }
     validates_true_for :completeness, logic: proc { complete? }
   end
@@ -15,14 +16,13 @@ module BagIt
   module Validity
     def decode_filename(s)
       s = s.gsub("%0D", "\r")
-      s = s.gsub("%0A", "\n")
-      s
+      s.gsub("%0A", "\n")
     end
 
     # Return true if the manifest cover all files and all files are
     # covered.
     def complete?
-      logger = Logger.new(STDOUT)
+      logger = Logger.new($stdout)
 
       errors.add :completeness, "there are no manifest files" if manifest_files == []
 

data/lib/bagit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BagIt
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/fetch_spec.rb

@@ -40,7 +40,7 @@ describe BagIt::Bag do
 
     it "contains manifested files" do
       path = File.join @bag_path, "manifest-sha1.txt"
-      data = File.open(path, &:read)
+      data = File.read(path)
       expect(data).to include("gnu.png")
     end
 

data/spec/manifest_spec.rb

@@ -101,10 +101,10 @@ describe BagIt::Bag do
       end
       it "contains manifest and bag info files" do
         @bag.tagmanifest_files.each do |mf|
-          expect(File.open(mf).read).to include(File.basename(@bag.bag_info_txt_file))
-          expect(File.open(mf).read).to include(File.basename(@bag.bagit_txt_file))
+          expect(File.read(mf)).to include(File.basename(@bag.bag_info_txt_file))
+          expect(File.read(mf)).to include(File.basename(@bag.bagit_txt_file))
           @bag.manifest_files.each do |man|
-            expect(File.open(mf).read).to include(man)
+            expect(File.read(mf)).to include(man)
           end
         end
       end

data/spec/tag_info_spec.rb

@@ -98,7 +98,7 @@ describe BagIt::Bag do
         @bag.write_bag_info "Source-Organization" => "Awesome Inc."
         @bag.write_bag_info "Bagging-Date" => "1901-01-01"
         @bag.write_bag_info
-        contents = File.open(path).read
+        contents = File.read(path)
         expect(contents).to include "Some Other Agent"
         expect(contents).to include "Awesome Inc."
         expect(contents).to include "1901-01-01"
@@ -107,7 +107,7 @@ describe BagIt::Bag do
         path = File.join @bag_path, "bag-info.txt"
         @bag.write_bag_info "Source-Organization" => "Awesome Inc."
         @bag.write_bag_info "Source-Organization" => "Awesome LLC."
-        contents = File.open(path).read
+        contents = File.read(path)
         expect(contents).to include "Awesome LLC."
         expect(contents).not_to include "Awesome Inc."
       end

data/spec/util/bagit_matchers.rb

@@ -18,7 +18,7 @@ module BagitMatchers
     def failure_message_when_negated
       "expected <#{@target}> to not be in collection <#{@expected}>"
     end
-    alias negative_failure_message failure_message_when_negated
+    alias_method :negative_failure_message, :failure_message_when_negated
   end
 
   def be_in(*expected_collection)
@@ -38,7 +38,7 @@ module BagitMatchers
     def failure_message_when_negated
       "expected <#{@target}> to not exist but it does"
     end
-    alias negative_failure_message failure_message_when_negated
+    alias_method :negative_failure_message, :failure_message_when_negated
   end
 
   def exist_on_fs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bagit
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tom Johnson, Francesco Lazzarino, Jamie Little
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2026-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: validatable
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -181,26 +195,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.4'
+      version: '4.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: BagIt package generation and validation
-test_files:
-- spec/bagit_spec.rb
-- spec/fetch_spec.rb
-- spec/manifest_spec.rb
-- spec/spec_helper.rb
-- spec/tag_info_spec.rb
-- spec/tag_spec.rb
-- spec/util/bagit_matchers.rb
-- spec/validation_spec.rb
+test_files: []