moab-versioning 4.2.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 26d64bba0aa593e619713fb761078c032df8e1cc
-  data.tar.gz: 91b9bbd3842691aabbc4a9f003347fceeea949f4
+SHA256:
+  metadata.gz: dd9a6b4c49a9ab93e011a23004c0c21b74878ff7dc46c29b022c56b83627c3bb
+  data.tar.gz: 065bb99748c0e06d5f3fafebc9b75552e1585709e170d27b27a5f14cb7b1db85
 SHA512:
-  metadata.gz: 94c2ec711d1135684611e517f994658c1358ea01b0687e46c454772476c72b9090250045a79adfb0bc5a8fe0e02988951fbce939eb9891d77956a46c67562cfc
-  data.tar.gz: e69e5ee8da7091da76bf6dba56856411da26b683ec5ae897f7c6a6811f5af9e8700a9306e4cd5f75bf20de5e92f0b35b7f87a47753d03fdedaad947f85619e70
+  metadata.gz: 2efdbe79de69d26b41de7de0052ade6e3c8cf1a8651e6e05d093b889cb0de0ac47061663951bef33082012719b3f5774ff37ced11ef210a8f7a67cfbc7bbb7b2
+  data.tar.gz: cd9518df71844ea61f4b036d08d51e2c86456c28492404265b8bd68d8510db1556ac359abd3ae95736011431ebab6bbe4a804530875e060b278dd54a9e57aff5

data/lib/moab/bagger.rb

@@ -259,7 +259,7 @@ module Moab
       rescue
         shell_execute(tar_cmd.sub('--force-local', ''))
       end
-      raise "Unable to create tarfile #{tar_pathname}" unless tar_pathname.exist?
+      raise(MoabRuntimeError, "Unable to create tarfile #{tar_pathname}") unless tar_pathname.exist?
       true
     end
 
@@ -274,11 +274,11 @@ module Moab
       else
         msg = "Shell command failed: [#{command}] caused by <STDERR = #{stderr}>"
         msg << " STDOUT = #{stdout}" if stdout && stdout.length.positive?
-        raise(StandardError, msg)
+        raise(MoabStandardError, msg)
       end
     rescue SystemCallError => e
       msg = "Shell command failed: [#{command}] caused by #{e.inspect}"
-      raise(StandardError, msg)
+      raise(MoabStandardError, msg)
     end
   end
 end

data/lib/moab/exceptions.rb

@@ -1,13 +1,9 @@
 module Moab
-  class ObjectNotFoundException < RuntimeError
-  end
+  class MoabRuntimeError < RuntimeError; end
+  class MoabStandardError < StandardError; end
 
-  class FileNotFoundException < RuntimeError
-  end
-
-  class InvalidMetadataException < RuntimeError
-  end
-
-  class ValidationException < RuntimeError
-  end
+  class FileNotFoundException < MoabRuntimeError; end
+  class InvalidMetadataException < MoabRuntimeError; end
+  class InvalidSuriSyntaxError < MoabRuntimeError; end
+  class ObjectNotFoundException < MoabRuntimeError; end
 end

data/lib/moab/file_group.rb

@@ -160,10 +160,10 @@ module Moab
     # @param pathname [Pathname] The file path to be tested
     # @return [Boolean] Test whether the given path is contained within the {#base_directory}
     def is_descendent_of_base?(pathname)
-      raise("base_directory has not been set") if @base_directory.nil?
+      raise(MoabRuntimeError, "base_directory has not been set") if @base_directory.nil?
       is_descendent = false
       pathname.expand_path.ascend { |ancestor| is_descendent ||= (ancestor == @base_directory) }
-      raise("#{pathname} is not a descendent of #{@base_directory}") unless is_descendent
+      raise(MoabRuntimeError, "#{pathname} is not a descendent of #{@base_directory}") unless is_descendent
       is_descendent
     end
 

data/lib/moab/file_signature.rb

