sdr-client 0.39.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aee57dd9e83aee0530538727e3005296c202386262d6f6da4cd0d3ed5dec1f36
-  data.tar.gz: dcf68795553348151c29d96184d5bdd4974693cacf45ac9cdac070a0381c281e
+  metadata.gz: cf5c97821bfab525a4f0b272b9519f26dd5bf46b164ab475965a1273588a31d0
+  data.tar.gz: 7545a75643e71bcdbd8bddfa6afdff6303e4ce05251746ea49d831669a48fc85
 SHA512:
-  metadata.gz: 8ab3ffa98954c69286a227769c976a9029a142721a1c8b127695b8184fb8ac310ca712d7de624a329641f4a756a66a48a071c4ac9d624f821518914bea020cac
-  data.tar.gz: 6e85cafdfa689f00e0971a28d1eacc93f502b73f9a9b4ad8c812d5a2c5ca9f33f75a72da2bdfb76fa3b7cc1c13f631f6755529f9c070d4be67f1e0523933e86a
+  metadata.gz: da880356f2d5bcfac1bc39c765411538e52b9449e4eb8ce3ccdcc5a9fd1ec8044cd5784905b76be318dc705b404df283b3ea0102b63059e877cb1cf36d8458bc
+  data.tar.gz: 6a55918f74cd35898ad80d991ae61102ce7971170d5a29c94a9791cbb3e23d46ea4f38736e05d99c7610ecd95eb22f012ac11dd159efe100ff850889c6457955

data/README.md

@@ -45,3 +45,9 @@ sdr --service-url https://sdr-api-server:3000 deposit --label 'hey there' \
   --collection 'druid:gh456kw9876' \
   --source-id 'googlebooks:stanford_12345' image42.jp2 ocr.html
 ```
+
+View the object:
+```
+sdr --service-url https://sdr-api-server:3000 get druid:bw581ng3176
+{"type":"http://cocina.sul.stanford.edu/models/document.jsonld","externalIdentifier":"druid:bw581ng3176","label":"Something something better title","version":1,"access":{"access":"stanford","copyright":"This work is copyrighted by the creator.","download":"stanford","useAndReproductionStatement":"This document is available only to the Stanford faculty, staff and student community."},"administrative":{"hasAdminPolicy":"druid:zx485kb6348"},"description":{"title":[{"value":"Something something better title"}],"contributor":[{"name":[{"value":"Hodge, Amy"}],"type":"person","role":[{"value":"Author"},{"value":"author","uri":"http://id.loc.gov/vocabulary/relators/aut","source":{"code":"marcrelator","uri":"http://id.loc.gov/vocabulary/relators/"}},{"value":"Creator"}]}],"form":[{"structuredValue":[{"value":"Text","type":"type"},{"value":"Report","type":"subtype"}],"type":"resource type","source":{"value":"Stanford self-deposit resource types"}},{"value":"reports","type":"genre","uri":"http://vocab.getty.edu/aat/300027267","source":{"code":"aat"}},{"value":"text","type":"resource type","source":{"value":"MODS resource types"}}],"note":[{"value":";alkdfjlsadkjf;l","type":"summary"},{"value":"amyhodge@stanford.edu","type":"contact","displayLabel":"Contact"}],"subject":[{"value":"lkfj","type":"topic"},{"value":";kfj","type":"topic"},{"value":"fjwelkb","type":"topic"}]},"identification":{"sourceId":"hydrus:20"},"structural":{"contains":[{"type":"http://cocina.sul.stanford.edu/models/fileset.jsonld","externalIdentifier":"bw581ng3176_1","label":"Test file","version":1,"structural":{"contains":[{"type":"http://cocina.sul.stanford.edu/models/file.jsonld","externalIdentifier":"druid:bw581ng3176/test.txt","label":"test.txt","filename":"test.txt","size":11,"version":1,"hasMimeType":"text/plain","hasMessageDigests":[{"type":"sha1","digest":"5d39343e4bb48abd97f759828282f5ebbac56c5e"},{"type":"md5","digest":"63b8812b0c05722a9d6c51cbd2bfb54b"}],"access":{"access":"world","download":"world"},"administrative":{"sdrPreserve":true,"shelve":true}}]}}]}}
+```

data/exe/sdr

@@ -19,6 +19,9 @@ end
 global.order!
 command = ARGV.shift
 
+retrieve_options = OptionParser.new do |opts|
+end
+
 deposit_options = OptionParser.new do |opts|
   opts.banner = "Usage: sdr #{command} [options]"
   opts.on('--label LABEL', 'The object label') do |label|
@@ -94,6 +97,7 @@ end
 SdrClient::CLI.help unless command
 
 subcommands = {
+  'get' => retrieve_options,
   'deposit' => deposit_options,
   'register' => deposit_options,
   'login' => OptionParser.new
@@ -106,11 +110,10 @@ end
 
 subcommands[command].order!
 
-options[:files] = ARGV unless ARGV.empty?
 options[:url] ||= 'https://sdr-api-prod.stanford.edu'
 
 begin
-  SdrClient::CLI.start(command, options)
+  SdrClient::CLI.start(command, options, ARGV)
 rescue StandardError => e
   warn "There was a problem making your request:\n\n"
   warn e.message

data/lib/sdr_client.rb

@@ -11,6 +11,7 @@ require 'cocina/models'
 require 'sdr_client/version'
 require 'sdr_client/deposit'
 require 'sdr_client/credentials'
+require 'sdr_client/find'
 require 'sdr_client/login'
 require 'sdr_client/login_prompt'
 require 'sdr_client/cli'

data/lib/sdr_client/cli.rb

@@ -23,6 +23,9 @@ module SdrClient
 
 
       COMMANDS:
+        get
+          Retrieve an object from the SDR
+
         deposit
           Accession an object into the SDR
 
@@ -34,12 +37,12 @@ module SdrClient
 
     HELP
 
-    def self.start(command, options)
+    def self.start(command, options, arguments = [])
       case command
+      when 'get'
+        puts SdrClient::Find.run(arguments.first, **options)
       when 'deposit', 'register'
-        display_errors(validate_deposit_options(options))
-        job_id = SdrClient::Deposit.run(accession: command == 'deposit', **options)
-        poll_for_job_complete(job_id: job_id, url: options[:url]) # TODO: add an option that skips this
+        deposit(command, options, arguments)
       when 'login'
         status = SdrClient::Login.run(options)
         puts status.failure if status.failure?
@@ -51,6 +54,13 @@ module SdrClient
       exit(1)
     end
 
+    def self.deposit(command, options, arguments)
+      options[:files] = arguments if arguments.present?
+      display_errors(validate_deposit_options(options))
+      job_id = SdrClient::Deposit.run(accession: command == 'deposit', **options)
+      poll_for_job_complete(job_id: job_id, url: options[:url]) # TODO: add an option that skips this
+    end
+
     def self.display_errors(errors)
       return if errors.empty?
 

data/lib/sdr_client/connection.rb

@@ -32,7 +32,7 @@ module SdrClient
       end
     end
 
-    delegate :put, :post, to: :connection
+    delegate :put, :post, :get, to: :connection
 
     private
 

data/lib/sdr_client/find.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module SdrClient
+  # The namespace for the "get" command
+  module Find
+    DRO_PATH = '/v1/resources/%<id>s'
+    # @return [String] job id for the background job result
+    def self.run(druid, url:, logger: Logger.new(STDOUT))
+      connection = Connection.new(url: url)
+      path = format(DRO_PATH, id: druid)
+      logger.info("Retrieving metadata from: #{path}")
+      response = connection.get(path)
+      response.body
+    end
+  end
+end

data/lib/sdr_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -213,6 +213,7 @@ files:
 - lib/sdr_client/deposit/update_resource.rb
 - lib/sdr_client/deposit/upload_files.rb
 - lib/sdr_client/deposit/upload_files_metadata_builder.rb
+- lib/sdr_client/find.rb
 - lib/sdr_client/login.rb
 - lib/sdr_client/login_prompt.rb
 - lib/sdr_client/version.rb
@@ -238,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: The CLI for https://github.com/sul-dlss/sdr-api