sdr-client 0.96.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74e0b90a6bacfc70362321764e79a26db88ca6b17bb37debcdfbafbba4cf117c
-  data.tar.gz: 512f7e341236bcfd30fba4b45cf8844b851c62335abc39139185913dbca375e1
+  metadata.gz: a66643c6ea7e08e14f529c7e5396a5037ab39cae895fa65bb7ddf7a6d98ca93c
+  data.tar.gz: 7a7986eb90c7de9eb1f4b0335e4bae0981fe2679ac2317de2f66daaee92f141f
 SHA512:
-  metadata.gz: fff091c59cf01f92fb978987e123814916ce791e9d965007a82641cf7a7ceb41011e34854ad7efed3afc454c31ffa6515de77dbfa3f2f1f55226213787f2b041
-  data.tar.gz: f3273189c211b9c82141aa7e10b76387d6a6a2105bca12b7d5867363ea6b2c35e136ab2dd5b72586c63f7ff9123c322db31f6741e57dc0883a7254735fcd5a4e
+  metadata.gz: 8fc2bb28ace65e03d8cf5336b080924a7ed6d2899cf5d2d54459b38b3d2849738cdaf9bee4fb8021a5b174f3062410748e20345cba9e10e42690995d4e0cd9f9
+  data.tar.gz: 4a3dcc3903a17266469c3ad2ca18c2d3fbb7ff57b1711b5753993a5202361d7cb9b526fbef9806a31daabcebc307cae4ba052b5f185bd6a34bfb75e694fbfd11

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.96.0)
+    sdr-client (1.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
@@ -43,35 +43,37 @@ GEM
       activesupport
     diff-lcs (1.5.0)
     docile (1.4.0)
-    dry-container (0.11.0)
+    dry-core (1.0.0)
       concurrent-ruby (~> 1.0)
-    dry-core (0.8.1)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-logic (1.4.0)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.3.0)
-    dry-logic (1.2.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-monads (1.6.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-monads (1.4.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.7)
-    dry-struct (1.4.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-types (~> 1.5)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
-    dry-types (1.5.1)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
+      dry-core (~> 1.0, < 2)
+      dry-inflector (~> 1.0, < 2)
+      dry-logic (>= 1.4, < 2)
+      zeitwerk (~> 2.6)
     edtf (3.1.0)
       activesupport (>= 3.0, < 8.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    faraday (2.5.2)
+    faraday (2.7.0)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
+    faraday-net_http (3.0.2)
     hashdiff (1.0.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
@@ -81,9 +83,9 @@ GEM
       multi_json
     minitest (5.16.3)
     multi_json (1.15.0)
-    nokogiri (1.13.8-x86_64-darwin)
+    nokogiri (1.13.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     openapi3_parser (0.9.2)
       commonmarker (~> 0.17)
@@ -98,40 +100,40 @@ GEM
     racc (1.6.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rspec_junit_formatter (0.5.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.2.9)
       rexml
-    rubocop (1.36.0)
+    rubocop (1.39.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.13.2)
+    rubocop-rspec (2.15.0)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -153,7 +155,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-darwin-19

data/README.md

@@ -11,9 +11,10 @@ This provides a way for consumers to easily and correctly deposit files to the S
 
 ## Install
 
-We recommend using the latest 3.x release of Ruby.
+Ruby 3 is required. The latest 3.x release is recommended.
 
 `gem install sdr-client`
+Note that some commands require the lastest version of the client. Use this command to update the client as necessary.
 
 ## Usage
 
@@ -35,6 +36,7 @@ Log in:
 ```
 sdr login --url https://sdr-api-server:3000
 ```
+You will be prompted for an email and password. Note that this is for an SDR API account, not SUNET account.
 
 Display version of sdr-client:
 ```

data/lib/sdr_client/cli.rb

@@ -72,6 +72,7 @@ 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)
@@ -95,6 +96,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,6 +115,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 register(*files)
       register_or_deposit(files: files, accession: false)
     end

data/lib/sdr_client/deposit/file_metadata_builder.rb

@@ -18,26 +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|
-          file_key = ::File.basename(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_key] ||= {}
-            files_metadata[file_key][operation::NAME] = result
+            files_metadata[filepath] ||= {}
+            files_metadata[filepath][operation::NAME] = result
           end
         end
         files_metadata
@@ -45,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/file_set.rb

@@ -41,7 +41,7 @@ module SdrClient
       def file_args(upload, upload_metadata)
         args = {
           external_identifier: upload.signed_id,
-          label: upload.filename,
+          label: ::File.basename(upload.filename),
           filename: upload.filename
         }
         args.merge!(upload_metadata)

data/lib/sdr_client/deposit/matching_file_grouping_strategy.rb

@@ -10,7 +10,7 @@ module SdrClient
         # Call `#values` on the result of the grouping operation because 1)
         # `Process#build_filesets` expects an array of arrays, not an array of
         # hashes, and 2) the keys aren't used anywhere
-        uploads.group_by { |ul| ::File.basename(ul.filename, '.*') }.values
+        uploads.group_by { |ul| ::File.join(::File.dirname(ul.filename), ::File.basename(ul.filename, '.*')) }.values
       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,31 +56,28 @@ 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
 
       def child_files_match
         # Files without request files.
         files.each do |filepath|
-          filename = ::File.basename(filepath)
-
-          raise "Request file not provided for #{filepath}" if request_files[filename].nil?
+          raise "Request file not provided for #{filepath}" if request_files[filepath].nil?
         end
 
         # Request files without files
-        filenames = files.map { |filepath| ::File.basename(filepath) }
         request_files.each_key do |request_filename|
-          raise "File not provided for request file #{request_filename}" unless filenames.include?(request_filename)
+          raise "File not provided for request file #{request_filename}" unless files.include?(request_filename)
         end
       end
 
-      # Map of filenames to mimetypes
+      # Map of relative filepaths to mimetypes
       def mime_types
         @mime_types ||=
           request_files.transform_values do |file|
@@ -81,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
@@ -93,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,22 +69,31 @@ 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
 
       def mime_types
         @mime_types ||=
           files.to_h do |filepath|
-            filename = ::File.basename(filepath)
-            [filename, metadata.for(filename)['mime_type']]
+            [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,38 +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|
-            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}")
@@ -61,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.basename(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

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.96.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api