Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make data/ directory automatically accessible to exercises #539

Merged
merged 70 commits into from
Jul 9, 2021
Merged

Make data/ directory automatically accessible to exercises #539

merged 70 commits into from
Jul 9, 2021

Commits on Jun 12, 2021

  1. Make files accessible to tutorials

    @rossellhayes
    rossellhayes committed Jun 12, 2021
    Configuration menu
    Copy the full SHA
    c16f532 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2021

  1. Handle cases where data/ directory, use_remote_files(), and chunk… 

    … options overlap
    @rossellhayes
    rossellhayes committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    86f32df View commit details
    Browse the repository at this point in the history

  2. Remove strwrap() (doesn't work in R Markdown pane)

    @rossellhayes
    rossellhayes committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    f7e2cd3 View commit details
    Browse the repository at this point in the history

  3. Ensure remote files are either URLs or system.file()s

    @rossellhayes
    rossellhayes committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    e7f1f1f View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. Namespace utils::download.file()

    @rossellhayes
    rossellhayes committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    cbd3571 View commit details
    Browse the repository at this point in the history

  2. Simplify code with better return values

    @rossellhayes
    rossellhayes committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    3380ae1 View commit details
    Browse the repository at this point in the history

  3. Add system.file() examples

    @rossellhayes
    rossellhayes committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    818fc45 View commit details
    Browse the repository at this point in the history

  4. Add tests for use_remote_files()

    @rossellhayes
    rossellhayes committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    7c60243 View commit details
    Browse the repository at this point in the history

  5. Add tests for copy_files()

    @rossellhayes
    rossellhayes committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    f691484 View commit details
    Browse the repository at this point in the history

  6. Refactor is_system_file() as a recursive function

    @rossellhayes
    rossellhayes committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    dee7aa0 View commit details
    Browse the repository at this point in the history

  7. Multiple calls to use_remote_files() now merge instead of overwriting

    @rossellhayes
    rossellhayes committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    11a0a1e View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2021

  1. Copy entire data directory during evaluate_exercise()

    @rossellhayes
    rossellhayes committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    fd6df39 View commit details
    Browse the repository at this point in the history

  2. Remove infrastructure around use_remote_files()

    @rossellhayes
    rossellhayes committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    9729a91 View commit details
    Browse the repository at this point in the history

  3. Add use_data_dir() function for specifiying a different place to fi… 

    …nd files
    @rossellhayes
    rossellhayes committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    26b61e1 View commit details
    Browse the repository at this point in the history

  4. Add data dir test documents to sandbox

    @rossellhayes
    rossellhayes committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    9266073 View commit details
    Browse the repository at this point in the history

  5. Only copy the data directory if the data directory exists

    @rossellhayes
    rossellhayes committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    5241eba View commit details
    Browse the repository at this point in the history

  6. Test overwriting and restoring files

    @rossellhayes
    rossellhayes committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    d812349 View commit details
    Browse the repository at this point in the history

  7. Add test without a data directory

    @rossellhayes
    rossellhayes committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    8d14c06 View commit details
    Browse the repository at this point in the history

  8. Remove cli formatting

    @rossellhayes
    rossellhayes committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    5fe2118 View commit details
    Browse the repository at this point in the history

  9. Update documentation of use_data_dir()

    @rossellhayes
    rossellhayes committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    28a7455 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2021

  1. Add test with here()

    @rossellhayes
    rossellhayes committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    4e2e336 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2021

  1. Prioritize environment variable over use_data_dir()

    @rossellhayes
    rossellhayes committed Jun 20, 2021
    Configuration menu
    Copy the full SHA
    9037bfa View commit details
    Browse the repository at this point in the history

  2. Add tests for data files

    @rossellhayes
    rossellhayes committed Jun 20, 2021
    Configuration menu
    Copy the full SHA
    9f30645 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2021

  1. Merged upstream/master into rossellhayes-data-files

    @gadenbuie
    gadenbuie committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    95e547e View commit details
    Browse the repository at this point in the history

  2. Remove commented-out code 

    Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
    @rossellhayes @gadenbuie
    rossellhayes and gadenbuie committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    7f641b4 View commit details
    Browse the repository at this point in the history

  3. Give friendlier error if data dir is not set up successfully in the t… 

    …utorial tempdir
    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    a653af5 View commit details
    Browse the repository at this point in the history

  4. Raise error if data directory is set by envvar or options() and can… 

    …not be found
    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    5b4a0ee View commit details
    Browse the repository at this point in the history

  5. Use "tutorial" instead of "learnr" as prefix in envvar and options()

    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    e3eb7b6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'data-files' of https://github.com/rossellhayes/learnr i… 

    …nto data-files
    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    6dad0f9 View commit details
    Browse the repository at this point in the history

  7. Fix option name in use_data_dir()

    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    4b84ff9 View commit details
    Browse the repository at this point in the history

  8. Split and label data dir tests

    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    4ef3078 View commit details
    Browse the repository at this point in the history

  9. Default data directory to "" and only set to "data/" if data director… 

    …y exists
    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    6672a55 View commit details
    Browse the repository at this point in the history

  10. Add tests for missing data directory

    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    a896a39 View commit details
    Browse the repository at this point in the history

  11. Change data directory precedence to options() > env var > "data/"

    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    19c792e View commit details
    Browse the repository at this point in the history

  12. Pass source_dir from evaluate_exercise() to copy_data_dir()

    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    3dc1352 View commit details
    Browse the repository at this point in the history

  13. Update tests to reflect change in data dir precedence

    @rossellhayes
    rossellhayes committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    ba6acca View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2021

  1. Remove use_data_dir(); data directory must now be specified with en… 

    …v var or default to "data/"
    @rossellhayes
    rossellhayes committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    11657fc View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. Remove braces in one-line if-else 

    Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
    @rossellhayes @gadenbuie
    rossellhayes and gadenbuie committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    5f63026 View commit details
    Browse the repository at this point in the history

  2. Update error message 

    Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
    @rossellhayes @gadenbuie
    rossellhayes and gadenbuie committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    7674d68 View commit details
    Browse the repository at this point in the history

  3. Update error class 

    Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
    @rossellhayes @gadenbuie
    rossellhayes and gadenbuie committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    be64636 View commit details
    Browse the repository at this point in the history

  4. Update error message 

    Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
    @rossellhayes @gadenbuie
    rossellhayes and gadenbuie committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    aceb3a2 View commit details
    Browse the repository at this point in the history

  5. Update error class 

    Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
    @rossellhayes @gadenbuie
    rossellhayes and gadenbuie committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    78b5864 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2021

  1. Reenable data dir set with options()

    @rossellhayes
    rossellhayes committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    8324144 View commit details
    Browse the repository at this point in the history

  2. Compact code for determining data dir

    @rossellhayes
    rossellhayes committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    9e78a7c View commit details
    Browse the repository at this point in the history

  3. Replace with_tempdir() with local_dir(local_tempdir())

    @rossellhayes
    rossellhayes committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    7ddafbd View commit details
    Browse the repository at this point in the history

  4. Use check = TRUE to simplfiy tests of evaluate_exercise()

    @rossellhayes
    rossellhayes committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    d3ed875 View commit details
    Browse the repository at this point in the history

  5. Only test that files have not been modified in tests focused on file … 

    …modification
    @rossellhayes
    rossellhayes committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    89d6840 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2021

  1. Update sandbox demo

    @rossellhayes
    rossellhayes committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    cef6ae7 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. Remove sandbox/data_dir/

    @gadenbuie
    gadenbuie committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    e19baa4 View commit details
    Browse the repository at this point in the history

  2. Minor edits to test labels

    @gadenbuie
    gadenbuie committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    b1bd8a4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into 'rosselhayes/data-files' 

    Conflicts:
	R/exercise.R
	tests/testthat/test-exercise.R
    @gadenbuie
    gadenbuie committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    509ddaf View commit details
    Browse the repository at this point in the history

  4. Move option/envvar checking into copy_data_dir()

    @gadenbuie
    gadenbuie committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    1d4cf7b View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Merge 

    Merge branch 'data-files' of https://github.com/rossellhayes/learnr into data-files

# Conflicts:
#	sandbox/data_dir/file_test/file_test.Rmd
    @rossellhayes
    rossellhayes committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    a836094 View commit details
    Browse the repository at this point in the history

  2. Add protect_options() function which restores options() and envva… 

    …rs, including `NULL` and `""`, to their original state on exit
    @rossellhayes
    rossellhayes committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    0eea1fd View commit details
    Browse the repository at this point in the history

  3. Add local_restore_options() function which *actually* restores `opt… 

    …ions()` and envvars, including `NULL` and `""`, to their original state on exit
    @rossellhayes
    rossellhayes committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    6b32eeb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'data-files' of https://github.com/rossellhayes/learnr i… 

    …nto data-files
    @rossellhayes
    rossellhayes committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    792b28d View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2021

  1. Add entry to NEWS

    @rossellhayes
    rossellhayes committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    9847989 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2021

  1. [docs] Increase toc_depth to show level-3 headings in TOC

    @gadenbuie
    gadenbuie committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    73483f9 View commit details
    Browse the repository at this point in the history

  2. [docs] Move setup chunks to level-3 heading and break into smaller ch… 

    …unks
    @gadenbuie
    gadenbuie committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    168249e View commit details
    Browse the repository at this point in the history

  3. [docs] Make level-3 headings title case

    @gadenbuie
    gadenbuie committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    84e9849 View commit details
    Browse the repository at this point in the history

  4. [docs] Add "Using Files in Exercises" to Exercise Setup 

    Documents new `data/` directory features
    @gadenbuie
    gadenbuie committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    ed861e2 View commit details
    Browse the repository at this point in the history

  5. [docs] Rebuild site

    @gadenbuie
    gadenbuie committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    337cc2d View commit details
    Browse the repository at this point in the history

  6. [docs] Summarize setup chunk options with links

    @gadenbuie
    gadenbuie committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    fcbf1da View commit details
    Browse the repository at this point in the history

  7. Reword NEWS entry

    @gadenbuie
    gadenbuie committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    aabfe07 View commit details
    Browse the repository at this point in the history

  8. options -> opts 

    Co-authored-by: Barret Schloerke <barret@rstudio.com>
    @rossellhayes @schloerke
    rossellhayes and schloerke committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    70fa098 View commit details
    Browse the repository at this point in the history

  9. Add local_restore_envvars() 

    Co-authored-by: Barret Schloerke <barret@rstudio.com>
    @rossellhayes @schloerke
    rossellhayes and schloerke committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    7ea8cce View commit details
    Browse the repository at this point in the history

  10. Use local_restore_envvars() 

    Co-authored-by: Barret Schloerke <barret@rstudio.com>
    @rossellhayes @schloerke
    rossellhayes and schloerke committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    020557b View commit details
    Browse the repository at this point in the history

  11. Use local_restore_envvars() 

    Co-authored-by: Barret Schloerke <barret@rstudio.com>
    @rossellhayes @schloerke
    rossellhayes and schloerke committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    8b091e5 View commit details
    Browse the repository at this point in the history

  12. Add .local_envir = parent.frame() as default in `local_restore_envv… 

    …ars()`
    @rossellhayes
    rossellhayes committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    c114b08 View commit details
    Browse the repository at this point in the history

  13. Add wrapper function local_restore_options_and_envvars()

    @rossellhayes
    rossellhayes committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    b00b736 View commit details
    Browse the repository at this point in the history