sdr-client 0.95.0 → 0.97.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d8cb9f5c5a64304448d2c1b18c84adf8d42097cde0a231d058542116b78fac
-  data.tar.gz: b5f8cfc11b2316b536e60c6d8c6c18c48277fc6b27fcd547663885398c3c8ff3
+  metadata.gz: c562c90ba48ff8d6168c1c7488537bde46faab61ec81963de5917776ffa9f079
+  data.tar.gz: 1e22559c270a5312f975a382c87daac40af750c24755f62c02873775d07c0855
 SHA512:
-  metadata.gz: e0f88edfa747baff0dc8ba256368fba69886b871bf2f9f08ec13e7d81532b5afe4a4e39ef6d935ebce74e6a6c1ce09e72d9eca0df4aea173088bad314dbda55b
-  data.tar.gz: a807248710399dfe0901d9c52becea8e03572768f33f64d3d409f66903917fc6d088ec5710ab978bddaa40422e512d335e00cbfcb68330056fff721d502d5dfd
+  metadata.gz: 5aa3b0ff99dfedf0751c5c0f9782d5c17b0092a5aa98a222e9f15c0011945f6fa67403f82334bcdfc6d405883e49682032dee0b498a1a0f56d7b84a52cf36756
+  data.tar.gz: ed9acb2561e273f516804b60b734d3a4c900b79c3648bfa62cde33d3164ab42e27d13d675233ca45f3f1f0d75314cca3702810a0a9ed3a9f7b68359332f12a89

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    sdr-client (0.95.0)
+    sdr-client (0.97.0)
       activesupport
-      cocina-models (~> 0.85.0)
+      cocina-models (~> 0.86.0)
       dry-monads
       faraday (>= 0.16)
 
@@ -20,7 +20,7 @@ GEM
     ast (2.4.2)
     attr_extras (6.2.5)
     byebug (11.1.3)
-    cocina-models (0.85.0)
+    cocina-models (0.86.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -45,33 +45,38 @@ GEM
     docile (1.4.0)
     dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-    dry-core (0.8.1)
+    dry-core (0.9.1)
       concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
     dry-inflector (0.3.0)
-    dry-logic (1.2.0)
+    dry-logic (1.3.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-monads (1.4.0)
+      dry-core (~> 0.9, >= 0.9)
+      zeitwerk (~> 2.6)
+    dry-monads (1.5.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 (~> 0.9, >= 0.9)
+      zeitwerk (~> 2.6)
+    dry-struct (1.5.2)
+      dry-core (~> 0.9, >= 0.9)
+      dry-types (~> 1.6)
       ice_nine (~> 0.11)
-    dry-types (1.5.1)
+      zeitwerk (~> 2.6)
+    dry-types (1.6.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
+      dry-core (~> 0.9, >= 0.9)
       dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
+      dry-logic (~> 1.3, >= 1.3)
+      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.6.0)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
+    faraday-net_http (3.0.1)
     hashdiff (1.0.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
@@ -81,9 +86,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)
@@ -100,38 +105,38 @@ GEM
     rake (13.0.6)
     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.37.1)
       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.14.2)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -153,7 +158,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.4)
 
 PLATFORMS
   x86_64-darwin-19
@@ -175,4 +180,4 @@ DEPENDENCIES
   webmock (~> 3.7)
 
 BUNDLED WITH
-   2.3.22
+   2.3.17

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/deposit/file_metadata_builder.rb

@@ -31,13 +31,12 @@ module SdrClient
       # @return [Hash<String, Hash<String, String>>]
       def build
         files.each do |file_path|
-          file_key = ::File.basename(file_path)
           OPERATIONS.each do |operation|
             result = operation.for(file_path: file_path)
             next if result.nil?
 
-            files_metadata[file_key] ||= {}
-            files_metadata[file_key][operation::NAME] = result
+            files_metadata[file_path] ||= {}
+            files_metadata[file_path][operation::NAME] = result
           end
         end
         files_metadata

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

@@ -61,15 +61,12 @@ module SdrClient
       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
 

data/lib/sdr_client/deposit/process.rb

@@ -77,8 +77,7 @@ module SdrClient
       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
     end

data/lib/sdr_client/deposit/upload_files.rb

@@ -28,6 +28,8 @@ module SdrClient
       def run
         file_metadata.map do |filename, 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,
                         url: response.direct_upload.fetch('url'),
                         content_type: response.content_type,

data/lib/sdr_client/deposit/upload_files_metadata_builder.rb

@@ -34,7 +34,7 @@ module SdrClient
       # 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)
+        file_path
       end
 
       def mime_type_for(file_path)

data/lib/sdr_client/version.rb

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

data/sdr-client.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'cocina-models', '~> 0.85.0'
+  spec.add_dependency 'cocina-models', '~> 0.86.0'
   spec.add_dependency 'dry-monads'
   spec.add_dependency 'faraday', '>= 0.16'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.95.0
+  version: 0.97.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: 0.86.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: 0.86.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -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