sdr-client 0.97.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c562c90ba48ff8d6168c1c7488537bde46faab61ec81963de5917776ffa9f079
-  data.tar.gz: 1e22559c270a5312f975a382c87daac40af750c24755f62c02873775d07c0855
+  metadata.gz: 1889b3e5a4bda3ce260dd4a0d9671f8ce3ab0db9ae7f05584d18f9f556e7bd0a
+  data.tar.gz: aa6ad237bd7febc4c74d40fdff148faa9ede2c0a560b010bce7d42b3cb295589
 SHA512:
-  metadata.gz: 5aa3b0ff99dfedf0751c5c0f9782d5c17b0092a5aa98a222e9f15c0011945f6fa67403f82334bcdfc6d405883e49682032dee0b498a1a0f56d7b84a52cf36756
-  data.tar.gz: ed9acb2561e273f516804b60b734d3a4c900b79c3648bfa62cde33d3164ab42e27d13d675233ca45f3f1f0d75314cca3702810a0a9ed3a9f7b68359332f12a89
+  metadata.gz: 9d5f381820d655416d1c8da19db0911af0a016d83fe4970f1a64d03bc8f9f2709f93c05ff0f367ad9bcb1e94f44fed86ef61798312a98660e3bf0e8ca2f1dfbc
+  data.tar.gz: 8b5dadcc030463318a87444611294571af60c18bd35d52fe5d0c89ddf7dbd71e4ecf66ec9df3bb21a60a4846cedf3f9e3b6d77835a14a959ec7268d75a17f618

data/.rubocop.yml

@@ -27,6 +27,9 @@ Naming/FileName:
   Exclude:
     - 'lib/sdr-client.rb'
 
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
 Gemspec/DeprecatedAttributeAssignment: # new in 1.10
   Enabled: true
 Gemspec/RequireMFA: # new in 1.23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sdr-client (0.97.0)
+    sdr-client (2.0.0)
       activesupport
       cocina-models (~> 0.86.0)
       dry-monads
@@ -18,7 +18,7 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    attr_extras (6.2.5)
+    attr_extras (7.0.0)
     byebug (11.1.3)
     cocina-models (0.86.0)
       activesupport
@@ -37,73 +37,94 @@ GEM
       zeitwerk (~> 2.1)
     commonmarker (0.23.6)
     concurrent-ruby (1.1.10)
+    config (4.1.0)
+      deep_merge (~> 1.2, >= 1.2.1)
+      dry-validation (~> 1.0, >= 1.0.0)
     crack (0.4.5)
       rexml
+    deep_merge (1.2.2)
     deprecation (1.1.0)
       activesupport
     diff-lcs (1.5.0)
     docile (1.4.0)
-    dry-container (0.11.0)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.0)
       concurrent-ruby (~> 1.0)
-    dry-core (0.9.1)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-inflector (0.3.0)
-    dry-logic (1.3.0)
+    dry-monads (1.6.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.9, >= 0.9)
+      dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-monads (1.5.0)
+    dry-schema (1.13.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.9, >= 0.9)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.5, < 2)
+      dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
-    dry-struct (1.5.2)
-      dry-core (~> 0.9, >= 0.9)
-      dry-types (~> 1.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-types (1.6.1)
+    dry-types (1.7.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      dry-inflector (~> 1.0, < 2)
+      dry-logic (>= 1.4, < 2)
+      zeitwerk (~> 2.6)
+    dry-validation (1.10.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.9, >= 0.9)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.3, >= 1.3)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
     edtf (3.1.0)
       activesupport (>= 3.0, < 8.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    faraday (2.6.0)
+    faraday (2.7.1)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.1)
+    faraday-net_http (3.0.2)
     hashdiff (1.0.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.6.2)
+    json (2.6.3)
     jsonpath (1.1.2)
       multi_json
+    launchy (2.5.0)
+      addressable (~> 2.7)
     minitest (5.16.3)
     multi_json (1.15.0)
-    nokogiri (1.13.9-x86_64-darwin)
+    nokogiri (1.13.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-linux)
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     openapi3_parser (0.9.2)
       commonmarker (~> 0.17)
     openapi_parser (0.15.0)
     optimist (3.0.1)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     patience_diff (1.2.0)
       optimist (~> 3.0)
-    public_suffix (5.0.0)
-    racc (1.6.0)
+    public_suffix (5.0.1)
+    racc (1.6.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -114,7 +135,7 @@ GEM
     rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
@@ -122,7 +143,7 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.2.9)
       rexml
-    rubocop (1.37.1)
+    rubocop (1.40.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -132,11 +153,11 @@ GEM
       rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
+    rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.14.2)
+    rubocop-rspec (2.15.0)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -158,7 +179,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.4)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-darwin-19
@@ -168,6 +189,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   byebug
+  config
+  launchy
   rake (~> 13.0)
   rspec (~> 3.0)
   rspec_junit_formatter

