From 0a9f43066d71e9e7ee04ce121083336ee7333a9d Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 24 Aug 2018 20:37:41 -0400 Subject: [PATCH] 'trollop' gem renamed to 'optimist' fix build no issue # Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cli/arvados-cli.gemspec | 2 +- sdk/cli/bin/arv | 20 ++++++++++---------- sdk/cli/bin/arv-run-pipeline-instance | 8 ++++---- sdk/cli/bin/arv-tag | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sdk/cli/arvados-cli.gemspec b/sdk/cli/arvados-cli.gemspec index 6f6035b39e..038b486612 100644 --- a/sdk/cli/arvados-cli.gemspec +++ b/sdk/cli/arvados-cli.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'google-api-client', '~> 0.6', '>= 0.6.3', '<0.8.9' s.add_runtime_dependency 'activesupport', '>= 3.2.13', '< 5' s.add_runtime_dependency 'json', '>= 1.7.7', '<3' - s.add_runtime_dependency 'trollop', '~> 2.0' + s.add_runtime_dependency 'optimist', '~> 3.0' s.add_runtime_dependency 'andand', '~> 1.3', '>= 1.3.3' s.add_runtime_dependency 'oj', '~> 3.0' s.add_runtime_dependency 'curb', '~> 0.8' diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv index 9783af202f..7110b4b991 100755 --- a/sdk/cli/bin/arv +++ b/sdk/cli/bin/arv @@ -35,7 +35,7 @@ begin require 'andand' require 'curb' require 'oj' - require 'trollop' + require 'optimist' rescue LoadError => error abort <<-EOS @@ -43,7 +43,7 @@ Error loading gems: #{error} Please install all required gems: - gem install arvados activesupport andand curb json oj trollop + gem install arvados activesupport andand curb json oj optimist EOS end @@ -375,7 +375,7 @@ end def arv_create client, arvados, global_opts, remaining_opts types = resource_types(arvados.discovery_document) - create_opts = Trollop::options do + create_opts = Optimist::options do opt :project_uuid, "Project uuid in which to create the object", :type => :string stop_on resource_types(arvados.discovery_document) end @@ -392,7 +392,7 @@ def arv_create client, arvados, global_opts, remaining_opts rsc = rsc.first discovered_params = arvados.discovery_document["resources"][rsc]["methods"]["create"]["parameters"] - method_opts = Trollop::options do + method_opts = Optimist::options do banner head_banner banner "Usage: arv create [--project-uuid] #{object_type} [create parameters]" banner "" @@ -402,7 +402,7 @@ def arv_create client, arvados, global_opts, remaining_opts opts = Hash.new() opts[:type] = v["type"].to_sym if v.include?("type") if [:datetime, :text, :object, :array].index opts[:type] - opts[:type] = :string # else trollop bork + opts[:type] = :string # else optimist bork end opts[:default] = v["default"] if v.include?("default") opts[:default] = v["default"].to_i if opts[:type] == :integer @@ -483,7 +483,7 @@ end def parse_arguments(discovery_document, subcommands) resources_and_subcommands = resource_types(discovery_document) + subcommands - option_parser = Trollop::Parser.new do + option_parser = Optimist::Parser.new do version __FILE__ banner head_banner banner "Usage: arv [--flags] subcommand|resource [method] [--parameters]" @@ -513,7 +513,7 @@ def parse_arguments(discovery_document, subcommands) stop_on resources_and_subcommands end - global_opts = Trollop::with_standard_exception_handling option_parser do + global_opts = Optimist::with_standard_exception_handling option_parser do o = option_parser.parse ARGV end @@ -544,7 +544,7 @@ def parse_arguments(discovery_document, subcommands) discovered_params = discovery_document\ ["resources"][resource.pluralize]\ ["methods"][method]["parameters"] - method_opts = Trollop::options do + method_opts = Optimist::options do banner head_banner banner "Usage: arv #{resource} #{method} [--parameters]" banner "" @@ -554,7 +554,7 @@ def parse_arguments(discovery_document, subcommands) opts = Hash.new() opts[:type] = v["type"].to_sym if v.include?("type") if [:datetime, :text, :object, :array].index opts[:type] - opts[:type] = :string # else trollop bork + opts[:type] = :string # else optimist bork end opts[:default] = v["default"] if v.include?("default") opts[:default] = v["default"].to_i if opts[:type] == :integer @@ -672,7 +672,7 @@ if resource_body elsif resource_body_is_readable_file resource_body = resource_body_file.read() 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 diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance index b66e9c0526..336b1a2c74 100755 --- a/sdk/cli/bin/arv-run-pipeline-instance +++ b/sdk/cli/bin/arv-run-pipeline-instance @@ -17,14 +17,14 @@ begin require 'rubygems' require 'json' require 'pp' - require 'trollop' + require 'optimist' require 'google/api_client' rescue LoadError => l $stderr.puts $: abort <<-EOS #{$0}: fatal: #{l.message} Some runtime dependencies may be missing. -Try: gem install arvados pp google-api-client json trollop +Try: gem install arvados pp google-api-client json optimist EOS end @@ -35,7 +35,7 @@ end # Parse command line options (the kind that control the behavior of # this program, that is, not the pipeline component parameters). -p = Trollop::Parser.new do +p = Optimist::Parser.new do version __FILE__ banner(< "-n" @@ -169,7 +169,7 @@ global_opts = Trollop::options do stop_on ['add', 'remove'] end -p = Trollop::Parser.new do +p = Optimist::Parser.new do opt(:all, "Remove this tag from all objects under your ownership. Only valid with `tag remove'.", :short => :none) @@ -180,7 +180,7 @@ p = Trollop::Parser.new do :short => :o) end -$options = Trollop::with_standard_exception_handling p do +$options = Optimist::with_standard_exception_handling p do p.parse ARGV end -- 2.30.2