Merge pull request #60 from enriquemondragon/java_download_argument

e-kotov · web-flow · commit 5b9a68dfc57f · 2025-03-04T22:11:09.000+01:00
Closes #55 Force argument for Java download
diff --git a/CITATION.cff b/CITATION.cff
@@ -10,6 +10,9 @@ license: MIT
 title: 'rJavaEnv: ''Java'' Environments for R Projects'
 version: 0.2.2
 doi: 10.32614/CRAN.package.rJavaEnv
+identifiers:
+- type: doi
+  value: 10.32614/CRAN.package.rJavaEnv
 abstract: 'Quickly install ''Java Development Kit (JDK)'' without administrative privileges
   and set environment variables in current R session or project to solve common issues
   with ''Java'' environment management in ''R''. Recommended to users of ''Java''/''rJava''-dependent
@@ -67,7 +70,7 @@ references:
   institution:
     name: R Foundation for Statistical Computing
     address: Vienna, Austria
-  year: '2024'
+  year: '2025'
   version: '>= 4.0'
 - type: software
   title: checkmate
@@ -80,7 +83,8 @@ references:
     given-names: Michel
     email: michellang@gmail.com
     orcid: https://orcid.org/0000-0001-9754-0393
-  year: '2024'
+  year: '2025'
+  doi: 10.32614/CRAN.package.checkmate
 - type: software
   title: cli
   abstract: 'cli: Helpers for Developing Command Line Interfaces'
@@ -90,8 +94,9 @@ references:
   authors:
   - family-names: Csárdi
     given-names: Gábor
-    email: csardi.gabor@gmail.com
-  year: '2024'
+    email: gabor@posit.co
+  year: '2025'
+  doi: 10.32614/CRAN.package.cli
 - type: software
   title: curl
   abstract: 'curl: A Modern and Flexible Web Client for R'
@@ -101,9 +106,10 @@ references:
   authors:
   - family-names: Ooms
     given-names: Jeroen
-    email: jeroen@berkeley.edu
+    email: jeroenooms@gmail.com
     orcid: https://orcid.org/0000-0002-4035-0289
-  year: '2024'
+  year: '2025'
+  doi: 10.32614/CRAN.package.curl
 - type: software
   title: jsonlite
   abstract: 'jsonlite: A Simple and Robust JSON Parser and Generator for R'
@@ -113,9 +119,10 @@ references:
   authors:
   - family-names: Ooms
     given-names: Jeroen
-    email: jeroen@berkeley.edu
+    email: jeroenooms@gmail.com
     orcid: https://orcid.org/0000-0002-4035-0289
-  year: '2024'
+  year: '2025'
+  doi: 10.32614/CRAN.package.jsonlite
 - type: software
   title: utils
   abstract: 'R: A Language and Environment for Statistical Computing'
@@ -125,23 +132,7 @@ references:
   institution:
     name: R Foundation for Statistical Computing
     address: Vienna, Austria
-  year: '2024'
-- type: software
-  title: quarto
-  abstract: 'quarto: R Interface to ''Quarto'' Markdown Publishing System'
-  notes: Suggests
-  url: https://quarto-dev.github.io/quarto-r/
-  repository: https://CRAN.R-project.org/package=quarto
-  authors:
-  - family-names: Allaire
-    given-names: JJ
-    email: jj@posit.co
-    orcid: https://orcid.org/0000-0003-0174-9868
-  - family-names: Dervieux
-    given-names: Christophe
-    email: cderv@posit.co
-    orcid: https://orcid.org/0000-0003-4474-2498
-  year: '2024'
+  year: '2025'
 - type: software
   title: testthat
   abstract: 'testthat: Unit Testing for R'
@@ -152,6 +143,7 @@ references:
   - family-names: Wickham
     given-names: Hadley
     email: hadley@posit.co
-  year: '2024'
+  year: '2025'
+  doi: 10.32614/CRAN.package.testthat
   version: '>= 3.0.0'
 
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -7,7 +7,9 @@ Authors@R: c(
     person("Mauricio", "Vargas", , "mavargas11@uc.cl", role = "ctb",
            comment = c(ORCID = "0000-0003-1017-7574")),
     person("Hadley", "Wickham", , "hadley@posit.co", role = "ctb",
-           comment = "use_java feature suggestion and PR review")
+           comment = "use_java feature suggestion and PR review"),
+    person("Enrique", "Mondragon-Estrada", , "enriquemondragon@proton.me", role = "ctb",
+           comment = c(ORCID = "0009-0004-5592-1728"))
   )
 Description: Quickly install 'Java Development Kit (JDK)' without
     administrative privileges and set environment variables in current R
diff --git a/R/java_download.R b/R/java_download.R
@@ -5,6 +5,7 @@
 #' @param cache_path The destination directory to download the Java distribution to. Defaults to a user-specific data directory.
 #' @param platform The platform for which to download the Java distribution. Defaults to the current platform.
 #' @param arch The architecture for which to download the Java distribution. Defaults to the current architecture.