@@ -73,7 +73,7 @@ module Moab
     # @param [Array<Symbol>] one or more keys of KNOWN_ALGOS to be computed
     # @return [Moab::FileSignature] object populated with (requested) checksums
     def self.from_file(pathname, algos_to_use = active_algos)
-      raise 'Unrecognized algorithm requested' unless algos_to_use.all? { |a| KNOWN_ALGOS.include?(a) }
+      raise(MoabRuntimeError, 'Unrecognized algorithm requested') unless algos_to_use.all? { |a| KNOWN_ALGOS.include?(a) }
 
       signatures = algos_to_use.map { |k| [k, KNOWN_ALGOS[k].call] }.to_h
 
@@ -178,7 +178,7 @@ module Moab
       return sig_from_file if eql?(sig_from_file)
       # The full signature from file is consistent with current values, or...
       # One or more of the fixity values is inconsistent, so raise an exception
-      raise "Signature inconsistent between inventory and file for #{pathname}: #{diff(sig_from_file).inspect}"
+      raise(MoabRuntimeError, "Signature inconsistent between inventory and file for #{pathname}: #{diff(sig_from_file).inspect}")
     end
 
     # @return [Hash<Symbol,String>] Key is type (e.g. :sha1), value is checksum names (e.g. ['SHA-1', 'SHA1'])

data/lib/moab/signature_catalog.rb

@@ -128,7 +128,7 @@ module Moab
     def normalize_group_signatures(group, group_pathname = nil)
       unless group_pathname.nil?
         group_pathname = Pathname(group_pathname)
-        raise "Could not locate #{group_pathname}" unless group_pathname.exist?
+        raise(MoabRuntimeError, "Could not locate #{group_pathname}") unless group_pathname.exist?
       end
       group.files.each do |file|
         unless file.signature.complete?

data/lib/moab/storage_object.rb

@@ -161,7 +161,7 @@ module Moab
     # @return [Boolean] Tests whether the new version number is one higher than the current version number
     def validate_new_inventory(version_inventory)
       if version_inventory.version_id != (current_version_id + 1)
-        raise "version mismatch - current: #{current_version_id} new: #{version_inventory.version_id}"
+        raise(MoabRuntimeError, "version mismatch - current: #{current_version_id} new: #{version_inventory.version_id}")
       end
       true
     end
@@ -177,7 +177,7 @@ module Moab
       when 1..current
         StorageObjectVersion.new(self, version_id)
       else
-        raise "Version ID #{version_id} does not exist"
+        raise(MoabRuntimeError, "Version ID #{version_id} does not exist")
       end
     end
 
@@ -187,7 +187,7 @@ module Moab
     # * Version 0 is a special case used to generate empty manifests
     # * Current version + 1 is used for creation of a new version
     def storage_object_version(version_id)
-      raise "Version ID not specified" unless version_id
+      raise(MoabRuntimeError, "Version ID not specified") unless version_id
       StorageObjectVersion.new(self, version_id)
     end
 

data/lib/moab/storage_object_version.rb

@@ -33,7 +33,7 @@ module Moab
       elsif version_id.is_a?(String) && version_id =~ /^v(\d+)$/
         @version_id = version_id.sub(/^v/, '').to_i
       else
-        raise "version_id (#{version_id}) is not in a recognized format"
+        raise(MoabRuntimeError, "version_id (#{version_id}) is not in a recognized format")
       end
       @version_name = StorageObject.version_dirname(@version_id)
       @version_pathname = storage_object.object_pathname.join(@version_name)
@@ -135,7 +135,7 @@ module Moab
     # @param bag_dir [Pathname,String] The location of the bag to be ingested
     # @return [void] Create the version subdirectory and move files into it
     def ingest_bag_data(bag_dir)
