From f6688407acaaa33c4d3558de40c88b5e43dd6419 Mon Sep 17 00:00:00 2001 From: Som Bohora Date: Fri, 10 Mar 2017 12:26:52 -0600 Subject: [PATCH 1/6] Update initializing-package.md --- documentation-for-developers/initializing-package.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation-for-developers/initializing-package.md b/documentation-for-developers/initializing-package.md index 7833b5e..d22d500 100644 --- a/documentation-for-developers/initializing-package.md +++ b/documentation-for-developers/initializing-package.md @@ -109,7 +109,7 @@ Travis-CI tests your package on different Linux environments. It starts with a Further details: * The first test will take Travis a long time (maybe 20 min?) because it's caching a lot of the environment setup. Once cached, a minimal package will take just a few minutes each push. * Only the last commit of a push is tested. -* Travis-CI can to a lot of things beyond this simple scenario. There's a lot to read. +* Travis-CI can do a lot of things beyond this simple scenario. There's a lot to read. * https://travis-ci.org/getting_started * https://docs.travis-ci.com/user/languages/r/ * Alternatively, use `devtools::use_travis()` and complete the extra fields. From 5f25e4a6a0c2512de1d34d45fbd13da423a5b29b Mon Sep 17 00:00:00 2001 From: Som Bohora Date: Fri, 10 Mar 2017 12:28:07 -0600 Subject: [PATCH 2/6] Update initializing-package.md --- documentation-for-developers/initializing-package.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation-for-developers/initializing-package.md b/documentation-for-developers/initializing-package.md index 7833b5e..472e477 100644 --- a/documentation-for-developers/initializing-package.md +++ b/documentation-for-developers/initializing-package.md @@ -127,7 +127,7 @@ AppVeyor tests your package on different Windows environments. It starts with a Further details: * The first test will take AppVeyor a long time (but not as long as Travis) because it's caching a lot of the environment setup. Once cached, a minimal package will take just a few minutes each push. * Only the last commit of a push is tested. -* AppVeyor can to a lot of things beyond this simple scenario. There's a lot to read. +* AppVeyor can do a lot of things beyond this simple scenario. There's a lot to read. * https://www.appveyor.com/docs/ * https://github.com/krlmlr/r-appveyor * Alternatively, use `devtools::use_appveyor()` and complete the extra fields. From ab2a2407e2ead3e9dcdc0871daaa49d2ee9b006d Mon Sep 17 00:00:00 2001 From: Will Beasley Date: Tue, 4 Apr 2017 10:01:33 -0500 Subject: [PATCH 3/6] add travis badge closes #11 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index cfe6b7d..981b652 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/wibeasley/r-package-skeleton.svg?branch=master)](https://travis-ci.org/wibeasley/r-package-skeleton) + # r-package-skeleton This is for a SCUG class scheduled for two 1-hour SCUG meetings. From 673fc857dcc48a5beccd2850a78f0118fbe71282 Mon Sep 17 00:00:00 2001 From: Som Bohora Date: Tue, 2 May 2017 09:39:11 -0500 Subject: [PATCH 4/6] 2017 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 981b652..231f103 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # r-package-skeleton -This is for a SCUG class scheduled for two 1-hour SCUG meetings. +This is for a 2017 SCUG class scheduled for two 1-hour SCUG meetings. Creating a minimal R package: initializing package skeleton From 09e413d53da64e94baa4ab9468eacb1015fab135 Mon Sep 17 00:00:00 2001 From: Will Beasley Date: Tue, 2 May 2017 10:04:16 -0500 Subject: [PATCH 5/6] ignoring files --- .Rbuildignore | 5 +++++ .gitignore | 1 + 2 files changed, 6 insertions(+) diff --git a/.Rbuildignore b/.Rbuildignore index 91114bf..1c2f0d1 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,2 +1,7 @@ ^.*\.Rproj$ ^\.Rproj\.user$ + + +documentation-for-developers/ + +.travis.yml diff --git a/.gitignore b/.gitignore index 886732b..674991a 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ vignettes/*.pdf *.utf8.md *.knit.md .Rproj.user + From 776b8acec04a787a241f0a1538809a1442a8bc85 Mon Sep 17 00:00:00 2001 From: Will Beasley Date: Tue, 2 May 2017 10:23:29 -0500 Subject: [PATCH 6/6] function that adds two integers closes #19 --- NAMESPACE | 1 + R/integer-addition.R | 13 +++++++++++++ man/integer_addition.Rd | 16 ++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 R/integer-addition.R create mode 100644 man/integer_addition.Rd diff --git a/NAMESPACE b/NAMESPACE index 6ae9268..9e07672 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,2 +1,3 @@ # Generated by roxygen2: do not edit by hand +export(integer_addition) diff --git a/R/integer-addition.R b/R/integer-addition.R new file mode 100644 index 0000000..d7f5b67 --- /dev/null +++ b/R/integer-addition.R @@ -0,0 +1,13 @@ +#' @name integer_addition +#' @export +#' @title adds two integers +#' @description Adding two numbers +#' @param a first integer +#' @param b second integer + +integer_addition <- function(a,b) +{ + c <- a+b + return(c) + +} diff --git a/man/integer_addition.Rd b/man/integer_addition.Rd new file mode 100644 index 0000000..5c873c4 --- /dev/null +++ b/man/integer_addition.Rd @@ -0,0 +1,16 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/integer-addition.R +\name{integer_addition} +\alias{integer_addition} +\title{adds two integers} +\usage{ +integer_addition(a, b) +} +\arguments{ +\item{a}{first integer} + +\item{b}{second integer} +} +\description{ +Adding two numbers +}