Merge pull request #182 from ThinkR-open/24-rebase3-clean-yourself

24 rebase3 clean yourself

Author: statnmap

.github/workflows/R-CMD-check-HTML5.yaml

@@ -1,15 +1,10 @@
-# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
-# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    branches:
-      - main
-      - master
-      - tmate
+    branches: [main, master]
   pull_request:
-    branches:
-      - main
-      - master
+    branches: [main, master]
 
 name: R-CMD-check
 
@@ -23,73 +18,34 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest, r: 'release'}
+          - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
-          - {os: windows-latest, r: 'devel'}
-          # - {os: windows-latest, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/latest"}
-          - {os: ubuntu-20.04,   r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.0.0 (ubuntu-20.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
-          - {os: ubuntu-20.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
-          - {os: ubuntu-20.04,   r: 'oldrel',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
-          - {os: ubuntu-20.04,   r: '3.6',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
-          - {os: ubuntu-20.04,   r: '3.5',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
-          # - {os: ubuntu-20.04,   r: '3.4',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
+          - {os: ubuntu-20.04,   r: '3.6'}
+          - {os: ubuntu-20.04,   r: '3.5'}
 
     env:
-      R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
-      RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
+          http-user-agent: ${{ matrix.config.http-user-agent }}
+          use-public-rspm: true
 
-      - uses: r-lib/actions/setup-pandoc@v1
-
-      - name: Query dependencies
-        run: |
-          install.packages('remotes')
-          saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
-          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
-        shell: Rscript {0}
-
-      - name: Cache R packages
-        if: runner.os != 'Windows'
-        uses: actions/cache@v2
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
-
-      - name: Install system dependencies
-        if: runner.os == 'Linux'
-        run: |
-          while read -r cmd
-          do
-            eval sudo $cmd
-          done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
-
-      - name: Install dependencies
-        run: |
-          remotes::install_deps(dependencies = TRUE)
-          remotes::install_cran("rcmdcheck")
-        shell: Rscript {0}
-
-      # - name: Setup tmate session
-      #   if: runner.os == 'Windows'
-      #   uses: mxschmitt/action-tmate@v3
-
-      - name: Check
-        env:
-          _R_CHECK_CRAN_INCOMING_REMOTE_: false
-        run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
-        shell: Rscript {0}
+          extra-packages: any::rcmdcheck
+          needs: check
 
-      - name: Upload check results
-        if: failure()
-        uses: actions/upload-artifact@main
+      - uses: r-lib/actions/check-r-package@v2
         with:
-          name: ${{ runner.os }}-r${{ matrix.config.r }}-results
-          path: check
+          upload-snapshots: true

.github/workflows/R-CMD-check.yaml

@@ -1,6 +1,6 @@
 Package: fusen
 Title: Build a Package from Rmarkdown Files
-Version: 0.4.1.9000
+Version: 0.5.0.9000
 Authors@R: c(
     person("Sebastien", "Rochette", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-1565-9313")),
@@ -34,7 +34,8 @@ Imports:
     tidyr,
     tools,
     usethis (>= 2.0.0),
-    utils
+    utils,
+    yaml
 Suggests: 
     knitr,
     pkgload,
@@ -45,9 +46,9 @@ Suggests:
     withr
 VignetteBuilder: 
     knitr
-Config/fusen/version: 0.4.1
-Config/testthat/edition: 3
+Config/fusen/version: 0.5.0.9000
 Config/Needs/website: ThinkR-open/thinkrtemplate
+Config/testthat/edition: 3
 Encoding: UTF-8
 Language: en-US
 LazyData: true

DESCRIPTION

@@ -7,11 +7,15 @@ export(add_flat_template)
 export(add_full)
 export(add_fusen_chunks)
 export(add_minimal)
+export(check_not_registered_files)
+export(clean_fusen_files)
 export(create_fusen)
+export(df_to_config)
 export(fill_description)
 export(inflate)
 export(init_share_on_github)
 export(load_flat_functions)
+export(register_all_to_config)
 importFrom(cli,cat_rule)
 importFrom(cli,cli_alert_danger)
 importFrom(cli,cli_alert_success)
@@ -23,6 +27,9 @@ importFrom(parsermd,parse_rmd)
 importFrom(parsermd,rmd_get_chunk)
 importFrom(parsermd,rmd_node_code)
 importFrom(stats,na.omit)
+importFrom(stats,setNames)
 importFrom(stringi,stri_trans_general)
 importFrom(tools,file_path_sans_ext)
 importFrom(utils,getFromNamespace)
+importFrom(utils,read.csv)
+importFrom(utils,write.csv)

NAMESPACE

@@ -1,12 +1,24 @@
-# fusen (development version)
+# fusen 0.5.0.9000
 
 ## New features
 
+### Publish your package website on GitHub
+
 - Publish your {fusen} project on a GitHub website with one command: `init_share_on_github()`
 
+### List all files created with an `inflate()` in a config file
+
+- `inflate()` creates a "dev/config_fusen.yaml" file to register all files created while inflating the corresponding flat file (First steps in #24)
+- Migrate from a non-fusen package or a previous version of {fusen} use with `register_all_to_config()`
+- Create or update the config file from a data.frame to list legitimate scripts (even if not associated with a flat file)
+
+### Others
+
+- Allow multiple examples for the same function (#149)
+
 ## Bug fixes
 
-- Fix using `function(` in documentation (#174, @FlorenceMounier)
+- Fix for when using word "`function(`" in documentation (#174, @FlorenceMounier)
 
 # fusen 0.4.1