data/config/settings.yml

@@ -0,0 +1,4 @@
+authentication_proxy_url:
+  'https://sdr-api-prod.stanford.edu': 'https://argo.stanford.edu/settings/tokens'
+  'https://sdr-api-qa.stanford.edu': 'https://argo-qa.stanford.edu/settings/tokens'
+  'https://sdr-api-stage.stanford.edu': 'https://argo-stage.stanford.edu/settings/tokens'

data/exe/sdr

@@ -4,5 +4,6 @@
 $LOAD_PATH.unshift 'lib'
 
 require 'sdr_client'
+require 'sdr_client/cli'
 
 SdrClient::CLI.start(ARGV)

data/lib/sdr_client/cli/config.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'config'
+
+Config.setup do |config|
+  # Name of the constant exposing loaded settings
+  config.const_name = 'Settings'
+
+  # Load environment variables from the `ENV` object and override any
+  # settings defined in files.
+  config.use_env = true
+
+  # Define ENV variable prefix deciding which variables to load into
+  # config.
+  config.env_prefix = 'SETTINGS'
+
+  # What string to use as level separator for settings loaded from ENV
+  # variables. Default value of '.' works well with Heroku, but you might
+  # want to change it for example for '__' to easy override settings from
+  # command line, where using dots in variable names might not be allowed
+  # (eg. Bash).
+  config.env_separator = '__'
+
+  # Ability to process variables names:
+  #   * nil  - no change
+  #   * :downcase - convert to lower case
+  config.env_converter = :downcase
+end
+
+Config.load_and_set_settings('config/settings.yml')

data/lib/sdr_client/cli.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'launchy'
 require 'thor'
+require_relative 'cli/config'
 
 module SdrClient
   # The SDR command-line interface
@@ -31,32 +33,19 @@ module SdrClient
 
     desc 'get DRUID', 'Retrieve an object from the SDR'
     def get(druid)
-      say SdrClient::Find.run(druid, url: options[:url], logger: Logger.new($stderr))
-    rescue SdrClient::Credentials::NoCredentialsError
-      say_error 'Log in first'
-      exit(1)
+      rescue_expected_exceptions do
+        say Find.run(druid, url: options[:url], logger: Logger.new($stderr))
+      end
     end
 
-    desc 'login', 'Prompt for email & password and create a login token (saved in ~/.sdr/token)'
+    desc 'login', 'Open authentication proxy UI, or prompt for username and password, and then prompt for token (saved in ~/.sdr/credentials)'
     def login
-      status = SdrClient::Login.run(
-        url: options[:url],
-        login_service: lambda do
-          {
-            email: ask('Email:'),
-            password: ask('Password:', echo: false)
-          }
-        end
-      )
-      return puts unless status.failure?
-
-      say_error status.failure
-      exit(1)
+      authentication_proxy_url ? login_via_proxy : login_via_credentials
     end
 
     desc 'version', 'Display the SDR CLI version'
     def version
-      say SdrClient::VERSION
+      say VERSION
     end
 
     desc 'update DRUID', 'Update an object in the SDR'
@@ -72,13 +61,13 @@ module SdrClient
     option :cdl, type: :boolean, default: false, desc: 'Controlled digital lending'
     option :cocina_file, desc: 'Path to a file containing Cocina JSON'
     option :cocina_pipe, type: :boolean, default: false, desc: 'Indicate Cocina JSON is being piped in'
+    option :basepath, default: Dir.getwd, desc: 'Base path for the files'
     def update(druid)
-      validate_druid!(druid)
-      job_id = SdrClient::Update.run(druid, **options)
-      poll_for_job_complete(job_id: job_id, url: options[:url])
-    rescue SdrClient::Credentials::NoCredentialsError
-      say_error 'Log in first'
-      exit(1)
+      rescue_expected_exceptions do
+        validate_druid!(druid)
+        job_id = Update.run(druid, **options)
+        poll_for_job_complete(job_id: job_id, url: options[:url])
+      end
     end
 
     desc 'deposit OPTIONAL_FILES', 'Deposit (accession) an object into the SDR'
