start move to ropensci

.travis.yml

@@ -18,8 +18,8 @@ addons:
 
 
 r_github_packages:
-  - AndySouth/rnaturalearthdata
-  - AndySouth/rnaturalearthhires
+  - ropenscilabs/rnaturalearthdata
+  - ropenscilabs/rnaturalearthhires
 
 #try to fix rgdal fail
 #2/6/16 not used in repijson which passes

DESCRIPTION

@@ -10,8 +10,8 @@ Description: Facilitates mapping by making natural earth map data from http://
 License: MIT + file LICENSE
 LazyData: true
 LazyDataCompression: xz
-URL: https://github.com/AndySouth/rnaturalearth
-BugReports: https://github.com/AndySouth/rnaturalearth/issues
+URL: https://github.com/ropenscilabs/rnaturalearth
+BugReports: https://github.com/ropenscilabs/rnaturalearth/issues
 Additional_repositories: http://packages.ropensci.org
 Depends:
     R (>= 3.1.1)

NAMESPACE

@@ -1,8 +1,9 @@
 # Generated by roxygen2: do not edit by hand
 
+export(")")
+export("devtools::install_github(\"ropenscilabs/rnaturalearthdata\")'")
 export(check_rnaturalearthdata)
 export(check_rnaturalearthhires)
-export(install_rnaturalearthdata)
 export(install_rnaturalearthhires)
 export(ne_coastline)
 export(ne_countries)

R/install-rnaturalearthdata.r

