arvados-cli 1.2.0.20180726182818 → 1.2.0.20180825003741

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e0450f2509d33d2b3b15a373edc664dce4ddcad9
4
- data.tar.gz: c50e13e09d62522eb824bd67679d52692c935184
3
+ metadata.gz: 4376cc92759cfde94bfff4bf663c7848f95f19e7
4
+ data.tar.gz: 9bb87a98cb637ffa9710a8633154ba8fd1728145
5
5
  SHA512:
6
- metadata.gz: 3d26677ba3b0245c083bf072fdee0486361e6b0f8d0b791d952d803a36e48e12a2c6f17837076b3d3b23bfdcf0c35c8fdd861439195a3dcf2b1f77fe00faf6a0
7
- data.tar.gz: a92d45e95f1ab6809be72ea1bdcb1866d8ce63c72876e570ce7bb19163b3f683b22c9a8291b28d249a41eb8dda08388eaa15261f27da11d0c0b26d56f358d12c
6
+ metadata.gz: e3692022a00bfd3f04fdba82bf177c5bed167055010c011993249fbbf51208a977ef2061079670cc0fe98b1eb7fe60264160cf6925e08db0227285fd7d4d3368
7
+ data.tar.gz: 05f509945080eab252228e2edae17913f67739cb30f38ff7ff955f630638d1686068395fdba3d1e1dca824768ba94e62bde6384edb4bdbfe5972ebbba2e7d5f6
data/bin/arv CHANGED
@@ -35,7 +35,7 @@ begin
35
35
  require 'andand'
36
36
  require 'curb'
37
37
  require 'oj'
38
- require 'trollop'
38
+ require 'optimist'
39
39
  rescue LoadError => error
40
40
  abort <<-EOS
41
41
 
@@ -43,7 +43,7 @@ Error loading gems: #{error}
43
43
 
44
44
  Please install all required gems:
45
45
 
46
- gem install arvados activesupport andand curb json oj trollop
46
+ gem install arvados activesupport andand curb json oj optimist
47
47
 
48
48
  EOS
49
49
  end
@@ -375,7 +375,7 @@ end
375
375
 
376
376
  def arv_create client, arvados, global_opts, remaining_opts
377
377
  types = resource_types(arvados.discovery_document)
378
- create_opts = Trollop::options do
378
+ create_opts = Optimist::options do
379
379
  opt :project_uuid, "Project uuid in which to create the object", :type => :string
380
380
  stop_on resource_types(arvados.discovery_document)
381
381
  end
@@ -392,7 +392,7 @@ def arv_create client, arvados, global_opts, remaining_opts
392
392
  rsc = rsc.first
393
393
 
394
394
  discovered_params = arvados.discovery_document["resources"][rsc]["methods"]["create"]["parameters"]
395
- method_opts = Trollop::options do
395
+ method_opts = Optimist::options do
396
396
  banner head_banner
397
397
  banner "Usage: arv create [--project-uuid] #{object_type} [create parameters]"
398
398
  banner ""
@@ -402,7 +402,7 @@ def arv_create client, arvados, global_opts, remaining_opts
402
402
  opts = Hash.new()
403
403
  opts[:type] = v["type"].to_sym if v.include?("type")
404
404
  if [:datetime, :text, :object, :array].index opts[:type]
405
- opts[:type] = :string # else trollop bork
405
+ opts[:type] = :string # else optimist bork
406
406
  end
407
407
  opts[:default] = v["default"] if v.include?("default")
408
408
  opts[:default] = v["default"].to_i if opts[:type] == :integer
@@ -483,7 +483,7 @@ end
483
483
  def parse_arguments(discovery_document, subcommands)
484
484
  resources_and_subcommands = resource_types(discovery_document) + subcommands
485
485
 
486
- option_parser = Trollop::Parser.new do
486
+ option_parser = Optimist::Parser.new do
487
487
  version __FILE__
488
488
  banner head_banner
489
489
  banner "Usage: arv [--flags] subcommand|resource [method] [--parameters]"
@@ -513,7 +513,7 @@ def parse_arguments(discovery_document, subcommands)
513
513
  stop_on resources_and_subcommands
514
514
  end
515
515
 
516
- global_opts = Trollop::with_standard_exception_handling option_parser do
516
+ global_opts = Optimist::with_standard_exception_handling option_parser do
517
517
  o = option_parser.parse ARGV
518
518
  end
519
519
 
@@ -544,7 +544,7 @@ def parse_arguments(discovery_document, subcommands)
544
544
  discovered_params = discovery_document\
545
545
  ["resources"][resource.pluralize]\
546
546
  ["methods"][method]["parameters"]
547
- method_opts = Trollop::options do
547
+ method_opts = Optimist::options do
548
548
  banner head_banner
549
549
  banner "Usage: arv #{resource} #{method} [--parameters]"
550
550
  banner ""
@@ -554,7 +554,7 @@ def parse_arguments(discovery_document, subcommands)
554
554
  opts = Hash.new()