@@ -95,6 +84,7 @@ module SdrClient
     option :view, enum: %w[world stanford location-based citation-only dark], desc: 'Access view level for the object'
     option :files_metadata, desc: 'JSON string representing per-file metadata'
     option :grouping_strategy, enum: %w[default filename], desc: 'Strategy for grouping files into filesets'
+    option :basepath, default: Dir.getwd, desc: 'Base path for the files'
     def deposit(*files)
       register_or_deposit(files: files, accession: true)
     end
@@ -113,22 +103,70 @@ module SdrClient
     option :view, enum: %w[world stanford location-based citation-only dark], desc: 'Access view level for the object'
     option :files_metadata, desc: 'JSON string representing per-file metadata'
     option :grouping_strategy, enum: %w[default filename], desc: 'Strategy for grouping files into filesets'
+    option :basepath, default: Dir.getwd, desc: 'Base path for the files'
     def register(*files)
       register_or_deposit(files: files, accession: false)
     end
 
     private
 
-    def register_or_deposit(files:, accession:)
-      opts = munge_options(options, files)
-      skip_polling = opts.delete(:skip_polling)
-      job_id = SdrClient::Deposit.run(accession: accession, **opts)
-      return if skip_polling
-
-      poll_for_job_complete(job_id: job_id, url: opts[:url])
-    rescue SdrClient::Credentials::NoCredentialsError
-      say_error 'Log in first'
+    def rescue_expected_exceptions
+      yield
+    rescue UnexpectedResponse::TokenExpired
+      say_error 'Token has expired! Please log in again.'
       exit(1)
+    rescue Credentials::NoCredentialsError
+      say_error 'No token found! Please log in first.'
+      exit(1)
+    end
+
+    def login_via_proxy
+      say 'Opened the configured authentication proxy in your browser. Once there, generate a new token and copy the entire value.'
+      Launchy.open(authentication_proxy_url)
+      # Some CLI environments will pop up a message about opening the URL in
+      # an existing browse. Since this is OS-dependency, and not something
+      # we can control via Launchy, just wait a bit before rendering the
+      # `ask` prompt so it's clearer to the user what's happening
+      sleep 0.5
+      token_string = ask('Paste token here:')
+      Credentials.write(token_string)
+      expiry = JSON.parse(token_string)['exp']
+      say "You are now authenticated for #{options[:url]} until #{expiry}"
+    rescue StandardError => e
+      say_error "Error logging in via proxy: #{e}"
+      exit(1)
+    end
+
+    def login_via_credentials
+      status = Login.run(
+        url: options[:url],
+        login_service: lambda do
+          {
+            email: ask('Email:'),
+            password: ask('Password:', echo: false)
+          }
+        end
+      )
+
+      return puts unless status.failure?
+
+      say_error status.failure
+      exit(1)
+    end
+
+    def authentication_proxy_url
+      @authentication_proxy_url ||= Settings.authentication_proxy_url[options[:url]]
+    end
+
+    def register_or_deposit(files:, accession:)
+      rescue_expected_exceptions do
+        opts = munge_options(options, files)
+        skip_polling = opts.delete(:skip_polling)
+        job_id = Deposit.run(accession: accession, **opts)
+        return if skip_polling
+
+        poll_for_job_complete(job_id: job_id, url: opts[:url])
+      end
     end
 
     def munge_options(options, files)
@@ -138,9 +176,9 @@ module SdrClient
         opts[:files_metadata] = JSON.parse(options[:files_metadata]) if options[:files_metadata]
         if options[:grouping_strategy]
           opts[:grouping_strategy] = if options[:grouping_strategy] == 'filename'
-                                       SdrClient::Deposit::MatchingFileGroupingStrategy
+                                       Deposit::MatchingFileGroupingStrategy
                                      else
-                                       SdrClient::Deposit::SingleFileGroupingStrategy
+                                       Deposit::SingleFileGroupingStrategy
                                      end
         end
       end
@@ -158,7 +196,7 @@ module SdrClient
       say('SDR is processing your request.', nil, false)
       result = nil
       1.upto(60) do
-        result = SdrClient::BackgroundJobResults.show(url: url, job_id: job_id)
+        result = BackgroundJobResults.show(url: url, job_id: job_id)
         break unless %w[pending processing].include?(result['status'])
 
         # the extra args to `say` prevent appending a newline

data/lib/sdr_client/deposit/file_metadata_builder.rb

@@ -18,25 +18,26 @@ module SdrClient
 
       # @param (see #initialize)
       # @return (see #build)
