Skip to content

Commit 4b1f2fd

Browse files
authored
Merge pull request #14 from inbo/hansvancalster-patch-1
Finalise version 0.0.3
2 parents 42e5905 + e200e42 commit 4b1f2fd

File tree

16 files changed

+84
-69
lines changed

16 files changed

+84
-69
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: git2rdata
22
Title: Store and Retrieve Data.frames in a Git Repository
3-
Version: 0.0.2.9000
3+
Version: 0.0.3
44
Authors@R: c(
55
person(
66
"Thierry", "Onkelinx", role = c("aut", "cre"),

NEWS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ git2rdata 0.0.2 (2019-02-26)
55

66
* metadata is added as a list to the objects rather than in YAML format.
77
* the [yaml](https://cran.r-project.org/package=yaml) package is used to store the metadata list in YAML format.
8-
* `write_vc()` now used the 'strict' argument instead of 'override'
8+
* `write_vc()` now uses the 'strict' argument instead of 'override'
99
* the functionality `rm_data()` is split into `rm_data()` and `prune_meta()` (#9)
1010

1111
### NEW FEATURES
@@ -30,9 +30,9 @@ git2rdata 0.0.2 (2019-02-26)
3030
* each helpfile contains a working example (#11)
3131
* README updated (#12)
3232
* Updated the rationale with links to the vignettes
33-
* `git2rdata` has an hexsticker logo
33+
* `git2rdata` has a hexsticker logo
3434
* A DOI is added
35-
* The installation instructions uses `remotes` and build the vignettes
35+
* The installation instructions use `remotes` and build the vignettes
3636
* `auto_commit()` was removed because of limited extra functionality over `git2r::commit()`
3737
* dataframes are read and written by base R functions instead of `readr` functions
3838

R/list_data.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#' list available data objects in the repository
1+
#' List available data files
22
#' @param root the `root` of the repository. Either a path or a `git-repository`
33
#' @param path relative `path` from the `root`. Defaults to the `root`
44
#' @inheritParams base::list.files

R/read_vc.R

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#' Read a \code{data.frame} from a repository
1+
#' Read a \code{data.frame}
2+
#'
3+
#' Note that the dataframe has to be written with `write_vc()` before it can be read with `read_vc()`.
24
#' @inheritParams write_vc
35
#' @return The \code{data.frame} with the file names and hashes as attributes
46
#' @rdname read_vc

R/write_vc.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#' Write a \code{data.frame} to a git repository
1+
#' Write a \code{data.frame}
22
#'
33
#' This will create two files. The `".tsv"` file contains the raw data.
44
#' The `".yml"` contains the meta data on the columns in YAML format.

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
[![DOI](https://zenodo.org/badge/147685405.svg)](https://zenodo.org/badge/latestdoi/147685405)
1111
## Rationale
1212

13-
The `git2rdata` package writes and reads dataframes as plain text files. Important information is stored in a metadata file.
13+
The `git2rdata` package is an R package for writing and reading dataframes as plain text files. Important information is stored in a metadata file.
1414

15-
1. Storing metadata allows to maintain variables classes. By default, the data is optimized for file storage prior to writing. This make the data less human readable and can be turned off. Details on the implementation are available on the [plain text](https://inbo.github.io/git2rdata/articles/plain_text.html) vignette.
16-
1. Storing metadata also allows to minimize row base [diffs](https://en.wikipedia.org/wiki/Diff) between two consecutive [commits](https://en.wikipedia.org/wiki/Commit_(version_control)). This is a useful feature when storing data as plain text files under version control. Details on this part of the implementation is available at the [version control](https://inbo.github.io/git2rdata/articles/version_control.html) vignette. Although `git2rdata` was envisioned with a [git](https://git-scm.com/) workflow in mind, it can also be used in combination with other version control systems like [subversion](https://subversion.apache.org/) or [mercurial](https://www.mercurial-scm.org/).
17-
1. `git2rdata` is intended to facility a reproducible and traceable workflow. A toy example is given in the [workflow](https://inbo.github.io/git2rdata/articles/workflow.html) vignette.
18-
1. The [efficiency](https://inbo.github.io/git2rdata/articles/efficiency.html) vignette gives some insight on the efficiency in terms of file storage, git repository size and speed for writing and reading.
15+
1. Storing metadata allows to maintain the classes of variables. By default, the data is optimized for file storage prior to writing. This makes the data less human readable and can be turned off. Details on the implementation are available in the [plain text](https://inbo.github.io/git2rdata/articles/plain_text.html) vignette.
16+
1. Storing metadata also allows to minimize row based [diffs](https://en.wikipedia.org/wiki/Diff) between two consecutive [commits](https://en.wikipedia.org/wiki/Commit_(version_control)). This is a useful feature when storing data as plain text files under version control. Details on this part of the implementation are available in the [version control](https://inbo.github.io/git2rdata/articles/version_control.html) vignette. Although `git2rdata` was envisioned with a [git](https://git-scm.com/) workflow in mind, it can also be used in combination with other version control systems like [subversion](https://subversion.apache.org/) or [mercurial](https://www.mercurial-scm.org/).
17+
1. `git2rdata` is intended to facilitate a reproducible and traceable workflow. A toy example is given in the [workflow](https://inbo.github.io/git2rdata/articles/workflow.html) vignette.
18+
1. The [efficiency](https://inbo.github.io/git2rdata/articles/efficiency.html) vignette provides some insight into the efficiency in terms of file storage, git repository size and speed for writing and reading.
1919

2020
## Installation
2121

2222
Install the development version
2323

2424
```r
25-
# installation requires the "remotes" packages
25+
# installation requires the "remotes" package
2626
# install.package("remotes")
2727

2828
# install with vignettes (recommended)
@@ -38,7 +38,7 @@ remotes::install_github("inbo/git2rdata"))
3838

3939
## Main usage
4040

41-
Dataframes are stored using `write_vc()` and retrieved with `read_vc()`. Both share the arguments `root` and `file`. Root refers to a base location where the dataframe should be stored. It can either point to a local directory or a local git repository. `file` is the file name to use and can include a path relative to `root`. Make sure the relative path stays within `root`.
41+
Dataframes are stored using `write_vc()` and retrieved with `read_vc()`. Both functions share the arguments `root` and `file`. `root` refers to a base location where the dataframe should be stored. It can either point to a local directory or a local git repository. `file` is the file name to use and can include a path relative to `root`. Make sure the relative path stays within `root`.
4242

4343
```r
4444
library(git2rdata)
@@ -55,7 +55,7 @@ Please use the output of `citation("git2rdata")`
5555
## Folder structure
5656

5757
- `R`: The source scripts of the [R](https://cran.r-project.org/) functions with documentation in [Roxygen](https://github.com/klutometis/roxygen) format
58-
- `man`: The help file in [Rd](https://cran.r-project.org/doc/manuals/r-release/R-exts.html#Rd-format) format
58+
- `man`: The help files in [Rd](https://cran.r-project.org/doc/manuals/r-release/R-exts.html#Rd-format) format
5959
- `testthat`: R scripts with unit tests using the [testthat](http://testthat.r-lib.org/) framework
6060
- `vignettes`: source code for the vignettes describing the package
6161
- `man-roxygen`: templates for documentation in Roxygen format
@@ -78,4 +78,4 @@ git2rdata
7878

7979
## Contributions
8080

81-
Contribution to `git2rdata` are welcome. Please read our [Contributing guidelines](.github/CONTRIBUTING.md) first. The `git2rdata` project is released with a [Contributor Code of Conduct](.github/CODE_OF_CONDUCT.md). By contributing to this project, you agree to abide by its terms.
81+
Contributions to `git2rdata` are welcome. Please read our [Contributing guidelines](.github/CONTRIBUTING.md) first. The `git2rdata` project is released with a [Contributor Code of Conduct](.github/CODE_OF_CONDUCT.md). By contributing to this project, you agree to abide by its terms.

codemeta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"codeRepository": "https://github.com/inbo/git2rdata",
1111
"issueTracker": "https://github.com/inbo/git2rdata/issues",
1212
"license": "https://spdx.org/licenses/GPL-3.0",
13-
"version": "0.0.2.9000",
13+
"version": "0.0.3",
1414
"programmingLanguage": {
1515
"@type": "ComputerLanguage",
1616
"name": "R",
@@ -163,7 +163,7 @@
163163
}
164164
],
165165
"readme": "https://github.com/inbo/git2rdata/blob/master/README.md",
166-
"fileSize": "334.831KB",
166+
"fileSize": "336.015KB",
167167
"contIntegration": [
168168
"https://travis-ci.org/inbo/git2rdata",
169169
"https://ci.appveyor.com/project/ThierryO/git2rdata/branch/master",

man/list_data.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/read_vc.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/write_vc.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)