Update to 1.2.0 and add check() function

3 files changed, 59 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e6e66e6065e..e575ee8aec93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = r-tidyr
 	pkgdesc = Tidy Messy Data
-	pkgver = 1.1.4
+	pkgver = 1.2.0
 	pkgrel = 1
 	url = https://cran.r-project.org/package=tidyr
 	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = r>=3.1
-	depends = r-dplyr>=0.8.2
-	depends = r-ellipsis>=0.1.0
+	checkdepends = r-data.table
+	checkdepends = r-testthat
+	makedepends = r-cpp11
+	depends = r-dplyr
+	depends = r-ellipsis
 	depends = r-glue
 	depends = r-lifecycle
 	depends = r-magrittr
 	depends = r-purrr
 	depends = r-rlang
-	depends = r-tibble>=2.1.1
-	depends = r-tidyselect>=1.1.0
-	depends = r-vctrs>=0.3.6
-	depends = r-cpp11>=0.2.6
+	depends = r-tibble
+	depends = r-tidyselect
+	depends = r-vctrs
 	optdepends = r-covr
 	optdepends = r-data.table
 	optdepends = r-jsonlite
@@ -26,7 +27,9 @@ pkgbase = r-tidyr
 	optdepends = r-repurrrsive
 	optdepends = r-rmarkdown
 	optdepends = r-testthat
-	source = https://cran.r-project.org/src/contrib/tidyr_1.1.4.tar.gz
-	sha256sums = 0b0c98be98a433e15a2550f60330b31a58529a9c58bc2abd7bff6462ab761241
+	source = https://cran.r-project.org/src/contrib/tidyr_1.2.0.tar.gz
+	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	sha256sums = 8cd01da9e97827521d01ea50b9225f2705c46b7538bbf74bec6249a04c1213a8
+	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-tidyr
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 7a8046a71e36..8b26ea512a71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: frichtlm <frichtlm@gmail.com>
 
 _cranname=tidyr
-_cranver=1.1.4
+_cranver=1.2.0
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
@@ -10,17 +11,50 @@ pkgdesc="Tidy Messy Data"
 arch=(i686 x86_64)
 url="https://cran.r-project.org/package=${_cranname}"
 license=(MIT)
-depends=('r>=3.1' 'r-dplyr>=0.8.2' 'r-ellipsis>=0.1.0' r-glue r-lifecycle r-magrittr r-purrr r-rlang 'r-tibble>=2.1.1' 'r-tidyselect>=1.1.0' 'r-vctrs>=0.3.6' 'r-cpp11>=0.2.6')
-optdepends=(r-covr r-data.table r-jsonlite r-knitr r-readr r-repurrrsive r-rmarkdown r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('0b0c98be98a433e15a2550f60330b31a58529a9c58bc2abd7bff6462ab761241')
+depends=(
+    r-dplyr
+    r-ellipsis
+    r-glue
+    r-lifecycle
+    r-magrittr
+    r-purrr
+    r-rlang
+    r-tibble
+    r-tidyselect
+    r-vctrs
+)
+makedepends=(r-cpp11)
+checkdepends=(r-data.table r-testthat)
+optdepends=(
+    r-covr
+    r-data.table
+    r-jsonlite
+    r-knitr
+    r-readr
+    r-repurrrsive
+    r-rmarkdown
+    r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
+        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
+sha256sums=('8cd01da9e97827521d01ea50b9225f2705c46b7538bbf74bec6249a04c1213a8'
+            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  mkdir -p build
+  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+}
+
+check() {
+  cd "${_cranname}/tests"
+  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+
+  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
+  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }