bagit 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac8457e8aaeb0c0ebf47ab69bd684ef53c39aa06
-  data.tar.gz: f2d8519577d2eca73c369c4523ebf34ccf1b034d
+  metadata.gz: fad8acbb5bb1291e22988803875886a17a8fb569
+  data.tar.gz: a85c86ea03545525a408d29b82b6ffdc0de7ac2b
 SHA512:
-  metadata.gz: 4b57162bc669f4ae8a739d51a3907f1b053b3980cc5b3331521b2419e21ecc10e12eb32a561ed233955920276ba9ee5e7e5af1baf28a705b84df36b3a6c28008
-  data.tar.gz: 0ab1ee1aa64b9917bb493aaf94976ab5459680d1fde980dca3632684ddee968320d821c8cb00bc041b3905261db7335d7b2592d33fab557616a1f5fbed940b9c
+  metadata.gz: cd98d4c2f70f6cd00d450981657e80e54ba0cb8c6394dd8b7a68069b736be44a4c23780c8bc98cb306c5e62afd3709a15f34c42df45d8613499651fca42923b8
+  data.tar.gz: 42ce0063033e43b1f328785f715b8b4e08a0bca0ae3186e4a505c2cef8a91b8adb694d70276f6abd3da0ab1a5b486c6b8d7651decf76fc86c1fb22230210c3c8

data/bagit.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license     = "MIT"
 
   spec.required_ruby_version = '~> 2.0'
-  
+
   spec.add_dependency 'validatable', '~> 1.6'
   spec.add_dependency 'docopt', '~> 0.5.0'
 
@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.4'
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/bin/bagit

@@ -3,22 +3,23 @@
 require 'bagit'
 require 'docopt'
 require 'logger'
-
+require 'pry'
 logger = Logger.new(STDOUT)
 
 doc = <<DOCOPT
 BagIt.
 
-Usage: 
-  bagit add [-f <file>...] [-t <tagfile>...] BAGPATH
+Usage:
+  bagit add [-f <file>...] [-t <tagfile>...] [-a <algo>] BAGPATH
   bagit delete [-f <file>...] [-t <tagfile>...] BAGPATH
   bagit remove [-t <tagfile>...] BAGPATH
-  bagit validate [-o] BAGPATH 
+  bagit validate [-o] BAGPATH
   bagit manifest [-T] BAGPATH
-  bagit list [--tags | --all] BAGPATH 
+  bagit list [--tags | --all] BAGPATH
   bagit -h | --version
 
 Options:
+  -a             A selected hashing algorithm. (md5, sha1, sha256)
   -h --help      Show this help screen.
   --version      Show version.
   -f <file>      File to add to/delete from bag. Repeatable.
@@ -31,11 +32,11 @@ Options:
 DOCOPT
 
   # Possible commands for bag-info write
-  # 
-  # bagit new [--source-organization <org>] [--organization-address <org-addr>] [--contact-name <contact>] 
-  #             [--contact-phone <phone>] [--contact-email <email>] [--external-description <ext-desc>] 
-  #             [--external-identifier <ext-id>] [--group-identifier <group-id>] [--count <count>] 
-  #             [--internal-sender-identifier <sender-id>] [--internal-sender-description <sender-desc>] 
+  #
+  # bagit new [--source-organization <org>] [--organization-address <org-addr>] [--contact-name <contact>]
+  #             [--contact-phone <phone>] [--contact-email <email>] [--external-description <ext-desc>]
+  #             [--external-identifier <ext-id>] [--group-identifier <group-id>] [--count <count>]
+  #             [--internal-sender-identifier <sender-id>] [--internal-sender-description <sender-desc>]
   #             [--bag-info-entry <label> <value>] [-f <file>...] [-t <tagfile>...] BAGPATH
 
 begin
@@ -86,7 +87,7 @@ begin
   #TODO: implement delete for data and tag files; remove for tag files.
 
   # handle add/delete bag data files
