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.

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

20 vault arg #22

Merged
merged 4 commits into from
Jul 25, 2017
Merged

20 vault arg #22

merged 4 commits into from
Jul 25, 2017

Conversation

AlexAxthelm
Copy link
Contributor

Put the find_vault before the is_valid_dir check, so that it actuall has something to check against.

Added a test to the issues testfile.

Alex Axthelm added 3 commits July 25, 2017 15:00
Empty argument was searching for vault in the package directory, rather
than at the `pkg_root` path. To fix, I temporarily change the
`secret.vault` option in the test
putting the `find_vault` first ensures that even if the vault argument
is empty (default NULL), then there will still be a path to check
against.
)
}

old.o <- options(secret.vault = getOption("secret.vault", pkg_root))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use withr::with_options() there instead of manually managing the options.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely. Didn't realize this package existed. Was looking for something like it.

@gaborcsardi
Copy link
Owner

Thanks, looks great! Could you please change the test that I commented on? Thanks!

@gaborcsardi
Copy link
Owner

Looks good, thanks much!

@gaborcsardi gaborcsardi merged commit bf19024 into gaborcsardi:master Jul 25, 2017
@AlexAxthelm AlexAxthelm deleted the 20-vault-arg branch July 25, 2017 21:05
@AlexAxthelm AlexAxthelm restored the 20-vault-arg branch July 25, 2017 21:07
@AlexAxthelm AlexAxthelm deleted the 20-vault-arg branch July 25, 2017 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants