Skip to content

Commit

Permalink
Purge old package name
Browse files Browse the repository at this point in the history
  • Loading branch information
btmonier committed Mar 14, 2023
1 parent 81d5970 commit 8e9155b
Show file tree
Hide file tree
Showing 13 changed files with 63 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
^bljars\.Rproj$
^mgjars\.Rproj$
^\.Rproj\.user$
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Description:
used in two packages generated by the Buckler Lab: rTASSEL and rPHG.
License: `use_gpl3_license()`
URL:
https://bitbucket.org/bucklerlab/bljars/src/master/
https://github.com/maize-genetics/MGJars
Depends:
rJava
Imports:
Expand All @@ -23,7 +23,7 @@ Imports:
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.2
RoxygenNote: 7.2.3
Suggests:
testthat (>= 3.0.0)
Config/testthat/edition: 3
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Generated by roxygen2: do not edit by hand

export(initializeJars)
export(updateJars)
2 changes: 1 addition & 1 deletion R/initializer.R
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ getCommitMetaData <- function(


## ----
#' @title Initialize \code{BLJars}.
#' @title Initialize \code{MGJars}.
#'
#' @description Download jar files to designated directory
#'
Expand Down
4 changes: 2 additions & 2 deletions R/updater.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#' @export
updateJars <- function(test = TRUE) {

paths <- BLJars:::getDirFields()
paths <- getDirFields()
blVersions <- rJava::.jnew("net/maizegenetics/tassel/TasselVersions")

if (test) {
metaDf <- read.csv("/home/btmonier/Temporary/test_rtassel/bljars_metadata_old.csv")
metaDf <- read.csv("/home/btmonier/Temporary/test_rtassel/mgjars_metadata_old.csv")
} else {
metaDf <- read.csv(metaPath)
}
Expand Down
2 changes: 1 addition & 1 deletion R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ getDirFields <- function(pkg = "MGJars", sep = "/") {
pkgDir <- find.package(pkg)
javaDir <- "java/"
metaDir <- "extdata/"
metaFile <- "bljars_metadata.csv"
metaFile <- "mgjars_metadata.csv"

return(
list(
Expand Down
8 changes: 4 additions & 4 deletions R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
fields <- getDirFields()
if (!any(grepl("jar", list.files(fields$fullJava)))) {
msg <- paste0(
"This looks like your first time running BLJars:", "\n",
"This looks like your first time running MGJars:", "\n",
" * Please run 'initializeJars()'", "\n",
" - This will download JAR files to the package.", "\n",
" * Once finished, please reload the BLJars package."
" * Once finished, please reload the MGJars package."
)
} else {
tasselVersions <- rJava::.jnew("net/maizegenetics/tassel/TasselVersions")

msg <- paste0(
"BLJars package successfully loaded:", "\n",
" * BLJars version....... ", utils::packageVersion("BLJars"), "\n",
"MGJars package successfully loaded:", "\n",
" * MGJars version....... ", utils::packageVersion("MGJars"), "\n",
" * PHG version.......... ", tasselVersions$phgVersion(), "\n",
" * TASSEL version....... ", tasselVersions$tasselVersion(), "\n",
" * Build date........... ", tasselVersions$tasselVersionDate(), "\n"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ experimental branches of `rTASSEL` and `rPHG`. In order to use this, the
user will need to manually initialize:

```
library(BLJars)
library(MGJars)
```

...and then load `rTASSEL` and/or `rPHG`:
Expand Down
14 changes: 14 additions & 0 deletions man/Enum.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/getCommitMetaData.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions man/getDirFields.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/initializeJars.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions man/updateJars.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8e9155b

Please sign in to comment.