pushmi_pullyu 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4380518d529c79ac7972e3ab29dee3524082df9e66a3f0f1e3eefbb5c08855d
-  data.tar.gz: c43b7f5a944ceb4fafa298ebbb7ec47725a8bbff04a8b04ea51874b6bacc2ba6
+  metadata.gz: efbf0435968a4a9c78b8ff2c5052a1b872277085ee6d849ccf973f468bcf806b
+  data.tar.gz: 98bb7ec8dcd874876235bb4f7c41272e2a033f9c014e3efb78c834344d1ab72a
 SHA512:
-  metadata.gz: 0c7e9b00f0e8a6727393da41e9060dff06a6b8aba0baf9f7ed84bbc89e17e0988e1858a8c0bd925983ccda379e249374af0c738be976ec21708a3cf6be35b20e
-  data.tar.gz: 6ed33393e60e371ea74b9eba143ff3ce3f6ddac81954ddf944d68f3d75087f2adc777ac4f8a8db4037c20131201ec0f1325a90d465b3cd06be6fa04a878a728d
+  metadata.gz: beec01dfe70827e3f0dac9289d4a11e63a98b9df2077a8343a46ac2b58de32be4cf634d7fd0f9cb22763b58083de6dbecd10a98e783b491e61dbef4f56ea77df
+  data.tar.gz: add946bc1f39b790fd7bee843e95b55785df90169ae3fa719d322db6e2282dcd0f8615f6be25fc4512ecdfc0467ae9ba5efdc7192398ffb685d5d0d90261cc99

data/CHANGELOG.md

@@ -6,6 +6,9 @@ PushmiPullyu is a Ruby application, whose primary job is to manage the flow of c
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and releases in PushmiPullyu adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.2]
+ - Simplify get entity code [#280](https://github.com/ualbertalib/pushmi_pullyu/issues/280)
+
 ## [2.1.1]
  - Increase clarity of log files [#433](https://github.com/ualbertalib/pushmi_pullyu/issues/433)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushmi_pullyu (2.1.1)
+    pushmi_pullyu (2.1.2)
       activesupport (>= 5, < 8)
       bagit (~> 0.4)
       connection_pool (~> 2.2)

data/lib/pushmi_pullyu/cli.rb

@@ -199,13 +199,14 @@ class PushmiPullyu::CLI
   def run_preservation_cycle
     begin
       entity = queue.wait_next_item
-      PushmiPullyu::Logging.log_preservation_attempt(entity,
-                                                     queue.get_entity_ingestion_attempt(entity))
-      return unless entity && entity[:type].present? && entity[:uuid].present?
     rescue StandardError => e
       log_exception(e)
     end
 
+    return unless entity && entity[:type].present? && entity[:uuid].present?
+
+    PushmiPullyu::Logging.log_preservation_attempt(entity,
+                                                   queue.get_entity_ingestion_attempt(entity))
     # add additional information about the error context to errors that occur while processing this item.
     Rollbar.scoped(entity_uuid: entity[:uuid]) do
       # Download AIP from Jupiter, bag and tar AIP directory and cleanup after
@@ -225,7 +226,7 @@ class PushmiPullyu::CLI
         queue.add_entity_in_timeframe(entity)
         PushmiPullyu::Logging.log_preservation_fail_and_retry(entity, queue.get_entity_ingestion_attempt(entity), e)
       rescue PushmiPullyu::PreservationQueue::MaxDepositAttemptsReached => e
-        PushmiPullyu::Logging.log_preservation_failure(entity, queue.get_entity_ingestion_attempt(entity), e)
+        PushmiPullyu::Logging.log_preservation_failure(entity, PushmiPullyu.options[:ingestion_attempts], e)
         log_exception(e)
       end
 

data/lib/pushmi_pullyu/version.rb

@@ -1,3 +1,3 @@
 module PushmiPullyu
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushmi_pullyu
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Shane Murnaghan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport