sdr-client 0.26.1 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f9928c696ecb5051e4f6ba708985a2448aaa3189f93df4fcd0b85ab733ea87
-  data.tar.gz: 457989602bdece5c31cbcc95276531721a6c5682c040176de7645c1730be4326
+  metadata.gz: 0cb04dd251d4bdc856e935f8f6ff157054973e51e703eac5cfec621d3ea9906c
+  data.tar.gz: cc254f2105f3499a6a219e93ce51dcdde7f9c05d8fcd729c6b3c04ad58141012
 SHA512:
-  metadata.gz: 94ed5ab0d789c3d2669979bb8753bd60d0f1a51f6434f6c8b28e210fc04dc4ffcd2af9125ef3b08e4e49996c5d05c2e53b5e8348794fbad351cc5dc57e4b0b0f
-  data.tar.gz: a816a3c86dccc3f90939a81eecf5cf46ef659b3fcc5d4c97948e41796bf13a1b2d5da8de958c0f58c5a46d0ab16f56fa813ef3d3c796671d7dd4b04fd591168f
+  metadata.gz: faa0bd4e365b80ce47f8860af6a6f24f0581428662a9ded8ea6b78523aa09b73a3bcebb5aff33e998152ab8b8e1d81d9883ddee53cf162a7bdbc047596437a76
+  data.tar.gz: afb9f79a157929f83ba886f679c0eaa11965d3e60b9aa730f29edcdcb552e18c7d76d55e064ff3cdced78cf05f5df704b5d87b019607424e7263ee1e7bbb98cf

data/.rubocop.yml

@@ -1,4 +1,3 @@
-
 inherit_from: .rubocop_todo.yml
 
 AllCops:
@@ -7,11 +6,6 @@ AllCops:
     - 'bin/console'
     - 'vendor/**/*'
 
-Layout/LineLength:
-  Max: 120
-  Exclude:
-    - 'spec/sdr_client/deposit/process_spec.rb'
-
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
@@ -21,4 +15,4 @@ Metrics/BlockLength:
 
 Naming/FileName:
   Exclude:
-    - 'lib/sdr-client.rb'
+    - 'lib/sdr-client.rb'

data/.rubocop_todo.yml

@@ -1,17 +1,29 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-04-27 08:24:29 -0400 using RuboCop version 0.82.0.
+# on 2020-06-24 17:02:25 -0700 using RuboCop version 0.79.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 2
-# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 16
 
-# Offense count: 7
+# Offense count: 8
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 15
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Exclude:
+    - 'exe/sdr'
+
+# Offense count: 187
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 1228

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,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/credentials.rb

@@ -10,14 +10,23 @@ 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'))
+        file.flush
       end
     end
 
     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_EX)
+        creds = file.readlines(chomp: true).first
+      end
+      raise NoCredentialsError if creds.nil?
+
+      creds
     end
 
     def self.credentials_path

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SdrClient
-  VERSION = '0.26.1'
+  VERSION = '0.28.3'
 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'
 
@@ -37,6 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.79.0'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.37.1'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov', '~> 0.17.0' # CodeClimate cannot use SimpleCov >= 0.18.0 for generating test coverage
   spec.add_development_dependency 'webmock', '~> 3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-client
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.28.3
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-25 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
@@ -140,16 +140,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: webmock
   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'