[ARVADOS] updated: 3cd8626eda1618b9f2be293fc01c29f3d00973a7

git at public.curoverse.com git at public.curoverse.com
Wed Jan 22 17:06:27 EST 2014


Summary of changes:
 apps/admin/setup-new-user.rb                       |    2 +-
 apps/workbench/.gitignore                          |    3 +
 apps/workbench/Gemfile                             |    1 +
 apps/workbench/Gemfile.lock                        |    3 +
 apps/workbench/app/assets/javascripts/users.js     |   40 ++
 .../app/assets/stylesheets/application.css         |   18 +
 .../app/controllers/application_controller.rb      |   15 +-
 .../app/controllers/collections_controller.rb      |   65 ++-
 .../app/controllers/sessions_controller.rb         |    2 +-
 .../app/controllers/user_agreements_controller.rb  |    2 +-
 apps/workbench/app/controllers/users_controller.rb |    7 +
 apps/workbench/app/helpers/application_helper.rb   |   47 ++-
 apps/workbench/app/models/arvados_api_client.rb    |   48 ++-
 apps/workbench/app/models/arvados_base.rb          |    6 +
 apps/workbench/app/models/arvados_resource_list.rb |    4 +
 apps/workbench/app/models/node.rb                  |    3 +
 apps/workbench/app/models/repository.rb            |    3 +
 apps/workbench/app/models/user.rb                  |    4 +
 apps/workbench/app/models/virtual_machine.rb       |    4 +-
 .../views/application/_arvados_attr_value.html.erb |   21 +
 .../app/views/application/_arvados_object.html.erb |   42 ++
 .../application/_arvados_object_attr.html.erb      |   19 +-
 .../app/views/application/_index.html.erb          |   19 +-
 .../workbench/app/views/application/error.json.erb |    1 +
 .../app/views/authorized_keys/create.js.erb        |    1 +
 .../app/views/authorized_keys/index.html.erb       |    4 +-
 .../app/views/collections/_index_tbody.html.erb    |   27 +
 .../workbench/app/views/collections/index.html.erb |   60 +-
 apps/workbench/app/views/collections/index.js.erb  |    4 +
 apps/workbench/app/views/collections/show.html.erb |   29 +-
 .../app/views/layouts/application.html.erb         |   15 +-
 .../app/views/repositories/index.html.erb          |    8 +-
 .../app/views/user_agreements/index.html.erb       |   46 +-
 .../views/users/{home.html.erb => _home.html.erb}  |   13 +-
 .../app/views/users/_notifications.html.erb        |   46 +-
 .../app/views/users/_quick_links.html.erb          |   10 -
 apps/workbench/app/views/users/_tables.html.erb    |   63 ++-
 apps/workbench/app/views/users/home.html.erb       |   74 +---
 apps/workbench/app/views/users/welcome.html.erb    |   15 +-
 .../app/views/virtual_machines/index.html.erb      |    4 +-
 .../config/environments/development.rb.example     |    9 +
 .../config/environments/production.rb.example      |    9 +
 apps/workbench/config/environments/test.rb.example |    9 +
 apps/workbench/config/routes.rb                    |    2 +
 .../test/fixtures/api_client_authorizations.yml    |   11 -
 apps/workbench/test/fixtures/authorized_keys.yml   |   11 -
 apps/workbench/test/fixtures/collections.yml       |   11 -
 apps/workbench/test/fixtures/groups.yml            |   11 -
 apps/workbench/test/fixtures/humans.yml            |   11 -
 apps/workbench/test/fixtures/job_tasks.yml         |   11 -
 apps/workbench/test/fixtures/jobs.yml              |   11 -
 apps/workbench/test/fixtures/links.yml             |   11 -
 apps/workbench/test/fixtures/logs.yml              |   11 -
 apps/workbench/test/fixtures/nodes.yml             |   11 -
 .../workbench/test/fixtures/pipeline_instances.yml |   11 -
 .../workbench/test/fixtures/pipeline_templates.yml |   11 -
 apps/workbench/test/fixtures/repositories.yml      |   11 -
 apps/workbench/test/fixtures/specimens.yml         |   11 -
 apps/workbench/test/fixtures/traits.yml            |   11 -
 apps/workbench/test/fixtures/users.yml             |   11 -
 apps/workbench/test/fixtures/virtual_machines.yml  |   11 -
 .../api_client_authorizations_controller_test.rb   |    3 -
 .../functional/authorized_keys_controller_test.rb  |    3 -
 .../test/functional/collections_controller_test.rb |    3 -
 .../test/functional/groups_controller_test.rb      |    3 -
 .../test/functional/humans_controller_test.rb      |    3 -
 .../test/functional/job_tasks_controller_test.rb   |    3 -
 .../test/functional/jobs_controller_test.rb        |    3 -
 .../test/functional/links_controller_test.rb       |    3 -
 .../test/functional/logs_controller_test.rb        |    3 -
 .../test/functional/nodes_controller_test.rb       |   45 --
 .../pipeline_instances_controller_test.rb          |    3 -
 .../pipeline_templates_controller_test.rb          |    3 -
 .../functional/repositories_controller_test.rb     |    3 -
 .../test/functional/sessions_controller_test.rb    |    3 -
 .../test/functional/specimens_controller_test.rb   |    3 -
 .../test/functional/traits_controller_test.rb      |    3 -
 .../test/functional/users_controller_test.rb       |    3 -
 .../functional/virtual_machines_controller_test.rb |    3 -
 crunch_scripts/pgp-survey-import                   |   12 +-
 doc/Gemfile                                        |    2 +-
 doc/Gemfile.lock                                   |   18 +-
 doc/Rakefile                                       |    1 +
 doc/_config.yml                                    |    3 +
 doc/_includes/navbar_left.html                     |    2 +-
 doc/_includes/navbar_top.html                      |    1 +
 doc/_includes/run-md5sum.py                        |   35 ++
 doc/_layouts/default.html                          |    7 +-
 doc/api/schema/Link.textile                        |   65 ++-
 doc/api/schema/Log.textile                         |   12 +-
 doc/css/bootstrap.css                              |    4 +-
 doc/gen_api_method_docs.py                         |  102 ++++
 doc/gen_api_schema_docs.py                         |   77 +++
 doc/images/glyphicons-halflings-white.png          |  Bin 0 -> 8777 bytes
 doc/images/glyphicons-halflings.png                |  Bin 0 -> 12799 bytes
 doc/index.html                                     |    7 +-
 doc/install/create-standard-objects.textile        |   16 +
 doc/install/index.md                               |    5 +-
 doc/install/install-api-server.md                  |    2 +-
 doc/install/install-workbench-app.md               |    2 +-
 doc/mkpydoc.sh                                     |    5 +
 doc/sdk/index.textile                              |   12 +
 .../python}/crunch-utility-libraries.textile       |   48 +-
 doc/sdk/python/python.textile                      |   10 +
 .../reference => sdk/python}/sdk-python.textile    |   18 +-
 doc/user/getting_started/community.textile         |   25 +
 doc/user/getting_started/ssh-access.textile        |   29 +-
 doc/user/reference/sdk-cli.textile                 |    7 +-
 .../tutorials/running-external-program.textile     |   65 ++
 doc/user/tutorials/tutorial-firstscript.textile    |   22 +-
 .../tutorial-gatk-variantfiltration.textile        |   11 +-
 doc/user/tutorials/tutorial-job-debug.textile      |    6 +-
 doc/user/tutorials/tutorial-job1.textile           |   33 +-
 doc/user/tutorials/tutorial-keep.textile           |   25 +-
 doc/user/tutorials/tutorial-new-pipeline.textile   |   12 +-
 doc/user/tutorials/tutorial-parallel.textile       |   10 +-
 doc/user/tutorials/tutorial-trait-search.textile   |   45 +-
 doc/zenweb-liquid.rb                               |   22 +
 docker/Makefile                                    |   19 +-
 docker/mkimage-debootstrap.sh                      |    8 +-
 sdk/cli/Gemfile                                    |    5 +-
 sdk/cli/Gemfile.lock                               |   16 +-
 sdk/cli/arvados-cli.gemspec                        |    5 +-
 sdk/cli/bin/arv                                    |   94 +++-
 sdk/cli/bin/arv-tag                                |  230 +++++++
 sdk/cli/test/test_arv-put.rb                       |   36 +-
 sdk/cli/test/test_arv-tag.rb                       |  106 ++++
 sdk/python/arvados/__init__.py                     |  638 ++------------------
 sdk/python/arvados/collection.py                   |  215 +++++++
 sdk/python/arvados/keep.py                         |  251 ++++++++
 sdk/python/arvados/stream.py                       |  225 +++++++
 sdk/ruby/arvados.gemspec                           |    2 +-
 .../api/app/controllers/application_controller.rb  |   62 ++-
 .../v1/api_client_authorizations_controller.rb     |   17 +-
 .../arvados/v1/collections_controller.rb           |   59 ++-
 .../arvados/v1/keep_disks_controller.rb            |    9 +-
 .../app/controllers/arvados/v1/nodes_controller.rb |    5 +
 .../controllers/arvados/v1/schema_controller.rb    |    4 +-
 .../arvados/v1/user_agreements_controller.rb       |    4 +
 services/api/app/controllers/static_controller.rb  |    2 +-
 services/api/app/models/arvados_model.rb           |    8 +
 services/api/app/models/authorized_key.rb          |   19 +
 services/api/app/models/collection.rb              |   16 +-
 .../api/config/environments/development.rb.example |    3 +
 .../api/config/environments/production.rb.example  |    3 +
 services/api/config/environments/test.rb.example   |    3 +
 services/api/script/rails                          |    2 +-
 .../arvados/v1/collections_controller_test.rb      |   38 ++
 148 files changed, 2544 insertions(+), 1448 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/users.js
 create mode 100644 apps/workbench/app/views/application/_arvados_attr_value.html.erb
 create mode 100644 apps/workbench/app/views/application/error.json.erb
 create mode 100644 apps/workbench/app/views/authorized_keys/create.js.erb
 create mode 100644 apps/workbench/app/views/collections/_index_tbody.html.erb
 create mode 100644 apps/workbench/app/views/collections/index.js.erb
 copy apps/workbench/app/views/users/{home.html.erb => _home.html.erb} (85%)
 delete mode 100644 apps/workbench/app/views/users/_quick_links.html.erb
 delete mode 100644 apps/workbench/test/fixtures/api_client_authorizations.yml
 delete mode 100644 apps/workbench/test/fixtures/authorized_keys.yml
 delete mode 100644 apps/workbench/test/fixtures/collections.yml
 delete mode 100644 apps/workbench/test/fixtures/groups.yml
 delete mode 100644 apps/workbench/test/fixtures/humans.yml
 delete mode 100644 apps/workbench/test/fixtures/job_tasks.yml
 delete mode 100644 apps/workbench/test/fixtures/jobs.yml
 delete mode 100644 apps/workbench/test/fixtures/links.yml
 delete mode 100644 apps/workbench/test/fixtures/logs.yml
 delete mode 100644 apps/workbench/test/fixtures/nodes.yml
 delete mode 100644 apps/workbench/test/fixtures/pipeline_instances.yml
 delete mode 100644 apps/workbench/test/fixtures/pipeline_templates.yml
 delete mode 100644 apps/workbench/test/fixtures/repositories.yml
 delete mode 100644 apps/workbench/test/fixtures/specimens.yml
 delete mode 100644 apps/workbench/test/fixtures/traits.yml
 delete mode 100644 apps/workbench/test/fixtures/users.yml
 delete mode 100644 apps/workbench/test/fixtures/virtual_machines.yml
 create mode 100644 doc/_includes/run-md5sum.py
 create mode 100755 doc/gen_api_method_docs.py
 create mode 100755 doc/gen_api_schema_docs.py
 create mode 100644 doc/images/glyphicons-halflings-white.png
 create mode 100644 doc/images/glyphicons-halflings.png
 create mode 100755 doc/mkpydoc.sh
 create mode 100644 doc/sdk/index.textile
 rename doc/{user/reference => sdk/python}/crunch-utility-libraries.textile (91%)
 create mode 100644 doc/sdk/python/python.textile
 rename doc/{user/reference => sdk/python}/sdk-python.textile (87%)
 create mode 100644 doc/user/getting_started/community.textile
 create mode 100644 doc/user/tutorials/running-external-program.textile
 create mode 100644 doc/zenweb-liquid.rb
 create mode 100755 sdk/cli/bin/arv-tag
 create mode 100644 sdk/cli/test/test_arv-tag.rb
 create mode 100644 sdk/python/arvados/collection.py
 create mode 100644 sdk/python/arvados/keep.py
 create mode 100644 sdk/python/arvados/stream.py

       via  3cd8626eda1618b9f2be293fc01c29f3d00973a7 (commit)
       via  3dc2b0008be4e09b47f73aeeb97d005cd7836619 (commit)
       via  2c7150729fcf1521d831b38c6aab016818b6b66a (commit)
       via  746f932006d9921e27f5100fcbadb86933c5234f (commit)
       via  ae03931ec5d885c4faa677aebc4645272a625a12 (commit)
       via  e30f2cc5c876a3efc62f619654971f8200210576 (commit)
       via  900b251f2dec14fba09e5e7a859cd67933946e56 (commit)
       via  843ff49bf3d4585a31d525df3b4dfe4891314da7 (commit)
       via  18e4d66b6fc65bc7dc486b3ff144cce92af5df8c (commit)
       via  9e31035da243334912a5dc6143a65ac7df389c69 (commit)
       via  12c9306193a1ec1a427e0ffda3f317a5f9ae091a (commit)
       via  f34faaa3ee1e9fc6780b6bcdd19ee1d21d410be0 (commit)
       via  26745c3d05f3a49902ac892297f76d0bfb92a272 (commit)
       via  c0a50172a8cc8baf6eae682da361ac8328d79201 (commit)
       via  be6152fd18b39246ac825c1c8762ccd78085441a (commit)
       via  fbf47c057817f7f9ea7d3ba1e5f3b6ea872c3c80 (commit)
       via  2e4fc5b7ec286d2beee8f93262dd70e481d161e2 (commit)
       via  e73f2804198ccd6d44e38312f3d4385dbd9b13ae (commit)
       via  f0b1d5bf37334b1d80b1d7f0a17a465ebf1c34df (commit)
       via  dd20d6a93d7ec92e477b3d957da8f984cfbfdff9 (commit)
       via  86ec3f61b905b2887cf7158ac97a4b817492ebad (commit)
       via  ab32bf9232962ab372f54b2bd5fe770b28a0e565 (commit)
       via  81707e982741b7ab100156c3390ae245b1e9f777 (commit)
       via  5331a594c86695ef360c2d03e1c42ffc00d213b8 (commit)
       via  88b9bd0d114334e1b73ebd620f6524f17b9a48db (commit)
       via  5d0e8c1b5eaf6534a0422470889c680ea5a2cc62 (commit)
       via  89397b66ebc9b8ec82d806fe6a2af2bbefd01161 (commit)
       via  d14c127786e9ad5490a700654ee513aaa0c53db6 (commit)
       via  a4eed7a6cc62e05553796a7cee0a7713e735a726 (commit)
       via  69fab19d5c5fdb685a4b6651ac2077a467a6ca9a (commit)
       via  7d6aad89ecb3005d5a9daedce265077ae1f19fcb (commit)
       via  e1ed5c20e3edc31c7aefe3257679b0db6f3c3316 (commit)
       via  5a2dd6a86ac170ea709b60c7f243ba9216cd0843 (commit)
       via  b29b5f97cf4f571114d0c73794b508d65af4331c (commit)
       via  906a43f38efe61f049fda03ff28f407837193a7a (commit)
       via  b2d3257922b14b44ab628260f1fb51a68bef95a2 (commit)
       via  0e847d07bd66e554822eb0854bbaee312eeba839 (commit)
       via  807c64b1fe731cff16e887876221dc2949e620d6 (commit)
       via  3055130be14ab26d68fd1c01a934870855ecbd5c (commit)
       via  ff5069a59469791a973f3b2c3ca13e52bcd7b91e (commit)
       via  09898bcec15c30328ae9e720e9a0c7be1595a004 (commit)
       via  7ad430f157028a8f8ab52c6f17c4864ada271667 (commit)
       via  fab072c1ec902a6f46c3d5a9ffb0f1c6219b45d0 (commit)
       via  1cb10e779a249bf82b0cf846a8976815da44eaa3 (commit)
       via  d8fde97325067566bcdb877795eaa56a8ee8c201 (commit)
       via  2b5dcd8efb8b050fbadf38ec4d682c748ad29866 (commit)
       via  8077e894a1f48e526c05ccf5cff22cfaae85ba69 (commit)
       via  bffcd382046785464c01b67a68ae56a786d74e82 (commit)
       via  89d46fe3c760785315ed1f53087e7aa2368f6f30 (commit)
       via  a2cfa777daee2cf7775c8a24cde16fdc2f48060d (commit)
       via  343892aa0ef79cf607abbfd85a04a612990022e1 (commit)
       via  db01005ac9398a2ff04655205eb64fd269260198 (commit)
       via  dcae8f7fbdc19e57599552c8e59a6f006eacdaf3 (commit)
       via  e00c117bc666cf55c8b2916995255ca424fb8286 (commit)
       via  48ad0eec0c9e63af1bef0ee83f3b885a4deadfe2 (commit)
       via  b1ba4904bc4ee727d8d1b3b90345612c60d4068d (commit)
       via  b88ef1f92a3140a9be37ed09c72175eee87fe071 (commit)
       via  55777101504449fd7784511f304870c3706bed60 (commit)
       via  a19ca95f031bf285cbb4db6d8d8bd1c216e3cfe3 (commit)
       via  c3c2786ca6301e2617ae922562e11e71aca968fd (commit)
       via  77d9504c4a5328ce47535e8c6692cb718add1a20 (commit)
       via  ac5d05f71b5907ad65ba06ae840935c9389315b0 (commit)
       via  60cb933e17126bee490c86e100a28c96323f54f2 (commit)
       via  463e996ae5276dc41deca98cb444c802e6f5e251 (commit)
       via  84f0a30a119355cd7deff1630a82d3d4c9a6d5ee (commit)
       via  5225a4deab9bf526d4e178cb5220f790b3d33e67 (commit)
       via  16f43bd3117ab352d3d64882898716ade5b0163c (commit)
       via  e049bc7067a800c2852ffaf82c9b530cef5b9f19 (commit)
       via  92d1022d103b58ddad0427736a776a27f198667e (commit)
       via  904989797f0e70dad2d4a2da8ed05693ad1619bd (commit)
       via  ccd618998410873f09444c1fb121e3f9decddc8a (commit)
       via  ac86cc3a04d65c1f330e237aa70df468faffd207 (commit)
       via  8e0fd05a52fca56bc67e0347f82897faaba8a958 (commit)
       via  ceddd030ffb6d11d0fc4244d45fd7b8e17d337e6 (commit)
       via  2d03682c2dbc5ee4567ed93e5f2cba770b8ba65e (commit)
       via  56d8ed80ce834a051be71d2bcf76a346b7bc7f0b (commit)
       via  8632354e4ec2361d8f53563a0df1da1ff0c01e63 (commit)
       via  f8aea2b0a7b6c0aebd2c97a0ca243a1299650ade (commit)
       via  c9b7cc4f504a879feb89df28a5f651e32839048a (commit)
       via  9197c69b5780a5b5ce9c40bd67e530aefdf0c7a9 (commit)
       via  d9752d891b40a8aa800ea1bb025f9c371d1fe454 (commit)
       via  7e4cdc1969319161c8412f57e4c68692421408a4 (commit)
       via  976a754dc7fceee767322ae964c287b63595211f (commit)
       via  57dbb702fde186b90fb2ad2504a35603a33b15dc (commit)
       via  2f464437d84aaccd5310d39e493767f93b0eab2c (commit)
       via  356878b49264fc1b2841e2a89d4406d2c5c4484a (commit)
       via  9feb81aabda1360618b363c65e190374091f6ff2 (commit)
       via  7aff46a6515cfb7531eaad04495430b0487d8375 (commit)
       via  ff458bd54745cc49632324f29934039a623f4287 (commit)
       via  123e96939cfdd9bb9a079f5598196e47b74b1f86 (commit)
       via  efa22e16995170b1c30cb745b4efbff752591dd6 (commit)
       via  567c0270bc7665e630bf5012e0fd2953fea462ce (commit)
       via  36601cdb390b06d0128152cbda6df7aadfab6aca (commit)
       via  c16fd46f51a61f5d66e08b786362d91ef5a33f7d (commit)
       via  030d673e455ac7fa92732eafe95f1db12f6a46b6 (commit)
       via  e52eb49c5e240f6adecf0242cd967a1ae6991291 (commit)
       via  78010f9d4ecb20c28756f2551e40420d6e850303 (commit)
       via  83f85a702927b37236b88ab9633d8e0e918e1218 (commit)
       via  08a34a30d20d9adf5c1a87769a756a5fec87de71 (commit)
       via  e47f06d00fa65678102594eb6a85b0aba298b33c (commit)
       via  de09cec28729344b8bde815019563082b8e57fb5 (commit)
       via  6696af28df909c0eb45f6cee8e7a3fc1d5658104 (commit)
       via  a999d262ee97000ed313cd4c127e0acf55e98c08 (commit)
       via  c2de465791157effa0b4d95fafe46e6976665439 (commit)
       via  425cd406f61d2de51cd8d5923a22d6d54b9f6809 (commit)
       via  7a8a6173026630b649a25d2c70d796d7f21dfb97 (commit)
       via  4068171eb8ee0cb9fd57e10ff024e04464438891 (commit)
       via  6ff244f2613d1f93f644f627f4cc5ba72790861f (commit)
       via  b4ca2d58ba0a42be2978d2d4a87c16a98d105e5a (commit)
       via  a61fbab411d08e5d7a1cbf5e9a9c711b7f2d601f (commit)
       via  f6911c2c1b39de18b136a6cf9566dba3089b33c2 (commit)
       via  0c1b35bbef95a30c78f9ac79f3d4218e1f53ab0b (commit)
       via  500c751e4c2b4903e35f97f65a675bd4dacf5ad6 (commit)
       via  7f1b2e9a8faeafff938efdf9e1f93c68d6a2669a (commit)
       via  4c259d9a05439830f3496166b5c6b92eb0f39de8 (commit)
       via  29c763eb4a438cbaf48ad0a188a01e69b9ecebb8 (commit)
       via  ad6b2213951d8e2b0ec41e7b1aff70a32b75de9f (commit)
       via  9ab5271a6bdd7a2b24f238e6348580bde850f2e4 (commit)
       via  b8c506206be876987bf17c6cacd2c01687b1c35a (commit)
       via  20f1e7eaf6053d52210002720e2b0a0c26e5169e (commit)
       via  2face69c76f5aa42b2204bf89d5194e83fca23c8 (commit)
       via  c190e60459f50d4a93f1a8f14315ea131f1e038a (commit)
       via  79ee8eac7e5731b27375cc7f06cac109f26287ea (commit)
       via  ce02e1cb45e3189e5dbf9f517cc09ab3aaf1934f (commit)
       via  deef76cfbc581937c2327ba9178a9c84b8b1a97c (commit)
       via  10c628c825ca50e7a054606da85947cbeff2f16f (commit)
       via  aefca1ea37be9e98c9ee07be918fa8249212faa8 (commit)
       via  d21013863bd48c838ee6148d30c9be26724411cc (commit)
       via  b411e0383ea297f76feb492ee99d52142491fb23 (commit)
       via  e4960a9fc343876bfa89f6354d4ac8867a949609 (commit)
       via  0b9a7fb2c29104c40978ca4e97b8c1ecd2573d69 (commit)
       via  810f32f306534bf9f16798608e550ef6e0b8025e (commit)
       via  0fa7c220a6f9e0deb220fd3036aa89eb9f2a7599 (commit)
       via  ce5bfc0d76b442619c5c0376a16abdbb09605d92 (commit)
       via  29c142861ce9da3f1cdb8a4c01185842ba3bf2a6 (commit)
       via  75a6e153ef17e810565154a63a6dc48d869a66d3 (commit)
       via  597fa321274909eb32af0c49a540f9fc07f13f7f (commit)
       via  ea12358e131b3528e101720edf896f074197dc1c (commit)
       via  e3d7eac7aa7067e32c0c8de26e66d84f370a7de8 (commit)
       via  8966e4255dc7c507abbd7cb2bbd319e2da070e9a (commit)
       via  36ca0d3ede8554a229d6872b151b7e79ce959ba9 (commit)
       via  c541edf2f95153dc2fc2fdd82182262a2ad30b43 (commit)
       via  fccdb6c00289936de09e3f911e2a5805a7df3281 (commit)
       via  5cf53c5f133040aa21ebfb4e7687e8759cfea636 (commit)
       via  7546b1b3ffb7ef649333c04c58eec6cdb7dd7ddd (commit)
       via  c8471ae15fddf918fd77045491aca20b3371b3d0 (commit)
       via  7e951eab94d0c984779b673d915c2736e730103b (commit)
       via  04eaf6ed0818f876017f59b3e22157a0165ad706 (commit)
       via  fe6783db8366694c5ac0a886eb00fa3f147f7a70 (commit)
       via  f7c6991be9078fffb8b200e83012c33a60ad4c18 (commit)
       via  6562cb9dce40bee18424cab67b76b524f33e8c9a (commit)
       via  037ee894b89df08f855e08b701f20944ec17dcf7 (commit)
       via  30c250473cd62b845acbec8a9af182410d572873 (commit)
       via  4c69fbec263b5eeea23d11ee93fb002d028e2b6f (commit)
       via  c185e2e2eb0a411b40e8d34c5e0bfe31addedcff (commit)
       via  6376dc9ef711e339c10e17349eee4c0fc022899c (commit)
       via  c4afede392e6128009f24ec6eb7f87ef9f3869cb (commit)
       via  c2d962b16eb0a68a880326abfbc04d07db230815 (commit)
       via  37a977fcc8d0fe24b0316d952349d7a7b09625c1 (commit)
       via  11a238896a160b8dba4e185a369cda1fd4a55609 (commit)
       via  d0f8dba42b3a4c1ca3ae66bb4ad79ec78a1d26d5 (commit)
       via  259d69ccefce787f5d2a4f2828ac4b0135432c87 (commit)
       via  36c9bf0c6243b987270b80c3764ad4ade49a0cbc (commit)
       via  d8c504bddb3c5940fc6955ae7107f06736f85022 (commit)
       via  993f62a209b5f9ec12779aed46d25e18e48cbbba (commit)
       via  c68407dea1a6474450bbeccdd52d8305a8bbc75a (commit)
       via  b54435b16c3f6b22d4526d543c276c314143d124 (commit)
      from  91e4be41d77d023a06d53879b974ecf5d3b82d94 (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 3cd8626eda1618b9f2be293fc01c29f3d00973a7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jan 22 17:07:08 2014 -0500

    Zenweb work in progress, adding plugin for liquid so we hopefully don't have to rewrite our pages.

diff --git a/doc/Gemfile b/doc/Gemfile
index ea40d14..ad695f0 100644
--- a/doc/Gemfile
+++ b/doc/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'zenweb'
-gem 'zenweb-textile'
+gem 'liquid'
diff --git a/doc/Gemfile.lock b/doc/Gemfile.lock
index 608a001..5de90b1 100644
--- a/doc/Gemfile.lock
+++ b/doc/Gemfile.lock
@@ -1,28 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
     coderay (1.1.0)
-    kramdown (0.14.2)
+    kramdown (1.3.1)
     less (1.2.21)
       mutter (>= 0.4.2)
       treetop (>= 1.4.2)
+    liquid (2.6.1)
+    makerakeworkwell (1.0.3)
+      rake (>= 0.9.2, < 11)
     mutter (0.5.3)
     polyglot (0.3.3)
+    rake (10.1.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    zenweb (3.0.0.b3)
+    zenweb (3.3.1)
       coderay (~> 1.0)
-      kramdown (~> 0.13)
+      kramdown (~> 1.0)
       less (~> 1.2)
-    zenweb-textile (0.0.1)
-      RedCloth (~> 4.2.9)
-      zenweb (= 3.0.0.b3)
+      makerakeworkwell (~> 1.0)
+      rake (>= 0.9, < 11)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  liquid
   zenweb
-  zenweb-textile
diff --git a/doc/Rakefile b/doc/Rakefile
index 12f87b1..65d2855 100644
--- a/doc/Rakefile
+++ b/doc/Rakefile
@@ -3,4 +3,5 @@
 require "rubygems"
 require "zenweb/tasks"
 load "zenweb-textile.rb"
+load "zenweb-liquid.rb"
 
diff --git a/doc/_config.yml b/doc/_config.yml
index b3a6eea..cd13810 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -1,6 +1,7 @@
 exclude: ["Rakefile", "tmp"]
 baseurl: /doc
 arvados_api_host: qr1hi.arvadosapi.com
+layout: default
 navbar:
   userguide:
     - Getting Started
diff --git a/doc/install/index.md b/doc/install/index.md
index 210c47a..39b3d97 100644
--- a/doc/install/index.md
+++ b/doc/install/index.md
@@ -3,7 +3,7 @@ layout: default
 navsection: installguide
 title: Overview
 navorder: 0
----
+...
 
 {% include alert-stub.html %}
 
diff --git a/doc/install/install-api-server.md b/doc/install/install-api-server.md
index dbae3da..c959e1b 100644
--- a/doc/install/install-api-server.md
+++ b/doc/install/install-api-server.md
@@ -3,7 +3,7 @@ layout: default
 navsection: installguide
 title: Install the API server
 navorder: 1
----
+...
 
 {% include alert-stub.html %}
 
diff --git a/doc/install/install-workbench-app.md b/doc/install/install-workbench-app.md
index 6c63598..c598785 100644
--- a/doc/install/install-workbench-app.md
+++ b/doc/install/install-workbench-app.md
@@ -3,7 +3,7 @@ layout: default
 navsection: installguide
 title: Install the Arvados workbench application
 navorder: 2
----
+...
 
 {% include alert-stub.html %}
 
diff --git a/doc/sdk/index.textile b/doc/sdk/index.textile
index 4224b59..ee001d9 100644
--- a/doc/sdk/index.textile
+++ b/doc/sdk/index.textile
@@ -3,7 +3,7 @@ layout: default
 navsection: sdk
 title: "SDK Reference"
 navorder: 0
----
+...
 
 h1. Arvados SDK Reference
 
diff --git a/doc/sdk/python/python.textile b/doc/sdk/python/python.textile
index 4d6900b..4483cd9 100644
--- a/doc/sdk/python/python.textile
+++ b/doc/sdk/python/python.textile
@@ -5,6 +5,6 @@ navmenu: Python
 title: "PyDoc Reference"
 navorder: 30
 no_nav_left: true
----
+...
 
 notextile. <iframe src="arvados/" style="width:100%; height:100%; border:none" />
diff --git a/doc/user/getting_started/community.textile b/doc/user/getting_started/community.textile
index 9a2aeca..7c63038 100644
--- a/doc/user/getting_started/community.textile
+++ b/doc/user/getting_started/community.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Getting Started
 title: Arvados Community and Getting Help
 navorder: 11
----
+...
 h1. Arvados Community and Getting Help
 
 
diff --git a/doc/user/tutorials/running-external-program.textile b/doc/user/tutorials/running-external-program.textile
index f23fae8..a1a7873 100644
--- a/doc/user/tutorials/running-external-program.textile
+++ b/doc/user/tutorials/running-external-program.textile
@@ -4,7 +4,7 @@ navsection: userguide
 navmenu: Tutorials
 title: "Running external programs"
 navorder: 18
----
+...
 
 h1. Running external programs
 
diff --git a/doc/zenweb-liquid.rb b/doc/zenweb-liquid.rb
new file mode 100644
index 0000000..f301aa4
--- /dev/null
+++ b/doc/zenweb-liquid.rb
@@ -0,0 +1,22 @@
+require 'zenweb'
+
+module ZenwebLiquid
+  VERSION = '0.0.1'
+end
+
+module Zenweb
+  class Page
+    
+    ##
+    # Render a page's liquid and return the intermediate result
+    def render_liquid page, content, binding = TOPLEVEL_BINDING
+      require 'liquid'
+      
+      unless defined? @liquid_template then
+        @liquid_template = Liquid::Template.parse(content).render()
+      end
+      
+      @liquid_template.render(binding)
+    end
+  end
+end

commit 3dc2b0008be4e09b47f73aeeb97d005cd7836619
Merge: 91e4be4 2c71507
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jan 22 11:37:45 2014 -0500

    Merge remote-tracking branch 'origin' into 1786-replace-jekyll-with-zenweb

diff --cc doc/_config.yml
index 108ec24,274ae9b..b3a6eea
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@@ -11,3 -10,5 +11,5 @@@ navbar
      - Concepts
      - API Methods
      - Schema
+   sdk:
 -    - Python
++    - Python
diff --cc doc/sdk/python/crunch-utility-libraries.textile
index 679138d,95a3780..c0b54fa
--- a/doc/sdk/python/crunch-utility-libraries.textile
+++ b/doc/sdk/python/crunch-utility-libraries.textile
@@@ -1,10 -1,10 +1,10 @@@
  ---
  layout: default
- navsection: userguide
- navmenu: Reference
+ navsection: sdk
+ navmenu: Python
  title: "Crunch utility libraries"
- navorder: 31
+ navorder: 20
 ----
 +...
  
  h1. Crunch utility libraries
  
diff --cc doc/sdk/python/sdk-python.textile
index d9b1e5d,81a61f0..2e9660e
--- a/doc/sdk/python/sdk-python.textile
+++ b/doc/sdk/python/sdk-python.textile
@@@ -1,12 -1,12 +1,12 @@@
  ---
  layout: default
- navsection: userguide
- navmenu: Reference
+ navsection: sdk
+ navmenu: Python
  title: "Python SDK"
- navorder: 23
+ navorder: 10
 ----
 +...
  
- h1. Reference: Python SDK
+ h1. Python SDK
  
  The Python SDK provides a generic set of wrappers so you can make API calls easily. It performs some validation before connecting to the API server: for example, it refuses to do an API call if a required parameter is missing.
  
diff --cc doc/user/reference/sdk-cli.textile
index fd8e86d,058f1b3..5a7753c
--- a/doc/user/reference/sdk-cli.textile
+++ b/doc/user/reference/sdk-cli.textile
@@@ -2,11 -2,11 +2,11 @@@
  layout: default
  navsection: userguide
  navmenu: Reference
- title: "Command line SDK"
+ title: "Command line interface"
  navorder: 22
 ----
 +...
  
- h1. Reference: Command line SDK
+ h1. Reference: Command Line Interface
  
  If you are logged in to an Arvados VM, the command line SDK should be installed. Try:
  
diff --cc doc/user/tutorials/tutorial-firstscript.textile
index b03aaa3,b582eef..daa71fa
--- a/doc/user/tutorials/tutorial-firstscript.textile
+++ b/doc/user/tutorials/tutorial-firstscript.textile
@@@ -4,9 -4,9 +4,9 @@@ navsection: userguid
  navmenu: Tutorials
  title: "Writing a Crunch script"
  navorder: 13
 ----
 +...
  
- h1. Tutorial: Writing a Crunch script
+ h1. Writing a Crunch script
  
  In this tutorial, we will write the "hash" script demonstrated in the first tutorial.
  
diff --cc doc/user/tutorials/tutorial-gatk-variantfiltration.textile
index 5e985c8,779761a..1748565
--- a/doc/user/tutorials/tutorial-gatk-variantfiltration.textile
+++ b/doc/user/tutorials/tutorial-gatk-variantfiltration.textile
@@@ -4,9 -4,9 +4,9 @@@ navsection: userguid
  navmenu: Tutorials
  title: "Using GATK with Arvados"
  navorder: 16
 ----
 +...
  
- h1. Tutorial: Using GATK with Arvados
+ h1. Using GATK with Arvados
  
  This tutorials demonstrates how to use the Genome Analysis Toolkit (GATK) with Arvados. In this example we will install GATK and then create a VariantFiltration job to assign pass/fail scores to variants in a VCF file.
  
diff --cc doc/user/tutorials/tutorial-job-debug.textile
index ad01eaa,6be687c..570713b
--- a/doc/user/tutorials/tutorial-job-debug.textile
+++ b/doc/user/tutorials/tutorial-job-debug.textile
@@@ -4,9 -4,9 +4,9 @@@ navsection: userguid
  navmenu: Tutorials
  title: "Debugging a Crunch script"
  navorder: 14
 ----
 +...
  
- h1. Tutorial: Debugging a Crunch script
+ h1. Debugging a Crunch script
  
  To test changes to a script by running a job, the change must be pushed into @git@, the job queued asynchronously, and the actual execution may be run on any compute server.  As a result, debugging a script can be difficult and time consuming.  This tutorial demonstrates using @arv-crunch-job@ to run your job in your local VM.  This avoids the job queue and allows you to execute the script from your uncomitted git tree.
  
diff --cc doc/user/tutorials/tutorial-job1.textile
index f920019,53d2342..be159db
--- a/doc/user/tutorials/tutorial-job1.textile
+++ b/doc/user/tutorials/tutorial-job1.textile
@@@ -4,9 -4,9 +4,9 @@@ navsection: userguid
  navmenu: Tutorials
  title: "Running a Crunch job"
  navorder: 12
 ----
 +...
  
- h1. Tutorial: Running a crunch job
+ h1. Running a crunch job
  
  This tutorial introduces the concepts and use of the Crunch job system using the @arv@ command line tool and Arvados Workbench.
  
diff --cc doc/user/tutorials/tutorial-keep.textile
index 2220ce1,6683498..eb0f969
--- a/doc/user/tutorials/tutorial-keep.textile
+++ b/doc/user/tutorials/tutorial-keep.textile
@@@ -4,9 -4,9 +4,9 @@@ navsection: userguid
  navmenu: Tutorials
  title: "Storing and Retrieving data using Arvados Keep"
  navorder: 11
 ----
 +...
  
- h1. Tutorial: Storing and Retrieving data using Arvados Keep
+ h1. Storing and Retrieving data using Arvados Keep
  
  This tutorial introduces you to the Arvados file storage system.
  
diff --cc doc/user/tutorials/tutorial-new-pipeline.textile
index 3eb9796,101d6ac..ee92090
--- a/doc/user/tutorials/tutorial-new-pipeline.textile
+++ b/doc/user/tutorials/tutorial-new-pipeline.textile
@@@ -4,9 -4,9 +4,9 @@@ navsection: userguid
  navmenu: Tutorials
  title: "Constructing a Crunch pipeline"
  navorder: 15
 ----
 +...
  
- h1. Tutorial: Constructing a Crunch pipeline
+ h1. Constructing a Crunch pipeline
  
  A pipeline in Arvados is a collection of crunch scripts, in which the output from one script may be used as the input to another script.
  
diff --cc doc/user/tutorials/tutorial-parallel.textile
index 3f278a7,8a61184..1cad88c
--- a/doc/user/tutorials/tutorial-parallel.textile
+++ b/doc/user/tutorials/tutorial-parallel.textile
@@@ -4,9 -4,9 +4,9 @@@ navsection: userguid
  navmenu: Tutorials
  title: "Parallel Crunch tasks"
  navorder: 15
 ----
 +...
  
- h1. Tutorial: Parallel Crunch tasks
+ h1. Parallel Crunch tasks
  
  In the tutorial "writing a crunch script,":tutorial-firstscript.html our script used a "for" loop to compute the md5 hashes for each file in sequence.  This approach, while simple, is not able to take advantage of the compute cluster with multiple nodes and cores to speed up computation by running tasks in parallel.  This tutorial will demonstrate how to create parallel Crunch tasks.
  
diff --cc doc/user/tutorials/tutorial-trait-search.textile
index 89492d2,d7fe50b..1fcbbc3
--- a/doc/user/tutorials/tutorial-trait-search.textile
+++ b/doc/user/tutorials/tutorial-trait-search.textile
@@@ -4,9 -4,9 +4,9 @@@ navsection: userguid
  navmenu: Tutorials
  title: "Querying the Metadata Database"
  navorder: 16
 ----
 +...
  
- h1. Tutorial: Querying the Metadata Database
+ h1. Querying the Metadata Database
  
  This tutorial introduces the Arvados Metadata Database.  The Metadata Database stores information about files in Keep.  This example will use the Python SDK to find public WGS (Whole Genome Sequencing) data for people who have reported a certain medical condition.
  

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list