From 47fe699d3eb04726c6e346e098569d2d51e608e3 Mon Sep 17 00:00:00 2001 From: boB Rudis Date: Tue, 19 Feb 2019 11:25:58 -0500 Subject: [PATCH] pre-travis check --- .codecov.yml | 1 + .travis.yml | 22 ++++++++++++++++++++++ DESCRIPTION | 2 +- README.Rmd | 4 ++++ README.md | 4 ++++ tests/testthat/test-metis.R | 26 +++++++++++++++++++------- 6 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 .codecov.yml create mode 100644 .travis.yml diff --git a/.codecov.yml b/.codecov.yml new file mode 100644 index 0000000..959972a --- /dev/null +++ b/.codecov.yml @@ -0,0 +1 @@ +comment: false \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..a0159d4 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: r + +warnings_are_errors: true + +cache: packages + +sudo: required + +jdk: + - oraclejdk8 + +addons: + apt: + packages: + - oracle-java8-set-default + +after_success: + - Rscript -e 'covr::codecov()' + +r: + - oldrel + - release diff --git a/DESCRIPTION b/DESCRIPTION index bf7bfd9..0082f1f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,7 +6,7 @@ Date: 2019-02-14 Authors@R: c( person("Bob", "Rudis", email = "bob@rud.is", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-5670-2640")), - person("Derek", "Abdine", comment = "Authentication driver update"), + person("Derek", "Abdine", role = "ctb", comment = "Authentication driver update"), person("Zachary", "Kurtz", email = "zdkurtz@gmail.com", role = "ctb") ) Maintainer: Bob Rudis diff --git a/README.Rmd b/README.Rmd index 19dcbd4..cc9ec25 100644 --- a/README.Rmd +++ b/README.Rmd @@ -18,6 +18,10 @@ Sys.setenv( options(width=120) ``` +[![Travis-CI Build Status](https://travis-ci.org/hrbrmstr/metis.svg?branch=master)](https://travis-ci.org/hrbrmstr/metis) +[![Coverage Status](https://codecov.io/gh/hrbrmstr/metis/branch/master/graph/badge.svg)](https://codecov.io/gh/hrbrmstr/metis +[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/metis)](https://cran.r-project.org/package=metis) + # metis Access and Query Amazon Athena via DBI/JDBC diff --git a/README.md b/README.md index 4d0456f..b4d0830 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ +[![Travis-CI Build Status](https://travis-ci.org/hrbrmstr/metis.svg?branch=master)](https://travis-ci.org/hrbrmstr/metis) +[![Coverage Status](https://codecov.io/gh/hrbrmstr/metis/branch/master/graph/badge.svg)](https://codecov.io/gh/hrbrmstr/metis +[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/metis)](https://cran.r-project.org/package=metis) + # metis Access and Query Amazon Athena via DBI/JDBC diff --git a/tests/testthat/test-metis.R b/tests/testthat/test-metis.R index 8f838ac..2ba31e6 100644 --- a/tests/testthat/test-metis.R +++ b/tests/testthat/test-metis.R @@ -6,13 +6,25 @@ drv <- metis::Athena() expect_is(drv, "AthenaDriver") -metis::dbConnect( - drv = drv, - Schema = "sampledb", - AwsCredentialsProviderClass = "com.simba.athena.amazonaws.auth.PropertiesFileCredentialsProvider", - AwsCredentialsProviderArguments = path.expand("~/.aws/athenaCredentials.props"), - S3OutputLocation = "s3://aws-athena-query-results-569593279821-us-east-1", -) -> con +if (identical(Sys.getenv("TRAVIS"), "true")) { + + metis::dbConnect( + drv = drv, + Schema = "sampledb", + S3OutputLocation = "s3://aws-athena-query-results-569593279821-us-east-1", + ) -> con + +} else { + + metis::dbConnect( + drv = drv, + Schema = "sampledb", + AwsCredentialsProviderClass = "com.simba.athena.amazonaws.auth.PropertiesFileCredentialsProvider", + AwsCredentialsProviderArguments = path.expand("~/.aws/athenaCredentials.props"), + S3OutputLocation = "s3://aws-athena-query-results-569593279821-us-east-1", + ) -> con + +} expect_is(con, "AthenaConnection")