[ARVADOS] updated: 1.1.2-42-g082df78

[Git user]

Summary of changes:
 sdk/R/R/HttpRequest.R |  2 +-
 sdk/R/README          | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 12 deletions(-)

       via  082df78ff6abc6ecb5fb817649111e7e6ef967a2 (commit)
       via  7c8c1719232d0a5b96e6cbfa46c94faeee65cf05 (commit)
      from  693b1f491499c33d82c3950aaa8f0b754a50c219 (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 082df78ff6abc6ecb5fb817649111e7e6ef967a2
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Wed Dec 20 21:50:15 2017 -0500

    Expand the README a bit, fix some syntax errors, add instructions for
    building/installing from source.
    
    refs #11876
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/sdk/R/README b/sdk/R/README
index 560be87..697a3cd 100644
--- a/sdk/R/README
+++ b/sdk/R/README
@@ -1,6 +1,28 @@
 R SDK for Arvados
 
-Examples of usage:
+Installation from source
+
+1. Dependencies
+
+libxml2-dev, libssl-dev, curl
+
+2. Build the ArvadosR package tarball
+
+cd arvados/sdk
+R CMD build R
+
+That will create a tarball of the Arvados package in the current directory.
+
+3. Install the R package and its dependencies
+
+Then start R. Assuming the generated tarball is named `ArvadosR_0.0.1.tar.gz`,
+install it like this:
+
+> install.packages(c('R6', 'httr', 'stringr', 'jsonlite', 'curl', 'XML'))
+> install.packages('./ArvadosR_0.0.1.tar.gz', repos = NULL, type="source", dependencies = TRUE)
+> library('ArvadosR')
+
+4. Examples of usage:
 
 --------------------------------------------------------------------------------------------------------------------------------
 
@@ -17,8 +39,7 @@ arv$getCollection("uuid")
 --------------------------------------------------------------------------------------------------------------------------------
 
 #List collections:
-
-collectionList <- arv$listCollections(list("uuid", "=" "aaaaa-bbbbb-ccccccccccccccc"), limit = 10, offset = 2)
+collectionList <- arv$listCollections(list(list("uuid", "=", "aaaaa-4zz18-ccccccccccccccc")), limit = 10, offset = 2)
 
 --------------------------------------------------------------------------------------------------------------------------------
 
@@ -30,13 +51,13 @@ deletedCollection <- arv$deleteCollection("uuid")
 
 #Update collection:
 
-updatedCollection <- arv$updateCollection("uuid", list((name = "new_name", description = "new_desciption")))
+updatedCollection <- arv$updateCollection("uuid", list(list(name = "new_name", description = "new_desciption")))
 
 --------------------------------------------------------------------------------------------------------------------------------
 
 #Create collection:
 
-cratedCollection <- arv$createCollection(list(list(name = "new_name", description = "new_desciption")))
+createdCollection <- arv$createCollection(list(list(name = "new_name", description = "new_desciption")))
 
 --------------------------------------------------------------------------------------------------------------------------------
 
@@ -50,7 +71,6 @@ cratedCollection <- arv$createCollection(list(list(name = "new_name", descriptio
 
 #Create collection object:
 
-arv <- Arvados$new("insert_token", "insert_host_name")
 collection <- Collection$new(arv, "uuid")
 
 --------------------------------------------------------------------------------------------------------------------------------
@@ -148,7 +168,7 @@ file$move("destination/file.cpp")
 
 subcollection <- collection$get("location/to/folder")
 
-file$move("destination/folder")
+subcollection$move("destination/folder")
 
 #Make sure to include folder name in destination
 #For example
@@ -167,8 +187,7 @@ arv$getProject("uuid")
 --------------------------------------------------------------------------------------------------------------------------------
 
 #List projects:
-
-projects <- arv$listProjects(list("uuid", "=" "aaaaa-bbbbb-ccccccccccccccc"), limit = 10, offset = 2)
+projects <- arv$listProjects(list(list("uuid", "=", "aaaaa-j7d0g-ccccccccccccccc")), limit = 10, offset = 2)
 
 --------------------------------------------------------------------------------------------------------------------------------
 
@@ -180,12 +199,12 @@ deletedProject <- arv$deleteProject("uuid")
 
 #Update project:
 
-updatedProject <- arv$updateProject("uuid", list((name = "new_name", description = "new_desciption")))
+updatedProject <- arv$updateProject("uuid", list(list(name = "new_name", description = "new_desciption")))
 
 --------------------------------------------------------------------------------------------------------------------------------
 
 #Create project:
 
-cratedProject <- arv$createProject(list(list(name = "project_name", description = "project_desciption")))
+createdProject <- arv$createProject(list(list(name = "project_name", description = "project_desciption")))
 
 --------------------------------------------------------------------------------------------------------------------------------

commit 7c8c1719232d0a5b96e6cbfa46c94faeee65cf05
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Wed Dec 20 21:22:37 2017 -0500

    Fix typo
    
    refs #11876
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/sdk/R/R/HttpRequest.R b/sdk/R/R/HttpRequest.R
index 7a399a4..82d3a21 100644
--- a/sdk/R/R/HttpRequest.R
+++ b/sdk/R/R/HttpRequest.R
@@ -79,7 +79,7 @@ HttpRequest <- R6::R6Class(
                 filters <- sapply(filters, function(filter)
                 {
                     if(length(filter) != 3)
-                        stop("Filter list must have exacthey 3 elements.")
+                        stop("Filter list must have exactly 3 elements.")
 
                     attributeAndOperator = filter[c(1, 2)]
                     filterList = filter[[3]]

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


hooks/post-receive
--