Skip to content

Commit cde01e1

Browse files
authored
Merge pull request #3 from inbo/vignette
finish vignette
2 parents 1027df6 + ddd696f commit cde01e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+965
-239
lines changed

.Rbuildignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1+
^tic\.R$
2+
^\.github$
3+
^CODE_OF_CONDUCT\.md$
4+
^codemeta\.json$
15
^.*\.Rproj$
26
^\.Rproj\.user$
37
^\.travis\.yml$
48
^appveyor\.yml$
9+
^_pkgdown.yml$
10+
^docs$

.github/CONTRIBUTING.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# CONTRIBUTING #
2+
3+
### Fixing typos
4+
5+
Small typos or grammatical errors in documentation may be edited directly using
6+
the GitHub web interface, so long as the changes are made in the _source_ file.
7+
8+
* YES: you edit a roxygen comment in a `.R` file below `R/`.
9+
* NO: you edit an `.Rd` file below `man/`.
10+
11+
### Prerequisites
12+
13+
Before you make a substantial pull request, you should always file an issue and
14+
make sure someone from the team agrees that it’s a problem. If you’ve found a
15+
bug, create an associated issue and illustrate the bug with a minimal
16+
[reprex](https://www.tidyverse.org/help/#reprex).
17+
18+
### Pull request process
19+
20+
* We recommend that you create a Git branch for each pull request (PR).
21+
* Look at the Travis and AppVeyor build status before and after making changes.
22+
The `README` should contain badges for any continuous integration services used
23+
by the package.
24+
* We recommend the tidyverse [style guide](http://style.tidyverse.org).
25+
You can use the [styler](https://CRAN.R-project.org/package=styler) package to
26+
apply these styles, but please don't restyle code that has nothing to do with
27+
your PR.
28+
* We use [roxygen2](https://cran.r-project.org/package=roxygen2).
29+
* We use [testthat](https://cran.r-project.org/package=testthat). Contributions
30+
with test cases included are easier to accept.
31+
* For user-facing changes, add a bullet to the top of `NEWS.md` below the
32+
current development version header describing the changes made followed by your
33+
GitHub username, and links to relevant issue(s)/PR(s).
34+
35+
### Code of Conduct
36+
37+
Please note that the git2rdata project is released with a
38+
[Contributor Code of Conduct](CODE_OF_CONDUCT.md). By contributing to this
39+
project you agree to abide by its terms.
40+
41+
### See rOpenSci [contributing guide](https://ropensci.github.io/dev_guide/contributingguide.html)
42+
for further details.
43+
44+
### Discussion forum
45+
46+
Check out our [discussion forum](https://discuss.ropensci.org) if you think your issue requires a longer form discussion.
47+
48+
### Prefer to Email?
49+
50+
Email the person listed as maintainer in the `DESCRIPTION` file of this repo.
51+
52+
Though note that private discussions over email don't help others - of course email is totally warranted if it's a sensitive problem of any kind.
53+
54+
### Thanks for contributing!
55+
56+
This contributing guide is adapted from the tidyverse contributing guide available at https://raw.githubusercontent.com/r-lib/usethis/master/inst/templates/tidy-contributing.md

.github/issue_template.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!-- IF THIS INVOLVES AUTHENTICATION: DO NOT SHARE YOUR USERNAME/PASSWORD, OR API KEYS/TOKENS IN THIS ISSUE - MOST LIKELY THE MAINTAINER WILL HAVE THEIR OWN EQUIVALENT KEY -->
2+
3+
<!-- If this issue relates to usage of the package, whether a question, bug or similar, along with your query, please paste your devtools::session_info() or sessionInfo() into the code block below, AND include a reproducible example (consider using a "reprex" https://cran.rstudio.com/web/packages/reprex/) If not, delete all this and proceed :) -->
4+
5+
<details> <summary><strong>Session Info</strong></summary>
6+
7+
```r
8+
9+
```
10+
</details>

.github/pull_request_template.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!-- IF THIS INVOLVES AUTHENTICATION: DO NOT SHARE YOUR USERNAME/PASSWORD, OR API KEYS/TOKENS IN THIS ISSUE - MOST LIKELY THE MAINTAINER WILL HAVE THEIR OWN EQUIVALENT KEY -->
2+
3+
<!-- If you've updated a file in the man-roxygen directory, make sure to update the man/ files by running devtools::document() or similar as .Rd files should be affected by your change -->
4+
5+
<!--- Provide a general summary of your changes in the Title above -->
6+
7+
## Description
8+
<!--- Describe your changes in detail -->
9+
10+
## Related Issue
11+
<!--- if this closes an issue make sure include e.g., "fix #4"
12+
or similar - or if just relates to an issue make sure to mention
13+
it like "#4" -->
14+
15+
## Example
16+
<!--- if introducing a new feature or changing behavior of existing
17+
methods/functions, include an example if possible to do in brief form -->
18+
19+
<!--- Did you remember to include tests? Unless you're just changing
20+
grammar, please include new tests for your change -->

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
.RData
44
.Ruserdata
55
inst/doc
6+
docs

.travis.yml

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,51 @@
11
# R for travis: see documentation at https://docs.travis-ci.com/user/languages/r
2+
# Default configuration for use with tic package
3+
# Usually you shouldn't need to change the first part of the file
24

3-
language: R
5+
# DO NOT CHANGE THE CODE BELOW
6+
before_install: R -q -e 'install.packages(c("remotes", "curl")); remotes::install_github("ropenscilabs/tic"); tic::prepare_all_stages(); tic::before_install()'
7+
install: R -q -e 'tic::install()'
8+
after_install: R -q -e 'tic::after_install()'
9+
before_script: R -q -e 'tic::before_script()'
10+
script: R -q -e 'tic::script()'
11+
after_success: R -q -e 'tic::after_success()'
12+
after_failure: R -q -e 'tic::after_failure()'
13+
before_deploy: R -q -e 'tic::before_deploy()'
14+
deploy:
15+
provider: script
16+
script: R -q -e 'tic::deploy()'
17+
on:
18+
branch: master
19+
condition:
20+
- $TRAVIS_PULL_REQUEST = false
21+
- $TRAVIS_EVENT_TYPE != cron
22+
- $TRAVIS_R_VERSION_STRING = release
23+
after_deploy: R -q -e 'tic::after_deploy()'
24+
after_script: R -q -e 'tic::after_script()'
25+
# DO NOT CHANGE THE CODE ABOVE
26+
27+
# Custom parts:
28+
29+
# Header
30+
language: r
431
r:
532
- oldrel
633
- release
734
- devel
835
sudo: false
36+
dist: trusty
937
cache: packages
1038
addons:
1139
apt:
1240
packages:
1341
- libgit2-dev
42+
latex: false
43+
44+
#env
45+
env:
46+
global:
47+
- _R_CHECK_FORCE_SUGGESTS_=false
48+
- MAKEFLAGS="-j 2"
1449

15-
r_packages:
16-
- covr
17-
- lintr
18-
after_script:
19-
- R CMD INSTALL $PKG_TARBALL
20-
- Rscript -e 'lintr::lint_package()'
21-
after_success:
22-
- Rscript -e 'covr::codecov()'
50+
#services
51+
services:

CODE_OF_CONDUCT.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Contributor Code of Conduct
2+
3+
As contributors and maintainers of this project, we pledge to respect all people who
4+
contribute through reporting issues, posting feature requests, updating documentation,
5+
submitting pull requests or patches, and other activities.
6+
7+
We are committed to making participation in this project a harassment-free experience for
8+
everyone, regardless of level of experience, gender, gender identity and expression,
9+
sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
10+
11+
Examples of unacceptable behavior by participants include the use of sexual language or
12+
imagery, derogatory comments or personal attacks, trolling, public or private harassment,
13+
insults, or other unprofessional conduct.
14+
15+
Project maintainers have the right and responsibility to remove, edit, or reject comments,
16+
commits, code, wiki edits, issues, and other contributions that are not aligned to this
17+
Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed
18+
from the project team.
19+
20+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
21+
opening an issue or contacting one or more of the project maintainers.
22+
23+
This Code of Conduct is adapted from the Contributor Covenant
24+
(http://contributor-covenant.org), version 1.0.0, available at
25+
http://contributor-covenant.org/version/1/0/0/

DESCRIPTION

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
Package: git2rdata
2-
Title: Store and retrieve data.frames in a git repository
3-
Version: 0.0.0.9000
2+
Title: Store and Retrieve Data.frames in a Git Repository
3+
Version: 0.0.1.9000
4+
Date: 2018-11-12
45
Authors@R: c(
56
person(
67
"Thierry", "Onkelinx", role = c("aut", "cre"),
78
email = "[email protected]",
89
comment = c(ORCID = "0000-0001-8804-4216")),
910
person(
10-
family = "Research Institute for Nature and Forest",
11+
"Research Institute for Nature and Forest",
1112
role = c("cph", "fnd"), email = "[email protected]"))
1213
Description: Make versioning of data.frame easy and efficient using git repositories.
1314
Depends: R (>= 3.4.0)
1415
Imports:
1516
assertthat,
1617
git2r (>= 0.23.0),
17-
methods
18+
methods,
19+
readr
1820
Suggests:
1921
knitr,
2022
rmarkdown,
@@ -23,13 +25,14 @@ License: GPL-3
2325
Encoding: UTF-8
2426
LazyData: true
2527
Roxygen: list(markdown = TRUE)
26-
RoxygenNote: 6.1.0
28+
RoxygenNote: 6.1.1
2729
URL: https://github.com/inbo/git2rdata
2830
BugReports: https://github.com/inbo/git2rdata/issues
2931
Collate:
3032
'write_vc.R'
3133
'auto_commit.R'
3234
'clean_data_path.R'
35+
'git2rdata-package.R'
3336
'meta.R'
3437
'read_vc.R'
3538
'recent_commit.R'

NAMESPACE

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ importFrom(git2r,workdir)
2727
importFrom(methods,setGeneric)
2828
importFrom(methods,setMethod)
2929
importFrom(methods,setOldClass)
30-
importFrom(utils,read.table)
30+
importFrom(readr,read_tsv)
31+
importFrom(readr,write_tsv)
32+
importFrom(utils,head)
3133
importFrom(utils,sessionInfo)
3234
importFrom(utils,tail)
33-
importFrom(utils,write.table)

NEWS.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
git2rdata 0.0.1 (2018-11-12)
2+
============================
3+
4+
### NEW FEATURES
5+
6+
* use readr to write and read plain text files
7+
* allows storage of strings with "NA" or special characters
8+
* handle ordered factors
9+
* stop handling complex numbers

0 commit comments

Comments
 (0)