sdr-client 0.25.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ba412736744579cc3c7730354944d6357027106ca021c60e7363071a441ac21
-  data.tar.gz: 808952a65481516130017e8215656062e06ed9386fbab4486eb2b00bf1e977a1
+  metadata.gz: 50a6b81aebe70d387a5be6aebb0851f82a14e67dacefe260af79c374a4a95a77
+  data.tar.gz: 4b21258044406e8cc46783b7554620bf5c7cd986600d0f3ecfddb1e88cdaf564
 SHA512:
-  metadata.gz: dbc1f0cb2fd1edf1b3af487cb585aab7304600cae177791d0861eeacfed8ba15caf8e59fd222def840e2e102656868e73869ec739fcc499fc40c0807b17ddaf8
-  data.tar.gz: 22a5983f2c7b3d77b70efbaab7a6e0280e9057cec80697c80759c4b6efd25fddfcd52c1b8b51c5bc4b819a42b9cabd09ecbb8abcb2522ba6ae2a25dfce2f97a7
+  metadata.gz: 64e6a60ee1e652b20ba4482f66a98b87ccdf7651933b99dc6abfa1d067f71d5e07a3d099fab72ecf33518a4ba6d33521fa2b340845a5e88b8139a6799648b364
+  data.tar.gz: 3f1c03720980a469de93ecfb60aa88b24652f647eb6929b0cda15d9702388b9a6ae19e93ea2e73439705bf1f96891378121725f48f909b6d6c29898796417eb8

data/.github/pull_request_template.md

@@ -2,4 +2,11 @@
 
 
 
-## Was the documentation (README, wiki) updated?
+## How was this change tested?
+
+
+
+## Which documentation and/or configurations were updated?
+
+
+

data/bin/console

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'sdr/client'
+require 'sdr_client'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/exe/sdr

@@ -6,37 +6,13 @@ require 'optparse'
 require 'sdr_client'
 
 options = {}
+
 global = OptionParser.new do |opts|
   opts.on('--service-url URL', 'Connect to the host at this URL') do |url|
     options[:url] = url
   end
   opts.on('-h', '--help', 'Display this screen') do
-    puts <<~HELP
-      DESCRIPTION:
-        The SDR Command Line Interface is a tool to interact with the Stanford Digital Repository.
-
-      SYNOPSIS:
-        sdr [options] <command>
-
-      OPTIONS:
-        --service-url (string)
-        Override the command's default URL with the given URL.
-
-        -h, --help
-        Displays this screen
-
-      COMMANDS
-        deposit
-        accession object into the SDR
-
-        register
-        create a draft object in SDR
-
-        login
-        Will prompt for email & password and exchange it for an login token, which it saves in ~/.sdr/token
-
-    HELP
-    exit
+    SdrClient::CLI.help
   end
 end
 
@@ -44,6 +20,7 @@ global.order!
 command = ARGV.shift
 
 deposit_options = OptionParser.new do |opts|
+  opts.banner = "Usage: sdr #{command} [options]"
   opts.on('--label LABEL', 'The object label') do |label|
     options[:label] = label
   end
@@ -54,8 +31,8 @@ deposit_options = OptionParser.new do |opts|
 
   opts.on('--type TYPE', 'The object type to create. ' \
           'One of: "image", "book", "document", "map", "manuscript", "media", ' \
-          '"three_dimensional", "collection", or "admin_policy"') do |type|
-    if %w[image book document map manuscript media three_dimensional collection admin_policy].include?(type)
+          '"three_dimensional", "object", "collection", or "admin_policy"') do |type|
+    if %w[image book document map manuscript media three_dimensional object collection admin_policy].include?(type)
       options[:type] = "http://cocina.sul.stanford.edu/models/#{type}.jsonld"
     end
   end
@@ -114,6 +91,8 @@ deposit_options = OptionParser.new do |opts|
   end
 end
 
