Merge branch 'release/0.2' into production

Author: Kirill Müller

DESCRIPTION

@@ -1,7 +1,8 @@
 Package: rprojroot
 Title: Finding Files in Project Subdirectories
-Version: 0.1-1
-Authors@R: as.person("Kirill Müller <krlmlr+r@mailbox.org> [aut, cre]")
+Version: 0.2
+Authors@R: person(given = "Kirill", family = "Müller", role = c("aut",
+        "cre"), email = "krlmlr+r@mailbox.org")
 Description: Robust, reliable and flexible paths to files below a
     project root. The 'root' of a project is defined as a directory
     that matches a certain criterion, e.g., it contains a certain

Makefile

@@ -1,2 +1,2 @@
--include makeR/Makefile
--include Makefile.in
+MAKEFILE_LOC := $(shell Rscript -e "cat(system.file('Makefile',package='rflow'))" )
+include ${MAKEFILE_LOC}

NEWS.md

@@ -1,5 +1,4 @@
-Version 0.1-1 (2016-02-04)
-===
+# rprojroot 0.2 (2016-03-24)
 
 - Add TL;DR section to vignette.
 - Root criteria now have two function members, `find_file()` and `make_fix_file()`, instead of the now removed `make_find_root_file()` and `make_fix_root_file()`.

README.md

@@ -1,6 +1,6 @@
 <!-- README.md is generated from README.Rmd. Please edit that file -->
-[rprojroot](https://krlmlr.github.io/rprojroot) [![wercker status](https://app.wercker.com/status/c4dfa136cd78514514e259cc388e880c/s/master "wercker status")](https://app.wercker.com/project/bykey/c4dfa136cd78514514e259cc388e880c) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/rprojroot?branch=master&svg=true)](https://ci.appveyor.com/project/krlmlr/rprojroot) [![codecov.io](https://codecov.io/github/krlmlr/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/rprojroot?branch=master)
-=======================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
+[rprojroot](https://krlmlr.github.io/rprojroot) [![wercker status](https://app.wercker.com/status/c4dfa136cd78514514e259cc388e880c/s/master "wercker status")](https://app.wercker.com/project/bykey/c4dfa136cd78514514e259cc388e880c) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/rprojroot?branch=master)](https://ci.appveyor.com/project/krlmlr/rprojroot) [![codecov.io](https://codecov.io/github/krlmlr/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/rprojroot?branch=master) [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/rprojroot)](https://cran.r-project.org/package=rprojroot)
+=============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
 
 This package helps accessing files relative to a *project root* to [stop the working directory insanity](https://gist.github.com/jennybc/362f52446fe1ebc4c49f).
 

readme/README.Rmd

@@ -18,7 +18,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-[rprojroot](https://krlmlr.github.io/rprojroot) [![wercker status](https://app.wercker.com/status/c4dfa136cd78514514e259cc388e880c/s/master "wercker status")](https://app.wercker.com/project/bykey/c4dfa136cd78514514e259cc388e880c) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/rprojroot?branch=master)](https://ci.appveyor.com/project/krlmlr/rprojroot) [![codecov.io](https://codecov.io/github/krlmlr/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/rprojroot?branch=master)
+[rprojroot](https://krlmlr.github.io/rprojroot) [![wercker status](https://app.wercker.com/status/c4dfa136cd78514514e259cc388e880c/s/master "wercker status")](https://app.wercker.com/project/bykey/c4dfa136cd78514514e259cc388e880c) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/rprojroot?branch=master)](https://ci.appveyor.com/project/krlmlr/rprojroot) [![codecov.io](https://codecov.io/github/krlmlr/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/rprojroot?branch=master) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/rprojroot)](https://cran.r-project.org/package=rprojroot)
 =================================================================================================================================================================================================================================================================================================================================================
 
 This package helps accessing files relative to a *project root* to [stop the working directory insanity](https://gist.github.com/jennybc/362f52446fe1ebc4c49f).
@@ -43,7 +43,7 @@ dir(rprojroot::find_root("DESCRIPTION"))
 Install from GitHub:
 
 ``` r
-devtools::install("krlmlr/rprojroot")
+devtools::install_github("krlmlr/rprojroot")
 ```
 
 See the [vignette](http://krlmlr.github.io/rprojroot/vignettes/rprojroot.html) for more detail.