[ARVADOS] updated: 5d87bcae66870127445e5eb018a69d606e93e244
git at public.curoverse.com
git at public.curoverse.com
Sun Nov 16 00:28:12 EST 2014
Summary of changes:
apps/workbench/Gemfile | 2 +-
apps/workbench/Gemfile.lock | 12 +-
.../app/assets/javascripts/pipeline_instances.js | 2 +-
.../app/assets/javascripts/select_modal.js | 31 +-
.../app/assets/javascripts/selection.js.erb | 3 +-
.../app/controllers/application_controller.rb | 9 +-
.../app/controllers/collections_controller.rb | 39 +--
.../controllers/pipeline_instances_controller.rb | 26 +-
apps/workbench/app/controllers/users_controller.rb | 6 +-
apps/workbench/app/helpers/application_helper.rb | 11 +-
apps/workbench/app/models/arvados_api_client.rb | 7 +-
apps/workbench/app/models/arvados_base.rb | 4 +-
apps/workbench/app/models/arvados_resource_list.rb | 165 ++++++----
.../app/views/application/_choose.html.erb | 9 +-
.../app/views/application/_paging.html.erb | 22 +-
.../app/views/collections/_choose_rows.html.erb | 22 +-
.../app/views/collections/_index_tbody.html.erb | 2 +-
.../collections/_show_chooser_preview.html.erb | 2 +-
.../app/views/collections/_show_files.html.erb | 23 +-
.../app/views/collections/_show_recent.html.erb | 4 +-
.../app/views/layouts/application.html.erb | 2 +-
apps/workbench/app/views/layouts/body.html.erb | 13 -
.../app/views/projects/_show_sharing.html.erb | 3 +-
.../workbench/app/views/users/_show_admin.html.erb | 2 +-
.../pipeline_instances_controller_test.rb | 2 +-
.../test/integration/pipeline_instances_test.rb | 67 ++--
.../test/unit/arvados_resource_list_test.rb | 97 ++++--
crunch_scripts/run-command | 5 +-
doc/api/schema/Job.html.textile.liquid | 13 +-
doc/sdk/cli/index.html.textile.liquid | 1 -
doc/sdk/cli/subcommands.html.textile.liquid | 8 +-
sdk/cli/bin/arv | 8 +-
sdk/cli/bin/arv-tag | 15 +-
sdk/go/keepclient/keepclient.go | 22 +-
sdk/go/keepclient/keepclient_test.go | 114 ++++---
sdk/go/keepclient/root_sorter.go | 57 ++++
sdk/go/keepclient/root_sorter_test.go | 58 ++++
sdk/go/keepclient/support.go | 65 +---
sdk/python/arvados/keep.py | 120 +++----
sdk/python/tests/run_test_server.py | 14 +-
sdk/python/tests/test_keep_client.py | 77 ++++-
sdk/ruby/arvados.gemspec | 2 +-
services/api/app/models/job.rb | 59 ++--
...141111133038_add_arvados_sdk_version_to_jobs.rb | 13 +
services/api/db/structure.sql | 7 +-
services/api/lib/load_param.rb | 7 +-
services/api/test/fixtures/keep_services.yml | 6 +-
services/api/test/fixtures/links.yml | 14 +
services/api/test/fixtures/pipeline_templates.yml | 38 +++
services/api/test/fixtures/repositories.yml | 5 +
.../arvados/v1/commits_controller_test.rb | 3 +-
.../arvados/v1/groups_controller_test.rb | 67 ++--
.../arvados/v1/repositories_controller_test.rb | 15 +-
services/api/test/helpers/git_test_helper.rb | 4 +-
services/api/test/integration/keep_proxy_test.rb | 17 +-
services/api/test/test.git.tar | Bin 153600 -> 194560 bytes
services/api/test/unit/job_test.rb | 84 ++++-
services/keepproxy/keepproxy_test.go | 14 +-
.../nodemanager/arvnodeman/computenode/__init__.py | 353 ---------------------
.../computenode/{ => dispatch}/__init__.py | 123 +------
.../arvnodeman/computenode/driver/__init__.py | 64 ++++
.../arvnodeman/computenode/{ => driver}/dummy.py | 3 +-
.../arvnodeman/computenode/{ => driver}/ec2.py | 3 +-
services/nodemanager/arvnodeman/config.py | 2 +-
services/nodemanager/arvnodeman/daemon.py | 7 +-
services/nodemanager/arvnodeman/launcher.py | 4 +-
services/nodemanager/tests/test_computenode.py | 279 ----------------
...computenode.py => test_computenode_dispatch.py} | 35 +-
...enode_ec2.py => test_computenode_driver_ec2.py} | 2 +-
services/nodemanager/tests/test_daemon.py | 4 +-
70 files changed, 1031 insertions(+), 1367 deletions(-)
create mode 100644 sdk/go/keepclient/root_sorter.go
create mode 100644 sdk/go/keepclient/root_sorter_test.go
create mode 100644 services/api/db/migrate/20141111133038_add_arvados_sdk_version_to_jobs.rb
copy services/nodemanager/arvnodeman/computenode/{ => dispatch}/__init__.py (69%)
create mode 100644 services/nodemanager/arvnodeman/computenode/driver/__init__.py
rename services/nodemanager/arvnodeman/computenode/{ => driver}/dummy.py (96%)
rename services/nodemanager/arvnodeman/computenode/{ => driver}/ec2.py (98%)
copy services/nodemanager/tests/{test_computenode.py => test_computenode_dispatch.py} (89%)
rename services/nodemanager/tests/{test_computenode_ec2.py => test_computenode_driver_ec2.py} (98%)
via 5d87bcae66870127445e5eb018a69d606e93e244 (commit)
via 83e73eda7123a6de741198d759841fd186fc2a11 (commit)
via 06afd90ff09a83982451733f1e39974299d9a2d9 (commit)
via 4b3222657e160eaf61459aac843e8377100a53e4 (commit)
via abe8fc4c5818165ffb696448c81b3bf1bb5dc1dd (commit)
via 4c110b5f4e8e92d613f70427f27bdfae2ea376c7 (commit)
via 2ac2528dc0e5b700a2640e28dc66e474db9ad329 (commit)
via 9cd99d3070cd69664a31f8e25fad68fe8b7c43cf (commit)
via 6de0a4ab0323e69a5499e59af03c9c5e6125fed7 (commit)
via 3a31350c6265cb1135d3d4d40af436aae91a9894 (commit)
via c805714d8bbc51adb32a3a3ae4b82ea41eaa0de0 (commit)
via 9325dabcc2b6c32a589ba86cc052946b4875eb1d (commit)
via 06e402b11ad4d503feb5fa45845cb27c93478cfc (commit)
via afdab87268e4ee2f19f92e02b219696081959378 (commit)
via 809b122ee02d566b3bddb26df928e57efa39ed87 (commit)
via f5c574f45a6352c7d675e8c111eef5083a435213 (commit)
via f81483a374fbdfe6d5f36e5f5e55f92455afa155 (commit)
via 1ac0e3da5fbd477bd2acbf5bd8baa3c86f08194b (commit)
via dff161c1eaaecd6b557e88709fdf5f0dcb52821b (commit)
via cf1db3981ad0c6416d2572ceeb512743a9df24c7 (commit)
via 3894b788440fce678a28b4c7a8780f2b7767449d (commit)
via 5be66e86ac84d7d46c8503c3c136cb144222e4bf (commit)
via fd207a0e0fc3aa02eba81b567b0b30d144ac3fbf (commit)
via 9ef386f6e405db49df44a24e4cdfe5a0c0742f62 (commit)
via d833a28612bb22e1489536b3b0dfe8eb00196fda (commit)
via 754ff84aab18b623b37f21377c639694e6ea0ed7 (commit)
via 1a001045ccce247a13266a5ef619ffbc07308226 (commit)
via 9966893484226206474d7d9936d884cc56582f15 (commit)
via ac21f0d45a76294aaca0c0c0fdf06eb72d03368d (commit)
via a0e70cf1da033f7d94e728ab919bd8cfcabf3743 (commit)
via c28b9b91028c90497455bfde188915982377b825 (commit)
via e158f485053be1e840073b321033d60d686a55a8 (commit)
via 8f9f0dece977ccf5a778f3b3bd2379375e723c18 (commit)
via b626a85eb86fd4909712852040cd305c71c37ee5 (commit)
via 5141c3ee23e89696773e227a93236ef2a51543c2 (commit)
via 45bfc1104dd30fb97a586de5ff96d6b739f7bb2b (commit)
via 6bcb827b1405ce8ca5d767108bc4356ecc2972f4 (commit)
via 093cebc3a4baed645fd5d4a5331c2ff837de8c77 (commit)
via 76c9a858643680d90f9694d49c212a54fe5b759f (commit)
via 91f0b180a8474321738577a12250b5a1b8f5bcbc (commit)
via b2610e066d569b323fe55ffee615e61ca4e461d1 (commit)
via c7b7e4d44e9349c9104fbfcd33c5e4b97fe17a71 (commit)
via e61de9add861db4c043341f3926acb95ded37862 (commit)
via 1237511f9da5ee20588d44be4db5f9e37cfc6400 (commit)
via fa3e996ee452bd9be853dd9e93aaec15623708f5 (commit)
via 1304e044aa87a65145bf8b6d4bc141586556c0ed (commit)
via 47b0cb35b5ee933757c4342bb75fd286c1dac8cb (commit)
via e02ef893c4f6cf881e449c248782b2ac21b49b0f (commit)
via 9405b5f224b205e681e378bd2d90d18f3638139b (commit)
via a4b55a80251d666ca39d0f8d201c70e493b4c661 (commit)
via 0198b4937df2be79e41ea76ea6c31841441f4f2c (commit)
via cac035d7a171b90f0dc714d17b500b4062c0c58b (commit)
via fbd2326841005c1a288c65502dc038f26923ed65 (commit)
via 0f9bca457448372de1d15dcd9ed4548c324ff14f (commit)
via 3bbb988777079718338e3e6cb9c6c9b5399be800 (commit)
via 83369774c123b427f519bd2a2229415fac383a6a (commit)
via d3cb9460f0a30f9602508bed7507c906b8a6d91d (commit)
via 1491cdd65b8a3ef75f66516004bc0680651da201 (commit)
via 29e012f772b1c1d4c286e143b50a9de9b8a6918c (commit)
via a5b4a7e8da51d84fe200d88dc39bd5431bb60a11 (commit)
via 723afcb87896a7dcee99bb41b37ef368464f4f40 (commit)
via cffe9566efaa838ada850353dd6e51ec4cc3ebff (commit)
via 88d7932586705439e7a02b403e65202164920660 (commit)
via 1c0e350af2a30f4627ad879545c9c6fc6554d92a (commit)
via 81bfa2fd57ee5e4b0042d418115f0e50170ee5eb (commit)
via 2361a1b4d619a0f405f98c507cff6219b237bb2e (commit)
via 47530892a8a6b174786316c3881e22dc0864c859 (commit)
via 6ac59725fedc0a958d60d85740b47deb25addb5b (commit)
via 974ad63fc24161cb228003f4ef4cc32d5da578ff (commit)
via 87567c9440a65a42fdde62e513b40dc5a8585fdf (commit)
via c1f7fd8aa615d4a91f919ce18a6085ae766a5517 (commit)
from f5a1a9210e7638babe33d16938246e93ff4dd334 (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 5d87bcae66870127445e5eb018a69d606e93e244
Author: Tom Clegg <tom at curoverse.com>
Date: Sat Nov 15 23:48:32 2014 -0500
3400: Do not fetch API results just for the sake of looking up resource_class.
diff --git a/apps/workbench/app/models/arvados_resource_list.rb b/apps/workbench/app/models/arvados_resource_list.rb
index 3000aa8..6890b87 100644
--- a/apps/workbench/app/models/arvados_resource_list.rb
+++ b/apps/workbench/app/models/arvados_resource_list.rb
@@ -2,6 +2,8 @@ class ArvadosResourceList
include ArvadosApiClientHelper
include Enumerable
+ attr_reader :resource_class
+
def initialize resource_class=nil
@resource_class = resource_class
@fetch_multiple_pages = true
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index d36f5f9..4e1503b 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -3,7 +3,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h4 class="modal-title"><%= params[:title] || "Choose #{@objects.first.andand.class_for_display}" %></h4>
+ <h4 class="modal-title"><%= params[:title] || "Choose #{@objects.resource_class.andand.class_for_display}" %></h4>
</div>
<div class="modal-body">
commit 83e73eda7123a6de741198d759841fd186fc2a11
Author: Tom Clegg <tom at curoverse.com>
Date: Sat Nov 15 23:47:21 2014 -0500
4024: @limit override must happen before find_objects_for_index.
diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 394bb7b..3326527 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -293,11 +293,6 @@ class PipelineInstancesController < ApplicationController
%w(Compare Graph)
end
- def index
- @limit = 20
- super
- end
-
protected
def for_comparison v
if v.is_a? Hash or v.is_a? Array
@@ -307,8 +302,12 @@ class PipelineInstancesController < ApplicationController
end
end
+ def load_filters_and_paging_params
+ params[:limit] = 20
+ super
+ end
+
def find_objects_by_uuid
@objects = model_class.where(uuid: params[:uuids])
end
-
end
commit 06afd90ff09a83982451733f1e39974299d9a2d9
Author: Tom Clegg <tom at curoverse.com>
Date: Sat Nov 15 23:46:09 2014 -0500
3400: Do not fetch_multiple_pages in #index actions.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 88ea4b0..e88d38e 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -164,6 +164,7 @@ class ApplicationController < ActionController::Base
def find_objects_for_index
@objects ||= model_class
@objects = @objects.filter(@filters).limit(@limit).offset(@offset)
+ @objects.fetch_multiple_pages(false)
end
def render_index
@@ -172,9 +173,9 @@ class ApplicationController < ActionController::Base
if params[:partial]
@next_page_href = next_page_href(partial: params[:partial], filters: @filters.to_json)
render json: {
- content: render_to_string(partial: "show_#{params[:partial]}", formats: [:html]),
- next_page_href: @next_page_href
-
+ content: render_to_string(partial: "show_#{params[:partial]}",
+ formats: [:html]),
+ next_page_href: @next_page_href
}
else
render json: @objects
@@ -218,6 +219,8 @@ class ApplicationController < ActionController::Base
if !objects
objects = @objects
end
+ # result_limit and result_offset won't work until we call #results
+ objects.results
if objects.respond_to?(:result_offset) and
objects.respond_to?(:result_limit) and
objects.respond_to?(:items_available)
@@ -268,7 +271,6 @@ class ApplicationController < ActionController::Base
if params[:partial]
f.json {
find_objects_for_index if !@objects
- @objects.fetch_multiple_pages(false)
render json: {
content: render_to_string(partial: "choose_rows.html",
formats: [:html]),
commit 4b3222657e160eaf61459aac843e8377100a53e4
Merge: abe8fc4 4c110b5
Author: Tom Clegg <tom at curoverse.com>
Date: Sat Nov 15 21:38:54 2014 -0500
4024: Merge branch '4388-workbench-update' into 4024-pipeline-instances-scroll
commit abe8fc4c5818165ffb696448c81b3bf1bb5dc1dd
Merge: f5a1a92 6de0a4a
Author: Tom Clegg <tom at curoverse.com>
Date: Sat Nov 15 21:18:47 2014 -0500
4024: Merge branch 'master' into 4024-pipeline-instances-scroll
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list