Merge branch 'talk-changes'

# Conflicts:
#	NEWS.md

Author: hadley

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: usethis
 Title: Automate Package and Project Setup
-Version: 1.0.0
+Version: 1.0.0.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", role = c("aut", "cre")),
     person("RStudio", role = "cph")

NAMESPACE

@@ -38,6 +38,7 @@ export(use_news_md)
 export(use_package)
 export(use_package_doc)
 export(use_pipe)
+export(use_r)
 export(use_rcpp)
 export(use_readme_md)
 export(use_readme_rmd)

NEWS.md

@@ -1,5 +1,7 @@
 # usethis 1.0.0.9000
 
+* `use_r()` creates and opens an `.R` file
+
 # usethis 1.0.0
 
 This is a new package that extracts out many functions that previously lived in devtools, as well as providing more building blocks so you can create your own helpers. As well as the many new helpers listed below, there are three main improvements to the package:

R/edit.R

@@ -54,10 +54,7 @@ edit_git_config <- function(scope = c("user", "project")) {
 #' @rdname edit
 edit_git_ignore <- function(scope = c("user", "project")) {
   scope <- match.arg(scope)
-  switch(scope,
-    user = edit_file("~", ".gitignore"),
-    project = edit_file(proj_get(), ".git/ignore")
-  )
+  edit_file(scope_dir(scope), ".gitignore")
   invisible()
 }
 

R/r.R

@@ -0,0 +1,26 @@
+#' Create a new R file.
+#'
+#' @param name File name, without extension.
+#' @export
+use_r <- function(name) {
+  check_file_name(name)
+
+  use_directory("R")
+  edit_file(proj_get(), paste0("R/", name, ".R"))
+
+  invisible(TRUE)
+}
+
+check_file_name <- function(name) {
+  if (!valid_file_name(name)) {
+    stop(
+      value(name), " is not a valid file name. It should:\n",
+      "* Contain only ASCII letters, numbers, '-', and '_'\n",
+      call. = FALSE
+    )
+  }
+}
+
+valid_file_name <- function(x) {
+  grepl("^[[:alpha:]_-]+$", x)
+}