arvados-cli 1.2.0.20180726182818 → 1.2.0.20180825003741

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0450f2509d33d2b3b15a373edc664dce4ddcad9
-  data.tar.gz: c50e13e09d62522eb824bd67679d52692c935184
+  metadata.gz: 4376cc92759cfde94bfff4bf663c7848f95f19e7
+  data.tar.gz: 9bb87a98cb637ffa9710a8633154ba8fd1728145
 SHA512:
-  metadata.gz: 3d26677ba3b0245c083bf072fdee0486361e6b0f8d0b791d952d803a36e48e12a2c6f17837076b3d3b23bfdcf0c35c8fdd861439195a3dcf2b1f77fe00faf6a0
-  data.tar.gz: a92d45e95f1ab6809be72ea1bdcb1866d8ce63c72876e570ce7bb19163b3f683b22c9a8291b28d249a41eb8dda08388eaa15261f27da11d0c0b26d56f358d12c
+  metadata.gz: e3692022a00bfd3f04fdba82bf177c5bed167055010c011993249fbbf51208a977ef2061079670cc0fe98b1eb7fe60264160cf6925e08db0227285fd7d4d3368
+  data.tar.gz: 05f509945080eab252228e2edae17913f67739cb30f38ff7ff955f630638d1686068395fdba3d1e1dca824768ba94e62bde6384edb4bdbfe5972ebbba2e7d5f6

data/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

data/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(<<EOF)
 
@@ -122,7 +122,7 @@ EOF
       type: :string)
   stop_on [:'--']
 end
-$options = Trollop::with_standard_exception_handling p do
+$options = Optimist::with_standard_exception_handling p do
   p.parse ARGV
 end
 $debuglevel = $options[:debug_level] || ($options[:debug] && 1) || 0

data/bin/arv-tag

@@ -113,11 +113,11 @@ begin
   require 'json'
   require 'pp'
   require 'oj'
-  require 'trollop'
+  require 'optimist'
 rescue LoadError
   abort <<-EOS
 #{$0}: fatal: some runtime dependencies are missing.
-Try: gem install pp google-api-client json trollop
+Try: gem install pp google-api-client json optimist
   EOS
 end
 
@@ -156,7 +156,7 @@ class Google::APIClient
   end
 end
 
-global_opts = Trollop::options do
+global_opts = Optimist::options do
   banner usage_string
   banner ""
   opt :dry_run, "Don't actually do anything", :short => "-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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0.20180726182818
+  version: 1.2.0.20180825003741
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -97,19 +97,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: andand
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: Arvados command line tools, git commit d6c7e2952413c33a4af9b1599e4000b9df622661
+description: Arvados command line tools, git commit 0a9f43066d71e9e7ee04ce121083336ee7333a9d
 email: gem-dev@curoverse.com
 executables:
 - arv