arvados 0.1.20150421171838 → 0.1.20150511150219

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a25c44b03acbf2dcf5d81815745323041dadef06
-  data.tar.gz: 13f7e04848bce28b04aeb44fb8589f3bc4220c17
+  metadata.gz: 641c34449b9320ce23f1fa85e349e15c1639ca71
+  data.tar.gz: 99c94c775ec24d05e5b8a1887fb4709579d10c87
 SHA512:
-  metadata.gz: 1291e066620c01abe18888c58f60c5d74f5f12483ef9ccb6778b0bbd8a4136059eae228c7d4b86064aa490afd9cd43fa27ce9e0de1ad4df1433f6f846e7edf0f
-  data.tar.gz: 7225d796be41cc5a384abbce723936f026ed9643b5c0aae887894177bf1b5e49f4a8e2885ba51fed0f0303c06fa6c3d11f310b35b75c5e31630ad60115ddec1a
+  metadata.gz: bfca07d78a198d4286690177294eaf513b75d036a63accfdfff6fddf6efa392f6932f0a7ae70757bcbda1a8731a1e6993a764cbaf26a9e8ee8bc3293d6b8dadf
+  data.tar.gz: 8529a8304b2d8bc522eda19e43ba79e9a44c8dd07214a92959ceca9c79704c298564e09243dda2a18e905176208cd4f3874a35268fa8065c33d497a9f923d53d

data/lib/arvados/keep.rb

@@ -154,7 +154,16 @@ module Keep
             stream_name = unescape token
           elsif in_file_tokens or not Locator.valid? token
             in_file_tokens = true
-            yield [stream_name] + split_file_token(token)
+
+            file_tokens = split_file_token(token)
+            stream_name_adjuster = ''
+            if file_tokens[2].include?('/')                # '/' in filename
+              parts = file_tokens[2].rpartition('/')
+              stream_name_adjuster = parts[1] + parts[0]   # /dir_parts
+              file_tokens[2] = parts[2]
+            end
+
+            yield [stream_name + stream_name_adjuster] + file_tokens
           end
         end
       end
@@ -165,11 +174,6 @@ module Keep
       if @files.nil?
         file_sizes = Hash.new(0)
         each_file_spec do |streamname, _, filesize, filename|
-          if filename.include?('/')
-            parts = filename.rpartition('/')
-            streamname = streamname + parts[1] + parts[0]   # ./dir_parts
-            filename = parts[2]
-          end
           file_sizes[[streamname, filename]] += filesize
         end
         @files = file_sizes.each_pair.map do |(streamname, filename), size|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados
 version: !ruby/object:Gem::Version
-  version: 0.1.20150421171838
+  version: 0.1.20150511150219
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -104,7 +104,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: Arvados client library, git commit da705110826943b04151f959e059b5f4ffcc4c5e
+description: Arvados client library, git commit 559d26fd819f477fed75201fa952fed19de77f7e
 email: gem-dev@curoverse.com
 executables: []
 extensions: []