Skip to content

Commit

Permalink
Fix: --parse/--serialize didn't work from cfg
Browse files Browse the repository at this point in the history
ht/ #34
  • Loading branch information
peritus committed Jan 10, 2014
1 parent 2ceb46c commit 47aed10
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
4 changes: 2 additions & 2 deletions bumpversion/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ def main(original_args=None):
help='Version that needs to be updated', required=False)
parser2.add_argument('--parse', metavar='REGEX',
help='Regex parsing the version string',
default='(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)')
default=defaults.get("parse", '(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)'))
parser2.add_argument('--serialize', metavar='FORMAT',
help='How to format what is parsed back to a version',
default='{major}.{minor}.{patch}')
default=defaults.get("serialize", str('{major}.{minor}.{patch}')))

known_args, remaining_argv = parser2.parse_known_args(args)

Expand Down
15 changes: 15 additions & 0 deletions tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,21 @@ def test_bump_version_custom_parse(tmpdir):

assert 'XXX1;1;0' == tmpdir.join("file6").read()

def test_bump_version_custom_parse_serialize_configfile(tmpdir):

tmpdir.join("file12").write("ZZZ8;0;0")
tmpdir.chdir()

tmpdir.join(".bumpversion.cfg").write("""[bumpversion]
files = file12
current_version = ZZZ8;0;0
serialize = ZZZ{spam};{garlg};{slurp}
parse = ZZZ(?P<spam>\d+);(?P<garlg>\d+);(?P<slurp>\d+)
""")

main(['garlg'])

assert 'ZZZ8;1;0' == tmpdir.join("file12").read()

def test_bumpversion_custom_parse_semver(tmpdir):
tmpdir.join("file15").write("XXX1.1.7-master+allan1")
Expand Down

0 comments on commit 47aed10

Please sign in to comment.