arvados-cli 0.1.20140114083750 → 0.1.20140117103233

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/bin/arv +2 -2
  2. data/bin/arv-tag +9 -11
  3. metadata +133 -102
  4. checksums.yaml +0 -7
data/bin/arv CHANGED
@@ -10,9 +10,9 @@ if RUBY_VERSION < '1.9.3' then
10
10
  EOS
11
11
  end
12
12
 
13
- # read authentication data from ~/.arvados if present
13
+ # read authentication data from ~/.config/arvados if present
14
14
  lineno = 0
15
- config_file = File.expand_path('~/.arvados')
15
+ config_file = File.expand_path('~/.config/arvados')
16
16
  if File.exist? config_file then
17
17
  File.open(config_file, 'r').each do |line|
18
18
  lineno = lineno + 1
data/bin/arv-tag CHANGED
@@ -81,11 +81,7 @@ def tag_remove(tag, obj_uuids=nil)
81
81
  $stderr.puts "no tags found to remove"
82
82
  end
83
83
 
84
- return {
85
- 'kind' => 'arvados#linkList',
86
- 'items_available' => results.length,
87
- 'items' => results,
88
- }
84
+ return results
89
85
  end
90
86
 
91
87
  if RUBY_VERSION < '1.9.3' then
@@ -191,6 +187,11 @@ $arvados = $client.discovered_api('arvados', $arvados_api_version)
191
187
 
192
188
  results = []
193
189
  cmd = ARGV.shift
190
+
191
+ if ARGV.empty?
192
+ usage
193
+ end
194
+
194
195
  case cmd
195
196
  when 'add'
196
197
  ARGV.each do |tag|
@@ -201,9 +202,9 @@ when 'add'
201
202
  when 'remove'
202
203
  ARGV.each do |tag|
203
204
  if $options[:all] then
204
- results.push(tag_remove(tag))
205
+ results.concat tag_remove(tag)
205
206
  else
206
- results.push(tag_remove(tag, $options[:object]))
207
+ results.concat tag_remove(tag, $options[:object])
207
208
  end
208
209
  end
209
210
  else
@@ -218,10 +219,7 @@ elsif global_opts[:json] then
218
219
  puts Oj.dump(results)
219
220
  else
220
221
  results.each do |r|
221
- next if r == nil
222
- if r["items"] and r["kind"].match /list$/i
223
- r['items'].each do |i| puts i['uuid'] end
224
- elsif r['uuid'].nil?
222
+ if r['uuid'].nil?
225
223
  abort("Response did not include a uuid:\n" +
226
224
  Oj.dump(r, :indent => 1) +
227
225
  "\n")
metadata CHANGED
@@ -1,150 +1,181 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: arvados-cli
3
- version: !ruby/object:Gem::Version
4
- version: 0.1.20140114083750
3
+ version: !ruby/object:Gem::Version
4
+ hash: 40280234206489
5
+ prerelease:
6
+ segments:
7
+ - 0
8
+ - 1
9
+ - 20140117103233
10
+ version: 0.1.20140117103233
5
11
  platform: ruby
6
- authors:
12
+ authors:
7
13
  - Arvados Authors
8
14
  autorequire:
9
15
  bindir: bin
10
16
  cert_chain: []
11
- date: 2014-01-14 00:00:00.000000000 Z
12
- dependencies:
13
- - !ruby/object:Gem::Dependency
17
+
18
+ date: 2014-01-17 00:00:00 Z
19
+ dependencies:
20
+ - !ruby/object:Gem::Dependency
14
21
  name: google-api-client
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - '>='
18
- - !ruby/object:Gem::Version
19
- version: 0.6.3
20
- type: :runtime
21
22
  prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - '>='
25
- - !ruby/object:Gem::Version
23
+ requirement: &id001 !ruby/object:Gem::Requirement
24
+ none: false
25
+ requirements:
26
+ - - ">="
27
+ - !ruby/object:Gem::Version
28
+ hash: 1
29
+ segments:
30
+ - 0
31
+ - 6
32
+ - 3
26
33
  version: 0.6.3
27
- - !ruby/object:Gem::Dependency
28
- name: activesupport
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - '>='
32
- - !ruby/object:Gem::Version
33
- version: 3.2.13
34
34
  type: :runtime
35
+ version_requirements: *id001
36
+ - !ruby/object:Gem::Dependency
37
+ name: activesupport
35
38
  prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - '>='
39
- - !ruby/object:Gem::Version
39
+ requirement: &id002 !ruby/object:Gem::Requirement
40
+ none: false
41
+ requirements:
42
+ - - ">="
43
+ - !ruby/object:Gem::Version
44
+ hash: 21
45
+ segments:
46
+ - 3
47
+ - 2
48
+ - 13
40
49
  version: 3.2.13
41
- - !ruby/object:Gem::Dependency
42
- name: json
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - '>='
46
- - !ruby/object:Gem::Version
47
- version: 1.7.7
48
50
  type: :runtime
51
+ version_requirements: *id002
52
+ - !ruby/object:Gem::Dependency
53
+ name: json
49
54
  prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - '>='
53
- - !ruby/object:Gem::Version
55
+ requirement: &id003 !ruby/object:Gem::Requirement
56
+ none: false
57
+ requirements:
58
+ - - ">="
59
+ - !ruby/object:Gem::Version
60
+ hash: 5
61
+ segments:
62
+ - 1
63
+ - 7
64
+ - 7
54
65
  version: 1.7.7
55
- - !ruby/object:Gem::Dependency
56
- name: trollop
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - '>='
60
- - !ruby/object:Gem::Version
61
- version: '2.0'
62
66
  type: :runtime
