namespacing fxn calls from base R pkgs

Author: sckott

DESCRIPTION

@@ -21,11 +21,8 @@ URL: https://github.com/ropensci/gistr
 BugReports: https://github.com/ropensci/gistr/issues
 VignetteBuilder: knitr
 Imports:
-    utils,
-    methods,
-    stats,
-    jsonlite,
-    httr (>= 1.0.0),
+    jsonlite (>= 1.4),
+    httr (>= 1.2.0),
     magrittr,
     assertthat,
     knitr,

NAMESPACE

@@ -62,8 +62,4 @@ importFrom(httr,warn_for_status)
 importFrom(jsonlite,flatten)
 importFrom(knitr,knit)
 importFrom(magrittr,"%>%")
-importFrom(methods,is)
 importFrom(rmarkdown,render)
-importFrom(stats,setNames)
-importFrom(utils,browseURL)
-importFrom(utils,file.edit)

R/browse.R

@@ -8,5 +8,5 @@ browse <- function(gist, what="html"){
   gist <- as.gist(gist)
   url <- switch(what, 
          html="html_url", json="url", forks="forks_url", commits="commits_url", comments="comments_url")
-  browseURL(gist[[url]])
+  utils::browseURL(gist[[url]])
 }

R/gist_create_git.R

@@ -171,7 +171,7 @@ gist_create_git <- function(files = NULL, description = "", public = TRUE, brows
   git2r::add(git, ftoadd)
   # commit files
   cm <- tryCatch(git2r::commit(git, message = "added files from gistr"), error = function(e) e)
-  if (is(cm, "error")) message(strsplit(cm$message, ":")[[1]][[2]])
+  if (inherits(cm, "error")) message(strsplit(cm$message, ":")[[1]][[2]])
   # create gist
   gst <- as.gist(cgist(description, public))
   # add remote
@@ -181,13 +181,13 @@ gist_create_git <- function(files = NULL, description = "", public = TRUE, brows
     url <- sprintf("https://gist.github.com/%s.git", gst$id)
   }
   ra <- tryCatch(git2r::remote_add(git, "gistr", url), error = function(e) e)
-  if (is(ra, "error")) message(strsplit(ra$message, ":")[[1]][[2]])
+  if (inherits(ra, "error")) message(strsplit(ra$message, ":")[[1]][[2]])
   # push up files
   push_msg <- "Old remote not found on GitHub Gists\nAdding new remote\nRe-attempting push"
   if (git_method == "ssh") {
     trypush <- tryCatch(git2r::push(git, "gistr", "refs/heads/master", force = TRUE), 
                         error = function(e) e)
-    if (is(trypush, "error")) {
+    if (inherits(trypush, "error")) {
       message(push_msg)
       git2r::remote_remove(git, "gistr")
       git2r::remote_add(git, "gistr", url)
@@ -197,7 +197,7 @@ gist_create_git <- function(files = NULL, description = "", public = TRUE, brows
     cred <- git2r::cred_env("GITHUB_USERNAME", "GITHUB_PAT")
     trypush <- tryCatch(git2r::push(git, "gistr", "refs/heads/master", force = TRUE, credentials = cred),
                         error = function(e) e)
-    if (is(trypush, "error")) {
+    if (inherits(trypush, "error")) {
       message(push_msg)
       git2r::remote_remove(git, "gistr")
       git2r::remote_add(git, "gistr", url)

R/gist_map.R

@@ -13,7 +13,7 @@
 #' gist_map(gist_id)
 #'}
 gist_map <- function(x, browse = TRUE) {
-  assertthat::assert_that(is(x, "gist"))
+  assertthat::assert_that(inherits(x, "gist"))
   file <- names(x$files)
   assertthat::assert_that(has_extension(file, "geojson"))
   render_url <- "https://render.githubusercontent.com/view/geojson/?url=https://gist.githubusercontent.com/"
@@ -24,7 +24,7 @@ gist_map <- function(x, browse = TRUE) {
   actual_commit <- strsplit(commit, "/")[[1]][1]
   path <- paste(render_url, user, actual_commit, "raw", file, sep = "/")
   if (browse) {
-    browseURL(path)
+    utils::browseURL(path)
   } else {
     path
   }

R/gist_save.R

@@ -54,8 +54,8 @@ g_wrap <- function(..., indent = 0, width = getOption("width")) {
 #' @export
 #' @rdname gist_save
 gist_open <- function(x) {
-  stopifnot(is(x, "gist_files"))
-  invisible(lapply(x, file.edit))
+  stopifnot(inherits(x, "gist_files"))
+  invisible(lapply(x, utils::file.edit))
 }
 
 isDir <- function(path) {

R/gistr-package.R

@@ -22,9 +22,6 @@
 #' @importFrom assertthat assert_that has_extension
 #' @importFrom dplyr bind_rows as_data_frame 
 #' @importFrom jsonlite flatten
-#' @importFrom utils browseURL file.edit
-#' @importFrom methods is
-#' @importFrom stats setNames
 #' @name gistr-package
 #' @aliases gistr
 #' @docType package

R/run.R

@@ -25,7 +25,7 @@
 #' }
 
 run <- function(x, filename="code.R", knitopts=list()){
-  if(is(x, "gist")){
+  if(inherits(x, "gist")){
     ff <- check_files(x)
     code <- get_raw(ff$raw_url)
     files <- file.path(tempdir(), ff$filename)
@@ -48,7 +48,7 @@ run <- function(x, filename="code.R", knitopts=list()){
           c(input=files,
             output=sub("\\.Rmd", "\\.md", files),
             knitopts))
-  if(is(x, 'gist')) x %>% update_files(outpath) else outpath
+  if(inherits(x, 'gist')) x %>% update_files(outpath) else outpath
 }
 
 check_files <- function(x){

R/tabl.R

@@ -66,7 +66,7 @@ tabl.gist <- function(x, ...){
   singles <- repeat_rows(singles, files_n)
 
   owner <- data.frame(others$owner, stringsAsFactors = FALSE)
-  owner <- if (NROW(owner) == 0) owner else setNames(owner, paste0("owner_", names(owner)))
+  owner <- if (NROW(owner) == 0) owner else stats::setNames(owner, paste0("owner_", names(owner)))
   owner <- repeat_rows(owner, files_n)
 
   one <- dplyr::as_data_frame(cbind_fill(singles, files, owner, as_df = TRUE))
@@ -88,7 +88,7 @@ repeat_rows <- function(x, n) {
 #' @export
 #' @rdname tabl
 tabl_data <- function(x) {
-  stopifnot(is(x, "list"))
+  stopifnot(inherits(x, "list"))
   suppressWarnings(dplyr::bind_rows(lapply(x, "[[", "data")))
 }
 
@@ -98,7 +98,7 @@ tabl.list <- function(x, ...) {
     x <- unlist(x, recursive = FALSE)
   }
   res <- lapply(x, tabl)
-  if (is(x[[1]], "commit")) {
+  if (inherits(x[[1]], "commit")) {
     suppressWarnings(dplyr::bind_rows(res))
   } else {
     res
@@ -125,7 +125,7 @@ lappdf <- function(x, prefix = NULL) {
     if (NROW(tmp) == 0) {
       tmp
     } else {
-      setNames( tmp, paste0(prefix, "_", names(tmp)) )
+      stats::setNames( tmp, paste0(prefix, "_", names(tmp)) )
     }
   } else {
     tmp

R/zzz.R

@@ -11,7 +11,7 @@ payload <- function(filenames, description = "") {
     list(content = paste(readLines(file, warn = FALSE), collapse = "\n"))
   })
   # del <- lapply(delete, function(file) structure(list(NULL), names = basename(file)))
-  del <- do.call("c", unname(Map(function(x) setNames(list(NULL), x), sapply(delete, basename))))
+  del <- do.call("c", unname(Map(function(x) stats::setNames(list(NULL), x), sapply(delete, basename))))
   ren <- lapply(rename, function(f) {
     tt <- f[[1]]
     list(filename = basename(f[[2]]),