From 92ab43325db14fe7fd93e3d165067216ae50d01f Mon Sep 17 00:00:00 2001 From: trinker Date: Sun, 15 Jun 2014 04:12:29 -0400 Subject: [PATCH] tweaks --- .Rbuildignore | 14 +- DESCRIPTION | 2 +- .../NEWPROJECT_NEW_VERSION/new_project.R | 209 ------------------ .../NEWPROJECT_OLD_VERSION/new_project.R | 184 --------------- inst/AFTER_REPORTS_UPDATES/TO_DO | 23 -- .../create_dolch_and_fry1000.R | 0 inst/maintenance.R | 2 +- 7 files changed, 13 insertions(+), 421 deletions(-) delete mode 100644 inst/AFTER_REPORTS_UPDATES/NEWPROJECT_NEW_VERSION/new_project.R delete mode 100644 inst/AFTER_REPORTS_UPDATES/NEWPROJECT_OLD_VERSION/new_project.R delete mode 100644 inst/AFTER_REPORTS_UPDATES/TO_DO rename inst/{Scraping Word Lists => Scraping_Word_Lists}/create_dolch_and_fry1000.R (100%) diff --git a/.Rbuildignore b/.Rbuildignore index ec8dfc2d..187a3d17 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -6,8 +6,6 @@ qdap.Rproj ^\.gitattributes tools.R maintenance.R -extra_statdoc -pdf_gen ^\.Rprofile style.R inst/polarity @@ -35,7 +33,7 @@ NEWS.md FAQ.md NEWS.html FAQ.html -demos +inst/demos ^\.travis\.yml$ inst/qdap_Demonstration inst/staticdocs @@ -59,5 +57,15 @@ inst/Rmd_vignette/qdap_vignette.html inst/Rmd_vignette/qdap_vignette.md inst/Rmd_vignette/qdap_vignette.Rproj inst/Rmd_vignette/figure +inst/extra_statdoc +inst/polarity +inst/qdap_Demonstration +inst/Scraping_Word_Lists +inst/staticdocs +inst/web +inst/pdf_gen +inst/demos/discoursemap + + diff --git a/DESCRIPTION b/DESCRIPTION index 0fae066e..af8f8367 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -28,7 +28,7 @@ Imports: reports, reshape2, scales, - tm, + tm (>= 0.6), tools, venneuler, wordcloud, diff --git a/inst/AFTER_REPORTS_UPDATES/NEWPROJECT_NEW_VERSION/new_project.R b/inst/AFTER_REPORTS_UPDATES/NEWPROJECT_NEW_VERSION/new_project.R deleted file mode 100644 index c8ae3bf0..00000000 --- a/inst/AFTER_REPORTS_UPDATES/NEWPROJECT_NEW_VERSION/new_project.R +++ /dev/null @@ -1,209 +0,0 @@ -#' Project Template -#' -#' Generate a project template to increase efficiency. -#' -#' @param project A character vector of the project name. -#' @param path The path to where the project should be created. Default is the -#' current working directory. -#' @param open logical. If \code{TRUE} the project will be opened in RStudio. -#' The default is to test if \code{new_project} is being used in the global -#' environment, if it is then the project directory will be opened. -#' @param github logical. If \code{TRUE} the repo will be sent to public -#' \href{https://github.com/}{GitHub} account. -#' @param \ldots Other arguments passed to \code{\link[reports]{new_report}}. -#' @details The project template includes these main directories and scripts: -#' \itemize{ -#' \item{ANALYSIS}{ - A directory containing the following analysis scripts: -#' \itemize{ -#' \item{01_clean_data.R}{ * initial cleaning of raw transcripts} -#' \item{02_analysis_I.R}{ * initial analysis} -#' \item{03_plots.R}{ * plotting script} -#' } -#' } -#' \item{CLEANED_TRANSCRIPTS}{ - A directory to store the cleaned transcripts (If the transcripts are already cleaned you may choose to not utilize the RAW_TRANSCRIPTS directory)} -#' \item{CM_DATA}{ - A directory to export/import scripts for cm_xxx family of functions} -#' \item{CODEBOOK}{ - A directory to store coding conventions or demographics data: -#' \itemize{ -#' \item{KEY.csv}{ * A blank template for demographic information} -#' } -#' } -#' \item{CORRESPONDENCE}{ - A directory to store correspondence and agreements with the client: -#' \itemize{ -#' \item{CONTACT_INFO.txt}{ * A txt file to put research team members' contact information} -#' } -#' } -#' \item{DATA}{ - A directory to store cleaned data (generally .RData format)} -#' \item{DATA_FOR_REVIEW}{ - A directory to put data that may need to be altered or needs to be inspected more closely} -#' \item{DOCUMENTS}{ - A directory to store documents related to the project} -#' \item{PLOTS}{ - A directory to store plots} -#' \item{PROJECT_WORKFLOW_GUIDE.pdf}{ * A pdf explaining the structure of the project template} -#' \item{RAW_DATA}{ - A directory to store non-transcript data related to the project: -#' \itemize{ -#' \item{ANALYTIC_MEMOS}{ * A directory to put audio files (or shortcuts)} -#' \item{AUDIO}{ * A directory to put audio files (or shortcuts)} -#' \item{FIELD_NOTES}{ * A directory to put audio files (or shortcuts)} -#' \item{PAPER_ARTIFACTS}{ * A directory to put paper artifacts} -#' \item{PHOTOGRAPHS}{ * A directory to put photographs} -#' \item{VIDEO}{ * A directory to put video files (or shortcuts)} -#' } -#' } -#' \item{RAW_TRANSCRIPTS}{ - A directory to store the raw transcripts} -#' \item{REPORTS}{ - A directory with report and presentation related tools. Please see the \cr \href{https://dl.dropbox.com/u/61803503/packages/REPORT_WORKFLOW_GUIDE.pdf}{REPORT_WORKFLOW_GUIDE.pdf} for more details} -#' \item{TABLES}{ - A directory to export tables to} -#' \item{WORD_LISTS}{ - A directory to store word lists that can be sourced and supplied to functions} -#' \item{.Rprofile}{ - Performs certain tasks such as loading libraries, data and sourcing functions upon startup in \href{http://www.rstudio.com/}{RStudio}} -#' \item{extra_functions.R}{ - A script to store user made functions related to the project -#' \itemize{ -#' \item{email}{ * A function to view, and optionally copy to the clipboard, emails for the client/lead researcher, analyst and/or other project members (information taking from ~/CORRESPONDENCE/CONTACT_INFO.txt file)} -#' \item{todo}{ * A function to view, and optionally copy to the clipboard, non-completed tasks from the \code{TO_DO.txt} file} -#' } -#' } -#' \item{LOG}{ - A text file documenting project changes/needs etc.} -#' \item{xxx.Rproj}{ - A project file used by \href{http://www.rstudio.com/}{RStudio}; clicking this will open the project in RStudio.} -#' \item{TO_DO}{ - A text file documenting project tasks} -#' } -#' -#' The template comes with a .Rproj file. This makes operating in -#' \href{http://www.rstudio.com/}{RStudio} very easy. The file can be kept on -#' the desktop or a git application such as \href{https://github.com/}{github}, -#' \href{https://bitbucket.org/}{bitbucket} or \href{https://www.dropbox.com/}{dropbox}, -#' depending on what the client/research team is comfortable utilizing. -#' -#' @return Creates a project template. -#' @keywords project, workflow, is.global -#' @export -#' @importFrom reports delete folder new_report repo2github UF -#' @importFrom tools file_ext -new_project <- function(project = "new", path = getwd(), - open = reports::is.global(2), github = FALSE, ...) { - project <- UF(project) - WD <- getwd() - on.exit(setwd(WD)) - if(file.exists(file.path(path, project))) { - message(paste0("\"", paste0(path, "/", project), - "\" already exists:\nDo you want to overwrite?\n")) - ans <- menu(c("Yes", "No")) - if (ans == "2") { - stop("new_project aborted") - } else { - delete(paste0(path, "/", project)) - } - } - x <- suppressWarnings(invisible(folder(folder.name=file.path(path, project)))) - setwd(x) - ANALYSIS <- CODEBOOK <- DATA <- DATA_FOR_REVIEW <- RAW_DATA <- NULL - RAW_TRANSCRIPTS <- PLOTS <- TABLES <- CM_DATA <- WORD_LISTS <- NULL - CORRESPONDENCE <- DOCUMENTS <- CLEANED_TRANSCRIPTS <- NULL - y <- invisible(folder(ANALYSIS, CODEBOOK, DATA, DATA_FOR_REVIEW, - RAW_TRANSCRIPTS, PLOTS, TABLES, CM_DATA, WORD_LISTS, CORRESPONDENCE, - DOCUMENTS, CLEANED_TRANSCRIPTS, RAW_DATA)) - todo <- paste("#when a task is complete put - in front of the item", - "#Use hanging indent", - "1. Task 1", sep = "\n") - cat(todo, file=paste0(x, "/", "TO_DO")) - cat(paste0("Project \"", project, "\" created: ", Sys.time(), "\n"), - file=paste0(x, "/", "LOG")) - invisible(folder(folder.name=file.path(y[[4]], "ALREADY_REVIEWED"))) - dats <- c("ANALYTIC_MEMOS", "AUDIO", "VIDEO", "FIELD_NOTES", "INTERVIEWS", - "PAPER_ARTIFACTS", "PHOTOGRAPHS") - invisible(folder(folder.name=file.path(y[[13]], dats))) - cat(paste0("library(qdap)\n", - "dir_map(\"CLEANED_TRANSCRIPTS\")\n\n\n\n", - "len <- length(dir(\"CLEANED_TRANSCRIPTS\"))\n", - "L1 <- lapply(paste0(\"dat\", 1:len), function(x) get(x))\n", - "names(L1) <- paste0(\"dat\", 1:len)\n", - "\n\n\n\nsave( , file = file.path(getwd(), \"DATA/cleaned.RData\"))\n"), - file=file.path(y[[1]], "01_clean_data.R")) - cat(paste0("lapply(c(\"qdap\", \"ggplot2\", \"grid\", \"scales\"), require, character.only = T)\n", - "source(\"extra_functions.R\")\n", - "load(\"DATA/cleaned.RData\")\n"), - file=paste0(y[[1]], "/", "02_analysis_I.R")) - cat(paste0("lapply(c(\"qdap\", \"ggplot2\", \"grid\", \"scales\"), require, character.only = T)\n", - "source(\"extra_functions.R\")\n", - "load(\"DATA/cleaned.RData\")\n", - "setwd(\"PLOTS\")\n"), - file=file.path(y[[1]], "03_plots.R")) - root <- system.file("extdata/docs", package = "qdap") - pdfloc <- file.path(root, "PROJECT_WORKFLOW_GUIDE.pdf") - invisible(file.copy(pdfloc, x)) - pdfloc4 <- file.path(root, "TEMP.txt") - invisible(file.copy(pdfloc4, x)) - invisible(file.rename(file.path(x, "TEMP.txt"), - file.path(x, paste0(project, ".Rproj")))) - pdfloc5 <- file.path(root, "extra_functions.R") - invisible(file.copy(pdfloc5, x)) - info <- c("PROJECT NAME: Project", - "CLIENT/LEAD RESEARCHER: lead_researcher 555-555-5555[skype: num1]", - "ANALYST: analyst_name 555-555-5555[skype: analyst_guy12]", - paste0("PROJECT MEMBERS:\n john doe 555-555-5555[skype: jd156]\n", - " jane doe 555-555-5555[skype: jd157]\n", - " nth_member 555-555-5555[skype: nmem123]\n"), - paste("PROJECT CREATED:", Sys.time()) - ) - info <- paste(info, collapse = "\n\n") - cat(info, file=paste0(y[[10]], "/", "CONTACT_INFO")) - write.csv(data.frame(person=""), file=paste0(y[[2]], "/", "KEY.csv"), - row.names = FALSE) - - ## Copy .Rprofile to main directory - pdfloc6 <- file.path(root, ".Rprofile") - invisible(file.copy(pdfloc6, x)) - - ## Create the reprots folder with `new_report` - invisible(new_report(c("REPORTS", project), ...)) - o <- paste0("Project \"", project, "\" created:\n", x, "\n") - class(o) <- "qdapProj" - - ## Send to github - if (github) { - try(repo2github(project.dir = x)) - } - - ## Open Project in RStudio - if (open) { - open_project(file.path(x, project, paste0(project, ".Rproj"))) - } - return(o) -} - -#' Prints a qdapProj Object -#' -#' Prints a qdapProj object. -#' -#' @param x The qdapProj object. -#' @param \ldots ignored -#' @method print qdapProj -#' @S3method print qdapProj -print.qdapProj <- -function(x, ...) { - class(x) <- NULL - message(x) -} - -wheresRstudio <- -function() { - myPaths <- c("rstudio", "~/.cabal/bin/rstudio", - "~/Library/Haskell/bin/rstudio", "C:\\PROGRA~1\\RStudio\\bin\\rstudio.exe", - "C:\\RStudio\\bin\\rstudio.exe", "/Applications/RStudio.app/Contents/MacOS/RStudio") - panloc <- Sys.which(myPaths) - temp <- panloc[panloc != ""] - if (identical(names(temp), character(0))) { - ans <- readline("RStudio not installed in one of the typical locations.\n - Do you know where RStudio is installed? (y/n) ") - if (ans == "y") { - temp <- readline("Enter the (unquoted) path to RStudio: ") - } else { - if (ans == "n") { - stop("RStudio not installed or not found.") - } - } - } - short.path <- which.min(unlist(lapply(gregexpr("RStudio", temp), "[[", 1))) - temp[short.path] -} - -open_project <- function(Rproj.loc) { - action <- paste(wheresRstudio(), Rproj.loc) - message("Preparing to open project!") - try(system(action, wait = FALSE, ignore.stderr = TRUE)) -} \ No newline at end of file diff --git a/inst/AFTER_REPORTS_UPDATES/NEWPROJECT_OLD_VERSION/new_project.R b/inst/AFTER_REPORTS_UPDATES/NEWPROJECT_OLD_VERSION/new_project.R deleted file mode 100644 index 39304620..00000000 --- a/inst/AFTER_REPORTS_UPDATES/NEWPROJECT_OLD_VERSION/new_project.R +++ /dev/null @@ -1,184 +0,0 @@ -#' Project Template -#' -#' Generate a project template to increase efficiency. -#' -#' @param project A character vector of the project name. -#' @param path The path to where the project should be created. Default is the -#' current working directory. -#' @param \ldots Other arguments passed to \code{\link[reports]{new_report}}. -#' @details The project template includes these main directories and scripts: -#' \itemize{ -#' \item{ANALYSIS}{ - A directory containing the following analysis scripts: -#' \itemize{ -#' \item{01_clean_data.R}{ * initial cleaning of raw transcripts} -#' \item{02_analysis_I.R}{ * initial analysis} -#' \item{03_plots.R}{ * plotting script} -#' } -#' } -#' \item{CLEANED_TRANSCRIPTS}{ - A directory to store the cleaned transcripts (If the transcripts are already cleaned you may choose to not utilize the RAW_TRANSCRIPTS directory)} -#' \item{CM_DATA}{ - A directory to export/import scripts for cm_xxx family of functions} -#' \item{CODEBOOK}{ - A directory to store coding conventions or demographics data: -#' \itemize{ -#' \item{KEY.csv}{ * A blank template for demographic information} -#' } -#' } -#' \item{CORRESPONDENCE}{ - A directory to store correspondence and agreements with the client: -#' \itemize{ -#' \item{CONTACT_INFO.txt}{ * A txt file to put research team members' contact information} -#' } -#' } -#' \item{DATA}{ - A directory to store cleaned data (generally .RData format)} -#' \item{DATA_FOR_REVIEW}{ - A directory to put data that may need to be altered or needs to be inspected more closely} -#' \item{DOCUMENTS}{ - A directory to store documents related to the project} -#' \item{PLOTS}{ - A directory to store plots} -#' \item{PROJECT_WORKFLOW_GUIDE.pdf}{ * A pdf explaining the structure of the project template} -#' \item{RAW_DATA}{ - A directory to store non-transcript data related to the project: -#' \itemize{ -#' \item{AUDIO}{ * A directory to put audio files (or shortcuts)} -#' \item{FIELD_NOTES}{ * A directory to put audio files (or shortcuts)} -#' \item{PAPER_ARTIFACTS}{ * A directory to put paper artifacts} -#' \item{PHOTOGRAPHS}{ * A directory to put photographs} -#' \item{VIDEO}{ * A directory to put video files (or shortcuts)} -#' } -#' } -#' \item{RAW_TRANSCRIPTS}{ - A directory to store the raw transcripts} -#' \item{REPORTS}{ - A directory with report and presentation related tools. Please see the \cr \href{https://dl.dropbox.com/u/61803503/packages/REPORT_WORKFLOW_GUIDE.pdf}{REPORT_WORKFLOW_GUIDE.pdf} for more details} -#' \item{TABLES}{ - A directory to export tables to} -#' \item{WORD_LISTS}{ - A directory to store word lists that can be sourced and supplied to functions} -#' \item{.Rprofile}{ - Performs certain tasks such as loading libraries, data and sourcing functions upon startup in \href{http://www.rstudio.com/}{RStudio}} -#' \item{extra_functions.R}{ - A script to store user made functions related to the project -#' \itemize{ -#' \item{email}{ * A function to view, and optionally copy to the clipboard, emails for the client/lead researcher, analyst and/or other project members (information taking from ~/CORRESPONDENCE/CONTACT_INFO.txt file)} -#' \item{todo}{ * A function to view, and optionally copy to the clipboard, non-completed tasks from the \code{TO_DO.txt} file} -#' } -#' } -#' \item{LOG}{ - A text file documenting project changes/needs etc.} -#' \item{xxx.Rproj}{ - A project file used by \href{http://www.rstudio.com/}{RStudio}; clicking this will open the project in RStudio.} -#' \item{TO_DO}{ - A text file documenting project tasks} -#' } -#' -#' The template comes with a .Rproj file. This makes operating in -#' \href{http://www.rstudio.com/}{RStudio} very easy. The file can be kept on -#' the desktop or a git application such as \href{https://github.com/}{github}, -#' \href{https://bitbucket.org/}{bitbucket} or \href{https://www.dropbox.com/}{dropbox}, -#' depending on what the client/research team is comfortable utilizing. -#' -#' @return Creates a project template. -#' @keywords project, workflow -#' @export -#' @importFrom reports delete folder new_report -#' @importFrom tools file_ext -new_project <- function(project = "new", path = getwd(), ...) { - WD <- getwd() - on.exit(setwd(WD)) - if(file.exists(paste0(path, "/", project))) { - cat(paste0("\"", paste0(path, "/", project), - "\" already exists:\nDo you want to overwrite?\n\n")) - ans <- menu(c("Yes", "No")) - if (ans == "2") { - stop("new_project aborted") - } else { - delete(paste0(path, "/", project)) - } - } - x <- suppressWarnings(invisible(folder(folder.name=paste0(path, "/", project)))) - setwd(x) - ANALYSIS <- CODEBOOK <- DATA <- DATA_FOR_REVIEW <- RAW_DATA <- NULL - RAW_TRANSCRIPTS <- PLOTS <- TABLES <- CM_DATA <- WORD_LISTS <- NULL - CORRESPONDENCE <- DOCUMENTS <- CLEANED_TRANSCRIPTS <- NULL - y <- invisible(folder(ANALYSIS, CODEBOOK, DATA, DATA_FOR_REVIEW, - RAW_TRANSCRIPTS, PLOTS, TABLES, CM_DATA, WORD_LISTS, CORRESPONDENCE, - DOCUMENTS, CLEANED_TRANSCRIPTS, RAW_DATA)) - todo <- paste("#when a task is complete put - in front of the item", - "#Use hanging indent", - "1. Task 1", sep = "\n") - cat(todo, file=paste0(x, "/", "TO_DO")) - cat(paste0("Project \"", project, "\" created: ", Sys.time(), "\n"), - file=paste0(x, "/", "LOG")) - invisible(folder(folder.name=paste0(y[[4]], "/", "ALREADY_REVIEWED"))) - dats <- c("AUDIO", "VIDEO", "FIELD_NOTES", "INTERVIEWS", "PAPER_ARTIFACTS", - "PHOTOGRAPHS") - invisible(folder(folder.name=paste0(y[[13]], "/", dats))) - cat(paste0("library(qdap)\n", - "dir_map(file.path(getwd(), \"CLEANED_TRANSCRIPTS\")\n\n\n\n", - "len <- length(dir(file.path(getwd(), \"CLEANED_TRANSCRIPTS\")))\n", - "L1 <- lapply(paste0(\"dat\", 1:len), function(x) get(x))\n", - "names(L1) <- paste0(\"dat\", 1:len)\n", - "\n\n\n\nsave( , file = file.path(getwd(), \"DATA/cleaned.RData\"))\n"), - file=paste0(y[[1]], "/", "01_clean_data.R")) - cat(paste0("library(qdap, ggplot2, grid, scales)\n", - "source(file.path(getwd(), \"extra_functions.R\"))\n", - "load(file.path(getwd(), \"DATA/cleaned.RData\"))\n"), - file=paste0(y[[1]], "/", "02_analysis_I.R")) - cat(paste0("library(qdap, ggplot2, grid, scales)\n", - "source(file.path(getwd(), \"extra_functions.R\"))\n", - "load(file.path(getwd(), \"DATA/cleaned.RData\"))\n", - "setwd(file.path(getwd(), \"PLOTS\"))\n"), - file=paste0(y[[1]], "/", "03_plots.R")) - root <- system.file("extdata/docs", package = "qdap") - pdfloc <- paste0(root, "/PROJECT_WORKFLOW_GUIDE.pdf") - invisible(file.copy(pdfloc, x)) - pdfloc4 <- paste0(root, "/TEMP.txt") - invisible(file.copy(pdfloc4, x)) - invisible(file.rename(paste0(x, "/TEMP.txt"), - paste0(x, "/", project, ".Rproj"))) - pdfloc5 <- paste0(root, "/extra_functions.R") - invisible(file.copy(pdfloc5, x)) - info <- c("PROJECT NAME: Project", - "CLIENT/LEAD RESEARCHER: lead_researcher 555-555-5555[skype: num1]", - "ANALYST: analyst_name 555-555-5555[skype: analyst_guy12]", - paste0("PROJECT MEMBERS:\n john doe 555-555-5555[skype: jd156]\n", - " jane doe 555-555-5555[skype: jd157]\n", - " nth_member 555-555-5555[skype: nmem123]\n"), - paste("PROJECT CREATED:", Sys.time()) - ) - info <- paste(info, collapse = "\n\n") - cat(info, file=paste0(y[[10]], "/", "CONTACT_INFO")) - write.csv(data.frame(person=""), file=paste0(y[[2]], "/", "KEY.csv"), - row.names = FALSE) - rpro <- c("#load the packages used", - "library(ggplot2)", - "library(reshape2)", - "library(plyr)", - "library(grid)", - "library(scales)", - "library(RColorBrewer)", - "library(qdap)", - "library(reports)", - "", - "WD <- getwd()", - "", - "#load functions into workspace", - "source(paste0(WD, \"/extra_functions.R\"))", - "", - "#load data into work space", - "dat <- paste0(WD, \"/DATA/\", dir(paste0(WD, \"/DATA/\")))", - "dat2 <- dat[file_ext(dat) %in% c(\"txt\", \"R\", \"r\")]", - "if (!identical(dat2, character(0))) {", - " try(lapply(dat2, source))", - "}", - "dat <- dat[file_ext(dat) == \"RData\"]", - "if (!identical(dat, character(0))) {", - " lapply(dat, load)", - "}") - cat(paste(rpro, collapse = "\n"), file = paste0(x, "/.Rprofile")) - cat(paste(rpro, collapse = "\n"), file = paste0(x, "/.Rprofile")) - invisible(new_report(c("REPORTS", project), ...)) - o <- paste0("Project \"", project, "\" created:\n", x, "\n") - class(o) <- "qdapProj" - return(o) -} - -#' Prints a qdapProj Object -#' -#' Prints a qdapProj object. -#' -#' @param x The qdapProj object. -#' @param \ldots ignored -#' @method print qdapProj -#' @S3method print qdapProj -print.qdapProj <- -function(x, ...) { - class(x) <- NULL - cat(x) -} diff --git a/inst/AFTER_REPORTS_UPDATES/TO_DO b/inst/AFTER_REPORTS_UPDATES/TO_DO deleted file mode 100644 index dcc0019d..00000000 --- a/inst/AFTER_REPORTS_UPDATES/TO_DO +++ /dev/null @@ -1,23 +0,0 @@ -NOTE TO SELF UNTIL reports GOES TO CRAN AGAIN: - -1. include vignette folder in the Rbuildignore - -2. lower reports version to NULL in DESCRIPTION - a. Add this later: reports (>= 0.2.0), - -3. Remove vignettebuilder from DESCRIPTION: - a. Add this back in later: VignetteBuilder: knitr - -4. Use old new_project.R and store the current in AFTER_REPORTS_UPDATES - - -Later Remove these from Rbuildignore -AFTER_REPORTS_UPDATES -vignettes - - -========================== -AFTER UPDATING -========================== -up version in DESCRIPTION -up version 2x in CITATION diff --git a/inst/Scraping Word Lists/create_dolch_and_fry1000.R b/inst/Scraping_Word_Lists/create_dolch_and_fry1000.R similarity index 100% rename from inst/Scraping Word Lists/create_dolch_and_fry1000.R rename to inst/Scraping_Word_Lists/create_dolch_and_fry1000.R diff --git a/inst/maintenance.R b/inst/maintenance.R index c492933c..bb53ab2d 100644 --- a/inst/maintenance.R +++ b/inst/maintenance.R @@ -175,7 +175,7 @@ names(NAMES_LIST) <- LETTERS #========================== # Vignette copy #========================== - path <- file.path("C:/Users/trinker/GitHub", "qdap_2.0.1.tar.gz") + path <- file.path("C:/Users/trinker/GitHub", "qdap_2.1.0.tar.gz") install.packages(path, repos = NULL, type="source") browseVignettes(package = 'qdap')