[ARVADOS] updated: 2d911a46e2698f18200bf2170bdb4c18452439a1

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |  2 +-
 apps/workbench/Gemfile.lock                        |  4 +-
 .../app/controllers/actions_controller.rb          |  1 +
 .../app/controllers/collections_controller.rb      |  9 +--
 apps/workbench/app/models/collection.rb            | 14 ++--
 .../app/views/collections/_show_files.html.erb     |  2 +-
 .../app/views/collections/_show_recent.html.erb    |  2 +-
 .../app/views/projects/_show_tab_contents.html.erb |  3 +-
 crunch_scripts/split-fastq.py                      |  7 +-
 sdk/python/arvados/collection.py                   |  3 +
 sdk/python/arvados/keep.py                         |  7 +-
 sdk/python/tests/test_keep_client.py               | 13 ++++
 sdk/ruby/lib/arvados/keep.rb                       | 77 ++++++++++++++++---
 sdk/ruby/test/test_keep_manifest.rb                | 87 +++++++++++++++++-----
 services/api/Gemfile                               |  2 +-
 services/api/Gemfile.lock                          |  4 +-
 services/api/app/models/collection.rb              |  9 +--
 17 files changed, 183 insertions(+), 63 deletions(-)

       via  2d911a46e2698f18200bf2170bdb4c18452439a1 (commit)
       via  35bee4f8071099b57925a49fc56554ceda900c81 (commit)
       via  f2bed1a9d44ccee1a5e1214e139d586b60b90e6a (commit)
       via  741bf44b15569a3a4b1a4705b62e4f50c8365bc9 (commit)
       via  4ef537243058616754efde56438a193626556bca (commit)
       via  bafb417c531d6094697a13a7465313d1cc7c0bc9 (commit)
      from  a3615da860d1d78d0ecb7e2890eea26963b5c01e (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 2d911a46e2698f18200bf2170bdb4c18452439a1
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 11 15:01:07 2014 -0400

    3654: add a default name to newly created combined collection

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 62c0b32..347644b 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -158,6 +158,7 @@ class ActionsController < ApplicationController
 
     normalized = arv_normalize combined
     newc = Collection.new({:manifest_text => normalized})
+    newc.name = newc.name || "Collection created at #{Time.now.localtime}"
     newc.save!
 
     chash.each do |k,v|
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 4718cb1..38c86e1 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -4,7 +4,7 @@
       <div class="btn-group btn-group-sm">
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
         <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Combine selections into a new collection", '#',
+          <li><%= link_to "Combine selected files into a new collection", '#',
                   'data-href' => combine_selected_path,
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine-collections',
diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 7272b51..5edabfa 100644
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -4,7 +4,7 @@
       <div class="btn-group btn-group-sm">
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
         <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Combine selections into a new collection", '#',
+          <li><%= link_to "Combine selected collections into a new collection", '#',
                   'data-href' => combine_selected_path,
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine-collections',
diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index 3235783..3aff23e 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -4,10 +4,11 @@
       <div class="btn-group btn-group-sm">
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
         <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Combine selections into a new collection", '#',
+          <li><%= link_to "Combine selected collections into a new collection", '#',
                   'data-href' => combine_selected_path(
                     action_data: {selection_param: 'project'}.to_json
                   ),
+                  'id' => 'combine_selections_button',
                   'data-selection-param-name' => 'selection[]',
                   'data-selection-action' => 'combine-project-contents',
                   'method' => 'post',

commit 35bee4f8071099b57925a49fc56554ceda900c81
Merge: a3615da f2bed1a
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 11 13:38:00 2014 -0400

    Merge branch 'master' into 3654-combine-selections


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


hooks/post-receive
--