Tidy dependencies and package in general (#151)

* In README, fix code highlighting and attach fgeo quietly
* Prune files
* Style
* Tidy imports and remotes

.buildignore/fgeo.Rmd

@@ -14,6 +14,8 @@ knitr::opts_chunk$set(
   collapse = TRUE,
   comment = "#>"
 )
+
+options(fgeo.quiet = TRUE)
 ```
 
 This article shows some of the key features of __fgeo__ applied to an exploratory data analysis. For a deeper and general approach to exploratory data analysis, see [this book section](http://r4ds.had.co.nz/exploratory-data-analysis.html). A version adapted for ForestGEO is available [here](https://forestgeo.github.io/fgeo/articles/siteonly/eda.html).

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: fgeo
 Title: Analyze Forest Diversity and Dynamics
-Version: 1.0.0.9000
+Version: 1.0.1
 Authors@R: 
     c(person(given = "Mauro",
              family = "Lepore",
@@ -79,19 +79,18 @@ URL: http://forestgeo.github.io/fgeo,
     https://github.com/forestgeo/fgeo
 BugReports: https://github.com/forestgeo/fgeo/issues
 Imports: 
+    fgeo.x (>= 1.0.1),
+    fgeo.tool (>= 1.0.1),
+    fgeo.analyze (>= 1.0.1),
+    fgeo.plot (>= 1.0.1),
     cli,
     crayon,
     dplyr,
-    fgeo.analyze,
-    fgeo.plot,
-    fgeo.tool,
-    fgeo.x,
     glue,
     magrittr,
     purrr,
     rlang,
     rstudioapi,
-    tibble,
     utils
 Suggests: 
     covr,
@@ -101,10 +100,10 @@ Suggests:
     spelling,
     testthat
 Remotes: 
-    forestgeo/fgeo.analyze,
-    forestgeo/fgeo.plot,
-    forestgeo/fgeo.tool,
-    forestgeo/fgeo.x
+    forestgeo/fgeo.x@*release,
+    forestgeo/fgeo.tool@*release,
+    forestgeo/fgeo.analyze@*release,
+    forestgeo/fgeo.plot@*release
 Encoding: UTF-8
 Language: en-US
 LazyData: true

NEWS.md

@@ -1,7 +1,12 @@
 # fgeo (development version)
 
-* Prepare the first public release
+* Work in progress.
 
-# fgeo 1.0.0 (internal GitHub release)
+# fgeo 1.0.1 (GitHub release)
+
+* Style.
+* Tidy dependencies.
+
+# fgeo 1.0.0 (GitHub release)
 
 * Internal GitHub release.

R/attach.R

@@ -5,8 +5,9 @@ core_unloaded <- function() {
 
 fgeo_attach <- function() {
   to_load <- core_unloaded()
-  if (length(to_load) == 0)
+  if (length(to_load) == 0) {
     return(invisible())
+  }
 
   msg(
     cli::rule(

R/conflicts.R

@@ -58,14 +58,16 @@ confirm_conflict <- function(packages, name) {
     is.function
   )
 
-  if (length(objs) <= 1)
+  if (length(objs) <= 1) {
     return()
+  }
 
   # Remove identical functions
   objs <- objs[!duplicated(objs)]
   packages <- packages[!duplicated(packages)]
-  if (length(objs) == 1)
+  if (length(objs) == 1) {
     return()
+  }
 
   packages
 }

R/fgeo_browse.R

@@ -22,4 +22,3 @@ fgeo_browse <- fgeo_browse_url("index.html")
 #' @rdname fgeo_browse
 #' @export
 fgeo_browse_reference <- fgeo_browse_url("articles/siteonly/reference.html")
-

R/fgeo_help.R

@@ -21,13 +21,12 @@
 #' if (interactive()) {
 #'   fgeo_help()
 #' }
-#'
-#' tibble::as_tibble(fgeo_help()$matches)
-#'
+#' 
+#' dplyr::as_tibble(fgeo_help()$matches)
+#' 
 #' if (interactive()) {
 #'   fgeo_help("stem", package = "fgeo.x")
 #' }
-#'
 #' @family functions to explore fgeo
 #' @export
 fgeo_help <- function(pattern = "", package = NULL, rebuild = TRUE, ...) {

R/fgeo_packages.R

@@ -16,7 +16,7 @@ fgeo_packages <- function(include_self = TRUE) {
 }
 
 fgeo_to_attach <- function() {
- fgeo_packages(include_self = FALSE)
+  fgeo_packages(include_self = FALSE)
 }
 
 
@@ -31,8 +31,8 @@ fgeo_to_attach <- function() {
 #' @family functions for developers
 #' @noRd
 fgeo_dependencies <- function(matches = NULL,
-  include_self = TRUE,
-  section = c("Imports", "Suggests")) {
+                              include_self = TRUE,
+                              section = c("Imports", "Suggests")) {
   section <- section[[1]]
   raw <- utils::packageDescription("fgeo")[[section]]
   pulled <- strsplit(raw, ",")[[1]]

R/utils.R

@@ -21,7 +21,6 @@ text_col <- function(x) {
   theme <- rstudioapi::getThemeInfo()
 
   if (isTRUE(theme$dark)) crayon::white(x) else crayon::black(x)
-
 }
 
 invert <- function(x) {
@@ -36,4 +35,3 @@ style_grey <- function(level, ...) {
     crayon::make_style(grDevices::grey(level), grey = TRUE)
   )
 }
-

R/zzz.R

@@ -1,6 +1,7 @@
 .onAttach <- function(...) {
-  if (all_attached(fgeo_to_attach()))
+  if (all_attached(fgeo_to_attach())) {
     return()
+  }
 
   crayon::num_colors(TRUE)
   fgeo_attach()

README.Rmd

@@ -12,6 +12,8 @@ knitr::opts_chunk$set(
   comment = "#>",
   fig.path = "man/figures/README-"
 )
+
+options(fgeo.quiet = TRUE)
 ```
 
 # <img src="https://i.imgur.com/vTLlhbp.png" align="right" height=88 /> Analyze forest diversity and dynamics
@@ -57,7 +59,7 @@ __Expected R environment__
 
 Install the latest stable version of all **fgeo** packages with:
 
-```
+```R
 install.packages("devtools")
 devtools::install_github("forestgeo/fgeo@*release", upgrade = "never")
 ```