From 2e87368898a141bf34454804ceb9cd8e2614093d Mon Sep 17 00:00:00 2001
From: Arni Magnusson <arni.magnusson@ices.dk>
Date: Sat, 4 Apr 2020 18:02:08 +0200
Subject: [PATCH] Rename process.bib->process.bibfile and
 process.internal->process.entry

---
 NAMESPACE                              |  4 ++--
 NEWS                                   |  3 +++
 R/{process.bib.R => process.bibfile.R} |  4 ++--
 R/{process.inner.R => process.entry.R} |  2 +-
 R/taf.bootstrap.R                      |  5 +++--
 man/icesTAF-internal.Rd                | 14 +++++++-------
 6 files changed, 18 insertions(+), 14 deletions(-)
 rename R/{process.bib.R => process.bibfile.R} (95%)
 rename R/{process.inner.R => process.entry.R} (97%)

diff --git a/NAMESPACE b/NAMESPACE
index d25b63b..4a90380 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -39,8 +39,8 @@ export(os.windows)
 export(parse.repo)
 export(period)
 export(plus)
-export(process.bib)
-export(process.inner)
+export(process.bibfile)
+export(process.entry)
 export(read.taf)
 export(rmdir)
 export(rnd)
diff --git a/NEWS b/NEWS
index 3bff8b6..3419d97 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,9 @@ icesTAF 3.4-0 (2020-03-27)
   a special value, similar to source = {file}. Warn if source = {owner/repo@ref}
   entry is missing the '@ref' part.
 
+* Renamed internal function process.bib() to process.bibfile() and
+  process.inner() to process.entry().
+
 
 
 
diff --git a/R/process.bib.R b/R/process.bibfile.R
similarity index 95%
rename from R/process.bib.R
rename to R/process.bibfile.R
index de6f9d6..2e315fd 100644
--- a/R/process.bib.R
+++ b/R/process.bibfile.R
@@ -6,7 +6,7 @@
 
 ## Process *.bib file
 
-process.bib <- function(bibfile, clean=TRUE, quiet=FALSE)
+process.bibfile <- function(bibfile, clean=TRUE, quiet=FALSE)
 {
   if(!quiet)
     message("Processing ", bibfile)
@@ -65,7 +65,7 @@ process.bib <- function(bibfile, clean=TRUE, quiet=FALSE)
              file.path(type, key) else type
     mkdir(dir)  # target directory
 
-    process.inner(bib, dir, quiet)
+    process.entry(bib, dir, quiet)
   }
 
   invisible(TRUE)
diff --git a/R/process.inner.R b/R/process.entry.R
similarity index 97%
rename from R/process.inner.R
rename to R/process.entry.R
index 06cefb3..ca2becc 100644
--- a/R/process.inner.R
+++ b/R/process.entry.R
@@ -6,7 +6,7 @@
 
 ## Process bib entry
 
-process.inner <- function(bib, dir, quiet)
+process.entry <- function(bib, dir, quiet)
 {
   key <- attr(bib, "key")
 
diff --git a/R/taf.bootstrap.R b/R/taf.bootstrap.R
index c728300..dcdab29 100644
--- a/R/taf.bootstrap.R
+++ b/R/taf.bootstrap.R
@@ -93,13 +93,14 @@ taf.bootstrap <- function(software=TRUE, data=TRUE, clean=TRUE, quiet=FALSE,
   ## 1  Process software
   if(software && file.exists("SOFTWARE.bib"))
   {
-    out["SOFTWARE.bib"] <- process.bib("SOFTWARE.bib", clean=clean, quiet=quiet)
+    out["SOFTWARE.bib"] <- process.bibfile("SOFTWARE.bib",
+                                           clean=clean, quiet=quiet)
   }
 
   ## 2  Process data
   if(data && file.exists("DATA.bib"))
   {
-    out["DATA.bib"] <- process.bib("DATA.bib", clean=clean, quiet=quiet)
+    out["DATA.bib"] <- process.bibfile("DATA.bib", clean=clean, quiet=quiet)
   }
 
   ## Remove empty folders
diff --git a/man/icesTAF-internal.Rd b/man/icesTAF-internal.Rd
index 10a81f6..06d8b51 100644
--- a/man/icesTAF-internal.Rd
+++ b/man/icesTAF-internal.Rd
@@ -1,7 +1,7 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/download.github.R, R/ds.file.R, R/ds.package.R,
-%   R/icesTAF-internal.R, R/parse.repo.R, R/process.bib.R, R/process.inner.R,
-%   R/taf.install.R
+% Please edit documentation in R/download.github.R, R/ds.file.R,
+%   R/ds.package.R, R/icesTAF-internal.R, R/parse.repo.R, R/process.bibfile.R,
+%   R/process.entry.R, R/taf.install.R
 \name{extract.subdir}
 \alias{extract.subdir}
 \alias{stamp.description}
@@ -9,8 +9,8 @@
 \alias{ds.package}
 \alias{icesTAF-internal}
 \alias{parse.repo}
-\alias{process.bib}
-\alias{process.inner}
+\alias{process.bibfile}
+\alias{process.entry}
 \alias{already.in.taf.library}
 \title{Various TAF Helper Functions}
 \usage{
@@ -24,9 +24,9 @@ ds.package(package, author, year, title, version, source)
 
 parse.repo(repo)
 
-process.bib(bibfile, clean = TRUE, quiet = FALSE)
+process.bibfile(bibfile, clean = TRUE, quiet = FALSE)
 
-process.inner(bib, dir, quiet)
+process.entry(bib, dir, quiet)
 
 already.in.taf.library(targz, lib)
 }