get dockerfile requirements right

.Rbuildignore

@@ -2,3 +2,5 @@
 ^\.Rproj\.user$
 ^\.github$
 ^README\.Rmd$
+^Makefile$
+^Jenkinsfile$

DESCRIPTION

@@ -1,24 +1,24 @@
-Package: civilytics
-Type: Package
-Title: Utilities Functions for Civilytics
-Version: 0.1.0
-Author: Jared E. Knowles <jared@civilytics.com>
-Maintainer: Jared E. Knowles <jared@civilytics.com>
-Description: House R functions for Civilytics Consulting LLC
-    This package implements a variety of useful functions for creating and 
-    branding analyses produced by Civilytics Consulting LLC. 
-License: LICENSE
-Depends:
-    R (>= 2.15.1)
-Imports:
-    ggplot2,
-    jpeg,
-    png,
-    stringr,
-    gridExtra,
-    grid
-Encoding: UTF-8
-LazyData: true
-Suggests: 
-    testthat
-RoxygenNote: 7.1.1
+Package: civilytics
+Type: Package
+Title: Utilities Functions for Civilytics
+Version: 0.1.0
+Author: Jared E. Knowles <jared@civilytics.com>
+Maintainer: Jared E. Knowles <jared@civilytics.com>
+Description: House R functions for Civilytics Consulting LLC
+    This package implements a variety of useful functions for creating and 
+    branding analyses produced by Civilytics Consulting LLC. 
+License: LICENSE
+Depends:
+    R (>= 2.15.1)
+Imports:
+    ggplot2,
+    jpeg,
+    png,
+    stringr,
+    gridExtra,
+    grid
+Encoding: UTF-8
+LazyData: true
+Suggests: 
+    testthat
+RoxygenNote: 7.2.1

Dockerfile

@@ -0,0 +1,22 @@
+# [Choice] R version: 4, 4.2, 4.1, 4.0
+ARG VARIANT=4.2
+# [Choice] Base image. Minimal (r-ver), tidyverse installed (tidyverse), or full image (binder): rocker/r-ver, rocker/tidyverse, rocker/binder
+ARG BASE_IMAGE=rocker/r-ver
+FROM ${BASE_IMAGE}:${VARIANT}
+
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  sudo \
+  libcurl4-gnutls-dev \
+  libxml2-dev \
+  libcairo2-dev \
+  libxt-dev \
+  libjpeg-dev \
+  libpng-dev \
+  openjdk-11-jdk \
+  libssl-dev \
+  libssh2-1-dev \
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /var/lib/shiny-server/bookmarks/shiny
+
+RUN install2.r ggplot2 jpeg png stringr gridExtra grid testthat

Jenkinsfile

@@ -0,0 +1,53 @@
+pipeline {
+  agent {
+    dockerfile true
+  }
+    stages {
+      stage('Docker setup') {
+        steps {
+         sh '''
+          R --version
+          java --version
+          '''
+        }
+
+      }
+      stage('Build and test') {
+        stages {
+          stage("Build package") {
+           steps {
+                sh '''
+                R CMD build .
+                '''
+            }
+          }
+        stage('Check') {
+          steps {
+            sh '''
+            R CMD check --no-manual civilytics_0.1.0.tar.gz
+            '''
+
+            sh '''
+            R CMD INSTALL civilytics_0.1.0.tar.gz
+            '''
+          }
+        }
+        stage('testthat'){
+         steps {
+         sh '''
+         R -e 'testthat::test_local(".")'
+         '''
+         }
+      }
+      stage('Clean') {
+        steps {
+
+          sh '''
+          @rm -rf civilytics_0.1.0.tar.gz civilytics.Rcheck
+          '''
+      }
+    }
+  }
+}
+}
+}

Makefile

@@ -0,0 +1,26 @@
+# h/t to @jimhester and @yihui for this parse block:
+# https://github.com/yihui/knitr/blob/dc5ead7bcfc0ebd2789fe99c527c7d91afb3de4a/Makefile#L1-L4
+# Note the portability change as suggested in the manual:
+# https://cran.r-project.org/doc/manuals/r-release/R-exts.html#Writing-portable-packages
+PKGNAME = `sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION`
+PKGVERS = `sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION`
+
+
+all: check
+
+build: install_deps
+	R CMD build .
+
+check: build
+	R CMD check --no-manual $(PKGNAME)_$(PKGVERS).tar.gz
+
+install_deps:
+	Rscript \
+	-e 'if (!requireNamespace("remotes")) install.packages("remotes")' \
+	-e 'remotes::install_deps(dependencies = TRUE)'
+
+install: build
+	R CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz
+
+clean:
+	@rm -rf $(PKGNAME)_$(PKGVERS).tar.gz $(PKGNAME).Rcheck

R/logo.R

@@ -84,7 +84,7 @@ add_logo <- function(plot, logo, margin_param = NULL) {
 #' @export
 #'
 #' @examples
-#' p1 <- qplot(mpg, wt, data = mtcars)
+#' p1 <- ggplot2::qplot(mpg, wt, data = mtcars)
 #' measure_caption(p1) # Should equal 1 since no caption is required
 measure_caption <- function(gg) {
   if (has_caption(gg)) {

man/add_logo.Rd

@@ -12,9 +12,6 @@ add_logo(plot, logo, margin_param = NULL)
 \item{logo}{a logo grob created by make_logo_grob()}
 
 \item{margin_param}{a numeric specifying what margin to add or subtract to align the logo}
-}
-\value{
-
 }
 \description{
 Add a logo to a ggplot2 object

man/add_logo_ga.Rd

@@ -16,9 +16,6 @@ add_logo_ga(plot_list, logo, nrow = 1, widths = NULL, margin_param = NULL)
 \item{widths}{an optional vector the same length as plot_list with the widths for each plot}
 
 \item{margin_param}{a number giving the adjustment up or down to help manually align logo and captions}
-}
-\value{
-
 }
 \description{
 Add a logo to a ggplot2 object

man/countDots.Rd

@@ -8,9 +8,6 @@ countDots(x)
 }
 \arguments{
 \item{x}{a character vector}
-}
-\value{
-
 }
 \description{
 Count the number of single period entries in a vector

man/get_png.Rd

@@ -8,13 +8,7 @@ get_png(filename)
 }
 \arguments{
 \item{filename}{a character with file path to a png file}
-}
-\value{
-
 }
 \description{
 Plot a PNG file as a rasterGrob for inclusion in ggplot2
 }
-\examples{
-
-}

man/grade_level_to_num.Rd

@@ -8,9 +8,6 @@ grade_level_to_num(x)
 }
 \arguments{
 \item{x}{character description of grade levels from NCES style data}
-}
-\value{
-
 }
 \description{
 Recode grade level from character to numeric

man/measure_caption.Rd

@@ -17,6 +17,6 @@ the caption
 Measure a ggplot2 object caption
 }
 \examples{
-p1 <- qplot(mpg, wt, data = mtcars)
+p1 <- ggplot2::qplot(mpg, wt, data = mtcars)
 measure_caption(p1) # Should equal 1 since no caption is required
 }

man/race_short_names.Rd

@@ -8,9 +8,6 @@ race_short_names(x)
 }
 \arguments{
 \item{x}{a character vector with NCES race codes, often from Urban Institute}
-}
-\value{
-
 }
 \description{
 Recode NCES race categories to shorter names