Merge branch 'devel'

jasenfinch · Feb 13, 2023 · c79a4de · c79a4de
2 parents dcf5f12 + 3aea686
commit c79a4de
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: grover
 Title: Web API Framework for Mass Spectrometry Data Transfer
-Version: 1.1.1
+Version: 1.1.2
 Authors@R: 
     person(given = "Jasen",
            family = "Finch",

diff --git a/NAMESPACE b/NAMESPACE
@@ -43,6 +43,7 @@ importFrom(crayon,blue)
 importFrom(crayon,bold)
 importFrom(crayon,red)
 importFrom(crayon,yellow)
+importFrom(dplyr,arrange)
 importFrom(dplyr,bind_rows)
 importFrom(dplyr,filter)
 importFrom(dplyr,mutate)
@@ -82,6 +83,7 @@ importFrom(plumber,serializer_content_type)
 importFrom(progress,progress_bar)
 importFrom(purrr,map)
 importFrom(purrr,map_chr)
+importFrom(purrr,map_dfr)
 importFrom(purrr,map_lgl)
 importFrom(purrr,walk)
 importFrom(rawrr,readFileHeader)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# grover 1.1.2
+
+* Ensure that the run information tibble returned by [`grover::runInfo`](https://jasenfinch.github.io/grover/reference/info.html) is ordered by .RAW file name.
+
 # grover 1.1.1
 
 * Ensure that [`grover::convertDirectory`](https://jasenfinch.github.io/grover/reference/convert.html) returns the file paths of the converted .mzML files for all the of the raw files in the specified directory.

diff --git a/R/client-info.R b/R/client-info.R
@@ -57,8 +57,8 @@ setMethod('sampleInfo',signature = 'GroverClient',
           })
 
 #' @rdname info
-#' @importFrom dplyr bind_rows rename
-#' @importFrom purrr map
+#' @importFrom dplyr bind_rows rename arrange
+#' @importFrom purrr map map_dfr
 #' @importFrom httr timeout
 #' @export
 
@@ -87,14 +87,15 @@ setMethod('runInfo',signature = 'GroverClient',
             pb$tick(0)
 
             run_info <- files %>% 
-              purrr::map_dfr(~{
+              map_dfr(~{
                 suppressMessages({
                   sample_info <- sampleInfo(
                     grover_client = grover_client,
                     instrument = instrument,
                     directory = directory,
                     file = .x)
-                })
+                }) %>% 
+                  arrange(`RAW file`)
 
                 pb$tick()