Moved tests location

.gitignore

@@ -1,3 +1,4 @@
 .Rproj.user
 .Rhistory
 .RData
+playground

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: lrequire
 Type: Package
-Title: Sources an R File with Caching, Exporting Specified Variables
-Version: 0.1
-Date: 2016-02-14
+Title: Sources and Encapsulates an R "Module" with Caching, Exposing Only Specified Variables
+Version: 0.1.1
+Date: 2016-02-19
 Author:  Rick Wargo <lrequire@rickwargo.com>
 Maintainer: Rick Wargo <lrequire@rickwargo.com>
 Description: In the fashion of 'node.js' <https://nodejs.org/>, requires a file,

NAMESPACE

@@ -1,3 +1,11 @@
 # Generated by roxygen2: do not edit by hand
 
+export(append.module.paths)
+export(find.first.R)
+export(get.module.cache)
+export(get.module.paths)
 export(lrequire)
+export(remove.from.module.cache)
+export(remove.module.paths)
+export(reset.module.cache)
+export(show.module.cache)

NEWS

@@ -1,2 +1,2 @@
-Version 0.1.0
+Version 0.1.1
 - CRAN release (Initial)

R/lrequire.R

@@ -59,7 +59,7 @@
 #' @author Rick Wargo, \email{lrequire@rickwargo.com}
 #'
 #' @examples
-#' say.hello.to <- lrequire('../lrequire/R/tests/example-hello')
+#' say.hello.to <- lrequire('../lrequire/tests/example-hello')
 #' say.hello.to('Rick')
 #'
 #' @export

R/showcache.R

@@ -8,8 +8,7 @@
 #'
 #' @examples
 #' show.module.cache()
+#' show.module.cache(all.names = TRUE)
 show.module.cache <- function(all.names = FALSE) {
-    for (v in ls(module.cache, all.names = all.names)) {
-    print(paste('Env:', v, '<-', module.cache[[v]]))
-  }
+  ls.str(module.cache, all.names = all.names)
 }

cran-comments.md

@@ -4,21 +4,7 @@
 * RStudio 0.99.491
 
 ## R CMD check results
-There were no ERRORs or WARNINGs. 
-
-There was 1 NOTE:
-
-* checking R code for possible problems ... NOTE
-lrequire : <anonymous>: no visible binding for global variable
-  ‘module.exports’
-lrequire : <anonymous>: no visible binding for global variable
-  ‘exports’
-
-### Explanation
-Both module.exports and exports are defined as global variables, but really local to the
-source file being lrequire'd. The function of lrequire is to take the variables specified 
-by the module.exports (or exports) list and make them, and only them, visible to the caller.
-This behavior operates as intended.
+There were no ERRORs, WARNINGs, or NOTEs. 
 
 ## Downstream dependencies
 

tests/runtests.R

@@ -2,6 +2,11 @@
 # No testing harness so as to not require additional packages
 # These tests may test more than a single piece of functionality
 
+library(lrequire)
+
+# actual tests are located in tests sub directory
+append.module.paths('tests', 0)
+
 tst1 <- lrequire(test1)
 tst2.sum <- lrequire(test2)
 tst3 <- lrequire(test3)
@@ -57,10 +62,10 @@ if (tst3$sum(1, 2) != 3) {
 }
 
 # test4 -- tests module.change_code, caching, and simplifying lrequire arguments to ensure they point to the same file
-source('test4.R')
+source('tests/test4.R')
 
 # test5 -- tests module.cache and associated functions
-source('test5.R')
+source('tests/test5.R')
 
 # test6 -- tests modules.path and associated functions
-source('test6.R')
+source('tests/test6.R')

tests/test6.R → tests/tests/test6.R

@@ -2,34 +2,34 @@ orig.path <- get.module.paths()
 
 # test getting of modules.path
 path <- get.module.paths()
-len5 <- length(path)
-if (len5 != 5) {
-  print('test6.1: failed -- length(path) != 5')
+len <- length(path)
+if (len != length(orig.path)) {
+  print('test6.1: failed -- length(path) != orig.length')
 } else {
   print('test6.1: succeeded')
 }
 
 # test append to end
 append.module.paths("/")
 path <- get.module.paths()
-len6 <- length(path)
-if (len6 != 6) {
-  print('test6.2.1: failed -- length(path) != 6')
+len <- length(path)
+if (len != length(orig.path)+1) {
+  print('test6.2.1: failed -- length(path) != orig.length+1')
 } else {
   print('test6.2.1: succeeded')
 }
-if (path[6] != "/") {
-  print('test6.2.2: failed -- path[6] != "/"')
+if (path[length(orig.path)+1] != "/") {
+  print('test6.2.2: failed -- path[orig.length+1] != "/"')
 } else {
   print('test6.2.2: succeeded')
 }
 
 # test remove (of recently appended path)
-remove.module.paths(6)
+remove.module.paths(length(orig.path)+1)
 path <- get.module.paths()
-len5 <- length(path)
-if (len5 != 5) {
-  print('test6.3.1: failed -- length(path) != 5')
+len <- length(path)
+if (len != length(orig.path)) {
+  print('test6.3.1: failed -- length(path) != orig.length')
 } else {
   print('test6.3.1: succeeded')
 }
@@ -42,24 +42,24 @@ if (!all.equal(orig.path, path)) {
 # test append to front
 append.module.paths("/", 0)
 path <- get.module.paths()
-len6 <- length(path)
-if (len6 != 6) {
-  print('test6.4.1: failed -- length(path) != 6')
+len <- length(path)
+if (len != length(orig.path)+1) {
+  print('test6.4.1: failed -- length(path) != orig.length+1')
 } else {
   print('test6.4.1: succeeded')
 }
 if (path[1] != "/") {
-  print('test6.4.2: failed -- path[6] != "/"')
+  print('test6.4.2: failed -- path[orig.length+1] != "/"')
 } else {
   print('test6.4.2: succeeded')
 }
 
 # test append to middle
 append.module.paths("/", 3)
 path <- get.module.paths()
-len7 <- length(path)
-if (len7 != 7) {
-  print('test6.5.1: failed -- length(path) != 7')
+len <- length(path)
+if (len != length(orig.path)+2) {
+  print('test6.5.1: failed -- length(path) != orig.length+2')
 } else {
   print('test6.5.1: succeeded')
 }
@@ -72,9 +72,9 @@ if (path[4] != "/") {
 # test remove (of multiple paths)
 remove.module.paths(1, 4)
 path <- get.module.paths()
-len5 <- length(path)
-if (len5 != 5) {
-  print('test6.6.1: failed -- length(path) != 5')
+len <- length(path)
+if (len != length(orig.path)) {
+  print('test6.6.1: failed -- length(path) != orig.length')
 } else {
   print('test6.6.1: succeeded')
 }