+#' @param force A logical. Whether the distribution file should be overwritten or not. Defaults to `FALSE`.
 #' @param temp_dir A logical. Whether the file should be saved in a temporary directory. Defaults to `FALSE`.
 #' @inheritParams global_quiet_param
 #'
@@ -13,10 +14,10 @@
 #'
 #' @examples
 #' \dontrun{
-#' 
+#'
 #' # download distribution of Java version 17
 #' java_download(version = "17", temp_dir = TRUE)
-#' 
+#'
 #' # download default Java distribution (version 21)
 #' java_download(temp_dir = TRUE)
 #' }
@@ -27,9 +28,10 @@ java_download <- function(
   platform = platform_detect()$os,
   arch = platform_detect()$arch,
   quiet = FALSE,
+  force = FALSE,
   temp_dir = FALSE
 ) {
-  
+
   # override cache_path if temp_dir is set to TRUE
   if (temp_dir) {
     temp_dir <- tempdir()
@@ -64,6 +66,7 @@ java_download <- function(
   checkmate::assert_choice(platform, valid_platforms)
   checkmate::assert_choice(arch, valid_architectures)
   checkmate::assert_flag(quiet)
+  checkmate::assert_flag(force)
 
   # Print out the detected platform and architecture
   if (!quiet) {
@@ -98,11 +101,32 @@ java_download <- function(
     cli::cli_inform("Downloading Java {version} ({distribution}) for {platform} {arch} to {dest_file}", .envir = environment())
   }
 
-  if (file.exists(dest_file)) {
+  if (file.exists(dest_file) & !force) {
     if (!quiet) {
       cli::cli_inform("File already exists. Skipping download.", .envir = environment())
     }
-  } else {
+  } else if(file.exists(dest_file) & force){
+    if (!quiet) {
+      cli::cli_inform("Removing existing installation.", .envir = environment())
+    }
+    file.remove(dest_file)
+    curl::curl_download(url, dest_file, quiet = FALSE)
+    curl::curl_download(url_md5, dest_file_md5, quiet = TRUE)
+    if (!quiet) {
+      cli::cli_inform("Download completed.", .envir = environment())
+
+      md5sum <- tools::md5sum(dest_file)
+      md5sum_expected <- readLines(dest_file_md5, warn = FALSE)
+
+      if (md5sum != md5sum_expected) {
+        cli::cli_alert_danger("MD5 checksum mismatch. Please try downloading the file again.", .envir = environment())
+        unlink(dest_file)
+        return(NULL)
+      } else {
+        cli::cli_inform("MD5 checksum verified.", .envir = environment())
+      }
+    }
+  } else if (!file.exists(dest_file)){
     curl::curl_download(url, dest_file, quiet = FALSE)
     curl::curl_download(url_md5, dest_file_md5, quiet = TRUE)
     if (!quiet) {
diff --git a/codemeta.json b/codemeta.json
@@ -14,7 +14,7 @@
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.4.1 (2024-06-14)",
+  "runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)",
   "provider": {
     "@id": "https://cran.r-project.org",
     "@type": "Organization",
@@ -43,6 +43,13 @@
       "givenName": "Hadley",
       "familyName": "Wickham",
       "email": "hadley@posit.co"
+    },
+    {
+      "@type": "Person",
+      "givenName": "Enrique",
+      "familyName": "Mondragon-Estrada",
+      "email": "enriquemondragon@proton.me",
+      "@id": "https://orcid.org/0009-0004-5592-1728"
     }
   ],
   "copyrightHolder": [
@@ -164,7 +171,7 @@
     },
     "SystemRequirements": null
   },
-  "fileSize": "219.775KB",
+  "fileSize": "224.631KB",
   "citation": [
     {
       "@type": "SoftwareSourceCode",
diff --git a/inst/schemaorg.json b/inst/schemaorg.json
@@ -20,6 +20,13 @@
           "email": "hadley@posit.co",
           "familyName": "Wickham",
           "givenName": "Hadley"
+        },
+        {
+          "id": "https://orcid.org/0009-0004-5592-1728",
+          "type": "Person",
+          "email": "enriquemondragon@proton.me",
+          "familyName": "Mondragon-Estrada",
+          "givenName": "Enrique"
         }
       ],
       "copyrightHolder": {
@@ -43,7 +50,7 @@
         "name": "Comprehensive R Archive Network (CRAN)",
         "url": "https://cran.r-project.org"
       },
-      "runtimePlatform": "R version 4.4.1 (2024-06-14)",
+      "runtimePlatform": "R version 4.4.1 (2024-06-14 ucrt)",
       "version": "0.2.2"
     },
     {
diff --git a/man/java_download.Rd b/man/java_download.Rd
