Rebase

ropensci · Jan 16, 2022 · 4bff667 · 4bff667
1 parent 583bc5b
commit 4bff667
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 77 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------
-# CITATION file created with {cffr} R package, v0.2.0
+# CITATION file created with {cffr} R package, v0.2.1
 # See also: https://docs.ropensci.org/cffr/
 # -----------------------------------------------------------
 
@@ -8,7 +8,7 @@ message: 'To cite package "cffr" in publications use:'
 type: software
 license: GPL-3.0-or-later
 title: 'cffr: Generate Citation File Format (''cff'') Metadata for R Packages'
-version: 0.2.0.9000
+version: 0.2.1
 doi: 10.21105/joss.03900
 abstract: The Citation File Format version 1.2.0 <doi:10.5281/zenodo.5171937> is a
   human and machine readable file format which provides citation metadata for software.
@@ -50,9 +50,16 @@ keywords:
 - citation-files
 - cff
 - metadata
+- citation-file-format
+- cran
+- r
+- r-package
+- ropensci
+- rstats
 references:
 - type: software
   title: 'R: A Language and Environment for Statistical Computing'
+  notes: Depends
   authors:
   - name: R Core Team
   location:
@@ -62,19 +69,21 @@ references:
   institution:
     name: R Foundation for Statistical Computing
   version: '>= 3.6.0'
-  notes: Depends
 - type: software
-  title: 'crayon: Colored Terminal Output'
+  title: crayon
+  abstract: 'crayon: Colored Terminal Output'
+  notes: Imports
   authors:
   - family-names: Csárdi
     given-names: Gábor
     email: csardi.gabor@gmail.com
   year: '2022'
-  notes: Imports
   url: https://CRAN.R-project.org/package=crayon
   version: '>= 1.4.1'
 - type: software
-  title: 'desc: Manipulate DESCRIPTION Files'
+  title: desc
+  abstract: 'desc: Manipulate DESCRIPTION Files'
+  notes: Imports
   authors:
   - family-names: Csárdi
     given-names: Gábor
@@ -85,22 +94,24 @@ references:
     given-names: Jim
     email: james.f.hester@gmail.com
   year: '2022'
-  notes: Imports
   url: https://CRAN.R-project.org/package=desc
   version: '>= 1.3.0'
 - type: software
-  title: 'jsonlite: A Simple and Robust JSON Parser and Generator for R'
+  title: jsonlite
+  abstract: 'jsonlite: A Simple and Robust JSON Parser and Generator for R'
+  notes: Imports
   authors:
   - family-names: Ooms
     given-names: Jeroen
     email: jeroen@berkeley.edu
     orcid: https://orcid.org/0000-0002-4035-0289
   year: '2022'
-  notes: Imports
   url: https://CRAN.R-project.org/package=jsonlite
   version: '>= 1.7.2'
 - type: software
-  title: 'jsonvalidate: Validate ''JSON'' Schema'
+  title: jsonvalidate
+  abstract: 'jsonvalidate: Validate ''JSON'' Schema'
+  notes: Imports
   authors:
   - family-names: FitzJohn
     given-names: Rich
@@ -112,11 +123,12 @@ references:
   - family-names: Poberezkin
     given-names: Evgeny
   year: '2022'
-  notes: Imports
   url: https://CRAN.R-project.org/package=jsonvalidate
   version: '>= 1.1.0'
 - type: software
-  title: 'yaml: Methods to Convert R Data to YAML and Back'
+  title: yaml
+  abstract: 'yaml: Methods to Convert R Data to YAML and Back'
+  notes: Imports
   authors:
   - family-names: Stephens
     given-names: Jeremy
@@ -138,21 +150,23 @@ references:
   - family-names: Warnes
     given-names: Gregory R.
   year: '2022'
-  notes: Imports
   url: https://CRAN.R-project.org/package=yaml
   version: '>= 2.2.1'
 - type: software
-  title: 'knitr: A General-Purpose Package for Dynamic Report Generation in R'
+  title: knitr
+  abstract: 'knitr: A General-Purpose Package for Dynamic Report Generation in R'
+  notes: Suggests
   authors:
   - family-names: Xie
     given-names: Yihui
     email: xie@yihui.name
     orcid: https://orcid.org/0000-0003-0645-5666
   year: '2022'
-  notes: Suggests
   url: https://CRAN.R-project.org/package=knitr
 - type: software
-  title: 'lifecycle: Manage the Life Cycle of your Package Functions'
+  title: lifecycle
+  abstract: 'lifecycle: Manage the Life Cycle of your Package Functions'
+  notes: Suggests
   authors:
   - family-names: Henry
     given-names: Lionel
@@ -162,10 +176,11 @@ references:
     email: hadley@rstudio.com
     orcid: https://orcid.org/0000-0003-4757-117X
   year: '2022'
-  notes: Suggests
   url: https://CRAN.R-project.org/package=lifecycle
 - type: software
-  title: 'rmarkdown: Dynamic Documents for R'
+  title: rmarkdown
+  abstract: 'rmarkdown: Dynamic Documents for R'
+  notes: Suggests
   authors:
   - family-names: Allaire
     given-names: JJ
@@ -200,20 +215,22 @@ references:
     email: rich@rstudio.com
     orcid: https://orcid.org/0000-0003-3925-190X
   year: '2022'
-  notes: Suggests
   url: https://CRAN.R-project.org/package=rmarkdown
 - type: software
-  title: 'testthat: Unit Testing for R'
+  title: testthat
+  abstract: 'testthat: Unit Testing for R'
+  notes: Suggests
   authors:
   - family-names: Wickham
     given-names: Hadley
     email: hadley@rstudio.com
   year: '2022'
-  notes: Suggests
   url: https://CRAN.R-project.org/package=testthat
   version: '>= 3.0.0'
 - type: software
-  title: 'usethis: Automate Package and Project Setup'
+  title: usethis
+  abstract: 'usethis: Automate Package and Project Setup'
+  notes: Suggests
   authors:
   - family-names: Wickham
     given-names: Hadley
@@ -228,5 +245,4 @@ references:
     email: malcolmbarrett@gmail.com
     orcid: https://orcid.org/0000-0003-0299-5825
   year: '2022'
-  notes: Suggests
   url: https://CRAN.R-project.org/package=usethis
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: cffr
 Title: Generate Citation File Format ('cff') Metadata for R Packages
-Version: 0.2.0.9000
+Version: 0.2.1
 Authors@R: c(
     person("Diego", "Hernangómez", , "diego.hernangomezherrero@gmail.com", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0001-8457-4658")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# cffr (development version)
+# cffr 0.2.1
 
 -   GitHub Action now runs only on `master` or `main`branch.
 

diff --git a/R/cff_create.R b/R/cff_create.R
@@ -375,6 +375,20 @@ parse_dependencies <- function(desc_path,
     mod$year <- year
     mod$notes <- clean_str(n$scope)
 
+    # Re-arrange
+    mod <- c(
+      mod[c(
+        "type",
+        "title", "abstract",
+        "notes"
+      )],
+      mod[!names(mod) %in% c(
+        "type",
+        "title", "abstract",
+        "notes"
+      )]
+    )
+
     mod <- as.cff(mod)
   })