CVS commit: pkgsrc/pkgtools/R2pkg/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Oct 19 13:37:00 UTC 2019

Modified Files:
        pkgsrc/pkgtools/R2pkg/files: R2pkg.R R2pkg_test.R

Log Message:
pkgtools/R2pkg: refactoring, tests


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/pkgtools/R2pkg/files/R2pkg.R
cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/R2pkg/files/R2pkg.R
diff -u pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.16 pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.17
--- pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.16    Sat Oct 19 11:47:23 2019
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg.R Sat Oct 19 13:37:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: R2pkg.R,v 1.16 2019/10/19 11:47:23 rillig Exp $
+# $NetBSD: R2pkg.R,v 1.17 2019/10/19 13:37:00 rillig Exp $
 #
 # Copyright (c) 2014,2015,2016,2017,2018,2019
 #      Brook Milligan.  All rights reserved.
@@ -535,26 +535,25 @@ message.wip.dependency <- function(depen
     level.warning('R-',arg.rpkg,' should not depend on a wip package: ',depends.pkg(dependency)[index])
 }
 
-message.too.many.dependencies <- function(dependency)
+update.dependency <- function(dependency, index=1)
 {
-  msg <- paste0('[ ',arg.level,' ] WARNING: too many dependencies found for ',depends(dependency),':')
-  for (pkg in depends.pkg(dependency))
-    msg <- paste(msg,pkg)
-  msg
-}
-
-update.dependency <- function(dependency,index=1)
-{
-  level.warning('updating dependency for ',depends(dependency),': ',depends.pkg(dependency)[index])
-  grep <- paste0('grep -E -q -e "',depends(dependency),'" ',arg.packages_list)
-  command <- paste0(grep,' || (cd ',depends.pkg(dependency)[index],' && ',arg.r2pkg,' ',arg.args,' ',depends(dependency),')')
+  level.message('updating dependency for ', depends(dependency), ': ', depends.pkg(dependency)[index])
+  command <- sprintf(
+    'grep -E -q -e "%s" %s || (cd %s && %s %s %s)',
+    depends(dependency), arg.packages_list,
+    depends.pkg(dependency)[index], arg.r2pkg, arg.args, depends(dependency))
   error <- system(command)
   if (error != 0)
-    level.warning('error updating dependency for ',depends(dependency))
+    level.warning('error updating dependency for ', depends(dependency))
 }
 
 make.depends <- function(imps,deps)
 {
+  warn_too_many_dependencies <- function(dependency) {
+    level.warning(sprintf('too many dependencies found for %s: %s',
+      depends(dependency), paste(depends.pkg(dependency))))
+  }
+
   imports <- make.imports(imps,deps)
   # XXX  message('===> imports:')
   # XXX print(imports)
@@ -565,21 +564,22 @@ make.depends <- function(imps,deps)
       for (i in 1:length(imports))
         {
           dependency <- make.dependency(imports[i])
+          depdirs <- depends.pkg(dependency)
           # XXX message('[ ',${LEVEL},' ] ===> ',i,' / ',length(imports),': ',depends(dependency))
-          if (length(depends.pkg(dependency)) == 0) # a dependency cannot be found
+          if (length(depdirs) == 0) # a dependency cannot be found
             {
               level.message('0 dependencies match ',dependency)
               if (arg.recursive)
                 {
                   dir.create(path=dependency.dir(dependency),recursive=TRUE)
-          update.dependency(dependency)
-        }
+                  update.dependency(dependency)
+                }
               else
                 level.warning('dependency needed for ',depends(dependency))
             }
-          else if (length(depends.pkg(dependency)) == 1) # a unique dependency found
+          else if (length(depdirs) == 1) # a unique dependency found
             {
-              level.message('1 dependency matches ',dependency,': ',depends.pkg(dependency))
+              level.message('1 dependency matches ',dependency,': ',depdirs)
               message.wip.dependency(dependency)
               if (arg.recursive && arg.update)
                 update.dependency(dependency)
@@ -588,18 +588,17 @@ make.depends <- function(imps,deps)
               else
                 DEPENDS <- rbind(DEPENDS,data.frame(key=depends.dir(dependency),value=depends.line(dependency)))
             }
-          else if (length(depends.pkg(dependency)) == 2) # two dependencies found
+          else if (length(depdirs) == 2) # two dependencies found
             {
-              d <- depends.pkg(dependency)
-              index <- grep('/wip/',d,invert=TRUE)
-              level.message('2 dependencies match ',dependency,':',paste(' ',depends.pkg(dependency)))
+              index <- grep('/wip/',depdirs,invert=TRUE)
+              level.message('2 dependencies match ',dependency,':',paste(' ',depdirs))
               # message('===> depends(dependency): ',depends(dependency))
               # message('===> depends.pkg(dependency):',paste(' ',d))
               # message('===> index: ',index)
               # message('===> buildlink3.line(): ',buildlink3.line(dependency,index))
               if (length(index) == 1) # a unique, non-wip, dependency found
                 {
-                  level.message('choosing unique non-wip dependency for ',dependency,': ',depends.pkg(dependency)[index])
+                  level.message('choosing unique non-wip dependency for ',dependency,': ',depdirs[index])
                   if (arg.recursive && arg.update)
                     update.dependency(dependency,index)
                   if (file.exists(buildlink3.file(dependency,index)))
@@ -610,18 +609,18 @@ make.depends <- function(imps,deps)
               else
                 {
                   level.message('no unique non-wip dependency matches')
-                  message(message.too.many.dependencies(dependency))
+                  warn_too_many_dependencies(dependency)
                   DEPENDS <- rbind(DEPENDS,data.frame(key='???',value=depends.line.2(dependency)))
                 }
             }
           else  # more than 2 dependencies found
             {
-              level.message(length(depends.pkg(dependency)),' dependencies match ',dependency,':',paste(' ',depends.pkg(dependency)))
-             message(message.too.many.dependencies(dependency))
+              level.message(length(depdirs),' dependencies match ',dependency,':',paste(' ',depdirs))
+              warn_too_many_dependencies(dependency)
               DEPENDS <- rbind(DEPENDS,data.frame(key='???',value=depends.line.2(dependency)))
             }
           if (length(new.depends.pkg(dependency)) > 0)
-            system(paste('echo',depends(dependency),arg.rpkg,'>>',arg.dependency_list))
+            system(paste('echo', depends(dependency), arg.rpkg, '>>', arg.dependency_list))
         }
     }
   DEPENDS <- as.sorted.list(DEPENDS)