-  unless opts['-f'].nil? 
+  unless opts['-f'].nil?
     #TODO: add files in nested directories
     opts['-f'].each { |datafile|
       begin
@@ -98,11 +99,11 @@ begin
       rescue Exception => e
         logger.error("Failed operation on bag file: #{e.message}")
       end
-    }  
+    }
   end
 
   # handle adding tag files
-  unless opts['-t'].nil? 
+  unless opts['-t'].nil?
     #TODO: add files in nested directories
     opts['-t'].each { |tagfile|
       begin
@@ -126,11 +127,15 @@ begin
   end
 
   # if we haven't quit yet, we need to re-manifest
-  # only do tags if tag files have been explictly added/removed or it is explictly called 
+  # only do tags if tag files have been explictly added/removed or it is explictly called
   bag.tagmanifest! if opts['-T'] or not opts['-t'].nil?
-  bag.manifest!
+
+  unless opts['-a'].nil?
+    bag.manifest!(algo: opts['<algo>'])
+  else
+    bag.manifest!
+  end
 
 rescue Docopt::Exit => e
   logger.error(e.message.red)
 end
-

data/lib/bagit/manifest.rb

@@ -12,7 +12,7 @@ module BagIt
      return s
     end
 
-  
+
     # All tag files that are bag manifest files (manifest-[algorithm].txt)
     def manifest_files
       files = Dir[File.join(@bag_dir, '*')].select { |f|
@@ -27,7 +27,7 @@ module BagIt
     end
 
     # Generate manifest files for all the bag files
-    def manifest!
+    def manifest!(algo: 'default')
 
       # nuke all the existing manifest files
       manifest_files.each { |f| FileUtils::rm f }
@@ -35,18 +35,44 @@ module BagIt
       # manifest each tag file for each algorithm
       bag_files.each do |f|
         rel_path = encode_filename(Pathname.new(f).relative_path_from(Pathname.new(bag_dir)).to_s)
-        
-        # sha1
-        sha1 = Digest::SHA1.file f
-        File.open(manifest_file(:sha1), 'a') { |io| io.puts "#{sha1} #{rel_path}" }
-
-        # md5
-        md5 = Digest::MD5.file f
-        File.open(manifest_file(:md5), 'a') { |io| io.puts "#{md5} #{rel_path}" }
+
+        case algo
+        when 'sha1'
+          write_sha1(f, rel_path)
+        when 'md5'
+          write_md5(f, rel_path)
+        when 'sha256'
+          write_sha256(f, rel_path)
+        when 'sha512'
+          write_sha256(f, rel_path)
+        when 'default'
+          write_sha1(f, rel_path)
+          write_md5(f, rel_path)
+        end
       end
       tagmanifest!
     end
 
+    def write_sha1(f, rel_path)
+      sha1 = Digest::SHA1.file f
+      File.open(manifest_file(:sha1), 'a') { |io| io.puts "#{sha1} #{rel_path}" }
+    end
+
+    def write_md5(f, rel_path)
+      md5 = Digest::MD5.file f
+      File.open(manifest_file(:md5), 'a') { |io| io.puts "#{md5} #{rel_path}" }
+    end
+
+    def write_sha256(f, rel_path)
+      sha256 = Digest::SHA256.file f
+      File.open(manifest_file(:sha256), 'a') { |io| io.puts "#{sha256} #{rel_path}" }
+    end
+
+    def write_sha512(f, rel_path)
+      sha512 = Digest::SHA512.file f
+      File.open(manifest_file(:sha512), 'a') { |io| io.puts "#{sha512} #{rel_path}" }
+    end
+
     # All tag files that are bag manifest files (tagmanifest-[algorithm].txt)
     def tagmanifest_files
       files = Dir[File.join(@bag_dir, '*')].select { |f|

data/lib/bagit/version.rb

@@ -1,3 +1,3 @@
 module BagIt
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bagit
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Tom Johnson, Francesco Lazzarino, Jamie Little
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: validatable
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: 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'
 description: Ruby Library and Command Line tools for bagit
 email: jamie@jamielittle.org
 executables:
@@ -147,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: BagIt package generation and validation