Make pkg_agent() play nice. (#27)

Closes #26.

NAMESPACE

@@ -1,7 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
 export(generate_pkg)
-export(pkg_agent)
+export(generate_pkg_agent)
 export(use_beekeeper)
 if (getRversion() < "4.3.0") importFrom("S7", "@")
 importFrom(glue,glue)

R/generate.R

@@ -11,7 +11,7 @@
 #' @return `TRUE` invisibly.
 #' @export
 generate_pkg <- function(config_file = "_beekeeper.yml",
-                         pkg_agent = pkg_agent(fs::path_dir(config_file))) {
+                         pkg_agent = generate_pkg_agent(config_file)) {
   .assert_is_pkg()
   config <- .read_config(config_file)
   api_definition <- readRDS(
@@ -107,27 +107,3 @@ generate_pkg <- function(config_file = "_beekeeper.yml",
 
   return(invisible(target))
 }
-
-#' Create a user agent for the active package
-#'
-#' @param path The path to the DESCRIPTION file, or to a directory within a
-#'   package.
-#'
-#' @return A string with the name of the package and (if available) the first
-#'   URL associated with the package.
-#'
-#' @export
-pkg_agent <- function(path = ".") {
-  pkg_desc <- desc::desc(file = path)
-  pkg_name <- pkg_desc$get_field("Package")
-  pkg_url_glue <- ""
-  pkg_url <- pkg_desc$get_urls()
-  if (length(pkg_url)) {
-    pkg_url_glue <- glue::glue(
-      " ({pkg_url[[1]]})"
-    )
-  }
-  return(
-    glue::glue("{pkg_name}{pkg_url_glue}")
-  )
-}

R/generate_pkg_agent.R

@@ -0,0 +1,26 @@
+#' Create a user agent for the active package
+#'
+#' @param path The path to the DESCRIPTION file, or to a directory within a
+#'   package.
+#'
+#' @return A string with the name of the package and (if available) the first
+#'   URL associated with the package.
+#'
+#' @export
+generate_pkg_agent <- function(path = ".") {
+  if (!fs::is_dir(path) && fs::path_file(path) != "DESCRIPTION") {
+    path <- fs::path_dir(path) # nocov
+  }
+  pkg_desc <- desc::desc(file = path)
+  pkg_name <- pkg_desc$get_field("Package")
+  pkg_url_glue <- ""
+  pkg_url <- pkg_desc$get_urls()
+  if (length(pkg_url)) {
+    pkg_url_glue <- glue::glue(
+      " ({pkg_url[[1]]})"
+    )
+  }
+  return(
+    glue::glue("{pkg_name}{pkg_url_glue}")
+  )
+}

tests/testthat/test-generate.R

@@ -18,10 +18,3 @@ test_that("Applying a 1-server config generates the expected R files.", {
     "nectar"
   )
 })
-
-test_that("pkg_agent() generates package agents", {
-  expect_identical(
-    pkg_agent(test_path("_fixtures", "DESCRIPTION")),
-    "beekeeper (https://jonthegeek.github.io/beekeeper/)"
-  )
-})

tests/testthat/test-generate_pkg_agent.R

@@ -0,0 +1,6 @@
+test_that("generate_pkg_agent() generates package agents", {
+  expect_identical(
+    generate_pkg_agent(test_path("_fixtures", "DESCRIPTION")),
+    "beekeeper (https://jonthegeek.github.io/beekeeper/)"
+  )
+})