13558: Merge branch 'master' into wtsi-hgi-13558-debug-log-tag-req-id

[arvados.git] / sdk / cli / bin / arv

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index da65b07bf0525b29047f2207543bc63e5fd2d851..9783af202fffd029e5921d99002990eabbb466bb 100755 (executable)
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 
 # Arvados cli client
 #
@@ -14,24 +17,33 @@ if RUBY_VERSION < '1.9.3' then
 end
 
 begin
-  require 'curb'
-  require 'rubygems'
-  require 'arvados/google_api_client'
   require 'json'
+  require 'net/http'
   require 'pp'
-  require 'trollop'
+  require 'tempfile'
+  require 'yaml'
+rescue LoadError => error
+  abort "Error loading libraries: #{error}\n"
+end
+
+begin
+  require 'rubygems'
+  # Load the gems with more requirements first, so we respect any version
+  # constraints they put on gems loaded later.
+  require 'arvados/google_api_client'
+  require 'active_support/inflector'
   require 'andand'
+  require 'curb'
   require 'oj'
-  require 'active_support/inflector'
-  require 'yaml'
-  require 'tempfile'
-  require 'net/http'
-rescue LoadError
+  require 'trollop'
+rescue LoadError => error
   abort <<-EOS
 
+Error loading gems: #{error}
+
 Please install all required gems:
 
-  gem install activesupport andand curb google-api-client json oj trollop yaml
+  gem install arvados activesupport andand curb json oj trollop
 
   EOS
 end
@@ -559,18 +571,18 @@ def parse_arguments(discovery_document, subcommands)
         if body_object["required"] == false
           is_required = false
         end
-        _resource_opt_desc = "Either a string representing #{resource} as JSON or a filename from which to read #{resource} JSON (use '-' to read from stdin)."
+        resource_opt_desc = "Either a string representing #{resource} as JSON or a filename from which to read #{resource} JSON (use '-' to read from stdin)."
         if is_required
-          _resource_opt_desc += " This option must be specified."
+          resource_opt_desc += " This option must be specified."
         end
-        opt resource.to_sym, _resource_opt_desc, {
+        opt resource.to_sym, resource_opt_desc, {
           required: is_required,
           type: :string
         }
       end
     end
 
-    discovered_params.each do |k,v|
+    discovered_params.merge({resource => {'type' => 'object'}}).each do |k,v|
       k = k.to_sym
       if ['object', 'array'].index(v["type"]) and method_opts.has_key? k
         if method_opts[k].andand.match /^\//
@@ -630,36 +642,43 @@ request_parameters = {_profile:true}.merge(method_opts)
 resource_body = request_parameters.delete(resource_schema.to_sym)
 if resource_body
   # check if resource_body is valid JSON by attempting to parse it
-  _is_json = true
+  resource_body_is_json = true
   begin
-    # we don't actually need the results of the parsing, 
+    # we don't actually need the results of the parsing,
     # just checking for the JSON::ParserError exception
     JSON.parse resource_body
   rescue JSON::ParserError => e
-    _is_json = false
+    resource_body_is_json = false
   end
-  _is_readable_file = false
+  resource_body_is_readable_file = false
   # if resource_body is not valid JSON, it should be a filename (or '-' for stdin)
   if resource_body == '-'
-    _is_readable_file = true
-    _resource_body_file = $stdin
+    resource_body_is_readable_file = true
+    resource_body_file = $stdin
   elsif File.readable? resource_body
-      _is_readable_file = true
-      _resource_body_file = File.open(resource_body, 'r')
+      resource_body_is_readable_file = true
+      resource_body_file = File.open(resource_body, 'r')
   end
-  if _is_json and _is_readable_file
-    abort "Argument '#{resource_body}' specified for option '--#{resource_schema.to_sym}' is both valid JSON and a readable file, cannot continue (suggest renaming the file '#{resource_body}')."
-  elsif !_is_json and !_is_readable_file
+  if resource_body_is_json and resource_body_is_readable_file
+    abort "Argument specified for option '--#{resource_schema.to_sym}' is both valid JSON and a readable file. Please consider renaming the file: '#{resource_body}'"
+  elsif !resource_body_is_json and !resource_body_is_readable_file
     if File.exists? resource_body
       # specified file exists but is not readable
-      abort "File '#{resource_body}' specified for option '--#{resource_schema.to_sym}' exists but is not readable."
+      abort "Argument specified for option '--#{resource_schema.to_sym}' is an existing file but is not readable. Please check permissions on: '#{resource_body}'"
     else
       # specified file does not exist
-      abort "File '#{resource_body}' specified for option '--#{resource_schema.to_sym}' does not exist."
+      abort "Argument specified for option '--#{resource_schema.to_sym}' is neither valid JSON nor an existing file: '#{resource_body}'"
+    end
+  elsif resource_body_is_readable_file
+    resource_body = resource_body_file.read()
+    begin
+      # we don't actually need the results of the parsing, 
+      # just checking for the JSON::ParserError exception
+      JSON.parse resource_body
+    rescue JSON::ParserError => e
+      abort "Contents of file '#{resource_body_file.path}' is not valid JSON: #{e}"
     end
-  elsif _is_readable_file
-    resource_body = _resource_body_file.read()
-    _resource_body_file.close()
+    resource_body_file.close()
   end
   request_body = {
     resource_schema => resource_body