3 files changed, 13 insertions(+), 5 deletions(-)

M ChangeLog
M DESCRIPTION
M R/functions.R

@@ 1,6 1,15 @@
 2023-12-12  Enrico Schumann  <es@enricoschumann.net>
 
-	* R/functions.R (ddf): add function
+	* DESCRIPTION (Version): 0.3.6
+
+        * R/functions.R (ddf): add function
+
+2023-11-17  Enrico Schumann  <es@enricoschumann.net>
+
+        * DESCRIPTION (Version): 0.3.5
+
+        * R/functions.R (pkg_build): 'bump.version' supports
+        x.y.z and x.y-z
 
 2023-10-16  Enrico Schumann  <es@enricoschumann.net>
 

@@ 1,7 1,7 @@
 Package: esutils
 Type: Package
 Title: esutils
-Version: 0.3.5
+Version: 0.3.6
 Date: 2023-12-12
 Maintainer: Enrico Schumann <es@enricoschumann.net>
 Authors@R: person(given = "Enrico", family = "Schumann",

@@ 274,15 274,14 @@ pkg_build <- function(pkg, parent.dir = ".",
         D_file <- file.path(pkg, "DESCRIPTION")
         D <- readLines(D_file)
         i <- grep("^Version: ", D)
-        v1 <- as.numeric(gsub(".*-(.*)", "\\1", D[i])) + 1
-        D[i] <- gsub("(.*-).*", paste0("\\1", v1), D[i])
+        v1 <- as.numeric(gsub(".*[-.](.*)", "\\1", D[i])) + 1
+        D[i] <- gsub("(.*[.-]).*", paste0("\\1", v1), D[i])
         i <- grep("^Date: ", D)
         D[i] <- paste("Date:", Sys.Date())
         writeLines(D, D_file)
     }
 
     if (bump.date) {
-        ## TODO allow major/minor/patch
         D_file <- file.path(pkg, "DESCRIPTION")
         D <- readLines(D_file)
         i <- grep("^Date: ", D)