[ARVADOS] updated: b0cf100405e0dd7e4913194cd88b71ff74cf1773

git at public.curoverse.com git at public.curoverse.com
Wed Mar 11 12:20:13 EDT 2015


Summary of changes:
 .../app/assets/javascripts/angular_shim.js         |   2 +-
 .../app/assets/javascripts/report_issue.js         |  13 +-
 apps/workbench/app/assets/javascripts/tab_panes.js |   4 +-
 .../app/assets/javascripts/upload_to_collection.js |  18 +-
 .../app/controllers/actions_controller.rb          |  12 +-
 .../app/controllers/application_controller.rb      |  39 ++-
 .../views/application/_report_issue_popup.html.erb |   2 +-
 .../workbench/test/integration/ajax_errors_test.rb |  56 ++++
 .../test/integration/collection_upload_test.rb     |  37 +++
 apps/workbench/test/integration/errors_test.rb     |  38 +--
 .../test/integration/report_issue_test.rb          |   5 +
 apps/workbench/test/test_helper.rb                 |  31 ++
 .../workbench/test/unit/arvados_api_client_test.rb |  23 ++
 doc/_config.yml                                    |   2 +-
 doc/install/index.html.textile.liquid              |  25 +-
 doc/install/install-api-server.html.textile.liquid |   6 +-
 doc/install/install-docker.html.textile.liquid     |   5 +-
 doc/install/install-keepproxy.html.textile.liquid  |  15 +
 .../install-manual-overview.html.textile.liquid    |  15 +-
 ...l-manual-prerequisites-ruby.html.textile.liquid |   8 +-
 doc/install/pre-built-docker.html.textile.liquid   |  32 ++
 sdk/go/keepclient/keepclient.go                    |   2 +-
 sdk/go/keepclient/support.go                       |   6 +-
 services/api/lib/record_filters.rb                 |   7 +-
 services/api/test/fixtures/groups.yml              |  11 +
 .../arvados/v1/groups_controller_test.rb           |   1 +
 services/keepstore/keepstore.go                    |  16 +
 services/keepstore/pull_worker.go                  |  99 ++++++
 services/keepstore/pull_worker_integration_test.go | 128 ++++++++
 services/keepstore/pull_worker_test.go             | 337 +++++++++++++++++++++
 30 files changed, 895 insertions(+), 100 deletions(-)
 create mode 100644 apps/workbench/test/integration/ajax_errors_test.rb
 create mode 100644 apps/workbench/test/unit/arvados_api_client_test.rb
 create mode 100644 doc/install/pre-built-docker.html.textile.liquid
 create mode 100644 services/keepstore/pull_worker.go
 create mode 100644 services/keepstore/pull_worker_integration_test.go
 create mode 100644 services/keepstore/pull_worker_test.go

       via  b0cf100405e0dd7e4913194cd88b71ff74cf1773 (commit)
       via  07cba2282dc6e8c701db411e716b8943e2dfa21f (commit)
       via  83c0e051c3611b021d7f0e2ea58d10c67c92698d (commit)
       via  dfcb25e5e9b8caf92a50c3e00026d3c0131bc2e8 (commit)
       via  ed0ed73d8bdd94dc04c93a1a2bc9f82ad45f6dcf (commit)
       via  60501a83ead2f3c71144d3af842e714cb3f91000 (commit)
       via  80c3b98907b68a9ca8b54fae84c1a6e96817c809 (commit)
       via  6a983720b3d1ee8e613bf3902e69fd14f505b995 (commit)
       via  a37e37c96f0de3939a8c2d873df5f3103589fc48 (commit)
       via  855a790d7be3ff345f04226bde3719fb90e6d9a5 (commit)
       via  07618b6828e179f39df2918f4f8a2d8f59d2c6d9 (commit)
       via  ebbe2d754223e788ef7c532fb5d1613a51f754a6 (commit)
       via  fc79e9d9109f84dd1c9851fd231d7d333914b54e (commit)
       via  2d0dd74fb0446f8cda195147d45a6ab4ca0e2431 (commit)
       via  c68037a915e0a0680c041e0c926e49233c2823f7 (commit)
       via  5fba915ccda49de6d4554b4e6088c0444b39cee6 (commit)
       via  56907cb993bce1287242c379bdfd48e329aa307d (commit)
       via  bc25cf11db28299cfb3cce8d51e253c4d7b6b7c1 (commit)
       via  fed95824264369e705b9f148f857295644dae138 (commit)
       via  ede1e36731d834142200a99501f9ca948c6a3b36 (commit)
       via  572a74976c1d2d341265c1377a60222215079c62 (commit)
       via  8c473f086b705d55132286cd2a276bcf67a15558 (commit)
       via  edc5c5d88db4f9584db8b8a4ec24e9307ec45244 (commit)
       via  5744e0bd6cdf57815739599291951884ba7f540d (commit)
       via  3e39701d68357b30030c5d187b8fc1da3c26cf6c (commit)
       via  eb1b1a9e03b9a00d3180fb666e696067ba595041 (commit)
       via  4d71b77be419a60d8dd64d16ebeb4b83be5cb97d (commit)
       via  2ae40cbbb77f0843662628732b9ca7679a369749 (commit)
       via  81baf3629fb922da0ba35e7a57d9fadfa8a1a8c1 (commit)
       via  560ceadf0e0e5f513de82de282f3b09bf211477d (commit)
       via  6058d8a2af0a7461f9a412b1b69948e4d0e9224f (commit)
       via  f54333c878b8d6bd5f78061b3ba406bee6abad36 (commit)
       via  2a4c56d2a0eead4c2863ff12882dc6512d4bf803 (commit)
       via  db1542b94b228e92e9b5bd82ad93ef83239a2768 (commit)
       via  797d78f4e7bc7807d42366054d6d49b4a550d8b9 (commit)
       via  d554f6e4b85728181946a016e08ae00f16c46c90 (commit)
       via  630b52566620e906c2037bc498cdd36b93240bd6 (commit)
       via  470e9c16d9c8713e4b0ba614ed5216ff1b47defa (commit)
       via  878b0ff6d405dfcd4f3277ff7d9382af29db6c32 (commit)
       via  4e98958d0eed70a8287d3e72d5256de483dbe721 (commit)
       via  c7200a367392801491134e97192840b8b20fc90b (commit)
       via  a882872e54809a5f5a19fc5673f7dd53655f1cb8 (commit)
       via  314b31df6b5f54e0e62dcc3d138ab32f0339d34c (commit)
       via  a798ad3d09bddd87bd1ece6ec62ec01410eae9d2 (commit)
       via  a69c06d2d7af4c328f779fd3f213f2018675962c (commit)
       via  7699440ac6000480ffbcd22f5a1c2982fb056dc5 (commit)
       via  eced957ae35db978aeb4c8602d0ea30902aaa9e4 (commit)
       via  ca7460bcc97a8b1402b81ecebc3f0ac3131230c0 (commit)
       via  8ba8aece3e72247d5dbf885b5845a1663956032d (commit)
       via  b887df487c6cb465c3212e8ef99278350e58ff0a (commit)
       via  ba032ff921ffb7be57d9f831e2a3dce8b38e266e (commit)
       via  753d0ef652e1593c0fbd204a3973554794215c2f (commit)
       via  a5b7c827e89fb082a51c6ab48ab98261f85d2a24 (commit)
       via  149eb0dabca09332dfd9a89cba4c6697e3c6c65d (commit)
       via  32a14171e8fe873d53effe87b9bac83aff1a2a60 (commit)
       via  afd38976a33c46b618ff9317192388b8f3f1a195 (commit)
       via  cb9fbffa7f480dae5f17eb44f27d0b3523da0f0a (commit)
      from  017f264a219a10fb218854a37299cce1cff4ff32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b0cf100405e0dd7e4913194cd88b71ff74cf1773