-      raise "Version already exists: #{@version_pathname}" if @version_pathname.exist?
+      raise(MoabRuntimeError, "Version already exists: #{@version_pathname}") if @version_pathname.exist?
       @version_pathname.join('manifests').mkpath
       bag_dir = Pathname(bag_dir)
       ingest_dir(bag_dir.join('data'), @version_pathname.join('data'))
@@ -149,7 +149,7 @@ module Moab
     # @param use_links [Boolean] If true, use hard links; if false, make copies
     # @return [void] recursively link or copy the source directory contents to the target directory
     def ingest_dir(source_dir, target_dir, use_links = true)
-      raise "cannot copy - target already exists: #{target_dir.expand_path}" if target_dir.exist?
+      raise(MoabRuntimeError, "cannot copy - target already exists: #{target_dir.expand_path}") if target_dir.exist?
       target_dir.mkpath
       source_dir.children.each do |child|
         if child.directory?

data/lib/moab/storage_repository.rb

@@ -18,10 +18,10 @@ module Moab
     # @return [Array<Pathname>] The list of filesystem root paths in which objects are stored
     def storage_roots
       unless defined?(@storage_roots)
-        raise "Moab::Config.storage_roots not found in config file" if Moab::Config.storage_roots.nil?
+        raise(MoabRuntimeError, "Moab::Config.storage_roots not found in config file") if Moab::Config.storage_roots.nil?
         @storage_roots = [Moab::Config.storage_roots].flatten.collect { |filesystem| Pathname(filesystem) }
-        raise "Moab::Config.storage_roots empty" if @storage_roots.empty?
-        @storage_roots.each { |root| raise "Storage root #{root} not found on system" unless root.exist? }
+        raise(MoabRuntimeError, "Moab::Config.storage_roots empty") if @storage_roots.empty?
+        @storage_roots.each { |root| raise(MoabRuntimeError, "Storage root #{root} not found on system") unless root.exist? }
       end
       @storage_roots
     end
@@ -29,7 +29,7 @@ module Moab
     # @return [String] The trunk segment of the object storage path
     def storage_trunk
       unless defined?(@storage_trunk)
-        raise "Moab::Config.storage_trunk not found in config file" if Moab::Config.storage_trunk.nil?
+        raise(MoabRuntimeError, "Moab::Config.storage_trunk not found in config file") if Moab::Config.storage_trunk.nil?
         @storage_trunk  = Moab::Config.storage_trunk
       end
       @storage_trunk
@@ -70,7 +70,7 @@ module Moab
       branch = storage_branch(object_id)
       storage_roots.each do |root|
         root_trunk = root.join(storage_trunk)
-        raise "Storage area not found at #{root_trunk}" unless root_trunk.exist?
+        raise(MoabRuntimeError, "Storage area not found at #{root_trunk}") unless root_trunk.exist?
         root_trunk_branch = root_trunk.join(branch)
         return root if root_trunk_branch.exist?
       end
@@ -79,7 +79,7 @@ module Moab
         branch = deposit_branch(object_id)
         storage_roots.each do |root|
           root_trunk = root.join(deposit_trunk)
-          raise "Deposit area not found at #{root_trunk}" unless root_trunk.exist?
+          raise(MoabRuntimeError, "Deposit area not found at #{root_trunk}") unless root_trunk.exist?
           root_trunk_branch = root_trunk.join(branch)
           return root if root_trunk_branch.exist?
         end
@@ -117,7 +117,7 @@ module Moab
     def storage_object(object_id, create = false)
       storage_object = find_storage_object(object_id)
       unless storage_object.object_pathname.exist?
-        raise Moab::ObjectNotFoundException, "No storage object found for #{object_id}" unless create
+        raise ObjectNotFoundException, "No storage object found for #{object_id}" unless create
         storage_object.object_pathname.mkpath
       end
       storage_object

data/lib/moab/utc_time.rb

@@ -14,7 +14,7 @@ module Moab
       when Time
         datetime
       else
-        raise "unknown time format #{datetime.inspect}"
+        raise(MoabRuntimeError, "unknown time format #{datetime.inspect}")
       end
     end
 
