[rkward-cvs] SF.net SVN: rkward:[3867] trunk/rkward/rkward/rbackend/rpackages/rkwarddev

[m-eik at users.sourceforge.net]

Revision: 3867
          http://rkward.svn.sourceforge.net/rkward/?rev=3867&view=rev
Author:   m-eik
Date:     2011-09-30 08:17:58 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
rkwarddev: fixed rk.plugin.skeleton() (not skipping editing DESCRIPTION if file exists)

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rpackages/rkwarddev/DESCRIPTION
    trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rk.plugin.skeleton.R
    trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rkwarddev-package.R
    trunk/rkward/rkward/rbackend/rpackages/rkwarddev/man/rkwarddev-package.Rd

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwarddev/DESCRIPTION	2011-09-30 08:13:32 UTC (rev 3866)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwarddev/DESCRIPTION	2011-09-30 08:17:58 UTC (rev 3867)
@@ -15,7 +15,7 @@
 Authors at R: c(person(given="Meik", family="Michalke",
     email="meik.michalke at hhu.de", role=c("aut", "cre")))
 Version: 0.02-3
-Date: 2011-09-29
+Date: 2011-09-30
 Collate:
     'rk.build.plugin.R'
     'rk-internal.R'

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rk.plugin.skeleton.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rk.plugin.skeleton.R	2011-09-30 08:13:32 UTC (rev 3866)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rk.plugin.skeleton.R	2011-09-30 08:17:58 UTC (rev 3867)
@@ -250,37 +250,39 @@
 	} else {}
 
 	## create DESCRIPTION file
-	if("desc" %in% create & isTRUE(checkCreateFiles(description.file))){
-		all.authors <- format(get.by.role(about[["author"]], role="aut"),
-			include=c("given", "family", "email"), braces=list(email=c("<", ">")))
-		all.maintainers <- format(get.by.role(about[["author"]], role="cre"),
-			include=c("given", "family", "email"), braces=list(email=c("<", ">")))
+	if("desc" %in% create){
+		if(isTRUE(checkCreateFiles(description.file))){
+			all.authors <- format(get.by.role(about[["author"]], role="aut"),
+				include=c("given", "family", "email"), braces=list(email=c("<", ">")))
+			all.maintainers <- format(get.by.role(about[["author"]], role="cre"),
+				include=c("given", "family", "email"), braces=list(email=c("<", ">")))
 
 ## TODO: check and add the commented values here:
 ## especially dependencies must be created from 'about'
-		desc <- data.frame(
-			Package=name,
-			Type="Package",
-			Title=about.node at attributes[["name"]],
-			Version=about.node at attributes[["version"]],
-			Date=about.node at attributes[["releasedate"]],
-			Author=all.authors,
-			AuthorsR=paste(deparse(about[["author"]]), collapse=" "),
-			Maintainer=all.maintainers,
-#			Depends="R (>= 2.9.0)",
-			Enhances="rkward",
-			Description=about.node at attributes[["shortinfo"]],
-			License=about.node at attributes[["license"]],
-#			Encoding="UTF-8",
-			LazyLoad=ifelse(isTRUE(lazyLoad), "yes", "no"),
-			URL=about.node at attributes[["url"]],
-			stringsAsFactors=FALSE)
+			desc <- data.frame(
+				Package=name,
+				Type="Package",
+				Title=about.node at attributes[["name"]],
+				Version=about.node at attributes[["version"]],
+				Date=about.node at attributes[["releasedate"]],
+				Author=all.authors,
+				AuthorsR=paste(deparse(about[["author"]]), collapse=" "),
+				Maintainer=all.maintainers,
+#				Depends="R (>= 2.9.0)",
+				Enhances="rkward",
+				Description=about.node at attributes[["shortinfo"]],
+				License=about.node at attributes[["license"]],
+#				Encoding="UTF-8",
+				LazyLoad=ifelse(isTRUE(lazyLoad), "yes", "no"),
+				URL=about.node at attributes[["url"]],
+				stringsAsFactors=FALSE)
 
-		# i have no clue how to circumvent this workaround:
-		desc$`Authors at R` <- desc[["AuthorsR"]]
-		desc <- subset(desc, select=-AuthorsR)
+			# i have no clue how to circumvent this workaround:
+			desc$`Authors at R` <- desc[["AuthorsR"]]
+			desc <- subset(desc, select=-AuthorsR)
 
-		write.dcf(desc, file=description.file)
+			write.dcf(desc, file=description.file)
+		} else {}
 		if(isTRUE(edit)){
 			rk.edit.files(description.file, title="DESCRIPTION", prompt=FALSE)
 		} else {}

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rkwarddev-package.R	2011-09-30 08:13:32 UTC (rev 3866)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rkwarddev-package.R	2011-09-30 08:17:58 UTC (rev 3867)
@@ -4,7 +4,7 @@
 #' Package: \tab rkwarddev\cr
 #' Type: \tab Package\cr
 #' Version: \tab 0.02-3\cr
-#' Date: \tab 2011-09-29\cr
+#' Date: \tab 2011-09-30\cr
 #' Depends: \tab R (>= 2.9.0),XiMpLe,rkward (>= 0.5.6)\cr
 #' Enhances: \tab rkward\cr
 #' Encoding: \tab UTF-8\cr

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwarddev/man/rkwarddev-package.Rd	2011-09-30 08:13:32 UTC (rev 3866)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwarddev/man/rkwarddev-package.Rd	2011-09-30 08:17:58 UTC (rev 3867)
@@ -9,7 +9,7 @@
 \details{
   \tabular{ll}{ Package: \tab rkwarddev\cr Type: \tab
   Package\cr Version: \tab 0.02-3\cr Date: \tab
-  2011-09-29\cr Depends: \tab R (>= 2.9.0),XiMpLe,rkward
+  2011-09-30\cr Depends: \tab R (>= 2.9.0),XiMpLe,rkward
   (>= 0.5.6)\cr Enhances: \tab rkward\cr Encoding: \tab
   UTF-8\cr License: \tab GPL (>= 3)\cr LazyLoad: \tab
   yes\cr URL: \tab http://rkward.sourceforge.net\cr }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.