updating documentation, DESCRIPTION, etc

.Rbuildignore

@@ -1,3 +1,6 @@
+^CRAN-RELEASE$
+^Meta$
+^doc$
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^README\.Rmd$

.gitignore

@@ -1,3 +1,5 @@
+Meta
+doc
 .Rproj.user
 .Rhistory
 .RData

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: bioset
 Type: Package
 Title: Convert a Matrix of Raw Values into Nice and Tidy Data
-Version: 0.2.2
+Version: 0.2.3
 Authors@R: person("Eike Christian", "Kühn",
  email = "[email protected]",
  role = c("aut", "cre"))

NEWS.md

@@ -1,3 +1,8 @@
+# bioset 0.2.3
+
+ * `set_read`: check `additional_vars` for column names that might get overwritten
+ * `canonicalise_units`: fix unit conversion for % w / v (will throw warning)
+
 # bioset 0.2.2
 
  * adapt code to changes coming dplyr 0.7.5 (thanks to krlmlr)

R/set.R

@@ -121,10 +121,12 @@ set_read <- function(
  is.character(additional_sep)
  )
 
- # check additional_vars for column names that will get overwritten
- for (i in 1 : length(additional_vars)) {
- if (additional_vars[[i]] %in% c("name", "real", "recovery", "conc", "value")) {
- warning("\"", paste0(additional_vars[[i]], "\" may not be used as column name"))
+ if (length(additional_vars) > 0) {
+ # check additional_vars for column names that will get overwritten
+ for (i in 1 : length(additional_vars)) {
+ if (additional_vars[[i]] %in% c("name", "real", "recovery", "conc", "value")) {
+ warning("\"", paste0(additional_vars[[i]], "\" may not be used as column name"))
+ }
  }
  }
 

cran-comments.md

@@ -1,8 +1,8 @@
 ## Test environments
 
- * local ubuntu 17.04 install, R 3.4.2
- * r-hub x86_64-pc-linux-gnu 64-bit (devel: 2018-04-14 r74601)
- * win-builder (devel: 2018-04-16 r74611)
+ * local ubuntu 17.04 install, R 3.5.1
+ * r-hub x86_64-pc-linux-gnu 64-bit, R devel: 2018-11-10 r75583
+ * win-builder, R 3.5.1
 
 ## R CMD check results