Merge pull request #979 from rstudio/handle-description-encoding

handle non-utf8 description encodings

R/bundlePackage.R

@@ -114,6 +114,6 @@ availablePackages <- function(repos) {
 }
 
 package_record <- function(name, lib_dir = NULL) {
-  path <- system.file("DESCRIPTION", package = name, lib.loc = lib_dir)
-  as.list(as.data.frame(read.dcf(path)))
+  record <- packageDescription(name, lib.loc = lib_dir, encoding = "UTF-8")
+  unclass(record)
 }

tests/testthat/packages/latin1package/DESCRIPTION

@@ -0,0 +1,10 @@
+Package: latin1package
+Type: Package
+Title: Provides some funky characters.
+Version: 0.1.0
+Author: Jens Fr�hling
+Maintainer: Jens Fr�hling <[email protected]>
+Description: a test package
+License: GPL-2
+Encoding: latin1
+LazyData: true

tests/testthat/packages/latin1package/NAMESPACE

@@ -0,0 +1 @@
+exportPattern("^[[:alpha:]]+")

tests/testthat/packages/latin1package/R/hello.R

@@ -0,0 +1,3 @@
+hello <- function() {
+  print("Hello, world!")
+}

tests/testthat/packages/latin1package/man/hello.Rd

@@ -0,0 +1,12 @@
+\name{hello}
+\alias{hello}
+\title{Hello, World!}
+\usage{
+hello()
+}
+\description{
+Prints 'Hello, world!'.
+}
+\examples{
+hello()
+}

tests/testthat/packages/utf8package/DESCRIPTION

@@ -0,0 +1,10 @@
+Package: utf8package
+Type: Package
+Title: Provides some funky characters.
+Version: 0.1.0
+Author: Jens Fröhling
+Maintainer: Jens Fröhling <[email protected]>
+Description: a test package
+License: GPL-2
+Encoding: UTF-8
+LazyData: true

tests/testthat/packages/utf8package/NAMESPACE

@@ -0,0 +1 @@
+exportPattern("^[[:alpha:]]+")

tests/testthat/packages/utf8package/R/hello.R

@@ -0,0 +1,3 @@
+hello <- function() {
+  print("Hello, world!")
+}

tests/testthat/packages/utf8package/man/hello.Rd

@@ -0,0 +1,12 @@
+\name{hello}
+\alias{hello}
+\title{Hello, World!}
+\usage{
+hello()
+}
+\description{
+Prints 'Hello, world!'.
+}
+\examples{
+hello()
+}

tests/testthat/packages/windows1251package/DESCRIPTION

@@ -0,0 +1,10 @@
+Package: windows1251package
+Type: Package
+Title: Provides some funky characters.
+Version: 0.1.0
+Author: ������ ����
+Maintainer: ������ ���� <[email protected]>
+Description: a test package
+License: GPL-2
+Encoding: Windows-1251
+LazyData: true

tests/testthat/packages/windows1251package/NAMESPACE

@@ -0,0 +1 @@
+exportPattern("^[[:alpha:]]+")

tests/testthat/packages/windows1251package/R/hello.R

@@ -0,0 +1,3 @@
+hello <- function() {
+  print("Hello, world!")
+}

tests/testthat/packages/windows1251package/man/hello.Rd

@@ -0,0 +1,12 @@
+\name{hello}
+\alias{hello}
+\title{Hello, World!}
+\usage{
+hello()
+}
+\description{
+Prints 'Hello, world!'.
+}
+\examples{
+hello()
+}

tests/testthat/test-bundlePackage.R

@@ -133,3 +133,14 @@ test_that("usePackrat prefers the environment variable over the option", {
   withr::local_options(rsconnect.packrat = TRUE)
   expect_false(usePackrat())
 })
+
+test_that("package_record works", {
+  latin1Record <- package_record("latin1package", lib_dir = test_path("packages"))
+  expect_equal(latin1Record$Author, "Jens Fröhling")
+
+  utf8Record <- package_record("utf8package", lib_dir = test_path("packages"))
+  expect_equal(utf8Record$Author, "Jens Fröhling")
+
+  windows1251Record <- package_record("windows1251package", lib_dir = test_path("packages"))
+  expect_equal(windows1251Record$Author, "Сергей Брин")
+})