arvados 0.1.20150421171838 → 0.1.20150511150219

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.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/arvados/keep.rb +10 -6
  3. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a25c44b03acbf2dcf5d81815745323041dadef06
4
- data.tar.gz: 13f7e04848bce28b04aeb44fb8589f3bc4220c17
3
+ metadata.gz: 641c34449b9320ce23f1fa85e349e15c1639ca71
4
+ data.tar.gz: 99c94c775ec24d05e5b8a1887fb4709579d10c87
5
5
  SHA512:
6
- metadata.gz: 1291e066620c01abe18888c58f60c5d74f5f12483ef9ccb6778b0bbd8a4136059eae228c7d4b86064aa490afd9cd43fa27ce9e0de1ad4df1433f6f846e7edf0f
7
- data.tar.gz: 7225d796be41cc5a384abbce723936f026ed9643b5c0aae887894177bf1b5e49f4a8e2885ba51fed0f0303c06fa6c3d11f310b35b75c5e31630ad60115ddec1a
6
+ metadata.gz: bfca07d78a198d4286690177294eaf513b75d036a63accfdfff6fddf6efa392f6932f0a7ae70757bcbda1a8731a1e6993a764cbaf26a9e8ee8bc3293d6b8dadf
7
+ data.tar.gz: 8529a8304b2d8bc522eda19e43ba79e9a44c8dd07214a92959ceca9c79704c298564e09243dda2a18e905176208cd4f3874a35268fa8065c33d497a9f923d53d
data/lib/arvados/keep.rb CHANGED
@@ -154,7 +154,16 @@ module Keep
154
154
  stream_name = unescape token
155
155
  elsif in_file_tokens or not Locator.valid? token
156
156
  in_file_tokens = true
157
- yield [stream_name] + split_file_token(token)
157
+
158
+ file_tokens = split_file_token(token)
159
+ stream_name_adjuster = ''
160
+ if file_tokens[2].include?('/') # '/' in filename
161
+ parts = file_tokens[2].rpartition('/')
162
+ stream_name_adjuster = parts[1] + parts[0] # /dir_parts
163
+ file_tokens[2] = parts[2]
164
+ end
165
+
166
+ yield [stream_name + stream_name_adjuster] + file_tokens
158
167
  end
159
168
  end
160
169
  end
@@ -165,11 +174,6 @@ module Keep
165
174
  if @files.nil?
166
175
  file_sizes = Hash.new(0)
167
176
  each_file_spec do |streamname, _, filesize, filename|
168
- if filename.include?('/')
169
- parts = filename.rpartition('/')
170
- streamname = streamname + parts[1] + parts[0] # ./dir_parts
171
- filename = parts[2]
172
- end
173
177
  file_sizes[[streamname, filename]] += filesize
174
178
  end
175
179
  @files = file_sizes.each_pair.map do |(streamname, filename), size|
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.20150421171838
4
+ version: 0.1.20150511150219
5
5
  platform: ruby
6
6
  authors:
7
7
  - Arvados Authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-21 00:00:00.000000000 Z
11
+ date: 2015-05-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: google-api-client
@@ -104,7 +104,7 @@ dependencies:
104
104
  - - "<"
105
105
  - !ruby/object:Gem::Version
106
106
  version: 1.0.0
107
- description: Arvados client library, git commit da705110826943b04151f959e059b5f4ffcc4c5e
107
+ description: Arvados client library, git commit 559d26fd819f477fed75201fa952fed19de77f7e
108
108
  email: gem-dev@curoverse.com
109
109
  executables: []
110
110
  extensions: []