[ARVADOS] updated: a2efd7925361ae71ee2abae987fa1b4801ac0555

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/users_controller.rb |   8 +-
 .../app/views/users/_manage_current_token.html.erb |   6 +-
 .../app/views/users/_manage_repositories.html.erb  |   4 +-
 .../app/views/users/_manage_ssh_keys.html.erb      |   2 +-
 sdk/python/arvados/commands/put.py                 |  21 ++--
 sdk/python/arvados/keep.py                         | 139 +++++++++++++--------
 sdk/python/bin/arv-ls                              |   2 +-
 7 files changed, 107 insertions(+), 75 deletions(-)

       via  a2efd7925361ae71ee2abae987fa1b4801ac0555 (commit)
       via  984c751aaa4304b4535fe1ebf099d66bc13c30f4 (commit)
       via  336e990ac85fa7732c021a3051abfa6977b54445 (commit)
       via  7a54fd6a073e03f98f68d0b6c816a9f394f625dd (commit)
       via  d525bce65134ab333f27978bf8a44555e4590577 (commit)
       via  673a10d2aabd1d9ed73fb6aeabb632f08f39a415 (commit)
       via  63ea4e55dcffca4e4cbcc7fc2070451dfc718dae (commit)
       via  5e1c7a2841d2c02f2dd0259a32011bc563957a4d (commit)
       via  537b461c3668c788b17f2d6eb72743056cdad3b1 (commit)
       via  4f3642a6629bcdd8c8be30f3181fae1c57e3a1db (commit)
       via  b53f78b45e416b710fd273aee52469e6ff5db7be (commit)
       via  0d1a48e90dfbbdf1f8bb6e08d634e70e38223ff6 (commit)
       via  575ecb6cb09d65a18492c8ecbc6af0eec01991f6 (commit)
      from  5c8437e59cbfd13b99d402b42b6bdfc18aa82bf8 (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 a2efd7925361ae71ee2abae987fa1b4801ac0555
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 29 14:09:58 2014 -0400

    3193: minor text updates in the UI panels.

diff --git a/apps/workbench/app/views/users/_manage_current_token.html.erb b/apps/workbench/app/views/users/_manage_current_token.html.erb
index b87d80a..33633ed 100644
--- a/apps/workbench/app/views/users/_manage_current_token.html.erb
+++ b/apps/workbench/app/views/users/_manage_current_token.html.erb
@@ -1,8 +1,6 @@
 ### Pasting the following lines at a shell prompt will allow Arvados SDKs</br>
-### to authenticate to your account, <%= current_user.email %></br></br>
-read ARVADOS_API_TOKEN <<EOF</br>
-<%= Thread.current[:arvados_api_token] %></br>
-EOF</br>
+### to authenticate to your account, <%= current_user.email %></br>
+export ARVADOS_API_TOKEN=<%= Thread.current[:arvados_api_token] %></br>
 export ARVADOS_API_TOKEN ARVADOS_API_HOST=<%= current_api_host %></br>
 <% if Rails.configuration.arvados_insecure_https %>
 export ARVADOS_API_HOST_INSECURE=true</br>
diff --git a/apps/workbench/app/views/users/_manage_repositories.html.erb b/apps/workbench/app/views/users/_manage_repositories.html.erb
index 994fb25..7ff11bd 100644
--- a/apps/workbench/app/views/users/_manage_repositories.html.erb
+++ b/apps/workbench/app/views/users/_manage_repositories.html.erb
@@ -1,7 +1,7 @@
 <div>
   <p>
-    For more information see <%= link_to raw('Setting up SSH access'),
-    "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access-unix.html", target: "_blank"%>
+    For more information see <%= link_to raw('Writing a pipeline'),
+    "#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-firstscript.html", target: "_blank"%>
   </p>
 
   <table class="table repositories-table">
diff --git a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
index 8c436d6..44dc660 100644
--- a/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
+++ b/apps/workbench/app/views/users/_manage_ssh_keys.html.erb
@@ -33,7 +33,7 @@
               <%= key[:public_key] %>
             </td>
             <td>
-              <%= link_to(authorized_key_path(id: key[:uuid]), method: 'delete', class: 'btn btn-sm', data: {confirm: "Really delete key"}) do %>
+              <%= link_to(authorized_key_path(id: key[:uuid]), method: 'delete', class: 'btn btn-sm', data: {confirm: "Really delete key?"}) do %>
                   <i class="fa fa-fw fa-trash-o"></i>
               <% end %>
             </td>

commit 984c751aaa4304b4535fe1ebf099d66bc13c30f4
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 29 13:44:13 2014 -0400

    3193: add head_uuid is a arvados#repository filter when looking for recpositories.

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index d578631..836c185 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -213,9 +213,11 @@ class UsersController < ApplicationController
   def manage_account
     # repositories current user can read / write
     repo_links = []
-    Link.where(tail_uuid: current_user.uuid,
-               link_class: 'permission',
-               name: ['can_write', 'can_read']).
+    Link.filter([['head_uuid', 'is_a', 'arvados#repository'],
+                 ['tail_uuid', '=', current_user.uuid],
+                 ['link_class', '=', 'permission'],
+                 ['name', 'in', ['can_write', 'can_read']],
+               ]).
           each do |perm_link|
             repo_links << perm_link[:head_uuid]
           end

commit 336e990ac85fa7732c021a3051abfa6977b54445
Merge: 5c8437e 7a54fd6
Author: radhika <radhika at curoverse.com>
Date:   Tue Jul 29 13:29:56 2014 -0400

    Merge branch 'master' into 3193-manage-account


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


hooks/post-receive
--