@@ -29,7 +29,7 @@ module Moab
       when Time
         datetime.utc.iso8601
       else
-        raise "unknown time format #{datetime.inspect}"
+        raise(MoabRuntimeError, "unknown time format #{datetime.inspect}")
       end
     end
   end

data/lib/serializer/serializable.rb

@@ -19,7 +19,8 @@ module Serializer
     #   The symbols should correspond to attributes declared using HappyMapper syntax
     def initialize(opts = {})
       opts.each do |key, value|
-        raise "#{key} is not a variable name in #{self.class.name}" unless variable_names.include?(key.to_s) || key == :test
+        errmsg = "#{key} is not a variable name in #{self.class.name}"
+        raise(Moab::MoabRuntimeError, errmsg) unless variable_names.include?(key.to_s) || key == :test
         instance_variable_set("@#{key}", value)
       end
     end
@@ -115,7 +116,7 @@ module Serializer
     # @param other [Serializable] The other object being compared
     # @return [Hash] Generate a hash containing the differences between two objects of the same type
     def diff(other)
-      raise "Cannot compare different classes" if self.class != other.class
+      raise(Moab::MoabRuntimeError, "Cannot compare different classes") if self.class != other.class
       left = other.to_hash
       right = to_hash
       if key.nil? || other.key.nil?

data/lib/stanford/content_inventory.rb

@@ -45,7 +45,7 @@ module Stanford
                 when 'all'
                   ng_doc.xpath("//file")
                 else
-                  raise "Unknown disposition subset (#{subset})"
+                  raise(Moab::MoabRuntimeError, "Unknown disposition subset (#{subset})")
                 end
       content_group = Moab::FileGroup.new(:group_id => 'content', :data_source => "contentMetadata-#{subset}")
       nodeset.each do |file_node|
@@ -198,7 +198,7 @@ module Stanford
       if file_size.nil? || file_size.empty?
         file_node['size'] = signature.size.to_s
       elsif file_size != signature.size.to_s
-        raise "Inconsistent size for #{file_node['id']}: #{file_size} != #{signature.size}"
+        raise(Moab::MoabRuntimeError, "Inconsistent size for #{file_node['id']}: #{file_size} != #{signature.size}")
       end
     end
 
@@ -228,7 +228,7 @@ module Stanford
         if cm_checksum.nil? || cm_checksum.empty?
           checksum_node.content = sig_checksum
         elsif cm_checksum != sig_checksum
-          raise "Inconsistent #{type} for #{file_node['id']}: #{cm_checksum} != #{sig_checksum}"
+          raise(Moab::MoabRuntimeError, "Inconsistent #{type} for #{file_node['id']}: #{cm_checksum} != #{sig_checksum}")
         end
       end
     end

data/lib/stanford/storage_repository.rb

@@ -31,10 +31,10 @@ module Stanford
     def druid_tree(object_id)
       # Note: this seems an odd place to do druid validation, but leaving it here for now
       syntax_msg = "Identifier has invalid suri syntax: #{object_id}"
-      raise syntax_msg + " nil or empty" if object_id.to_s.empty?
+      raise(Moab::InvalidSuriSyntaxError, syntax_msg + " nil or empty") if object_id.to_s.empty?
       identifier = object_id.split(':')[-1]
-      raise syntax_msg if identifier.to_s.empty?
-      raise syntax_msg unless DruidTools::Druid.valid?(identifier, true)
+      raise(Moab::InvalidSuriSyntaxError, syntax_msg) if identifier.to_s.empty?
+      raise(Moab::InvalidSuriSyntaxError, syntax_msg) unless DruidTools::Druid.valid?(identifier, true)
       DruidTools::Druid.new(identifier, true).tree.join(File::SEPARATOR)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moab-versioning
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Darren Weber
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: confstruct
@@ -244,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of digital object versioning toolkit used by the SULAIR