@@ -19,9 +19,9 @@ check_rnaturalearthdata <- function() {
 install_rnaturalearthdata <- function() {
   instructions <- paste(" Please try installing the package for yourself",
                         "using the following command: \n",
-                        'devtools::install_github("AndySouth/rnaturalearthdata")' )
-                        #"    install.packages(\"rnaturalearthdata\", repos = \"http://packages.ropensci.org\",",
-                        #"type = \"source\")")
+                        #'devtools::install_github("ropenscilabs/rnaturalearthdata")' )
+                        "    install.packages(\"rnaturalearthdata\", repos = \"http://packages.ropensci.org\",",
+                        "type = \"source\")")
 
   error_func <- function(e) {
     stop(paste("Failed to install the rnaturalearthdata package.\n", instructions))
@@ -32,11 +32,10 @@ install_rnaturalearthdata <- function() {
                          title = "Install the rnaturalearthdata package?")
     if (input == 1) {
       message("Installing the rnaturalearthdata package.")
-      tryCatch(#TODO change from former to latter when rnaturalearthdata on rOpenSci and/or CRAN
-               #utils::install.packages("rnaturalearthdata",
-               #                        repos = c("http://packages.ropensci.org", "http://cran.rstudio.com"),
-               #                        type = "source"),
-               devtools::install_github("AndySouth/rnaturalearthdata"),
+      tryCatch(utils::install.packages("rnaturalearthdata",
+               repos = c("http://packages.ropensci.org", "http://cran.rstudio.com"),
+               type = "source"),
+               #devtools::install_github("ropenscilabs/rnaturalearthdata"),
                error = error_func, warning = error_func)
     } else {
       stop(paste("The rnaturalearthdata package is necessary for that method.\n",

R/install-rnaturalearthhires.r

@@ -19,9 +19,8 @@ check_rnaturalearthhires <- function() {
 install_rnaturalearthhires <- function() {
   instructions <- paste(" Please try installing the package for yourself",
                         "using the following command: \n",
-                        'devtools::install_github("AndySouth/rnaturalearthhires")' )
-                        #"    install.packages(\"rnaturalearthhires\", repos = \"http://packages.ropensci.org\",",
-                        #"type = \"source\")")
+                        "    install.packages(\"rnaturalearthhires\", repos = \"http://packages.ropensci.org\",",
+                        "type = \"source\")")
 
   error_func <- function(e) {
     stop(paste("Failed to install the rnaturalearthhires package.\n", instructions))

README.Rmd

@@ -35,7 +35,7 @@ The [Natural Earth](http://www.naturalearthdata.com/) website structures vector
 ### Install rnaturalearth
 
 ```
-devtools::install_github("andysouth/rnaturalearth", build_vignettes=TRUE)
+devtools::install_github("ropenscilabs/rnaturalearth", build_vignettes=TRUE)
 
 ```
 
@@ -78,7 +78,7 @@ vignette('what-is-a-country', package='rnaturalearth')
 ```
 
 ## Reproducible download of Natural Earth data into the package
-[Script](https://github.com/AndySouth/rnaturalearthdata/blob/master/data-raw/data_download_script.r) used to get data into the accompanying data packages.
+[Script](https://github.com/ropenscilabs/rnaturalearthdata/blob/master/data-raw/data_download_script.r) used to get data into the accompanying data packages.
 
 ## Acknowledgements
 Thanks to [Lincoln Mullen](https://github.com/lmullen) for code structure inspiration from [USAboundaries](https://github.com/ropensci/USAboundaries), [Hadley Wickham](https://github.com/hadley) for comments and prompting, [Bob Rudis](https://github.com/hrbrmstr) for answers to stackoverflow questions about downloading Natural Earth data into R. The [Natural Earth team](http://www.naturalearthdata.com/about/contributors/) and [Nathan Kelso](https://github.com/nvkelso) for providing such a great resource.

README.md

@@ -21,7 +21,7 @@ The [Natural Earth](http://www.naturalearthdata.com/) website structures vector
 
 ### Install rnaturalearth
 
-    devtools::install_github("andysouth/rnaturalearth", build_vignettes=TRUE)
+    devtools::install_github("ropenscilabs/rnaturalearth", build_vignettes=TRUE)
 
 ### First Usage
 
@@ -80,7 +80,7 @@ vignette('what-is-a-country', package='rnaturalearth')
 Reproducible download of Natural Earth data into the package
 ------------------------------------------------------------
 
-[Script](https://github.com/AndySouth/rnaturalearthdata/blob/master/data-raw/data_download_script.r) used to get data into the accompanying data packages.
+[Script](https://github.com/ropenscilabs/rnaturalearthdata/blob/master/data-raw/data_download_script.r) used to get data into the accompanying data packages.
 
 Acknowledgements
 ----------------

appveyor.yml

@@ -17,8 +17,8 @@ install:
 # Adapt as necessary starting from here
 
 build_script:
-  - travis-tool.sh install_github AndySouth/rnaturalearthhires
-  - travis-tool.sh install_github AndySouth/rnaturalearthdata
+  - travis-tool.sh install_github ropenscilabs/rnaturalearthhires
+  - travis-tool.sh install_github ropenscilabs/rnaturalearthdata
   - travis-tool.sh r_binary_install proto rgdal  
   - travis-tool.sh install_deps
 

vignettes/rnaturalearth.Rmd

@@ -11,11 +11,11 @@ vignette: >
   \usepackage[utf8]{inputenc}
 ---
 
-This vignette is an introduction to [rnaturalearth](https://github.com/AndySouth/rnaturalearth), an R package to hold and facilitate interaction with natural earth vector map data. `rnaturalearth` is a data package designed to provide map data that can be visualised using other R packages.
+This vignette is an introduction to [rnaturalearth](https://github.com/ropenscilabs/rnaturalearth), an R package to hold and facilitate interaction with natural earth vector map data. `rnaturalearth` is a data package designed to provide map data that can be visualised using other R packages.
 
 [Natural Earth](http://www.naturalearthdata.com/) is a public domain map dataset including vector country and other administrative boundaries. 
 
-[rnaturalearth](https://github.com/AndySouth/rnaturalearth) does two main things.
+[rnaturalearth](https://github.com/ropenscilabs/rnaturalearth) does two main things.
 
 1. Contains pre-downloaded vector maps for : 
     + countries `ne_countries()`
@@ -93,7 +93,7 @@ sp::plot(ne_coastline())
 
 ## 2. Downloading other Natural Earth vectors with ne_download().  
 
-Each [Natural Earth](http://www.naturalearthdata.com/) dataset is characterised on the website according to `scale`, `type` and `category`. [rnaturalearth](https://github.com/AndySouth/rnaturalearth) allows you to specify `scale`, `type` and `category` and will construct the url and download the corresponding file.
+Each [Natural Earth](http://www.naturalearthdata.com/) dataset is characterised on the website according to `scale`, `type` and `category`. [rnaturalearth](https://github.com/ropenscilabs/rnaturalearth) allows you to specify `scale`, `type` and `category` and will construct the url and download the corresponding file.
 
 ```{r, eval=FALSE, echo=TRUE, message=FALSE}
 

vignettes/what-is-a-country.Rmd

@@ -11,11 +11,11 @@ vignette: >
   \usepackage[utf8]{inputenc}
 ---
 
-This vignette shows how [rnaturalearth](https://github.com/AndySouth/rnaturalearth) allows mapping countries using different definitions of what a country is. What a country is can be more complicated than you might expect.
+This vignette shows how [rnaturalearth](https://github.com/ropenscilabs/rnaturalearth) allows mapping countries using different definitions of what a country is. What a country is can be more complicated than you might expect.
 
 For example, from my own parochial perspective, it allows mapping the UK as a whole or separating out England, Scotland, Wales and Northern Ireland. It also allows you to exclude far away places like the Falkland Islands, or not. Mapping France it allows the inclusion or exclusion of French Guiana and islands in the South Pacific.
 
-[rnaturalearth](https://github.com/AndySouth/rnaturalearth) is an R package to hold and facilitate interaction with natural earth vector map data.
+[rnaturalearth](https://github.com/ropenscilabs/rnaturalearth) is an R package to hold and facilitate interaction with natural earth vector map data.
 
 [Natural Earth](http://www.naturalearthdata.com/) is a public domain map dataset including vector country boundaries.