-      def self.build(files:, files_metadata:)
-        new(files: files, files_metadata: files_metadata.dup).build
+      def self.build(files:, files_metadata:, basepath:)
+        new(files: files, files_metadata: files_metadata.dup, basepath: basepath).build
       end
 
-      # @param [Array<String>] files the list of files for which to generate metadata
-      def initialize(files:, files_metadata:)
+      # @param [Array<String>] files the list of relative filepaths for which to generate metadata
+      def initialize(files:, files_metadata:, basepath:)
         @files = files
         @files_metadata = files_metadata
+        @basepath = basepath
       end
 
-      # @return [Hash<String, Hash<String, String>>]
+      # @return [Hash<String, Hash<String, String>>] a map of relative filepaths to a map of metadata
       def build
-        files.each do |file_path|
+        files.each do |filepath|
           OPERATIONS.each do |operation|
-            result = operation.for(file_path: file_path)
+            result = operation.for(filepath: absolute_filepath_for(filepath))
             next if result.nil?
 
-            files_metadata[file_path] ||= {}
-            files_metadata[file_path][operation::NAME] = result
+            files_metadata[filepath] ||= {}
+            files_metadata[filepath][operation::NAME] = result
           end
         end
         files_metadata
@@ -44,7 +45,11 @@ module SdrClient
 
       private
 
-      attr_reader :files, :files_metadata
+      attr_reader :files, :files_metadata, :basepath
+
+      def absolute_filepath_for(filepath)
+        ::File.join(basepath, filepath)
+      end
     end
   end
 end

data/lib/sdr_client/deposit/file_metadata_builder_operations/md5.rb

@@ -8,8 +8,8 @@ module SdrClient
       # MD5 for this file.
       class MD5
         NAME = 'md5'
-        def self.for(file_path:, **)
-          Digest::MD5.file(file_path).hexdigest
+        def self.for(filepath:, **)
+          Digest::MD5.file(filepath).hexdigest
         end
       end
     end

data/lib/sdr_client/deposit/file_metadata_builder_operations/mime_type.rb

@@ -8,8 +8,8 @@ module SdrClient
       # Mime-type for this file.
       class MimeType
         NAME = 'mime_type'
-        def self.for(file_path:, **)
-          argv = Shellwords.escape(file_path)
+        def self.for(filepath:, **)
+          argv = Shellwords.escape(filepath)
           `file --mime-type -b #{argv}`.chomp
         end
       end

data/lib/sdr_client/deposit/file_metadata_builder_operations/sha1.rb

@@ -8,8 +8,8 @@ module SdrClient
       # SHA1 for this file.
       class SHA1
         NAME = 'sha1'
-        def self.for(file_path:, **)
-          Digest::SHA1.file(file_path).hexdigest
+        def self.for(filepath:, **)
+          Digest::SHA1.file(filepath).hexdigest
         end
       end
     end

data/lib/sdr_client/deposit/model_process.rb

@@ -11,17 +11,20 @@ module SdrClient
       # @param [Boolean] accession should the accessionWF be started
       # @param [String] priority (nil) what processing priority should be used
       #                          either 'low' or 'default'
-      # @param [Array<String>] files a list of file names to upload
+      # @param [Array<String>] files a list of relative filepaths to upload
+      # @param [String] basepath filepath to which filepaths are relative
       # @param [Boolean] assign_doi should a DOI be assigned to this item
       # @param [Logger] logger the logger to use
       def initialize(request_dro:, # rubocop:disable Metrics/ParameterLists
                      connection:,
                      accession:,
+                     basepath:,
                      priority: nil,
                      files: [],
                      assign_doi: false,
                      logger: Logger.new($stdout))
         @files = files
+        @basepath = basepath
         @connection = connection
         @request_dro = request_dro
         @logger = logger
@@ -34,10 +37,14 @@ module SdrClient
         check_files_exist
         child_files_match
 
-        file_metadata = UploadFilesMetadataBuilder.build(files: files, mime_types: mime_types)
+        # file_metadata is a map of relative filepaths to Files::DirectUploadRequests
+        file_metadata = UploadFilesMetadataBuilder.build(files: files, mime_types: mime_types, basepath: basepath)
+        # upload_response is an array of Files::DirectUploadResponse
         upload_responses = UploadFiles.upload(file_metadata: file_metadata,
+                                              filepath_map: filepath_map,
                                               logger: logger,
                                               connection: connection)
