arvados 0.1.20160315200920 → 0.1.20160420143004
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/arvados.rb +2 -2
- data/lib/arvados/collection.rb +6 -6
- data/lib/arvados/keep.rb +4 -4
- metadata +33 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f8c522b5507e853242a979407cf3699ec48efc42
|
4
|
+
data.tar.gz: 5650fa062992332588f65a17b42b9aad7f6962ee
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: da4371e2e45b4002b901384ed072a18ff700c6265de3db81ccbd773a1fb32a589ace030cd51d798888b68d4b400a5282f1950785c3de76a78272e26339e987b1
|
7
|
+
data.tar.gz: 40b6dc54b66304b3e8f6356b3a75046fbe9274c77a6de87c0d60d52020ce01acbcf5991e76377d5dbc4563dba6e7a1d8b01e355d4011990f832c22ad2a4d8700
|
data/lib/arvados.rb
CHANGED
@@ -209,7 +209,7 @@ class Arvados
|
|
209
209
|
:parameters => parameters,
|
210
210
|
:body_object => body,
|
211
211
|
:headers => {
|
212
|
-
authorization
|
212
|
+
:authorization => 'OAuth2 '+arvados.config['ARVADOS_API_TOKEN']
|
213
213
|
})
|
214
214
|
resp = JSON.parse result.body, :symbolize_names => true
|
215
215
|
if resp[:errors]
|
@@ -217,7 +217,7 @@ class Arvados
|
|
217
217
|
elsif resp[:uuid] and resp[:etag]
|
218
218
|
self.new(resp)
|
219
219
|
elsif resp[:items].is_a? Array
|
220
|
-
resp.merge(items
|
220
|
+
resp.merge(:items => resp[:items].collect do |i|
|
221
221
|
self.new(i)
|
222
222
|
end)
|
223
223
|
else
|
data/lib/arvados/collection.rb
CHANGED
@@ -44,7 +44,7 @@ module Arv
|
|
44
44
|
end
|
45
45
|
|
46
46
|
def cp_r(source, target, source_collection=nil)
|
47
|
-
opts = {descend_target
|
47
|
+
opts = {:descend_target => !source.end_with?("/")}
|
48
48
|
copy(:merge, source.chomp("/"), target, source_collection, opts)
|
49
49
|
end
|
50
50
|
|
@@ -70,7 +70,7 @@ module Arv
|
|
70
70
|
end
|
71
71
|
|
72
72
|
def rm_r(source)
|
73
|
-
remove(source, recursive
|
73
|
+
remove(source, :recursive => true)
|
74
74
|
end
|
75
75
|
|
76
76
|
protected
|
@@ -155,7 +155,7 @@ module Arv
|
|
155
155
|
modified
|
156
156
|
end
|
157
157
|
|
158
|
-
|
158
|
+
Struct.new("LocatorSegment", :locators, :start_pos, :length)
|
159
159
|
|
160
160
|
class LocatorRange < Range
|
161
161
|
attr_reader :locator
|
@@ -187,9 +187,9 @@ module Arv
|
|
187
187
|
end_index = search_for_byte(start_pos + length - 1, start_index)
|
188
188
|
end
|
189
189
|
seg_ranges = @ranges[start_index..end_index]
|
190
|
-
LocatorSegment.new(seg_ranges.map(&:locator),
|
191
|
-
|
192
|
-
|
190
|
+
Struct::LocatorSegment.new(seg_ranges.map(&:locator),
|
191
|
+
start_pos - seg_ranges.first.begin,
|
192
|
+
length)
|
193
193
|
end
|
194
194
|
|
195
195
|
private
|
data/lib/arvados/keep.rb
CHANGED
@@ -47,19 +47,19 @@ module Keep
|
|
47
47
|
raise ArgumentError.new "locator is nil or empty"
|
48
48
|
end
|
49
49
|
|
50
|
-
m = LOCATOR_REGEXP.match(tok
|
50
|
+
m = LOCATOR_REGEXP.match(tok)
|
51
51
|
unless m
|
52
52
|
raise ArgumentError.new "not a valid locator #{tok}"
|
53
53
|
end
|
54
54
|
|
55
|
-
tokhash, _, toksize, _, trailer = m[1..
|
55
|
+
tokhash, _, toksize, _, _, trailer = m[1..6]
|
56
56
|
tokhints = []
|
57
57
|
if trailer
|
58
58
|
trailer.split('+').each do |hint|
|
59
|
-
if hint =~ /^[[:upper:]][[:alnum:]@_-]
|
59
|
+
if hint =~ /^[[:upper:]][[:alnum:]@_-]*$/
|
60
60
|
tokhints.push(hint)
|
61
61
|
else
|
62
|
-
raise ArgumentError.new "
|
62
|
+
raise ArgumentError.new "invalid hint #{hint}"
|
63
63
|
end
|
64
64
|
end
|
65
65
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: arvados
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.20160420143004
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Arvados Authors
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-04-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -16,7 +16,7 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3
|
19
|
+
version: '3'
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
22
|
version: 4.2.6
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 3
|
29
|
+
version: '3'
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
32
|
version: 4.2.6
|
@@ -54,22 +54,36 @@ dependencies:
|
|
54
54
|
name: google-api-client
|
55
55
|
requirement: !ruby/object:Gem::Requirement
|
56
56
|
requirements:
|
57
|
-
- - "~>"
|
58
|
-
- !ruby/object:Gem::Version
|
59
|
-
version: 0.6.3
|
60
57
|
- - ">="
|
61
58
|
- !ruby/object:Gem::Version
|
62
|
-
version: 0.
|
59
|
+
version: '0.7'
|
60
|
+
- - "<"
|
61
|
+
- !ruby/object:Gem::Version
|
62
|
+
version: '0.9'
|
63
63
|
type: :runtime
|
64
64
|
prerelease: false
|
65
65
|
version_requirements: !ruby/object:Gem::Requirement
|
66
|
+
requirements:
|
67
|
+
- - ">="
|
68
|
+
- !ruby/object:Gem::Version
|
69
|
+
version: '0.7'
|
70
|
+
- - "<"
|
71
|
+
- !ruby/object:Gem::Version
|
72
|
+
version: '0.9'
|
73
|
+
- !ruby/object:Gem::Dependency
|
74
|
+
name: i18n
|
75
|
+
requirement: !ruby/object:Gem::Requirement
|
66
76
|
requirements:
|
67
77
|
- - "~>"
|
68
78
|
- !ruby/object:Gem::Version
|
69
|
-
version: 0
|
70
|
-
|
79
|
+
version: '0'
|
80
|
+
type: :runtime
|
81
|
+
prerelease: false
|
82
|
+
version_requirements: !ruby/object:Gem::Requirement
|
83
|
+
requirements:
|
84
|
+
- - "~>"
|
71
85
|
- !ruby/object:Gem::Version
|
72
|
-
version: 0
|
86
|
+
version: '0'
|
73
87
|
- !ruby/object:Gem::Dependency
|
74
88
|
name: json
|
75
89
|
requirement: !ruby/object:Gem::Requirement
|
@@ -94,23 +108,23 @@ dependencies:
|
|
94
108
|
name: jwt
|
95
109
|
requirement: !ruby/object:Gem::Requirement
|
96
110
|
requirements:
|
111
|
+
- - "<"
|
112
|
+
- !ruby/object:Gem::Version
|
113
|
+
version: '2'
|
97
114
|
- - ">="
|
98
115
|
- !ruby/object:Gem::Version
|
99
116
|
version: 0.1.5
|
100
|
-
- - "<"
|
101
|
-
- !ruby/object:Gem::Version
|
102
|
-
version: 1.0.0
|
103
117
|
type: :runtime
|
104
118
|
prerelease: false
|
105
119
|
version_requirements: !ruby/object:Gem::Requirement
|
106
120
|
requirements:
|
121
|
+
- - "<"
|
122
|
+
- !ruby/object:Gem::Version
|
123
|
+
version: '2'
|
107
124
|
- - ">="
|
108
125
|
- !ruby/object:Gem::Version
|
109
126
|
version: 0.1.5
|
110
|
-
|
111
|
-
- !ruby/object:Gem::Version
|
112
|
-
version: 1.0.0
|
113
|
-
description: Arvados client library, git commit a301612e7c0f300c1d3ba68d31f0da61cbb2d020
|
127
|
+
description: Arvados client library, git commit d7b6ec65cfd774f0d17c96d2baf9b6620c55ad8d
|
114
128
|
email: gem-dev@curoverse.com
|
115
129
|
executables: []
|
116
130
|
extensions: []
|
@@ -134,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
134
148
|
requirements:
|
135
149
|
- - ">="
|
136
150
|
- !ruby/object:Gem::Version
|
137
|
-
version:
|
151
|
+
version: 1.8.7
|
138
152
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
139
153
|
requirements:
|
140
154
|
- - ">="
|