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

(PDK-626) Templatedir can now handle multiple directories #340

Merged
merged 1 commit into from
Nov 14, 2017

Conversation

HelenCampbell
Copy link
Contributor

Required for the new 'convert' functionality - The aim of this update is so that files needed for convert are kept in a default directory,
while new requires additional directories that will be found in the 'moduleroot_init'.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.2%) to 92.514% when pulling 936650d on HelenCampbell:tempnew into 2e50498 on puppetlabs:master.

@HelenCampbell
Copy link
Contributor Author

This PR won't pass acceptance tests while https://github.com/puppetlabs/pdk-module-template/pull/56 isn't merged.

Both of these PRs will need merged at the same time as their functionality depends on one another.

@HelenCampbell HelenCampbell changed the title (PDK-626) Templatedir can now handle multiple directories (WIP)(PDK-626) Templatedir can now handle multiple directories Nov 6, 2017
@DavidS
Copy link
Contributor

DavidS commented Nov 8, 2017

The new code should not fail just because there is no moduleroot_init directory in the current template.

Once that is changed, the next question raised is how to test the additions without depending on "the" template. It'll cause more work now, but make the project more nimble, if you add a local example template for integration testing, that can be modified to exercise the code without external dependencies.

Finally, we still do not test the whole workflow end-to-end with pushing a new module to github/travis/appveyor. But that, again, is a new ticket.

@HelenCampbell
Copy link
Contributor Author

@DavidS The issue is that if we don't fail on no moduleroot_init being present, there is the potential that only half the files will be generated (whatever ends up being in moduleroot, assuming we are using the new template style), but I get your point.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 92.573% when pulling 452957c on HelenCampbell:tempnew into fe340a8 on puppetlabs:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 92.573% when pulling f2260df on HelenCampbell:tempnew into fe340a8 on puppetlabs:master.

Required for the new 'convert' functionality - The aim of this update is so that files needed for convert are kept in a default directory,
while new requires additional directories that will be found in the 'moduleroot_init'.
@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 92.573% when pulling 7facba3 on HelenCampbell:tempnew into fe340a8 on puppetlabs:master.

@HelenCampbell HelenCampbell changed the title (WIP)(PDK-626) Templatedir can now handle multiple directories (PDK-626) Templatedir can now handle multiple directories Nov 13, 2017
@bmjen bmjen merged commit 5945270 into puppetlabs:master Nov 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants