sdr-client 2.13.1 → 2.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 073d9149d7aade5f78842251778f8731ca9ef8e767ab0abe59f5ff360f3d8c2a
-  data.tar.gz: 1085b1b409a72c1a7d0377198199f44244ea7f4db17e78449a1931ac0e1502af
+  metadata.gz: 30ae047ce917b1e8806379dd4aa57282c69af3eb1a756ffc1a2c01e67e8eef76
+  data.tar.gz: 475b3e52ee610abfd063f512fcdbbe9c2cc35a52ac6ab368a72e81925a132e19
 SHA512:
-  metadata.gz: 84aff6cb5c387c48fded7fa363f486e7123f3c2e2d55396e0fe7c9e785fd1a268158d5cc65eb77cd34dfaea8d66654f1a2e727ee0d366f66ce53f50087054840
-  data.tar.gz: aafac64bc2a0bd62c06085288858d19e1d9ea17c88fd5d8b58edc6172c5ebd907c091d577a7b778bf00c2cfff0ac155810bad7387eab3f8665c393cd75eb366e
+  metadata.gz: df78e5244f588d1fe88a96d564e77e2611cb2dc503c9b8300ec06cc1fbffdb79ec4332502e38b6aa87ee5b1f287ca4134f7d4c6c8c6e55061b30a60708ec406a
+  data.tar.gz: 171f539702caf45adefa8037f788e9dc8de530a11d35fd0a6c6b1bbbb9a7bb017bf3997e05d6c2e8097a07b15c5af1b073b93c70aa9001be69ea6138ef9d74a4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sdr-client (2.13.1)
+    sdr-client (2.13.2)
       activesupport
       cocina-models (~> 0.96.0)
       config

data/lib/sdr_client/redesigned_client/cli/credentials.rb

@@ -9,25 +9,25 @@ module SdrClient
         def self.write(body)
           token = JSON.parse(body).fetch('token')
           FileUtils.mkdir_p(credentials_path, mode: 0o700)
-          File.atomic_write(credentials_file) { |file| file.write(token) }
-          File.chmod(0o600, credentials_file)
+          ::File.atomic_write(credentials_file) { |file| file.write(token) }
+          ::File.chmod(0o600, credentials_file)
         end
 
         def self.read
           return unless ::File.exist?(credentials_file)
 
-          creds = File.read(credentials_file, chomp: true)
+          creds = ::File.read(credentials_file, chomp: true)
           return if creds.nil?
 
           creds
         end
 
         def self.credentials_path
-          @credentials_path ||= File.join(Dir.home, '.sdr')
+          @credentials_path ||= ::File.join(Dir.home, '.sdr')
         end
 
         def self.credentials_file
-          File.join(credentials_path, 'credentials')
+          ::File.join(credentials_path, 'credentials')
         end
       end
     end

data/lib/sdr_client/redesigned_client/cli/update.rb

@@ -46,7 +46,7 @@ module SdrClient
         end
 
         def cocina_hash_from_file
-          @cocina_hash_from_file ||= JSON.parse(File.read(options[:cocina_file]), symbolize_names: true)
+          @cocina_hash_from_file ||= JSON.parse(::File.read(options[:cocina_file]), symbolize_names: true)
         end
 
         def cocina_hash_from_pipe
@@ -65,7 +65,7 @@ module SdrClient
         end
 
         def update_cocina_from_file(cocina_object)
-          if !File.file?(options[:cocina_file]) || !File.readable?(options[:cocina_file])
+          if !::File.file?(options[:cocina_file]) || !::File.readable?(options[:cocina_file])
             raise "File not found: #{options[:cocina_file]}"
           end
 

data/lib/sdr_client/redesigned_client/cli.rb

@@ -64,17 +64,26 @@ module SdrClient
         validate_druid!(druid)
         # Make sure client is configured
         client
-        job_id = CLI::Update.run(druid, **options)
+        job_id = Update.run(druid, **options)
         if options[:skip_polling]
           say "job ID #{job_id} queued (not polling because `-s` flag was supplied)"
           return
         end
 
+        # the extra args to `say` prevent appending a newline
+        say('SDR is processing your request.', nil, false)
+
         job_status = client.job_status(job_id: job_id)
-        if job_status.wait_until_complete
-          say "success! (druid: #{job_status.druid})"
+        job_status.wait_until_complete { say('.', nil, false) }
+
+        if job_status.complete?
+          if job_status.errors
+            say_error " errored! #{job_status.errors}"
+          else
+            say " success! (druid: #{job_status.druid})"
+          end
         else
-          say_error "errored! #{job_status.errors}"
+          say_error " job #{job_id} did not complete\n#{job_status.result.inspect}"
         end
       end
 
@@ -143,7 +152,7 @@ module SdrClient
         sleep 0.5
         token_string = ask('Paste token here:')
         expiry = JSON.parse(token_string)['exp']
-        CLI::Credentials.write(token_string)
+        Credentials.write(token_string)
         say "You are now authenticated for #{options[:url]} until #{expiry}"
         token_string
       end

data/lib/sdr_client/redesigned_client/job_status.rb

@@ -6,6 +6,8 @@ module SdrClient
   class RedesignedClient
     # Wraps operations waiting for results from jobs
     class JobStatus
+      attr_reader :result
+
       def initialize(job_id:)
         @job_id = job_id
         @result = {
@@ -35,11 +37,26 @@ module SdrClient
       # @param [Integer] timeout_in_secs (180) timeout after this many secs
       # @param [Float] backoff_factor (2.0) how quickly to backoff. This should be > 1.0 and probably ought to be <= 2.0
       # @return [Boolean] true if successful false if unsuccessful.
-      def wait_until_complete(secs_between_requests: 3.0,
+      def wait_until_complete(secs_between_requests: 3.0, # rubocop:disable Metrics/MethodLength
                               timeout_in_secs: 180,
                               backoff_factor: 2.0,
                               max_secs_between_requests: 60)
-        poll_until_complete(secs_between_requests, timeout_in_secs, backoff_factor, max_secs_between_requests)
+        begin
+          Timeout.timeout(timeout_in_secs) do
+            loop do
+              break if complete?
+
+              yield if block_given?
+
+              sleep(secs_between_requests)
+              # Exponential backoff, limited to max_secs_between_requests
+              secs_between_requests = [secs_between_requests * backoff_factor, max_secs_between_requests].min
+            end
+          end
+        rescue Timeout::Error
+          @result[:output][:errors] = ["Not complete after #{timeout_in_secs} seconds"]
+        end
+
         errors.nil?
       end
 
@@ -54,21 +71,6 @@ module SdrClient
       def path
         "/v1/background_job_results/#{job_id}"
       end
-
-      def poll_until_complete(secs_between_requests, timeout_in_secs, backoff_factor, max_secs_between_requests)
-        interval = secs_between_requests
-        Timeout.timeout(timeout_in_secs) do
-          loop do
-            break if complete?
-
-            sleep(interval)
-            # Exponential backoff, limited to max_secs_between_requests
-            interval = [interval * backoff_factor, max_secs_between_requests].min
-          end
-        end
-      rescue Timeout::Error
-        @result[:output][:errors] = ["Not complete after #{timeout_in_secs} seconds"]
-      end
     end
   end
 end

data/lib/sdr_client/redesigned_client/metadata.rb

@@ -35,6 +35,7 @@ module SdrClient
           model: request_builder.to_cocina,
           basepath: basepath,
           files: files,
+          accession: accession,
           request_builder: request_builder,
           **options
         )

data/lib/sdr_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '2.13.1'
+  VERSION = '2.13.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.13.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport