Merge pull request #176 from RcppCore/feature/use-pkgkitten

Feature/use pkgkitten

Author: eddelbuettel

.travis.yml

@@ -19,7 +19,7 @@ before_install:
 
 install:
   - ./travis-tool.sh install_aptget r-cran-runit
-  - ./travis-tool.sh install_r inline rbenchmark highlight
+  - ./travis-tool.sh install_r inline rbenchmark highlight pkgKitten
 
 script: 
   - ./travis-tool.sh run_tests

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.11.2.3
-Date: 2014-09-03
+Version: 0.11.2.4
+Date: 2014-09-10
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, 
  Douglas Bates, and John Chambers
 Maintainer: Dirk Eddelbuettel <[email protected]>
@@ -51,7 +51,7 @@ Description: The Rcpp package provides R functions as well as a C++ library
  see 'citation("Rcpp")' for details.
 Depends: R (>= 3.0.0)
 Imports: methods
-Suggests: RUnit, inline, rbenchmark, highlight
+Suggests: RUnit, inline, rbenchmark, highlight, pkgKitten (>= 0.1.1)
 VignetteBuilder: highlight
 URL: http://www.rcpp.org, http://dirk.eddelbuettel.com/code/rcpp.html, https://github.com/RcppCore/Rcpp
 License: GPL (>= 2)

R/Rcpp.package.skeleton.R

@@ -26,8 +26,10 @@ Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
                                   maintainer = if (missing(author)) "Who to complain to"
                                                else author,
                                   email = "[email protected]",
-                                  license = "What Licence is it under ?") {
+                                  license = "GPL (>= 2)") {
 
+    havePkgKitten <- require("pkgKitten", quietly=TRUE, character.only=TRUE)
+
     call <- match.call()
     call[[1]] <- as.name("package.skeleton")
     env <- parent.frame(1)
@@ -117,17 +119,21 @@ Rcpp.package.skeleton <- function(name = "anRpackage", list = character(),
     close( ns )
 
 	## update the package description help page
-	package_help_page <- file.path(root, "man", sprintf( "%s-package.Rd", name))
-	if (file.exists(package_help_page)) {
-	    lines <- readLines(package_help_page)
-	    lines <- gsub("What license is it under?", license, lines, fixed = TRUE)
-	    lines <- gsub("Who to complain to <[email protected]>",
-                      sprintf( "%s <%s>", maintainer, email),
-                      lines, fixed = TRUE)
-	    lines <- gsub( "Who wrote it", author, lines, fixed = TRUE)
-	    writeLines(lines, package_help_page)
-	}
-
+    if (havePkgKitten) {                # if pkgKitten is available, use it
+        pkgKitten::playWithPerPackageHelpPage(name, path, maintainer, email)
+    } else {
+        package_help_page <- file.path(root, "man", sprintf( "%s-package.Rd", name))
+        if (file.exists(package_help_page)) {
+            lines <- readLines(package_help_page)
+            lines <- gsub("What license is it under?", license, lines, fixed = TRUE)
+            lines <- gsub("Who to complain to <[email protected]>",
+                          sprintf( "%s <%s>", maintainer, email),
+                          lines, fixed = TRUE)
+            lines <- gsub( "Who wrote it", author, lines, fixed = TRUE)
+            writeLines(lines, package_help_page)
+        }
+    }
+    
 	## lay things out in the src directory
 	src <- file.path(root, "src")
 	if (!file.exists(src)) {

man/Rcpp.package.skeleton.Rd

@@ -18,7 +18,7 @@ Rcpp.package.skeleton(name = "anRpackage", list = character(),
 	author = "Who wrote it", 
 	maintainer = if(missing( author)) "Who to complain to" else author, 
 	email = "[email protected]", 
-	license = "What Licence is it under ?"
+	license = "GPL (>= 2)"
 	)
 }
 \arguments{