Merge f61a848 into 913a847

.Rbuildignore

@@ -6,3 +6,4 @@ todo.txt
 ^\.travis\.yml$
 ^NEWS\.md$
 ^cran-comments\.md$
+^CONDUCT\.md$

.travis.yml

@@ -20,6 +20,7 @@ before_install:
 install:
   - ./travis-tool.sh install_deps
   - ./travis-tool.sh github_package jimhester/covr
+  - ./travis-tool.sh github_package jimhester/lintr
 
 script: ./travis-tool.sh run_tests
 
@@ -33,3 +34,6 @@ notifications:
 
 after_success:
   - Rscript -e 'library(covr);coveralls()'
+  - Rscript -e 'lintr::lint_package(linters=c(assignment_linter, single_quotes_linter, absolute_paths_linter, no_tab_linter, commas_linter, spaces_left_parentheses_linter, spaces_inside_linter, open_curly_linter, closed_curly_linter, snake_case_linter, multiple_dots_linter, object_length_linter, object_usage_linter, trailing_whitespace_linter, trailing_blank_lines_linter))'
+
+#Linters to add:   line_length_linter (181), infix_spaces_linter (73)

CONDUCT.md

@@ -0,0 +1,25 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who 
+contribute through reporting issues, posting feature requests, updating documentation,
+submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for
+everyone, regardless of level of experience, gender, gender identity and expression,
+sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or
+imagery, derogatory comments or personal attacks, trolling, public or private harassment,
+insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments,
+commits, code, wiki edits, issues, and other contributions that are not aligned to this 
+Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed 
+from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by 
+opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the Contributor Covenant 
+(http:contributor-covenant.org), version 1.0.0, available at 
+http://contributor-covenant.org/version/1/0/0/

DESCRIPTION

@@ -20,6 +20,7 @@ Depends:
     caret
 Suggests:
     testthat,
+    lintr,
     randomForest,
     rpart,
     kernlab,

README.md

@@ -21,3 +21,5 @@ There are also tagged versions of caretEnsemble on github you can install via de
 ```{R}
 devtools::install_github('zachmayer/caretEnsemble@0.0')
 ```
+
+Please note that this project is released with a [Contributor Code of Conduct](CONDUCT.md). By participating in this project you agree to abide by its terms.

cran-comments.md

@@ -1,15 +1,14 @@
-This is a re-submission of a new package to CRAN.
+## Test environments
+* local OS X install, R 3.1.2
+* ubuntu 12.04 (on travis-ci), R 3.1.2
+* win-builder (devel and release)
 
-The re-submission fixes the following issues in our first submission:
+## R CMD check results
+There were no ERRORs, WARNINGs, or NOTES. 
 
-1. 'This package' is redundant: what else might it be a description of?:
-    'This package' removed from Description.
-2. Describe the package, not what it is not: Decpription updated to remove
-    extraneous lines.
-3. Examples take too long: We updated most of the example with `\dontrun{}` 
-    blocks so they will not be run on CRAN.
-4. Tests take too long: We used `testthat::skip_on_cran()` to skip all of the 
-    longer-runing rests.  Testing on CRAN should now take 30-40 seconds.
-
-`R CMD CHECK` passes on mac, ubuntu, and windows with no errors, warnings or 
-    notes
+## Downstream dependencies
+I have also run R CMD check on downstream dependencies of caretEnsemble 
+(https://github.com/wch/checkresults/blob/master/httr/r-release). All packages 
+that I could install passed except:
+
+* XYZ:...

tests/testthat/test-lintr.R

@@ -0,0 +1,6 @@
+# if (requireNamespace("lintr", quietly = TRUE)) {
+#   context("lints")
+#   test_that("Package Style", {
+#     lintr::expect_lint_free()
+#   })
+# }