From 9e0b3730f52f11e1fe90239a985e30c95f0dff07 Mon Sep 17 00:00:00 2001
From: Ben Anderson <dataknut@icloud.com>
Date: Thu, 17 Oct 2019 19:02:09 +1300
Subject: [PATCH] amended package stuff

---
 NAMESPACE            |  2 +-
 R/dependencies.R     |  1 -
 R/setup.R            | 11 +++++++++++
 R/utilities.R        | 19 -------------------
 man/outputMessage.Rd | 23 -----------------------
 man/setup.Rd         | 14 ++++++++++++++
 6 files changed, 26 insertions(+), 44 deletions(-)
 create mode 100644 R/setup.R
 delete mode 100644 man/outputMessage.Rd
 create mode 100644 man/setup.Rd

diff --git a/NAMESPACE b/NAMESPACE
index d37f9f6..c7121c0 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -4,8 +4,8 @@ export(findParentDirectory)
 export(fixCountLabels)
 export(loadData)
 export(loadLibraries)
-export(outputMessage)
 export(setYears)
+export(setup)
 export(tidyNum)
 import(data.table)
 import(readr)
diff --git a/R/dependencies.R b/R/dependencies.R
index 4ac8a5d..45da9cf 100644
--- a/R/dependencies.R
+++ b/R/dependencies.R
@@ -1,4 +1,3 @@
 # State required packages
 #' @import data.table
-#' @import readr
 #' @import utils
diff --git a/R/setup.R b/R/setup.R
new file mode 100644
index 0000000..abc2967
--- /dev/null
+++ b/R/setup.R
@@ -0,0 +1,11 @@
+#' Sets package parameters etc
+#'
+#' \code{setup} loads global package parameters and settings
+#'
+#'
+#' @author Ben Anderson, \email{b.anderson@@soton.ac.uk}
+#' @export
+#'
+setup <- function() {
+  source(paste0(here::here(), "/packageSettings.R"))
+}
diff --git a/R/utilities.R b/R/utilities.R
index 630bc6a..073215e 100644
--- a/R/utilities.R
+++ b/R/utilities.R
@@ -64,23 +64,4 @@ loadLibraries <- function(..., repo = "https://cran.rstudio.com"){
 
   # Load packages
   sapply(packages, require, character.only = TRUE)
-}
-
-
-#' Concatenate vectors after converting to character and print message
-#'
-#' \code{outputMessage} 
-#' Concatenate vectors after converting to character and print message
-#'
-#' Display a message in the output. Equivalent to \code{print(paste(c(...)))}, also like glue()
-#'
-#' @param ... one or more R objects, to be converted to character vectors.
-#' @param collapse an optional character string to separate the results. Not NA_character_.
-#'
-#' @author Mikey Harper, \email{m.harper@@soton.ac.uk}
-#' @export
-outputMessage <- function(..., collapse = NULL){
-  
-  writeLines(paste(..., sep = " "))
-  
 }
\ No newline at end of file
diff --git a/man/outputMessage.Rd b/man/outputMessage.Rd
deleted file mode 100644
index 8e1e9ba..0000000
--- a/man/outputMessage.Rd
+++ /dev/null
@@ -1,23 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/utilities.R
-\name{outputMessage}
-\alias{outputMessage}
-\title{Concatenate vectors after converting to character and print message}
-\usage{
-outputMessage(..., collapse = NULL)
-}
-\arguments{
-\item{...}{one or more R objects, to be converted to character vectors.}
-
-\item{collapse}{an optional character string to separate the results. Not NA_character_.}
-}
-\description{
-\code{outputMessage} 
-Concatenate vectors after converting to character and print message
-}
-\details{
-Display a message in the output. Equivalent to \code{print(paste(c(...)))}, also like glue()
-}
-\author{
-Mikey Harper, \email{m.harper@soton.ac.uk}
-}
diff --git a/man/setup.Rd b/man/setup.Rd
new file mode 100644
index 0000000..beb4826
--- /dev/null
+++ b/man/setup.Rd
@@ -0,0 +1,14 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/setup.R
+\name{setup}
+\alias{setup}
+\title{Sets package parameters etc}
+\usage{
+setup()
+}
+\description{
+\code{setup} loads global package parameters and settings
+}
+\author{
+Ben Anderson, \email{b.anderson@soton.ac.uk}
+}
-- 
GitLab