Skip to content

Commit

Permalink
Including changes suggested by CRAN
Browse files Browse the repository at this point in the history
  • Loading branch information
gvegayon committed Nov 6, 2017
1 parent c7e501b commit 816b7d2
Show file tree
Hide file tree
Showing 11 changed files with 79 additions and 30 deletions.
3 changes: 2 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
^readme\.rmd$
^README\.md$
^codecov\.yml$
.+[.]zip
.+[.]zip
^cran-comments\.md$
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2017-11-06 George G. Vega Yon <[email protected]>
* Solving CRAN comments.


2017-11-05 George G. Vega Yon <[email protected]>
* Preparing CRAN release.

Expand Down
19 changes: 11 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Package: googlePublicData
Type: Package
Title: Working with Google's Public Data Explorer DSPL Metadata Files
Version: 0.16.0
Date: 2017-11-05
Title: Working with Google's 'Public Data Explorer' DSPL Metadata Files
Version: 0.16.1
Date: 2017-11-06
Authors@R: person("George", "Vega Yon", email="[email protected]",
role =c("aut","cre"))
Description: Provides a collection of functions to set up 'Google Public Data Explorer'
data visualization tool with your own data, building automaticaly the corresponding
DataSet Publishing Language file, or DSPL (XML),
metadata file jointly with the CSV files. All zip-up and ready to be published in
'Public Data Explorer'.
<https://www.google.com/publicdata/> data visualization tool with your own data,
building automatically the corresponding DataSet Publishing Language file, or
DSPL (XML), metadata file jointly with the CSV files. All zip-up and ready to
be published in 'Public Data Explorer'.
Depends:
R (>= 3.2.0)
Imports: XML, utils, readxl
Expand All @@ -18,4 +18,7 @@ URL: http://github.com/gvegayon/googlePublicData/
BugReports: http://github.com/gvegayon/googlePublicData/issues
LazyLoad: yes
RoxygenNote: 6.0.1
Suggests: testthat, covr, googleVis
Suggests:
testthat,
covr,
googleVis
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Changes in version 0.16.1 (2017-11-06)

* Correcting wrong example.


# Changes in version 0.16.0 (2017-11-05)

## Development
Expand Down
5 changes: 3 additions & 2 deletions R/googlepublicdata.r
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,14 @@ NULL
#'
#' \dontrun{
#' # Parsing some xlsx files at "my stats folder"
#' mydspl <- dspl(path="my stats folder/", ext="xls")
#' mydspl <- dspl(path="my stats folder/")
#'
#' # Checking the summary of the data bundle
#' summary(mydspl)
#'
#' # Writing the DSPL XML definition into a file
#' print(mydspl, path="my stats folder/mydspl.xml")
#' outputfile <- tempfile()
#' print(mydspl, path=outputfile)
#'
#' }
#' @name dspl-methods
Expand Down
14 changes: 14 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## R CMD check results

0 errors | 0 warnings | 0 note

## Reverse dependencies

There are no reverse dependencies.

---

* I've included the changes suggested on the DESCRIPTION file.

* I've fixed the example (which was enclosed by a dontrun) as suggested.

22 changes: 12 additions & 10 deletions inst/CITATION
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
citHeader("To cite the 'googlePublicData' package in publications use:")
year <- sub("-.*", "", meta$Date)
note <- sprintf("R package version %s", meta$Version)

citEntry(entry="Manual",
title = "googlePublicData: Working with Google's Public Data Explorer DSPL Metadata Files",
author = person("George", "Vega Yon", email="[email protected]", role=c("aut","cre")),
year = 2015,
month = "July",
url = "http://github.com/gvegayon/googlePublicData",
textVersion =
paste("George G. Vega Yon",
"Working with Google's Public Data Explorer DSPL Metadata Files"))
bibentry(bibtype = "Manual",
title = "{netdiffuseR}: Analysis of Diffusion and Contagion Processes on Networks",
author = c(
person("George", "Vega Yon"),
person("Stephanie", "Dyal"),
person("Timothy", "Hayes"),
person("Thomas", "Valente")),
year = year,
note = note,
url = "https://github.com/USCCANA/netdiffuseR")
7 changes: 7 additions & 0 deletions inst/NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@


CHANGES IN VERSION 0.16.1 (2017-11-06)


- Correcting wrong example.



CHANGES IN VERSION 0.16.0 (2017-11-05)


Expand Down
11 changes: 11 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
news:
Rscript -e "rmarkdown::pandoc_convert('NEWS.md', 'plain', output='inst/NEWS')"&& \
head -n 80 inst/NEWS
check:
cd ..&&R CMD build googlePublicData/ && \
R CMD check --as-cran googlePublicData*.tar.gz

checkv:
cd ..&&R CMD build googlePublicData/ && \
R CMD check --as-cran --use-valgrind googlePublicData*.tar.gz

5 changes: 3 additions & 2 deletions man/dspl-methods.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ data.path <-try(paste(.libPaths()[1],'/googlePublicData/data',sep=''), silent=T)
data.path
```

## [1] "/usr/local/lib/R/site-library/googlePublicData/data"
## [1] "/home/george/R/x86_64-pc-linux-gnu-library/3.4/googlePublicData/data"

``` r
# The dspl function looks for csv files in that paths, and analyzes them
Expand All @@ -42,17 +42,17 @@ mydspl <- dspl(path=data.path, sep=";")

## 6 files found...

## /usr/local/lib/R/site-library/googlePublicData/data/countries.csv analyzed correctly
## /home/george/R/x86_64-pc-linux-gnu-library/3.4/googlePublicData/data/countries.csv analyzed correctly

## /usr/local/lib/R/site-library/googlePublicData/data/country_slice.csv analyzed correctly
## /home/george/R/x86_64-pc-linux-gnu-library/3.4/googlePublicData/data/country_slice.csv analyzed correctly

## /usr/local/lib/R/site-library/googlePublicData/data/gender_country_slice.csv analyzed correctly
## /home/george/R/x86_64-pc-linux-gnu-library/3.4/googlePublicData/data/gender_country_slice.csv analyzed correctly

## /usr/local/lib/R/site-library/googlePublicData/data/genders.csv analyzed correctly
## /home/george/R/x86_64-pc-linux-gnu-library/3.4/googlePublicData/data/genders.csv analyzed correctly

## /usr/local/lib/R/site-library/googlePublicData/data/states.csv analyzed correctly
## /home/george/R/x86_64-pc-linux-gnu-library/3.4/googlePublicData/data/states.csv analyzed correctly

## /usr/local/lib/R/site-library/googlePublicData/data/state_slice.csv analyzed correctly
## /home/george/R/x86_64-pc-linux-gnu-library/3.4/googlePublicData/data/state_slice.csv analyzed correctly

``` r
# If we wanted to write the zip file... ready to be uploaded to
Expand Down

0 comments on commit 816b7d2

Please sign in to comment.