sdr-client 0.26.1 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f9928c696ecb5051e4f6ba708985a2448aaa3189f93df4fcd0b85ab733ea87
-  data.tar.gz: 457989602bdece5c31cbcc95276531721a6c5682c040176de7645c1730be4326
+  metadata.gz: 0b57004bc33af516fb892a3d1cd317c1549319e97e4ca4ccc7c9ea82a00f81c0
+  data.tar.gz: 808661eb382c5a6f3098a96a473fa8396f29d413e290d822d32739f9fe34db49
 SHA512:
-  metadata.gz: 94ed5ab0d789c3d2669979bb8753bd60d0f1a51f6434f6c8b28e210fc04dc4ffcd2af9125ef3b08e4e49996c5d05c2e53b5e8348794fbad351cc5dc57e4b0b0f
-  data.tar.gz: a816a3c86dccc3f90939a81eecf5cf46ef659b3fcc5d4c97948e41796bf13a1b2d5da8de958c0f58c5a46d0ab16f56fa813ef3d3c796671d7dd4b04fd591168f
+  metadata.gz: 343d5374e9e2b12731ff06111d71646fcca815c030e67e4fd29b65477440b9bc1fde6a04b2d597ccb17c37ec56ff5a6cdc4010ad05bfaba30c7eed569ecf94b3
+  data.tar.gz: 356c88775241392487f41a31733169625f43f745e6e0c9e432a464e581b6c366a13148cd22495877972db75808e402efbf5929761adac1ad4445b35c12bc3fa9

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
@@ -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,7 +9,6 @@ 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'

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

@@ -51,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'
@@ -63,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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '0.26.1'
+  VERSION = '0.27.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.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.26.1
+  version: 0.27.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-11 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
@@ -211,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'