+SdrClient::CLI.help unless command
+
 subcommands = {
   'deposit' => deposit_options,
   'register' => deposit_options,
@@ -122,10 +101,19 @@ subcommands = {
 
 unless subcommands.key?(command)
   puts "unknown command '#{command}'"
-  exit
+  SdrClient::CLI.help
 end
 
 subcommands[command].order!
 
 options[:files] = ARGV unless ARGV.empty?
-SdrClient::CLI.start(command, options)
+options[:url] ||= 'https://sdr-api-prod.stanford.edu'
+
+begin
+  SdrClient::CLI.start(command, options)
+rescue StandardError => e
+  warn "There was a problem making your request:\n\n"
+  warn e.message
+  puts
+  puts subcommands[command].help
+end

data/lib/sdr_client.rb

@@ -9,12 +9,12 @@ require 'cocina/models'
 
 require 'sdr_client/version'
 require 'sdr_client/deposit'
-require 'sdr_client/model_deposit'
 require 'sdr_client/credentials'
 require 'sdr_client/login'
 require 'sdr_client/login_prompt'
 require 'sdr_client/cli'
 require 'sdr_client/connection'
+require 'sdr_client/background_job_results'
 
 module SdrClient
   class Error < StandardError; end

data/lib/sdr_client/background_job_results.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module SdrClient
+  # API calls around background job results from dor-services-app
+  module BackgroundJobResults
+    # Get status/result of a background job
+    # @param url [String] url for the service
+    # @param job_id [String] required string representing a job identifier
+    # @return [Hash] result of background job
+    def self.show(url:, job_id:)
+      connection = Connection.new(url: "#{url}/v1/background_job_results/#{job_id}").connection
+      resp = connection.get
+
+      raise "unexpected response: #{resp.status} #{resp.body}" unless resp.success?
+
+      JSON.parse(resp.body).with_indifferent_access
+    end
+  end
+end

data/lib/sdr_client/cli.rb

@@ -3,15 +3,46 @@
 module SdrClient
   # The command line interface
   module CLI
+    HELP = <<~HELP
+      DESCRIPTION:
+        The SDR Command Line Interface is a tool to interact with the Stanford Digital Repository.
+
+      SYNOPSIS:
+        sdr [options] <command>
+
+        To see help text for each command you can run:
+
+        sdr [options] <command> help
+
+      OPTIONS:
+        --service-url (string)
+        Override the command's default URL with the given URL.
+
+        -h, --help
+        Displays this screen
+
+
+      COMMANDS:
+        deposit
+          Accession an object into the SDR
+
+        register
+          Create a draft object in SDR and retrieve a Druid identifier.
+
+        login
+          Will prompt for email & password and exchange it for an login token, which it saves in ~/.sdr/token
+
+    HELP
+
     def self.start(command, options)
       case command
-      when 'deposit'
-        SdrClient::Deposit.run(accession: true, **options)
-      when 'register'
-        SdrClient::Deposit.run(accession: false, **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
       when 'login'
         status = SdrClient::Login.run(options)
-        puts status.value if status.failure?
+        puts status.failure if status.failure?
       else
         raise "Unknown command #{command}"
       end
@@ -19,5 +50,38 @@ module SdrClient
       puts 'Log in first'
       exit(1)
     end
+
+    def self.display_errors(errors)
+      return if errors.empty?
+
+      raise errors.map { |k, v| "#{k} #{v}" }.join("\n")
+    end
+
+    def self.validate_deposit_options(options)
+      {}.tap do |errors|
+        errors['admin-policy'] = 'is a required argument' unless options[:apo]
+        errors['source-id'] = 'is a required argument' unless options[:source_id]
+      end
+    end
+
+    def self.help
+      puts HELP
+      exit
+    end
+
+    def self.poll_for_job_complete(job_id:, url:)
+      result = nil
+      1.upto(5) do |_n|
+        result = SdrClient::BackgroundJobResults.show(url: url, job_id: job_id)
+        break unless %w[pending processing].include? result['status']
+
+        sleep 5
+      end
+      if result['status'] == 'complete'
+        puts result.dig('output', 'druid')
+      else
+        warn "Job #{job_id} did not complete\n#{result.inspect}"
+      end
+    end
   end
 end

data/lib/sdr_client/credentials.rb

@@ -10,6 +10,7 @@ module SdrClient
       json = JSON.parse(body)
       Dir.mkdir(credentials_path, 0o700) unless Dir.exist?(credentials_path)
       File.open(credentials_file, 'w', 0o600) do |file|
+        file.flock(File::LOCK_EX)
         file.write(json.fetch('token'))
       end
     end
@@ -17,7 +18,14 @@ module SdrClient
     def self.read
       raise NoCredentialsError unless ::File.exist?(credentials_file)
 
-      IO.readlines(credentials_file, chomp: true).first
+      creds = nil
+      File.open(credentials_file, 'r') do |file|
+        file.flock(File::LOCK_SH)
+        creds = file.readlines(chomp: true).first
+      end
+      raise NoCredentialsError if creds.nil?
+
+      creds
     end
 
     def self.credentials_path

data/lib/sdr_client/deposit.rb

@@ -8,6 +8,7 @@ module SdrClient
     BOOK_TYPE = 'http://cocina.sul.stanford.edu/models/book.jsonld'
     # rubocop:disable Metrics/ParameterLists
     # rubocop:disable Metrics/MethodLength
+    # @return [String] job id for the background job result
     def self.run(label: nil,
                  type: BOOK_TYPE,
                  viewing_direction: nil,
@@ -50,6 +51,19 @@ module SdrClient
     end
     # rubocop:enable Metrics/MethodLength
     # rubocop:enable Metrics/ParameterLists
+
+    def self.model_run(request_dro:,
+                       files: [],
+                       url:,
+                       accession:,
+                       logger: Logger.new(STDOUT))
+      connection = Connection.new(url: url)
+      ModelProcess.new(request_dro: request_dro,
+                       connection: connection,
+                       files: files,
+                       logger: logger,
+                       accession: accession).run
+    end
   end
 end
 require 'json'
@@ -62,6 +76,7 @@ require 'sdr_client/deposit/file_metadata_builder'
 require 'sdr_client/deposit/file_set'
 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/upload_files'
 require 'sdr_client/deposit/upload_resource'

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'digest'
+require 'shellwords'
 
 module SdrClient
   module Deposit
@@ -9,7 +9,8 @@ module SdrClient
       class MimeType
         NAME = 'mime_type'
         def self.for(file_path:, **)
-          `file --mime-type -b #{file_path}`.chomp
+          argv = Shellwords.escape(file_path)
+          `file --mime-type -b #{argv}`.chomp
         end
       end
     end

data/lib/sdr_client/deposit/process.rb

@@ -26,6 +26,7 @@ module SdrClient
       # rubocop:enable Metrics/ParameterLists
 
       # rubocop:disable Metrics/AbcSize
+      # @return [String] job id for the background job result
       def run
         check_files_exist
         upload_responses = UploadFiles.new(files: files,

data/lib/sdr_client/deposit/upload_resource.rb

@@ -21,14 +21,14 @@ module SdrClient
       end
 
       # @param [Hash<Symbol,String>] the result of the metadata call
-      # @return [Hash<Symbol,String>] the result of the metadata call
+      # @return [String] job id for the background job result
       def run
         response = metadata_request
         unexpected_response(response) unless response.status == 201
 
         logger.info("Response from server: #{response.body}")
 
-        { druid: JSON.parse(response.body)['druid'], background_job: response.headers['Location'] }
+        JSON.parse(response.body)['jobId']
       end
 
       private

data/lib/sdr_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '0.25.0'
+  VERSION = '0.28.1'
 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.32.0'
+  spec.add_dependency 'cocina-models', '~> 0.33.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.25.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - 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/connection.rb
 - lib/sdr_client/credentials.rb
@@ -210,7 +211,6 @@ files:
 - lib/sdr_client/deposit/upload_resource.rb
 - lib/sdr_client/login.rb
 - lib/sdr_client/login_prompt.rb
-- lib/sdr_client/model_deposit.rb
 - lib/sdr_client/version.rb
 - sdr-client.gemspec
 homepage: https://github.com/sul-dlss/sdr-client

data/lib/sdr_client/model_deposit.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'logger'
-
-module SdrClient
-  # The namespace for the "deposit" command
-  module Deposit
-    def self.model_run(request_dro:,
-                       files: [],
-                       url:,
-                       accession:,
-                       logger: Logger.new(STDOUT))
-      connection = Connection.new(url: url)
-      ModelProcess.new(request_dro: request_dro,
-                       connection: connection,
-                       files: files,
-                       logger: logger,
-                       accession: accession).run
-    end
-  end
-end
-require 'sdr_client/deposit/model_process'