diff --git a/DESCRIPTION b/DESCRIPTION index beda90a..5c12132 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -7,7 +7,7 @@ URL: https://predictiveecology.github.io/SpaDES.addins/, https://github.com/PredictiveEcology/SpaDES.addins Version: 0.1.0 -Date: 2017-08-31 +Date: 2017-09-01 Authors@R: c( person("Alex M", "Chubaty", email = "alexander.chubaty@canada.ca", role = c("aut", "cre")), diff --git a/NAMESPACE b/NAMESPACE index 5a15fa0..ad9a72d 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -3,7 +3,6 @@ importFrom(SpaDES.core,copyModule) importFrom(SpaDES.core,newModule) importFrom(SpaDES.core,openModules) -importFrom(devtools,load_all) importFrom(magrittr,"%>%") importFrom(miniUI,gadgetTitleBar) importFrom(miniUI,miniContentPanel) diff --git a/R/load-all.R b/R/load-all.R deleted file mode 100644 index 3ac979c..0000000 --- a/R/load-all.R +++ /dev/null @@ -1,17 +0,0 @@ -#' Quickly reload a package from source -#' -#' Simply a convenience wrapper around \code{devtools::loadall}, to be used for -#' binding an RStudio keyboard shortcut. -#' By default, this will load the \pkg{SpaDES.core} package from the path -#' \file{~/GitHub/SpaDES.core}. -#' This can be changed by setting the \code{spades.loadpkgs} option. -#' -#' @param path Path to the source package directory. -#' Default: \code{getOption("spades.loadpkgs", "~/GitHub/SpaDES.core")}. -#' -#' @author Alex Chubaty -#' @importFrom devtools load_all -#' -addin_loadAll <- function(path = getOption("spades.loadpkgs", "~/GitHub/SpaDES.core")) { # nolint - devtools::load_all(path) -} diff --git a/R/spades-addins-package.R b/R/spades-addins-package.R index 48401a7..352fc37 100644 --- a/R/spades-addins-package.R +++ b/R/spades-addins-package.R @@ -31,15 +31,5 @@ #' \item \emph{none yet} #' } #' -#' @section Package options: -#' -#' #' \code{SpaDES} packages use the following \code{\link{options}} to configure behaviour: -#' -#' \itemize{ -#' \item \code{spades.loadpkgs}: The default packages to load using the -#' \emph{SpaDES: load all} addin. Should be a path to a package's source directory. -#' Default is \code{"~/GitHub/SpaDES.core"}. -#' } -#' #' @rdname spades-addins-package "_PACKAGE" diff --git a/R/zzz.R b/R/zzz.R deleted file mode 100644 index 1aabeca..0000000 --- a/R/zzz.R +++ /dev/null @@ -1,14 +0,0 @@ -## be sure to update the 'Package Options' section of the package help file -## in R/spades-addins-package.R -## -.onLoad <- function(libname, pkgname) { - ## set options using the approach used by devtools - opts <- options() - opts.spades <- list( # nolint - spades.loadpkgs = "~/GitHub/SpaDES.core" - ) - toset <- !(names(opts.spades) %in% names(opts)) - if (any(toset)) options(opts.spades[toset]) - - invisible() -} diff --git a/docs/articles/i-rstudio-addins.html b/docs/articles/i-rstudio-addins.html index 7f89ea4..beb0e20 100644 --- a/docs/articles/i-rstudio-addins.html +++ b/docs/articles/i-rstudio-addins.html @@ -72,7 +72,7 @@

Using SpaDES.addins with RStudio

Alex M. Chubaty

-

August 31 2017

+

September 01 2017

@@ -116,12 +116,6 @@

SpaDES package development (advanced)

More advanced users planning on contributing code to the SpaDES ecosystem of packages, can make use of additional package development tools.

-
-

-SpaDES: load_all -

-

Provides a wrapper around devtools::load_all(), to be used for binding an RStudio keyboard shortcut. By default, this will load the SpaDES.core package.

-
@@ -142,11 +136,7 @@

  • Create a new SpaDES module from a template
    • -
  • -SpaDES package development (advanced) -
    • +
  • SpaDES package development (advanced)
    • diff --git a/docs/reference/index.html b/docs/reference/index.html index 783f3ae..4a23b60 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -119,12 +119,6 @@

    addin_copyModule

    RStudio addin to copy an existing module

    - - - -

    addin_loadAll

    - -

    Quickly reload a package from source

    diff --git a/docs/reference/spades-addins-package.html b/docs/reference/spades-addins-package.html index b72a37c..898db12 100644 --- a/docs/reference/spades-addins-package.html +++ b/docs/reference/spades-addins-package.html @@ -119,15 +119,6 @@

    Package options

    - - -

    #' SpaDES packages use the following options to configure behaviour:

    -

    See also

    Useful links:

    diff --git a/man/addin_loadAll.Rd b/man/addin_loadAll.Rd deleted file mode 100644 index f4dbcbb..0000000 --- a/man/addin_loadAll.Rd +++ /dev/null @@ -1,22 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/load-all.R -\name{addin_loadAll} -\alias{addin_loadAll} -\title{Quickly reload a package from source} -\usage{ -addin_loadAll(path = getOption("spades.loadpkgs", "~/GitHub/SpaDES.core")) -} -\arguments{ -\item{path}{Path to the source package directory. -Default: \code{getOption("spades.loadpkgs", "~/GitHub/SpaDES.core")}.} -} -\description{ -Simply a convenience wrapper around \code{devtools::loadall}, to be used for -binding an RStudio keyboard shortcut. -By default, this will load the \pkg{SpaDES.core} package from the path -\file{~/GitHub/SpaDES.core}. -This can be changed by setting the \code{spades.loadpkgs} option. -} -\author{ -Alex Chubaty -} diff --git a/man/spades-addins-package.Rd b/man/spades-addins-package.Rd index 4cd5666..8d1d01c 100644 --- a/man/spades-addins-package.Rd +++ b/man/spades-addins-package.Rd @@ -41,18 +41,6 @@ Provides 'RStudio' addins for 'SpaDES' packages and 'SpaDES' module development. } } -\section{Package options}{ - - -#' \code{SpaDES} packages use the following \code{\link{options}} to configure behaviour: - -\itemize{ - \item \code{spades.loadpkgs}: The default packages to load using the - \emph{SpaDES: load all} addin. Should be a path to a package's source directory. - Default is \code{"~/GitHub/SpaDES.core"}. -} -} - \seealso{ Useful links: \itemize{ diff --git a/vignettes/i-rstudio-addins.Rmd b/vignettes/i-rstudio-addins.Rmd index 3c94c2a..345ebf0 100644 --- a/vignettes/i-rstudio-addins.Rmd +++ b/vignettes/i-rstudio-addins.Rmd @@ -54,7 +54,3 @@ To copy an existing module, simply invoke the *SpaDES: copy module* addin from t # `SpaDES` package development (advanced) More advanced users planning on contributing code to the `SpaDES` ecosystem of packages, can make use of additional package development tools. - -## *SpaDES: load_all* - -Provides a wrapper around `devtools::load_all()`, to be used for binding an RStudio keyboard shortcut. By default, this will load the `SpaDES.core` package.