Merge pull request #27 from ldecicco-USGS/master

Adding unix tests.

.Rbuildignore

+^.*\.Rproj$
+^\.Rproj\.user$
+^\.Rproj\inst\dataRetrieval.log
+^\.Rproj\inst\dataRetrieval-concordance.tex
+^\.Rproj\inst\dataRetrieval.toc
+^\.Rproj\inst\dataRetrieval.tex
+^\.travis\.yml$
+^\.Rproj\.gitignore
+^\.Rproj\.RData
+^\.Rproj\dataRetrieval.Rproj
+^\.Rproj\.Rhistory
+^\.Rproj\.travis.yml
+^\.Rproj\appveyor.yml
+

.travis.yml

@@ -2,19 +2,24 @@
 
 language: c
 
-before_install:
-  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
-  - chmod 755 ./travis-tool.sh
-  - ./travis-tool.sh bootstrap
+env:
+   global:
+     - CRAN: http://cran.rstudio.com
+     - R_BUILD_ARGS="--no-build-vignettes --no-manual"
+     - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
+     - BOOTSTRAP_LATEX=""
 
-install:
-  - ./travis-tool.sh install_deps
-  - ./travis-tool.sh install_github USGS-R/EGRET
+script: "./travis-tool.sh run_tests"
 
-script: ./travis-tool.sh run_tests
+before_script:
+  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
+  - chmod 755 ./travis-tool.sh
+  - "./travis-tool.sh bootstrap"
+  - "./travis-tool.sh install_deps - ./travis-tool.sh install_r zoo XML RCurl dplyr reshape2 lubridate"
+  - "./travis-tool.sh install_github USGS-R/EGRET"
 
 on_failure:
-  - ./travis-tool.sh dump_logs
+  - "./travis-tool.sh dump_logs"
 
 notifications:
   email:

NAMESPACE

@@ -30,7 +30,6 @@ export(getWQPSample)
 export(getWQPSites)
 export(getWQPqwData)
 export(getWaterML1Data)
-export(getWaterML2Data)
 export(mergeReport)
 export(padVariable)
 export(populateConcentrations)

README.md

 `dataRetrieval`
 =============
+Linux: ![travis](https://travis-ci.org/USGS-R/dataRetrieval.svg?branch=master) 
 
-[![Build status](https://ci.appveyor.com/api/projects/status/luni4ckts7j1u2k8)](https://ci.appveyor.com/project/USGS-R/dataretrieval)
+Windows: [![Build status](https://ci.appveyor.com/api/projects/status/luni4ckts7j1u2k8)](https://ci.appveyor.com/project/USGS-R/dataretrieval)
 
 
 R package source for data retrieval specifically for the EGRET R package: