patch #44

.Rbuildignore

@@ -19,3 +19,4 @@
 ^Meta$
 ^cran-comments\.md$
 ^CRAN-SUBMISSION$
+^revdep$

.gitignore

@@ -1,9 +1,11 @@
 .Rproj.user
 docs
 inst/doc
-dev/
+dev
+!dev/Makefile
 *.irods
 /doc/
 /Meta/
 NEWS.md
 CRAN-SUBMISSION
+revdep/

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: rirods
 Title: R Client for 'iRODS'
-Version: 0.1.1.9000
+Version: 0.1.2
 Authors@R: c(
     person("Martin", "Schobben", , "schobbenmartin@gmail.com", 
            role = c("aut", "cre", "cph"),

NEWS.md

@@ -1,4 +1,10 @@
-# rirods (development version)
+# rirods 0.1.2
+
+* Adding more documentation as vignettes:
+  + Use iRODS demo
+  + rirods vs iCommands
+  + Accessing data locally and in iRODS
+  + Use iRODS metadata
 
 # rirods 0.1.1
 

R/irods-demo.R

@@ -63,10 +63,13 @@ use_irods_demo <- function(user = character(), pass = character(),
 
   resp_user <- TRUE
   if (length(irods_images) == 0 ||
-      !all(grepl(paste0(irods_images_ref, collapse = "|"), irods_images))) {
+      !all(grepl(paste0(irods_images_ref, collapse = "|"), irods_images))
+      ) {
     message("\nThe iRODS demo Docker containers are not built on this system. \n")
-    resp_user <-
-      utils::askYesNo("Would you like it to be built?", default = FALSE)
+    if (interactive()) {
+      resp_user <-
+        utils::askYesNo("Would you like it to be built?", default = FALSE)
+    }
   }
 
   # launch irods_demo
@@ -151,9 +154,13 @@ remove_docker_images <- function() {
     stop("Docker containers are still running. Stop them with ",
          "`stop_irods_demo()` and proceed", call. = FALSE)
   }
-  system2(
-    system.file(package = "rirods", "shell_scripts", "docker-images-remove.sh"),
-    paste0(irods_images_ref, collapse = ", ")
+  bsh <-
+    system.file(package = "rirods", "shell_scripts", "docker-images-remove.sh")
+  Map(
+    function(x) {
+      system2(bsh, x, stderr = NULL)
+    },
+    irods_images_ref
   )
   invisible()
 }

README.Rmd

@@ -65,7 +65,7 @@ use_irods_demo("alice", "passWORD")
 unlink(rirods:::path_to_irods_conf())
 ```
 
-This will result in the demonstration REST API running at http://localhost/irods-rest/0.9.3 (or later version).
+This will result in the demonstration REST API running at `http://localhost/irods-rest/0.9.3` (or later version).
 
 These Docker containers are designed to easily stand up a **DEMONSTRATION** of the iRODS server. It is intended for education and exploration. (See also `vignette("demo")`.)