67
+ version_requirements: *id003
68
+ - !ruby/object:Gem::Dependency
69
+ name: trollop
63
70
  prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - '>='
67
- - !ruby/object:Gem::Version
68
- version: '2.0'
69
- - !ruby/object:Gem::Dependency
70
- name: andand
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - '>='
74
- - !ruby/object:Gem::Version
75
- version: 1.3.3
71
+ requirement: &id004 !ruby/object:Gem::Requirement
72
+ none: false
73
+ requirements:
74
+ - - ">="
75
+ - !ruby/object:Gem::Version
76
+ hash: 3
77
+ segments:
78
+ - 2
79
+ - 0
80
+ version: "2.0"
76
81
  type: :runtime
82
+ version_requirements: *id004
83
+ - !ruby/object:Gem::Dependency
84
+ name: andand
77
85
  prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - '>='
81
- - !ruby/object:Gem::Version
86
+ requirement: &id005 !ruby/object:Gem::Requirement
87
+ none: false
88
+ requirements:
89
+ - - ">="
90
+ - !ruby/object:Gem::Version
91
+ hash: 29
92
+ segments:
93
+ - 1
94
+ - 3
95
+ - 3
82
96
  version: 1.3.3
83
- - !ruby/object:Gem::Dependency
84
- name: oj
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - '>='
88
- - !ruby/object:Gem::Version
89
- version: 2.0.3
90
97
  type: :runtime
98
+ version_requirements: *id005
99
+ - !ruby/object:Gem::Dependency
100
+ name: oj
91
101
  prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - '>='
95
- - !ruby/object:Gem::Version
102
+ requirement: &id006 !ruby/object:Gem::Requirement
103
+ none: false
104
+ requirements:
105
+ - - ">="
106
+ - !ruby/object:Gem::Version
107
+ hash: 9
108
+ segments:
109
+ - 2
110
+ - 0
111
+ - 3
96
112
  version: 2.0.3
97
- - !ruby/object:Gem::Dependency
98
- name: curb
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - ~>
102
- - !ruby/object:Gem::Version
103
- version: '0.8'
104
113
  type: :runtime
114
+ version_requirements: *id006
115
+ - !ruby/object:Gem::Dependency
116
+ name: curb
105
117
  prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
118
+ requirement: &id007 !ruby/object:Gem::Requirement
119
+ none: false
120
+ requirements:
108
121
  - - ~>
109
- - !ruby/object:Gem::Version
110
- version: '0.8'
111
- description: This is the Arvados SDK CLI gem, git revision 904989797f0e70dad2d4a2da8ed05693ad1619bd
122
+ - !ruby/object:Gem::Version
123
+ hash: 27
124
+ segments:
125
+ - 0
126
+ - 8
127
+ version: "0.8"
128
+ type: :runtime
129
+ version_requirements: *id007
130
+ description: This is the Arvados SDK CLI gem, git revision 3055130be14ab26d68fd1c01a934870855ecbd5c
112
131
  email: gem-dev@clinicalfuture.com
113
- executables:
132
+ executables:
114
133
  - arv
115
134
  - arv-run-pipeline-instance
116
135
  - arv-crunch-job
117
136
  - arv-tag
118
137
  extensions: []
138
+
119
139
  extra_rdoc_files: []
120
- files:
140
+
141
+ files:
121
142
  - bin/arv
122
143
  - bin/arv-run-pipeline-instance
123
144
  - bin/arv-crunch-job
124
145
  - bin/arv-tag
125
146
  - bin/crunch-job
126
147
  homepage: http://arvados.org
127
- licenses:
148
+ licenses:
128
149
  - Apache License, Version 2.0
129
- metadata: {}
130
150
  post_install_message:
131
151
  rdoc_options: []
132
- require_paths:
152
+
153
+ require_paths:
133
154
  - lib
134
- required_ruby_version: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - '>='
137
- - !ruby/object:Gem::Version
138
- version: '0'
139
- required_rubygems_version: !ruby/object:Gem::Requirement
140
- requirements:
141
- - - '>='
142
- - !ruby/object:Gem::Version
143
- version: '0'
155
+ required_ruby_version: !ruby/object:Gem::Requirement
156
+ none: false
157
+ requirements:
158
+ - - ">="
159
+ - !ruby/object:Gem::Version
160
+ hash: 3
161
+ segments:
162
+ - 0
163
+ version: "0"
164
+ required_rubygems_version: !ruby/object:Gem::Requirement
165
+ none: false
166
+ requirements:
167
+ - - ">="
168
+ - !ruby/object:Gem::Version
169
+ hash: 3
170
+ segments:
171
+ - 0
172
+ version: "0"
144
173
  requirements: []
174
+
145
175
  rubyforge_project:
146
- rubygems_version: 2.1.11
176
+ rubygems_version: 1.8.24
147
177
  signing_key:
148
- specification_version: 4
178
+ specification_version: 3
149
179
  summary: Arvados SDK CLI
150
180
  test_files: []
181
+
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: 10c954c49f736c060b3ba558f1d7f422325f58ba
4
- data.tar.gz: 2db16c0373569ba9db54c0919bc4bf858fafaf28
5
- SHA512:
6
- metadata.gz: a120d09636cfd08e121f490de8feeb5ccf29581452badcc751ffa1b56e55d9be39833a4b72aa9d250493014a5f946f3da45f63d9b9585a99ff853120ea414fda
7
- data.tar.gz: 144cfdf671405b3e0b1b81f2ee2a4054727072ef684c0ebf3437d5493b19351f35ad3c6d843626eb2cff9818620de8319eb522163b1b9368d5b190ece0cda768