[ARVADOS] updated: 35729f8faeae665e5a706d56cfacf01e76de99a9

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |  1 +
 apps/workbench/Gemfile.lock                        |  4 +
 .../workbench/app/assets/javascripts/log_viewer.js |  2 +-
 .../app/controllers/collections_controller.rb      | 28 ++++++-
 .../controllers/pipeline_instances_controller.rb   | 18 +++--
 apps/workbench/app/helpers/provenance_helper.rb    | 10 ++-
 apps/workbench/app/views/jobs/_show_log.html.erb   | 48 +++++++++---
 apps/workbench/config/application.default.yml      |  3 +
 .../test/functional/collections_controller_test.rb | 37 ++++-----
 .../pipeline_instances_controller_test.rb          | 68 ++++++++++++++++
 apps/workbench/test/integration/jobs_test.rb       | 56 ++++++++++++++
 apps/workbench/test/test_helper.rb                 |  1 +
 .../app/controllers/arvados/v1/jobs_controller.rb  |  5 ++
 services/api/app/models/arvados_model.rb           |  6 ++
 services/api/app/models/job.rb                     | 44 ++++++++++-
 services/api/config/routes.rb                      |  1 +
 services/api/script/crunch-dispatch.rb             | 90 ++++++++++++----------
 services/api/test/fixtures/collections.yml         | 14 ++++
 services/api/test/fixtures/jobs.yml                | 37 +++++++++
 services/api/test/fixtures/links.yml               | 14 ++++
 services/api/test/fixtures/pipeline_instances.yml  | 16 ++++
 services/api/test/fixtures/pipeline_templates.yml  | 27 +++++++
 .../functional/arvados/v1/jobs_controller_test.rb  | 17 +++-
 services/api/test/integration/jobs_api_test.rb     |  2 +-
 services/api/test/unit/job_test.rb                 | 62 ++++++++++++++-
 services/fuse/tests/test_mount.py                  |  3 +-
 26 files changed, 525 insertions(+), 89 deletions(-)

       via  35729f8faeae665e5a706d56cfacf01e76de99a9 (commit)
       via  f19ce869a14511bb8031309a75fd9ee7acfeee6c (commit)
       via  62790d76daf181a457d8f47741721967cd9cb7d9 (commit)
       via  2935de4fbccf43b7daedb9412f2ada1bf65c52ab (commit)
       via  23acabd1c9685b0a30027a643ebc10b25d3985d3 (commit)
       via  a8bd120b4b5056e7a688e6ce4a60c1251fe7cb0f (commit)
       via  165a36741ced8d09ec15aa30873e51dab2b3e215 (commit)
       via  5d006b95fdcbb48afffef8272b4d2071acb5221b (commit)
       via  754495b451fb7dc65fe2d2c43fa4876638b0be66 (commit)
       via  4ff61dd25a70e6467bbafeaaf794cc381f684384 (commit)
       via  196b4b55725db26af4000162329421c73ca893af (commit)
       via  edc5e4b6645b9b983a85a892bf3d3ad1432a657d (commit)
       via  359d96e3442f93094703a6966aecca9b0a90f55b (commit)
       via  d9d74825806615a539da950686ae801bbbf60e24 (commit)
       via  4769d3156e5d486837f7eb524ab5ca798ed090dc (commit)
       via  3ee8ac519f0c3f3fd211372d2a4699586d5c2aa8 (commit)
       via  d9df153743ada521cb42852ce2b4879b1981bbd9 (commit)
       via  dd0f2323bd5fbcef6a3921c45d6e3025a77d2e35 (commit)
       via  34e461fe9d33283d8e2135802ee9accb30a5e34f (commit)
       via  70b1ac0b5a02879bb5b60f651bf0810e8362f074 (commit)
       via  8f1554cf9cfc279e0127d7ea2c7a79a98e323f13 (commit)
       via  407f1cf196f60f4af21c89cbdccb2c98e05518fb (commit)
       via  3412c35d3da73b94c133099dceab9770fb465165 (commit)
       via  1afcc0c00dc9f901acce6d5b166ee51c497f8555 (commit)
       via  3dfc071494cbb0386ecd7269c72a435fc7f9cc24 (commit)
       via  5233f1d185706095d2f045b8431781c9a421ee16 (commit)
       via  6b17ef224b600b3ce889546d648df43d8aea81f4 (commit)
       via  3cdc055b90fd859cbd0e101becb4abd78f4d467f (commit)
       via  a4679fb93b4b835509cc77f9bf2fdce02d40520e (commit)
       via  5a341ad3a358bfadb96c83fb95acb7ce3f50cd83 (commit)
       via  4f41341675c108e9ffa4e5ba15b8bca521152a67 (commit)
       via  521df5cd1e19a671a4f940128c5c61930df9c8bb (commit)
       via  74bcc470f33cd47ca4106a7565871c07c40f9c00 (commit)
       via  641a04fc2dd876440ed983a4cdf0e03f188040c1 (commit)
       via  070ca0d5fdd81ed1d3a32fbfc4d1329bb911bdf1 (commit)
       via  2873926cdbfc8012b276db11d24cea3ad6a4bdd4 (commit)
       via  8bc77d6ee612217cfb50bca997ce3b94c19637e9 (commit)
       via  caa5dd776dfad5e50592a5cc2824c70ac3474b46 (commit)
       via  469f117ead24509639fb5b6ba6c9bd1b6067460c (commit)
       via  4671db01d21dad219582444592e99a74d1fa35d8 (commit)
       via  362be0f8b6b1d559e041c8cda7d9f154fb93ee97 (commit)
      from  f0358d88ba065369e70a89205ca1ad4ea4700cd1 (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 35729f8faeae665e5a706d56cfacf01e76de99a9
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 2 14:54:59 2014 -0400

    3583: extend encode quotes logic for script parameters as well, just in case.

diff --git a/apps/workbench/app/helpers/provenance_helper.rb b/apps/workbench/app/helpers/provenance_helper.rb
index 677b9cd..4faad99 100644
--- a/apps/workbench/app/helpers/provenance_helper.rb
+++ b/apps/workbench/app/helpers/provenance_helper.rb
@@ -149,7 +149,7 @@ module ProvenanceHelper
         end
         unless node == ""
           node += "']"
-          node_value = "#{node}".gsub("\"", "\\\"")
+          node_value = encode_quotes node
           gr += "\"#{node_value}\" [label=\"#{node_value}\"];\n"
           gr += edge(job_uuid(job), node_value, {:label => prefix})
         end
@@ -160,8 +160,9 @@ module ProvenanceHelper
           gr += edge(job_uuid(job), m, {:label => prefix})
           gr += generate_provenance_edges(m)
         elsif @opts[:all_script_parameters]
-          gr += "\"#{sp}\" [label=\"#{sp}\"];\n"
-          gr += edge(job_uuid(job), sp, {:label => prefix})
+          sp_value = encode_quotes sp
+          gr += "\"#{sp_value}\" [label=\"#{sp_value}\"];\n"
+          gr += edge(job_uuid(job), sp_value, {:label => prefix})
         end
       end
       gr
@@ -264,6 +265,9 @@ module ProvenanceHelper
       gr
     end
 
+    def encode_quotes value
+      value.andand.gsub("\"", "\\\"")
+    end
   end
 
   def self.create_provenance_graph(pdata, svgId, opts={})

commit f19ce869a14511bb8031309a75fd9ee7acfeee6c
Merge: f0358d8 62790d7
Author: radhika <radhika at curoverse.com>
Date:   Thu Oct 2 12:19:54 2014 -0400

    Merge branch 'master' into 3583-provenance-graph-issue


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


hooks/post-receive
--