Make it portable

ZauchnerP · Oct 19, 2023 · 991f0ff · 991f0ff
1 parent af43fde
commit 991f0ff
Show file tree

Hide file tree

Showing 42 changed files with 116 additions and 1,991 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,15 +1,15 @@
 Package: gmoTree
 Title: Get and Modify oTree Data
-Version: 0.0.3
-Date: 2023-10-09
+Version: 1.0.0
+Date: 2023-10-19
 Authors@R: 
     person("Patricia F.", "Zauchner", , "[email protected]", role = c("aut", "trl", "cre", "cph"),
            comment = c(ORCID = "https://orcid.org/0000-0002-5938-1683"))
 Description: Import, merge, and manage data from oTree experiments.
 License: GPL (>= 3)
 URL: https://zauchnerp.github.io/gmoTree/,
-    https://github.com/ZauchnerP/gmoTree
-BugReports: https://github.com/ZauchnerP/gmoTree/issues
+    https://github.com/ZauchnerP/gmoTree/
+BugReports: https://github.com/ZauchnerP/gmoTree/issues/
 Depends: 
     R (>= 4.3.0)
 Imports: 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# gmoTree 1.0.0
+
+* Makes file names of the examples portable. Changes import_otree() code to import those files as well.
+
 # gmoTree 0.0.3
 
 * Minor improvement of the documentation & website.

diff --git a/R/import_otree.R b/R/import_otree.R
@@ -245,22 +245,30 @@ import_otree <- function(
   # Special all apps wide definer
   app_filedf$app <- stringr::str_remove(app_filedf$app,
                                         "-[0-9]{4}-[0-9]{2}-[0-9]{2}")
+
+  # Remove file name extension
   app_filedf$app <- stringr::str_remove(app_filedf$app,
                                         ".xlsx")
   app_filedf$app <- stringr::str_remove(app_filedf$app,
                                         ".csv")
+
+  # Remove access information for Chats and Time
   app_filedf$app <-
     stringr::str_remove(app_filedf$app,
-                        "\\s*\\(accessed [0-9]{4}-[0-9]{2}-[0-9]{2}\\)")
+                        ".\\(accessed.[0-9]{4}-[0-9]{2}-[0-9]{2}\\)")
+  # Info: The dot is only there to ensure portable file names for the examples!
+  # Was \\s* before
 
+  # Remove final underscore
   app_filedf$app <- stringr::str_remove(app_filedf$app, "_$")
 
   app_filedf$app <- stringr::str_remove(app_filedf$app, "-$")
 
   # Special handling of Time and Chats
   app_filedf$app <- gsub("ChatMessages.*", "Chats", app_filedf$app)
   app_filedf$app <- gsub("PageTimes.*", "Time", app_filedf$app)
-  app_filedf$app <- gsub("Chat messages.*", "Chats", app_filedf$app)
+  app_filedf$app <- gsub("Chat.messages.*", "Chats", app_filedf$app) 
+  # Info: The dot is only there to ensure portable file names for the examples!
   app_filedf$app <- gsub("TimeSpent.*", "Time", app_filedf$app)
 
   # Sort app-names

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
   [![R-CMD-check](https://github.com/ZauchnerP/gmoTree/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/ZauchnerP/gmoTree/actions/workflows/R-CMD-check.yaml)
   <!-- badges: end -->
 
-gmoTree is an R package developed for importing, merging, and efficiently managing data obtained from running oTree (https://www.otree.org/) experiments. It's particularly valuable when dealing with complex experimental designs that span multiple sessions and generate a large number of files that need to be integrated.
+gmoTree is an R package developed for importing, merging, and efficiently managing data obtained from running <a href="https://www.otree.org/" target="_blank">oTree</a> experiments. It's particularly valuable when dealing with complex experimental designs that span multiple sessions and generate a large number of files that need to be integrated.
 
 gmoTree is not an official package of the oTree team, but it was created to complement the open-source platform.
 

diff --git a/build/vignette.rds b/build/vignette.rds
diff --git a/cran-comments.md b/cran-comments.md
@@ -1,3 +1,48 @@
+# Version 1.0.0 (Resubmission)
+
+[x] Portable file names warning is now circumvented.
+
+Now, there are no ERRORs or WARNINGs. But there are some notes.
+
+
+## Notes 
+
+```
+Notes:
+
+* checking CRAN incoming feasibility ... [6s/16s] NOTE
+Maintainer: anonymized
+
+New submission
+
+Possibly misspelled words in DESCRIPTION:
+  oTree (2:23, 8:50)
+  
+```
+[x] oTree is not misspelled.
+
+[x] The feasibility-note can be ignored according to https://mailman.stat.ethz.ch/pipermail/r-devel/2014-March/068497.html.
+
+```
+* checking for detritus in the temp directory ... NOTE
+Found the following files/directories:
+  'lastMiKTeXException'
+```
+[x] Can be ignored according to https://github.com/r-hub/rhub/issues/503. 
+
+```
+* checking for non-standard things in the check directory ... NOTE
+Found the following files/directories:
+  ''NULL''
+```
+[x] Can be ignored according to https://github.com/r-hub/rhub/issues/560.
+
+```
+* checking HTML version of manual ... NOTE
+Skipping checking HTML validation: no command 'tidy' found
+```
+[x] A bug in rhub? https://github.com/r-hub/rhub/issues/548
+
 # Version 0.0.1 
 
 ```
@@ -12,4 +57,4 @@
 ```
 
 This warning is not circumventable since my package is intended to import
-data that may have this pattern (i.e., may include whitespaces).
+data that may have this pattern (i.e., may include whitespaces).
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/intro_to_gmoTree.html b/docs/articles/intro_to_gmoTree.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/impressum.html b/docs/impressum.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,7 +3,7 @@ pkgdown: 2.0.7
 pkgdown_sha: ~
 articles:
   intro_to_gmoTree: intro_to_gmoTree.html
-last_built: 2023-10-09T15:25Z
+last_built: 2023-10-19T13:03Z
 urls:
   reference: https://zauchnerp.github.io/gmoTree/reference
   article: https://zauchnerp.github.io/gmoTree/articles

diff --git a/docs/reference/apptime.html b/docs/reference/apptime.html
diff --git a/docs/reference/assignv.html b/docs/reference/assignv.html
diff --git a/docs/reference/assignv_to_aaw.html b/docs/reference/assignv_to_aaw.html
diff --git a/docs/reference/delete_cases.html b/docs/reference/delete_cases.html
diff --git a/docs/reference/delete_dropouts.html b/docs/reference/delete_dropouts.html
diff --git a/docs/reference/delete_duplicate.html b/docs/reference/delete_duplicate.html
diff --git a/docs/reference/delete_plabels.html b/docs/reference/delete_plabels.html
diff --git a/docs/reference/delete_sessions.html b/docs/reference/delete_sessions.html
diff --git a/docs/reference/extime.html b/docs/reference/extime.html
diff --git a/docs/reference/import_otree.html b/docs/reference/import_otree.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/make_ids.html b/docs/reference/make_ids.html
diff --git a/docs/reference/messy_chat.html b/docs/reference/messy_chat.html