Merge branch 'release/1.0-2' into production

r-lib · Mar 29, 2016 · 59cbad3 · 59cbad3
2 parents 451f737 + 5d32326
commit 59cbad3
Show file tree

Hide file tree

Showing 12 changed files with 202 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,3 @@
 inst/doc
 /inst/web
 /vignettes/*.html
-/man
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rprojroot
 Title: Finding Files in Project Subdirectories
-Version: 1.0-1
+Version: 1.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
@@ -29,4 +29,3 @@ Collate:
     'has-file.R'
     'root.R'
     'shortcut.R'
-    'zzz-autoroxy.R'
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,15 @@
+# rprojroot 1.0-2 (2016-03-28)
+
+- Fix test that fails on Windows only on CRAN.
+
+
 # rprojroot 1.0-1 (2016-03-26)
 
+- Updated NEWS.
+
+
+# rprojroot 1.0 (2016-03-26)
+
 Initial CRAN release.
 
 - S3 class `root_criterion`:

diff --git a/R/zzz-autoroxy.R b/R/zzz-autoroxy.R
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <!-- 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&type=svg)](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)
+[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) [![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).

diff --git a/cran-comments.md b/cran-comments.md
@@ -7,7 +7,7 @@
 
 0 errors | 0 warnings | 1 note
 
-* 1 day since last update: Fixup release to repair NEWS file.
+* 1 day since last update: Fix checks that fail on Windows.
 
 ## Reverse dependencies
 

diff --git a/man/criteria.Rd b/man/criteria.Rd
diff --git a/man/find_root.Rd b/man/find_root.Rd
diff --git a/man/find_root_file.Rd b/man/find_root_file.Rd
diff --git a/man/root_criterion.Rd b/man/root_criterion.Rd
diff --git a/readme/README.Rmd b/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&type=svg)](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)
+[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) [![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).

diff --git a/tests/testthat/test-make.R b/tests/testthat/test-make.R
@@ -8,5 +8,6 @@ test_that("Shortcuts", {
   oldwd <- setwd("~")
   on.exit(setwd(oldwd))
 
-  expect_equal(R("testthat"), oldwd)
+  expect_equal(normalizePath(R("testthat"), mustWork = TRUE),
+               normalizePath(oldwd, mustWork = TRUE))
 })