[ARVADOS] updated: cdf7b162906cb37d4ecf88ff6c72433bcdd8fc84

git at public.curoverse.com git at public.curoverse.com
Wed May 7 12:11:40 EDT 2014


Summary of changes:
 apps/workbench/test/test_helper.rb                 |   20 +-
 doc/_config.yml                                    |    3 +-
 doc/api/methods.html.textile.liquid                |   39 ++-
 doc/api/methods/logs.html.textile.liquid           |   22 +-
 doc/api/schema/Job.html.textile.liquid             |    1 +
 doc/install/index.html.md.liquid                   |   18 -
 doc/install/index.html.textile.liquid              |   18 +
 doc/install/install-api-server.html.textile.liquid |    5 +-
 .../install-crunch-dispatch.html.textile.liquid    |   44 +-
 doc/install/install-sso.html.textile.liquid        |    3 +-
 .../install-workbench-app.html.textile.liquid      |   30 +-
 doc/sdk/perl/index.html.textile.liquid             |    2 +-
 doc/sdk/python/sdk-python.html.textile.liquid      |   10 +-
 docker/build_tools/Makefile                        |   10 +
 docker/jobs/Dockerfile                             |   20 +
 sdk/cli/bin/crunch-job                             |   49 ++-
 sdk/java/ArvadosSDKJavaExampleWithPrompt.java      |    4 +
 .../main/java/org/arvados/sdk/java/Arvados.java    |    8 +-
 sdk/python/.gitignore                              |    1 -
 sdk/python/arvados/events.py                       |   33 ++
 sdk/python/arvados/fuse.py                         |  317 -----------
 sdk/python/arvados/fuse/__init__.py                |  585 ++++++++++++++++++++
 sdk/python/bin/arv-mount                           |   51 ++-
 sdk/python/build.sh                                |   16 -
 sdk/python/requirements.txt                        |    3 +
 sdk/python/run_test_server.py                      |   86 +++
 sdk/python/{setup.py.src => setup.py}              |    9 +-
 sdk/python/setup.py.src                            |    8 +-
 sdk/python/setup_fuse.py                           |   21 +
 sdk/python/setup_header.py                         |   11 +
 sdk/python/test_mount.py                           |  246 +++++++--
 sdk/python/test_websockets.py                      |   32 ++
 .../controllers/arvados/v1/schema_controller.rb    |    4 +-
 services/api/lib/record_filters.rb                 |   13 +-
 services/api/script/import_commits.rb              |    9 -
 .../functional/arvados/v1/jobs_controller_test.rb  |   34 ++
 36 files changed, 1275 insertions(+), 510 deletions(-)
 delete mode 100644 doc/install/index.html.md.liquid
 create mode 100644 doc/install/index.html.textile.liquid
 create mode 100644 docker/jobs/Dockerfile
 create mode 100644 sdk/python/arvados/events.py
 delete mode 100644 sdk/python/arvados/fuse.py
 create mode 100644 sdk/python/arvados/fuse/__init__.py
 delete mode 100755 sdk/python/build.sh
 create mode 100644 sdk/python/run_test_server.py
 copy sdk/python/{setup.py.src => setup.py} (82%)
 create mode 100644 sdk/python/setup_fuse.py
 create mode 100644 sdk/python/setup_header.py
 create mode 100644 sdk/python/test_websockets.py
 delete mode 100755 services/api/script/import_commits.rb

       via  cdf7b162906cb37d4ecf88ff6c72433bcdd8fc84 (commit)
       via  722862465129f1f30cbb2432132140883d31b4ca (commit)
       via  27fa0d391eb95008acf41ba207bc13b8c4fe794c (commit)
       via  2de827e57ae9ba1b0d322199d071ae900a5b7e0c (commit)
       via  d9aa5decc6edce30285df049277de2cf2c138c26 (commit)
       via  222ce386e36b3d146e718a5d2f64a95fb30996bb (commit)
       via  26d69329e87e343b84a132a4754068aca66ad132 (commit)
       via  036a701b45399e0114eed5b0e1ce6b478c614534 (commit)
       via  b4516edf0a7cd1b584442953a8c965fc65104906 (commit)
       via  8fcba3783d9a79bb18a00d339f9b3222f1eccd7f (commit)
       via  71143e41dbc8755d5ccb97990525bbb05aad69e9 (commit)
       via  31c711afc4ff8a1728aeb3e5f405a131047671c9 (commit)
       via  5b252752cdfd8b129d10913f7e2ec7b47f544ead (commit)
       via  45938e41f983ce41d8b55c3f980b7f31bc269124 (commit)
       via  f91c73aba940adf1e9fbd530d102931af45a63c5 (commit)
       via  a04d67ef0823d6c87e8515cfe6cf88793ef5e3bb (commit)
       via  df2ce01533175ff7190a5d13fdca4b61f22befd3 (commit)
       via  f493dd4dfab89c228fab05e2b46851211c7fc586 (commit)
       via  facf07110e28fe552342fbad623d621b43e22b99 (commit)
       via  6f3853aef989e8c2243159bbf0ea352948ae4878 (commit)
       via  a2104e385abe47470dd42836a66360bf62afa57b (commit)
       via  e6aa5b48be1209d74c4c69be3eeca549f02418f3 (commit)
       via  2e524eb008f8b70ca1263ccde460365109c66a90 (commit)
       via  b5f193aa657134822d4df67cabc25c631926395b (commit)
       via  ff1e29f702d4f3036f5af014ad6e423b886ed0bb (commit)
       via  66f1ae7a9be590461592199c6d3646dbc4eba786 (commit)
       via  4bd14ccfa216fe1d115772508ac7d7c64ec59a48 (commit)
       via  cbf0429a8a5edd2f8a8d9b01ce39334e07e56bf8 (commit)
       via  121fb6bdcdf3731903ce3d21c0a284c20e6a6fca (commit)
       via  6abcf1f6bdb82b176a9fbb48b6c7cefa64970a9d (commit)
       via  2b03b05de753509c026b4c67857cd49a11f44dcf (commit)
       via  603bccd66ac868c2accf9dff9c3ca6b7feeed962 (commit)
       via  1f763a5b1ad5c65a3265b4284958ecc0fe336f50 (commit)
       via  9143c3ec039d6c89512055f70c2fcc6e1065f1d7 (commit)
       via  a8918e636507200148758302dc6b9a081dc2f206 (commit)
      from  f7f61eca36d66a723b02ac34db888f5fbdc63fc8 (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 cdf7b162906cb37d4ecf88ff6c72433bcdd8fc84
Merge: 7228624 2de827e
Author: radhika <radhika at curoverse.com>
Date:   Wed May 7 12:11:22 2014 -0400

    Merge branch 'master' into 2525-java-sdk


commit 722862465129f1f30cbb2432132140883d31b4ca
Author: radhika <radhika at curoverse.com>
Date:   Wed May 7 12:10:47 2014 -0400

    2525: prompt example

diff --git a/sdk/java/ArvadosSDKJavaExampleWithPrompt.java b/sdk/java/ArvadosSDKJavaExampleWithPrompt.java
index dc10fec..93ba3aa 100644
--- a/sdk/java/ArvadosSDKJavaExampleWithPrompt.java
+++ b/sdk/java/ArvadosSDKJavaExampleWithPrompt.java
@@ -34,6 +34,7 @@ public class ArvadosSDKJavaExampleWithPrompt {
 
     System.out.print("Welcome to Arvados Java SDK.");
     System.out.println("\nYou can use this example to call API methods interactively.");
+    System.out.println("\nPlease refer to http://doc.arvados.org/api/index.html for api documentation");
     System.out.println("\nTo make the calls, enter input data at the prompt.");
     System.out.println("When entering parameters, you may enter a simple string or a well-formed json.");
     System.out.println("For example to get a user you may enter:  user, zzzzz-12345-67890");

commit 27fa0d391eb95008acf41ba207bc13b8c4fe794c
Author: radhika <radhika at curoverse.com>
Date:   Wed May 7 12:09:07 2014 -0400

    2525: list resources, methods, and parameters in prompt example to improve user experience.

diff --git a/sdk/java/ArvadosSDKJavaExampleWithPrompt.java b/sdk/java/ArvadosSDKJavaExampleWithPrompt.java
index 64a7760..dc10fec 100644
--- a/sdk/java/ArvadosSDKJavaExampleWithPrompt.java
+++ b/sdk/java/ArvadosSDKJavaExampleWithPrompt.java
@@ -68,6 +68,9 @@ public class ArvadosSDKJavaExampleWithPrompt {
 
         // read method parameters
         System.out.println("\nEnter parameter name, value (for example uuid, uuid-value)");
+        System.out.println("\nAvailable parameters are: " + 
+              arv.getAvailableParametersForMethod(resourceName, methodName));
+        
         System.out.print("\n>>> ");
         Map paramsMap = new HashMap();
         String param = "";
diff --git a/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java b/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
index 298ee77..a81c3cf 100644
--- a/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
+++ b/sdk/java/src/main/java/org/arvados/sdk/java/Arvados.java
@@ -170,7 +170,13 @@ public class Arvados {
     Map<String, RestMethod> methodMap = getMatchingMethodMap (resourceName);
     return (methodMap.keySet());
   }
-  
+
+  public Set<String> getAvailableParametersForMethod(String resourceName, String methodName)
+      throws Exception {
+    RestMethod method = getMatchingMethod(resourceName, methodName);
+    return (method.getParameters().keySet());
+  }
+
   private HashMap<String, Object> loadParameters(Map<String, Object> paramsMap,
       RestMethod method) throws Exception {
     HashMap<String, Object> parameters = Maps.newHashMap();

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list