555
555
  opts[:type] = v["type"].to_sym if v.include?("type")
556
556
  if [:datetime, :text, :object, :array].index opts[:type]
557
- opts[:type] = :string # else trollop bork
557
+ opts[:type] = :string # else optimist bork
558
558
  end
559
559
  opts[:default] = v["default"] if v.include?("default")
560
560
  opts[:default] = v["default"].to_i if opts[:type] == :integer
@@ -672,7 +672,7 @@ if resource_body
672
672
  elsif resource_body_is_readable_file
673
673
  resource_body = resource_body_file.read()
674
674
  begin
675
- # we don't actually need the results of the parsing,
675
+ # we don't actually need the results of the parsing,
676
676
  # just checking for the JSON::ParserError exception
677
677
  JSON.parse resource_body
678
678
  rescue JSON::ParserError => e
@@ -17,14 +17,14 @@ begin
17
17
  require 'rubygems'
18
18
  require 'json'
19
19
  require 'pp'
20
- require 'trollop'
20
+ require 'optimist'
21
21
  require 'google/api_client'
22
22
  rescue LoadError => l
23
23
  $stderr.puts $:
24
24
  abort <<-EOS
25
25
  #{$0}: fatal: #{l.message}
26
26
  Some runtime dependencies may be missing.
27
- Try: gem install arvados pp google-api-client json trollop
27
+ Try: gem install arvados pp google-api-client json optimist
28
28
  EOS
29
29
  end
30
30
 
@@ -35,7 +35,7 @@ end
35
35
  # Parse command line options (the kind that control the behavior of
36
36
  # this program, that is, not the pipeline component parameters).
37
37
 
38
- p = Trollop::Parser.new do
38
+ p = Optimist::Parser.new do
39
39
  version __FILE__
40
40
  banner(<<EOF)
41
41
 
@@ -122,7 +122,7 @@ EOF
122
122
  type: :string)
123
123
  stop_on [:'--']
124
124
  end
125
- $options = Trollop::with_standard_exception_handling p do
125
+ $options = Optimist::with_standard_exception_handling p do
126
126
  p.parse ARGV
127
127
  end
128
128
  $debuglevel = $options[:debug_level] || ($options[:debug] && 1) || 0
data/bin/arv-tag CHANGED
@@ -113,11 +113,11 @@ begin
113
113
  require 'json'
114
114
  require 'pp'
115
115
  require 'oj'
116
- require 'trollop'
116
+ require 'optimist'
117
117
  rescue LoadError
118
118
  abort <<-EOS
119
119
  #{$0}: fatal: some runtime dependencies are missing.
120
- Try: gem install pp google-api-client json trollop
120
+ Try: gem install pp google-api-client json optimist
121
121
  EOS
122
122
  end
123
123
 
@@ -156,7 +156,7 @@ class Google::APIClient
156
156
  end
157
157
  end
158
158
 
159
- global_opts = Trollop::options do
159
+ global_opts = Optimist::options do
160
160
  banner usage_string
161
161
  banner ""
162
162
  opt :dry_run, "Don't actually do anything", :short => "-n"
@@ -169,7 +169,7 @@ global_opts = Trollop::options do
169
169
  stop_on ['add', 'remove']
170
170
  end
171
171
 
172
- p = Trollop::Parser.new do
172
+ p = Optimist::Parser.new do
173
173
  opt(:all,
174
174
  "Remove this tag from all objects under your ownership. Only valid with `tag remove'.",
175
175
  :short => :none)
@@ -180,7 +180,7 @@ p = Trollop::Parser.new do
180
180
  :short => :o)
181
181
  end
182
182
 
183
- $options = Trollop::with_standard_exception_handling p do
183
+ $options = Optimist::with_standard_exception_handling p do
184
184
  p.parse ARGV
185
185
  end
186
186
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arvados-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0.20180726182818
4
+ version: 1.2.0.20180825003741
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arvados Authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-07-26 00:00:00.000000000 Z
11
+ date: 2018-08-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: arvados
@@ -97,19 +97,19 @@ dependencies:
97
97
  - !ruby/object:Gem::Version
98
98
  version: '3'
99
99
  - !ruby/object:Gem::Dependency
100
- name: trollop
100
+ name: optimist
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
103
  - - "~>"
104
104
  - !ruby/object:Gem::Version
105
- version: '2.0'
105
+ version: '3.0'
106
106
  type: :runtime
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
109
109
  requirements:
110
110
  - - "~>"
111
111
  - !ruby/object:Gem::Version
112
- version: '2.0'
112
+ version: '3.0'
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: andand
115
115
  requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ dependencies:
158
158
  - - "~>"
159
159
  - !ruby/object:Gem::Version
160
160
  version: '0.8'
161
- description: Arvados command line tools, git commit d6c7e2952413c33a4af9b1599e4000b9df622661
161
+ description: Arvados command line tools, git commit 0a9f43066d71e9e7ee04ce121083336ee7333a9d
162
162
  email: gem-dev@curoverse.com
163
163
  executables:
164
164
  - arv