Merge: 07cba22 83c0e05
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Mar 11 12:07:41 2015 -0400

    Merge branch 'master' into 5145-combine-collections-repeated-filenames


commit 07cba2282dc6e8c701db411e716b8943e2dfa21f
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Mar 11 12:07:28 2015 -0400

    5145: small updates

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 6569abe..7737a3c 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -169,11 +169,7 @@ class ActionsController < ApplicationController
         manifest_file = m[4].split('/')[-1]
         uniq_file = derive_unique_filename(manifest_file, manifest_files)
         normalized = arv_normalize mt, '--extract', ".#{m[4]}"
-        index = normalized.rindex manifest_file
-        part1 = normalized[0, index]
-        part2 = normalized[index, normalized.length]
-        part2 = part2.gsub(manifest_file) {|s| uniq_file}
-        normalized = part1 + part2
+        normalized = normalized.gsub(/(\d+:\d+:)(#{Regexp.quote manifest_file})/) {|s| "#{$1}#{uniq_file}" }
         combined += normalized
         manifest_files << uniq_file
       else
@@ -190,10 +186,10 @@ class ActionsController < ApplicationController
           end
 
           manifest_parts.each do |part|
-            part_match = /\d*:\d*:(\S+)/.match(part)
+            part_match = /(\d+:\d+:)(\S+)/.match(part)
             if part_match
-              uniq_file = derive_unique_filename(part_match[1], manifest_files)
-              adjusted_parts << (part.gsub(part_match[1]) {|s| uniq_file})
+              uniq_file = derive_unique_filename(part_match[2], manifest_files)
+              adjusted_parts << "#{part_match[1]}#{uniq_file}" 
               manifest_files << uniq_file
             else
               adjusted_parts << part

commit 60501a83ead2f3c71144d3af842e714cb3f91000
Merge: 017f264 855a790
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Mar 11 11:14:00 2015 -0400

    Merge branch 'master' into 5145-combine-collections-repeated-filenames


-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list