Merge lp://staging/~tvansteenburgh/charm-tools/charm-create-templates into lp://staging/charm-tools/1.2
Proposed by
Tim Van Steenburgh
| Status: | Merged |
|---|---|
| Merge reported by: | Marco Ceppi |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~tvansteenburgh/charm-tools/charm-create-templates |
| Merge into: | lp://staging/charm-tools/1.2 |
| Diff against target: |
3560 lines (+2538/-558) 66 files modified
Makefile (+10/-20) charmtools/charms.py (+4/-3) charmtools/create.py (+61/-118) charmtools/generators/__init__.py (+23/-0) charmtools/generators/generator.py (+127/-0) charmtools/generators/prompt.py (+60/-0) charmtools/generators/template.py (+95/-0) charmtools/generators/utils.py (+80/-0) charmtools/templates/bash/__init__.py (+19/-0) charmtools/templates/bash/files/README.ex (+44/-0) charmtools/templates/bash/files/config.yaml (+14/-0) charmtools/templates/bash/files/hooks/config-changed (+2/-0) charmtools/templates/bash/files/hooks/install (+10/-0) charmtools/templates/bash/files/hooks/relation-name-relation-broken (+2/-0) charmtools/templates/bash/files/hooks/relation-name-relation-changed (+12/-0) charmtools/templates/bash/files/hooks/relation-name-relation-departed (+7/-0) charmtools/templates/bash/files/hooks/relation-name-relation-joined (+7/-0) charmtools/templates/bash/files/hooks/start (+4/-0) charmtools/templates/bash/files/hooks/stop (+7/-0) charmtools/templates/bash/files/hooks/upgrade-charm (+7/-0) charmtools/templates/bash/files/icon.svg (+279/-0) charmtools/templates/bash/files/metadata.yaml (+17/-0) charmtools/templates/bash/files/revision (+1/-0) charmtools/templates/bash/template.py (+68/-0) charmtools/templates/charm/README.ex (+0/-44) charmtools/templates/charm/config.yaml (+0/-14) charmtools/templates/charm/hooks/config-changed (+0/-2) charmtools/templates/charm/hooks/install (+0/-10) charmtools/templates/charm/hooks/relation-name-relation-broken (+0/-2) charmtools/templates/charm/hooks/relation-name-relation-changed (+0/-12) charmtools/templates/charm/hooks/relation-name-relation-departed (+0/-7) charmtools/templates/charm/hooks/relation-name-relation-joined (+0/-7) charmtools/templates/charm/hooks/start (+0/-4) charmtools/templates/charm/hooks/stop (+0/-7) charmtools/templates/charm/hooks/upgrade-charm (+0/-7) charmtools/templates/charm/icon.svg (+0/-279) charmtools/templates/charm/metadata.yaml (+0/-17) charmtools/templates/charm/revision (+0/-1) charmtools/templates/python/__init__.py (+19/-0) charmtools/templates/python/config.yaml (+5/-0) charmtools/templates/python/files/README.ex (+44/-0) charmtools/templates/python/files/charm-helpers.yaml (+4/-0) charmtools/templates/python/files/config.yaml (+14/-0) charmtools/templates/python/files/hooks/config-changed (+36/-0) charmtools/templates/python/files/hooks/install (+26/-0) charmtools/templates/python/files/hooks/start (+26/-0) charmtools/templates/python/files/hooks/stop (+26/-0) charmtools/templates/python/files/hooks/upgrade-charm (+26/-0) charmtools/templates/python/files/hooks_symlinked/hooks.py (+54/-0) charmtools/templates/python/files/icon.svg (+279/-0) charmtools/templates/python/files/metadata.yaml (+17/-0) charmtools/templates/python/files/revision (+1/-0) charmtools/templates/python/files/scripts/charm_helpers_sync.py (+225/-0) charmtools/templates/python/files/tests/00-setup (+5/-0) charmtools/templates/python/files/tests/10-deploy (+35/-0) charmtools/templates/python/template.py (+86/-0) scripts/test (+1/-1) setup.py (+4/-0) tests/generators/test_generator.py (+147/-0) tests/generators/test_prompt.py (+82/-0) tests/generators/test_template.py (+43/-0) tests/generators/test_utils.py (+142/-0) tests/test_charm_create.py (+112/-0) tests_functional/create/test.sh (+6/-2) tests_functional/create/test_python_create.py (+112/-0) tests_functional/proof/record.sh (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~tvansteenburgh/charm-tools/charm-create-templates |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marco Ceppi (community) | Approve | ||
| Jorge Niedbalski (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Added pluggable 'charm create' templates.
Includes a python charm template (the new default).
To post a comment you must log in.
Revision history for this message
| Marco Ceppi (marcoceppi) wrote | # |
Revision history for this message
| Marco Ceppi (marcoceppi) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hello Tim,
Great work. I reviewed this change carefully for `-t python` , all my expected use case scenarios are being covered by your changes.
I did experienced some errors but they were fixed since bazaar revision 334 after pointing that bug on IRC.
The only missing piece that i can think of is the ability to expose a general metadata.yml generator command line option. I can work on that piece after having this change set merged on trunk.
LGTM +1