[ARVADOS] updated: 1.1.2-211-g0488e81

[Git user]

Summary of changes:
 sdk/R/R/Collection.R                              | 6 +++++-
 sdk/R/R/CollectionTree.R                          | 5 +++++
 sdk/R/R/Subcollection.R                           | 2 +-
 sdk/cwl/tests/arvados-tests.sh                    | 3 +++
 sdk/cwl/tests/{secondary/dir => hg19}/hg19.fa     | 0
 sdk/cwl/tests/{secondary/dir => hg19}/hg19.fa.amb | 0
 sdk/cwl/tests/{secondary/dir => hg19}/hg19.fa.ann | 0
 sdk/cwl/tests/{secondary/dir => hg19}/hg19.fa.fai | 0
 8 files changed, 14 insertions(+), 2 deletions(-)
 copy sdk/cwl/tests/{secondary/dir => hg19}/hg19.fa (100%)
 copy sdk/cwl/tests/{secondary/dir => hg19}/hg19.fa.amb (100%)
 copy sdk/cwl/tests/{secondary/dir => hg19}/hg19.fa.ann (100%)
 copy sdk/cwl/tests/{secondary/dir => hg19}/hg19.fa.fai (100%)

       via  0488e81c85948faa6a14ca437d9e594d91bcbbd8 (commit)
       via  14b4a1acc30cf4c84135ec7580d228ad1aacca17 (commit)
       via  8137793fcd26eed30004f62a0c9ed0f839a9bd5e (commit)
      from  59eb2058e7111581645c960ba868f49f0fed152b (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 0488e81c85948faa6a14ca437d9e594d91bcbbd8
Merge: 14b4a1a 8137793
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Fri Jan 26 16:00:59 2018 +0100

    Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>


commit 14b4a1acc30cf4c84135ec7580d228ad1aacca17
Author: Fuad Muhic <fmuhic at capeannenterprises.com>
Date:   Fri Jan 26 15:59:47 2018 +0100

    getFileListing now returns sorted list
    
    Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic at capeannenterprises.com>

diff --git a/sdk/R/R/Collection.R b/sdk/R/R/Collection.R
index 203aaff..8d49cd0 100644
--- a/sdk/R/R/Collection.R
+++ b/sdk/R/R/Collection.R
@@ -142,7 +142,11 @@ Collection <- R6::R6Class(
             elementToMove$move(newLocation)
         },
 
-        getFileListing = function() private$REST$getCollectionContent(self$uuid),
+        getFileListing = function()
+        {
+            content <- private$REST$getCollectionContent(self$uuid)
+            content[order(tolower(content))]
+        },
 
         get = function(relativePath)
         {
diff --git a/sdk/R/R/CollectionTree.R b/sdk/R/R/CollectionTree.R
index 40cedef..fcc5dbe 100644
--- a/sdk/R/R/CollectionTree.R
+++ b/sdk/R/R/CollectionTree.R
@@ -96,6 +96,11 @@ CollectionTree <- R6::R6Class(
             }
             else
             {
+                # Note: REST always returns folder name alone before other folder content
+                # (for some reason), so in first iteration we don't know if it's a file
+                # or folder since its just a name, so we assume it's a file. 
+                # If we encounter that same name again we know 
+                # it's a folder so we need to replace ArvadosFile with Subcollection.
                 if("ArvadosFile" %in% class(child))
                 {
                     child = private$replaceFileWithSubcollection(child)
diff --git a/sdk/R/R/Subcollection.R b/sdk/R/R/Subcollection.R
index c42e7e5..a1f83f5 100644
--- a/sdk/R/R/Subcollection.R
+++ b/sdk/R/R/Subcollection.R
@@ -117,7 +117,7 @@ Subcollection <- R6::R6Class(
                     content <- c(content, child$getName())
             }
 
-            content
+            content[order(tolower(content))]
         },
 
         getSizeInBytes = function()

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


hooks/post-receive
--