Index: pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R
diff -u pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R:1.11 pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R:1.12
--- pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R:1.11       Sat Oct 19 11:47:23 2019
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg_test.R    Sat Oct 19 13:37:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: R2pkg_test.R,v 1.11 2019/10/19 11:47:23 rillig Exp $
+# $NetBSD: R2pkg_test.R,v 1.12 2019/10/19 13:37:00 rillig Exp $
 #
 # Copyright (c) 2019
 #      Roland Illig.  All rights reserved.
@@ -56,6 +56,36 @@ linesConnection <- function(...)
 make_mklines <- function(...)
     read.Makefile.as.dataframe(linesConnection(...))
 
+mocked_system <- function() {
+    commands <- list()
+    mock <- function(cmd) {
+        commands <<- append(commands, cmd)
+        0
+    }
+    get_commands <- function()
+        unlist(commands)
+    expect_commands <- function(...)
+        expect_equal(!!get_commands(), !!c(...))
+    list(
+        mock = mock,
+        commands = get_commands,
+        expect_commands = expect_commands)
+}
+
+mocked_message <- function() {
+    messages <- list()
+    mock <- function(...)
+        messages <<- append(messages, paste0(...))
+    get_messages <- function()
+        unlist(messages)
+    expect_messages <- function(...)
+        expect_equal(!!get_messages(), !!c(...))
+    list(
+        mock = mock,
+        messages = get_messages,
+        expect_messages = expect_messages)
+}
+
 test_that('linesConnection', {
     lines <- readLines(linesConnection('1', '2', '3'))
 
@@ -63,27 +93,25 @@ test_that('linesConnection', {
 })
 
 test_that('level.message', {
-    output <- ''
-    mock_message <- function(...) output <<- paste0(output, ..., '\n')
-
+    message <- mocked_message()
+    local_mock(message = message$mock)
     arg.level <<- 123  # XXX: should use with_environment instead
-    with_mock(message = mock_message, {
-        level.message('mess', 'age', ' text')
-    })
 
-    expect_equal(output, '[ 123 ] message text\n')
+    level.message('mess', 'age', ' text')
+
+    message$expect_messages(
+        '[ 123 ] message text')
 })
 
 test_that('level.warning', {
-    output <- ''
-    mock_message <- function(...) output <<- paste0(output, ..., '\n')
-
+    message <- mocked_message()
+    local_mock(message = message$mock)
     arg.level <<- 321  # XXX: should use with_environment instead
-    with_mock(message = mock_message, {
-        level.warning('mess', 'age', ' text')
-    })
 
-    expect_equal(output, '[ 321 ] WARNING: message text\n')
+    level.warning('mess', 'age', ' text')
+
+    message$expect_messages(
+        '[ 321 ] WARNING: message text')
 })
 
 test_that('trim.space', {
@@ -450,11 +478,25 @@ test_that('buildlink3.line', {
 # test_that('message.wip.dependency', {
 # })
 
-# test_that('message.too.many.dependencies', {
-# })
-
-# test_that('update.dependency', {
-# })
+test_that('update.dependency', {
+    system <- mocked_system()
+    message <- mocked_message()
+    local_mock(system = system$mock, message = message$mock)
+    local_dir(package_dir)
+    arg.packages_list <<- 'already-updated'
+    arg.r2pkg <<- 'pkg/bin/R2pkg'
+    arg.args <<- '-u'
+
+    update.dependency(make.dependency('assertthat'))
+
+    system$expect_commands(
+        paste0(
+            'grep -E -q -e "assertthat" already-updated ',
+            '|| ',
+            '(cd ../../devel/R-assertthat && pkg/bin/R2pkg -u assertthat)'))
+    message$expect_messages(
+        "[ 321 ] updating dependency for assertthat: ../../devel/R-assertthat")
+})
 
 # test_that('make.depends', {
 # })
@@ -740,10 +782,8 @@ test_that('conflicts', {
 
 test_that('update.Makefile', {
     local_dir(tempdir())
-    local_mock('system', function(...) {
-        expect_printed(list(...), 'asdf')
-        ''
-    })
+    system <- mocked_system()
+    local_mock(system = system$mock)
     writeLines(
         c(
             mkcvsid,
@@ -778,6 +818,7 @@ test_that('update.Makefile', {
             '',
             'asdf'),
         readLines('Makefile'))
+    system$expect_commands(c())
 })
 
 # test_that('create.Makefile', {