+
         new_request_dro = UpdateDroWithFileIdentifiers.update(request_dro: request_dro, upload_responses: upload_responses)
         CreateResource.run(accession: @accession,
                            priority: @priority,
@@ -49,12 +56,12 @@ module SdrClient
 
       private
 
-      attr_reader :request_dro, :files, :logger, :connection
+      attr_reader :request_dro, :files, :logger, :connection, :basepath
 
       def check_files_exist
         logger.info('checking to see if files exist')
-        files.each do |file_name|
-          raise Errno::ENOENT, file_name unless ::File.exist?(file_name)
+        files.each do |filepath|
+          raise Errno::ENOENT, filepath unless ::File.exist?(absolute_filepath_for(filepath))
         end
       end
 
@@ -70,7 +77,7 @@ module SdrClient
         end
       end
 
-      # Map of filenames to mimetypes
+      # Map of relative filepaths to mimetypes
       def mime_types
         @mime_types ||=
           request_files.transform_values do |file|
@@ -78,7 +85,7 @@ module SdrClient
           end
       end
 
-      # Map of filenames to request files
+      # Map of absolute filepaths to Cocina::Models::RequestFiles
       def request_files
         @request_files ||= begin
           return {} unless request_dro.structural
@@ -90,6 +97,16 @@ module SdrClient
           end.flatten(1).to_h
         end
       end
+
+      def absolute_filepath_for(filename)
+        ::File.join(basepath, filename)
+      end
+
+      def filepath_map
+        @filepath_map ||= files.each_with_object({}) do |filepath, obj|
+          obj[filepath] = absolute_filepath_for(filepath)
+        end
+      end
     end
   end
 end

data/lib/sdr_client/deposit/process.rb

@@ -13,7 +13,8 @@ module SdrClient
       #                          either 'low' or 'default'
       # @param [Class] grouping_strategy class whose run method groups an array of uploads
       # @param [Class] file_set_type_strategy class whose run method determines file_set type
-      # @param [Array<String>] files a list of file names to upload
+      # @param [Array<String>] files a list of relative filepaths to upload
+      # @param [String] basepath filepath to which filepaths are relative
       # @param [Boolean] assign_doi should a DOI be assigned to this item
       # @param [Logger] logger the logger to use
       #
@@ -21,6 +22,7 @@ module SdrClient
       def initialize(metadata:,
                      connection:,
                      accession:,
+                     basepath:,
                      priority: nil,
                      grouping_strategy: SingleFileGroupingStrategy,
                      file_set_type_strategy: FileTypeFileSetStrategy,
@@ -36,6 +38,7 @@ module SdrClient
         @accession = accession
         @priority = priority
         @assign_doi = assign_doi
+        @basepath = basepath
       end
       # rubocop:enable Metrics/ParameterLists
 
@@ -44,8 +47,9 @@ module SdrClient
       def run
         check_files_exist
 
-        file_metadata = UploadFilesMetadataBuilder.build(files: files, mime_types: mime_types)
+        file_metadata = UploadFilesMetadataBuilder.build(files: files, mime_types: mime_types, basepath: basepath)
         upload_responses = UploadFiles.upload(file_metadata: file_metadata,
+                                              filepath_map: filepath_map,
                                               logger: logger,
                                               connection: connection)
         metadata_builder = MetadataBuilder.new(metadata: metadata,
@@ -65,12 +69,12 @@ module SdrClient
 
       private
 
-      attr_reader :metadata, :files, :connection, :logger, :grouping_strategy, :file_set_type_strategy
+      attr_reader :metadata, :files, :connection, :logger, :grouping_strategy, :file_set_type_strategy, :basepath
 
       def check_files_exist
         logger.info('checking to see if files exist')
-        files.each do |file_name|
-          raise Errno::ENOENT, file_name unless ::File.exist?(file_name)
+        files.each do |filepath|
+          raise Errno::ENOENT, filepath unless ::File.exist?(absolute_filepath_for(filepath))
         end
       end
 
@@ -80,6 +84,16 @@ module SdrClient
             [filepath, metadata.for(filepath)['mime_type']]
           end
       end
+
+      def filepath_map
+        @filepath_map ||= files.each_with_object({}) do |filepath, obj|
+          obj[filepath] = absolute_filepath_for(filepath)
+        end
+      end
+
+      def absolute_filepath_for(filepath)
+        ::File.join(basepath, filepath)
+      end
     end
   end
 end

data/lib/sdr_client/deposit/upload_files.rb

@@ -8,40 +8,43 @@ module SdrClient
     class UploadFiles
       BLOB_PATH = '/v1/direct_uploads'
 
-      # @param [Hash<String,Files::DirectUploadRequest>] the metadata for uploading the files
+      # @param [Hash<String,Files::DirectUploadRequest>] file_metadata map of relative filepaths to file metadata
+      # @param [Hash<String,String>] filepath_map map of relative filepaths to absolute filepaths
       # @param [Logger] logger the logger to use
       # @param [Connection] connection
-      def self.upload(file_metadata:, logger:, connection:)
-        new(file_metadata: file_metadata, logger: logger, connection: connection).run
+      def self.upload(file_metadata:, filepath_map:, logger:, connection:)
+        new(file_metadata: file_metadata, filepath_map: filepath_map, logger: logger, connection: connection).run
       end
 
-      # @param [Hash<String,Files::DirectUploadRequest>] the metadata for uploading the files
+      # @param [Hash<String,Files::DirectUploadRequest>] file_metadata map of relative filepaths to file metadata
+      # @param [Hash<String,String>] filepath_map map of relative filepaths to absolute filepaths
       # @param [Logger] logger the logger to use
       # @param [Connection] connection
-      def initialize(file_metadata:, logger:, connection:)
+      def initialize(file_metadata:, filepath_map:, logger:, connection:)
         @file_metadata = file_metadata
+        @filepath_map = filepath_map
         @logger = logger
         @connection = connection
       end
 
       # @return [Array<Files::DirectUploadResponse>] the responses from the server for the uploads
       def run
-        file_metadata.map do |filename, metadata|
+        file_metadata.map do |filepath, metadata|
           direct_upload(metadata.to_json).tap do |response|
-            # ActiveStorage modifies the filename provided in response, so setting here.
-            response.filename = filename
-            upload_file(filename: filename,
+            # ActiveStorage modifies the filename provided in response, so setting here with the relative filename
+            response.filename = filepath
+            upload_file(filename: filepath,
                         url: response.direct_upload.fetch('url'),
                         content_type: response.content_type,
                         content_length: response.byte_size)
-            logger.info("Upload of #{filename} complete")
+            logger.info("Upload of #{filepath} complete")
           end
         end
       end
 
       private
 
-      attr_reader :logger, :connection, :file_metadata
+      attr_reader :logger, :connection, :file_metadata, :filepath_map
 
       def direct_upload(metadata_json)
         logger.info("Starting an upload request: #{metadata_json}")
@@ -63,7 +66,7 @@ module SdrClient
         logger.info("Uploading `#{filename}' to #{url}")
 
         upload_response = connection.put(url) do |req|
-          req.body = ::File.open(filename)
+          req.body = ::File.open(filepath_map[filename])
           req.headers['Content-Type'] = content_type
           req.headers['Content-Length'] = content_length.to_s
         end

data/lib/sdr_client/deposit/upload_files_metadata_builder.rb

@@ -6,39 +6,36 @@ module SdrClient
   module Deposit
     # Collecting all the metadata about the files for a deposit
     class UploadFilesMetadataBuilder
-      # @param [Array<String>] files a list of filepaths to upload
+      # @param [Array<String>] files a list of relative filepaths to upload
       # @param [Hash<String,String>] mime_types a map of filenames to mime types
+      # @param [String] basepath path to which files are relative
       # @return [Hash<String, Files::DirectUploadRequest>] the metadata for uploading the files
-      def self.build(files:, mime_types:)
-        new(files: files, mime_types: mime_types).build
+      def self.build(files:, mime_types:, basepath:)
+        new(files: files, mime_types: mime_types, basepath: basepath).build
       end
 
-      # @param [Array<String>] files a list of filepaths to upload
+      # @param [Array<String>] files a list of absolute filepaths to upload
       # @param [Hash<String,String>] mime_types a map of filenames to mime types
-      def initialize(files:, mime_types:)
+      # @param [String] basepath path to which files are relative
+      def initialize(files:, mime_types:, basepath:)
         @files = files
         @mime_types = mime_types
+        @basepath = basepath
       end
 
-      attr_reader :files, :mime_types
+      attr_reader :files, :mime_types, :basepath
 
       # @return [Hash<String, Files::DirectUploadRequest>] the metadata for uploading the files
       def build
-        files.each_with_object({}) do |path, obj|
-          obj[path] = Files::DirectUploadRequest.from_file(path,
-                                                           file_name: filename_for(path),
-                                                           content_type: mime_type_for(path))
+        files.each_with_object({}) do |filepath, obj|
+          obj[filepath] = Files::DirectUploadRequest.from_file(absolute_filepath_for(filepath),
+                                                               file_name: filepath,
+                                                               content_type: mime_types[filepath])
         end
       end
 
-      # This can be overridden in the case that the file on disk has a different
-      # name than we want to repo to know about.
-      def filename_for(file_path)
-        file_path
-      end
-
-      def mime_type_for(file_path)
-        mime_types[filename_for(file_path)]
+      def absolute_filepath_for(filepath)
+        ::File.join(basepath, filepath)
       end
     end
   end

data/lib/sdr_client/deposit.rb

@@ -8,6 +8,9 @@ module SdrClient
     BOOK_TYPE = Cocina::Models::ObjectType.book
     # rubocop:disable Metrics/ParameterLists
     # rubocop:disable Metrics/MethodLength
+    # params [Array<String>] files a list of relative filepaths to upload
+    # params [String] basepath filepath to which filepaths are relative, defaults to current directory
+    # params [Hash<String,Hash>] file_metadata relative filepath, hash of metadata per-file metadata
     # @return [String] job id for the background job result
     def self.run(label: nil,
                  type: BOOK_TYPE,
@@ -26,29 +29,34 @@ module SdrClient
                  url:,
                  files: [],
                  files_metadata: {},
+                 basepath: Dir.getwd,
                  accession: false,
                  priority: nil,
                  grouping_strategy: SingleFileGroupingStrategy,
                  file_set_type_strategy: FileTypeFileSetStrategy,
                  logger: Logger.new($stdout))
-      augmented_metadata = FileMetadataBuilder.build(files: files, files_metadata: files_metadata)
-      metadata = Request.new(label: label,
-                             type: type,
-                             view: view,
-                             download: download,
-                             apo: apo,
-                             use_and_reproduction: use_and_reproduction,
-                             copyright: copyright,
-                             collection: collection,
-                             source_id: source_id,
-                             catkey: catkey,
-                             embargo_release_date: embargo_release_date,
-                             embargo_access: embargo_access,
-                             embargo_download: embargo_download,
-                             viewing_direction: viewing_direction,
-                             files_metadata: augmented_metadata)
+      # augmented_metadata is a map of relative filepaths to file metadata
+      augmented_metadata = FileMetadataBuilder.build(files: files, files_metadata: files_metadata, basepath: basepath)
+      request = Request.new(label: label,
+                            type: type,
+                            view: view,
+                            download: download,
+                            apo: apo,
+                            use_and_reproduction: use_and_reproduction,
+                            copyright: copyright,
+                            collection: collection,
+                            source_id: source_id,
+                            catkey: catkey,
+                            embargo_release_date: embargo_release_date,
+                            embargo_access: embargo_access,
+                            embargo_download: embargo_download,
+                            viewing_direction: viewing_direction,
+                            files_metadata: augmented_metadata)
       connection = Connection.new(url: url)
-      Process.new(metadata: metadata, connection: connection, files: files,
+      Process.new(metadata: request,
+                  connection: connection,
+                  files: files,
+                  basepath: basepath,
                   grouping_strategy: grouping_strategy,
                   file_set_type_strategy: file_set_type_strategy,
                   accession: accession,
@@ -57,9 +65,11 @@ module SdrClient
     end
     # rubocop:enable Metrics/MethodLength
 
-    # @param [Array<String>] files absolute paths to files
+    # @param [Array<String>] files relative paths to files
+    # @params [String] basepath path to which files are relative
     def self.model_run(request_dro:,
                        files: [],
+                       basepath: Dir.getwd,
                        url:,
                        accession:,
                        priority: nil,
@@ -68,6 +78,7 @@ module SdrClient
       ModelProcess.new(request_dro: request_dro,
                        connection: connection,
                        files: files,
+                       basepath: basepath,
                        logger: logger,
                        accession: accession,
                        priority: priority).run
@@ -90,7 +101,6 @@ require 'sdr_client/deposit/request'
 require 'sdr_client/deposit/metadata_builder'
 require 'sdr_client/deposit/model_process'
 require 'sdr_client/deposit/process'
-require 'sdr_client/deposit/unexpected_response'
 require 'sdr_client/deposit/update_resource'
 require 'sdr_client/deposit/update_dro_with_file_identifiers'
 require 'sdr_client/deposit/upload_files'

data/lib/sdr_client/find.rb

@@ -7,9 +7,6 @@ module SdrClient
   module Find
     DRO_PATH = '/v1/resources/%<id>s'
 
-    # Raised when find returns an unsuccessful response
-    class Failed < StandardError; end
-
     # @raise [Failed] if the find operation fails
     # @return [String] JSON for the given Cocina object or an error
     def self.run(druid, url:, logger: Logger.new($stdout))
@@ -17,12 +14,10 @@ module SdrClient
       path = format(DRO_PATH, id: druid)
       logger.info("Retrieving metadata from: #{path}")
       response = connection.get(path)
-      unless response.success?
-        error_message = "There was an HTTP #{response.status} error making the request: #{response.body}"
-        logger.error(error_message)
-        raise Failed, error_message
-      end
-      response.body
+      return response.body if response.success?
+
+      logger.error("There was an HTTP #{response.status} error making the request: #{response.body}")
+      UnexpectedResponse.call(response)
     end
   end
 end

data/lib/sdr_client/unexpected_response.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module SdrClient
+  # Handles unexpected responses
+  class UnexpectedResponse
+    # Raised when there is a request error (e.g.: a cocina-models version mismatch)
+    class BadRequest < StandardError; end
+    # Raised when there is a problem with the credentials
+    class Unauthorized < StandardError; end
+    # Raised when there is an expired token
+    class TokenExpired < StandardError; end
+
+    # @param [Faraday::Response] response
+    def self.call(response)
+      case response.status
+      when 400
+        raise BadRequest, "There was an error with your request: #{response.body}"
+      when 401
+        raise TokenExpired, 'Your token has expired' if response.body.match?('Signature has expired')
+
+        raise Unauthorized, 'There was an error with your credentials.'
+      else
+        raise "unexpected response: #{response.status} #{response.body}"
+      end
+    end
+  end
+end

data/lib/sdr_client/version.rb

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

data/lib/sdr_client.rb

@@ -9,13 +9,13 @@ require 'active_support/core_ext/file/atomic'
 require 'cocina/models'
 
 require 'sdr_client/version'
+require 'sdr_client/unexpected_response'
 require 'sdr_client/deposit'
 require 'sdr_client/update'
 require 'sdr_client/credentials'
 require 'sdr_client/find'
 require 'sdr_client/login'
 require 'sdr_client/login_prompt'
-require 'sdr_client/cli'
 require 'sdr_client/connection'
 require 'sdr_client/background_job_results'
 

data/sdr-client.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', '>= 0.16'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'config'
+  spec.add_development_dependency 'launchy'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.24'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.97.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: config
+  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: launchy
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -215,12 +243,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/settings.yml
 - exe/remove_w3cdtf_encoding_from_event_dates
 - exe/sdr
 - lib/sdr-client.rb
 - lib/sdr_client.rb
 - lib/sdr_client/background_job_results.rb
 - lib/sdr_client/cli.rb
+- lib/sdr_client/cli/config.rb
 - lib/sdr_client/connection.rb
 - lib/sdr_client/credentials.rb
 - lib/sdr_client/deposit.rb
@@ -241,7 +271,6 @@ files:
 - lib/sdr_client/deposit/process.rb
 - lib/sdr_client/deposit/request.rb
 - lib/sdr_client/deposit/single_file_grouping_strategy.rb
-- lib/sdr_client/deposit/unexpected_response.rb
 - lib/sdr_client/deposit/update_dro_with_file_identifiers.rb
 - lib/sdr_client/deposit/update_resource.rb
 - lib/sdr_client/deposit/upload_files.rb
@@ -249,6 +278,7 @@ files:
 - lib/sdr_client/find.rb
 - lib/sdr_client/login.rb
 - lib/sdr_client/login_prompt.rb
+- lib/sdr_client/unexpected_response.rb
 - lib/sdr_client/update.rb
 - lib/sdr_client/version.rb
 - sdr-client.gemspec
@@ -259,7 +289,7 @@ metadata:
   source_code_uri: https://github.com/sul-dlss/sdr-client
   changelog_uri: https://github.com/sul-dlss/sdr-client/releases
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -274,8 +304,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.2.32
+signing_key: 
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api
 test_files: []

data/lib/sdr_client/deposit/unexpected_response.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module SdrClient
-  module Deposit
-    # Handles unexpected responses when manipulating resources
-    class UnexpectedResponse
-      # Raised when there is a request error (e.g.: a cocina-models version mismatch)
-      class BadRequest < StandardError; end
-      # Raised when there is a problem with the credentials
-      class Unauthorized < StandardError; end
-
-      # @param [Faraday::Response] response
-      def self.call(response)
-        case response.status
-        when 400
-          raise BadRequest, "There was an error with your request: #{response.body}"
-        when 401
-          raise Unauthorized, 'There was an error with your credentials. Perhaps they have expired?'
-        else
-          raise "unexpected response: #{response.status} #{response.body}"
-        end
-      end
-    end
-  end
-end