Merge branch 'release/0.2.3'

HenrikBengtsson · Jun 8, 2015 · a5a4684 · a5a4684
2 parents fc0b122 + 2b16080
commit a5a4684
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 501 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -15,7 +15,7 @@ README[.]md
 ^pkg-build[.]sh$
 ^appveyor[.]yml$
 ^covr-utils.R$
-^[.]coveralls[.]R$
+^[.]covr[.]R$
 
 #----------------------------
 # R related

diff --git a/.coveralls.R → .covr.R b/.coveralls.R → .covr.R
@@ -22,5 +22,5 @@ excl <- exclusions(
 str(excl)
 
 # Run through tests, record source code coverage, and
-# publish to Coveralls
+# publish to Coveralls or Codecov
 covr <- covr_package(exclusions=excl, quiet=FALSE)
diff --git a/.make/.travis.yml.rsp b/.make/.travis.yml.rsp
diff --git a/.make/Makefile b/.make/Makefile
@@ -244,7 +244,7 @@ check_Rex:
 
 
 covr:
-	$(R_SCRIPT) -e "source('.coveralls.R'); covr::shine(covr)"
+	$(R_SCRIPT) -e "source('.covr.R'); covr::shine(covr)"
 
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -371,8 +371,31 @@ Makefile: $(FILES_MAKEFILE)
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Refresh
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-refresh_%:
-	$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/r-package-files/master/templates/$*')"
+.make/Makefile:
+	$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/r-package-files/master/.make/Makefile', path='.make/')"
+
+.make/.travis.yml.rsp:
+	$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/r-package-files/master/.make/.travis.yml.rsp', path='.make/')"
+
+.make/appveyor.yml.rsp:
+	$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/r-package-files/master/.make/appveyor.yml.rsp', path='.make/')"
+
+.make/README.md.rsp:
+	$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/r-package-files/master/.make/README.md.rsp', path='.make/')"
+
+.covr.R:
+	$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/covr-utils/master/.covr.R')"
+
+clean:
+	$(RM) .make/.travis.yml.rsp .make/appveyor.yml.rsp .make/README.md.rsp .covr.R
+	$(RM) covr-utils.R
+
+refresh: clean
+	$(MAKE) --silent .make/.travis.yml.rsp
+	$(MAKE) --silent .make/appveyor.yml.rsp
+	$(MAKE) --silent .make/README.md.rsp
+	$(MAKE) --silent .covr.R
+	$(R_SCRIPT) -e "R.utils::downloadFile('https://raw.githubusercontent.com/HenrikBengtsson/r-package-files/master/.make/Makefile', path='.make/', skip=FALSE)"
 
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

diff --git a/.make/README.md.rsp b/.make/README.md.rsp