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

Extract code from cli.main into shorter methods #68

Merged
merged 60 commits into from Aug 24, 2019
Merged

Extract code from cli.main into shorter methods #68

merged 60 commits into from Aug 24, 2019

Commits on Jun 13, 2019

  1. Extract method from main: _parse_phase_1

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    d500455 View commit details
    Browse the repository at this point in the history

  2. Extract method from main: _setup_logging

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    938b333 View commit details
    Browse the repository at this point in the history

  3. Rename parser1 to root_parser

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    fb74a18 View commit details
    Browse the repository at this point in the history

  4. Extract method from main: _determine_vcs_is_usable

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    086c8a6 View commit details
    Browse the repository at this point in the history

  5. Extract method from main: _determine_current_version

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    503cb2c View commit details
    Browse the repository at this point in the history

  6. Reshuffle extracted methods (keep them ordered)

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    316ad5d View commit details
    Browse the repository at this point in the history

  7. Extract method from main: _determine_config_file

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    8491cce View commit details
    Browse the repository at this point in the history

  8. Extract method from main: _load_configuration

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    5632d8c View commit details
    Browse the repository at this point in the history

  9. Extract method from main: parse_phase_2

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    d00d784 View commit details
    Browse the repository at this point in the history

  10. Extract method from main: _setup_versionconfig

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    e3d41b6 View commit details
    Browse the repository at this point in the history

  11. Extract method from main: _update_current_version

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    c9e5fef View commit details
    Browse the repository at this point in the history

  12. Extract method from main: _assemble_context

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    a15daa4 View commit details
    Browse the repository at this point in the history

  13. Extract method from main: _assemble_new_version

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    ee605e2 View commit details
    Browse the repository at this point in the history

  14. Extract method from main: parse_phase_3

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    0576547 View commit details
    Browse the repository at this point in the history

  15. Extract method from main: _parse_new_version

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    2af7d75 View commit details
    Browse the repository at this point in the history

  16. Extract method from main: _determine_files

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    a58e559 View commit details
    Browse the repository at this point in the history

  17. Reshuffle extracted methods (keep them ordered)

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    12caeda View commit details
    Browse the repository at this point in the history

  18. Extract method from main: _determine_vcs_dirty

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    7fff9a2 View commit details
    Browse the repository at this point in the history

  19. Extract method from main: _check_files_contain_version

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    772390b View commit details
    Browse the repository at this point in the history

  20. Extract method from main: _replace_version_in_files

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    695c744 View commit details
    Browse the repository at this point in the history

  21. Extract method from main: _log_list

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    2946d09 View commit details
    Browse the repository at this point in the history

  22. Extract method from main: _update_config_file

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    e10e096 View commit details
    Browse the repository at this point in the history

  23. Extract method from main: _commit_to_vcs

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    870acb6 View commit details
    Browse the repository at this point in the history

  24. Extract method from main: _tag_in_vcs

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    dbac6ae View commit details
    Browse the repository at this point in the history

  25. Refactor: avoid the body-in-if antipattern 

    http://wiki.c2.com/?ArrowAntiPattern
    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    6e90254 View commit details
    Browse the repository at this point in the history

  26. Refactor: make intent of 'if not vcs' more clear

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    1fcdedd View commit details
    Browse the repository at this point in the history

  27. Refactor: improve arguments of _setup_logging

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    1322039 View commit details
    Browse the repository at this point in the history

  28. Refactor _determine_vcs_is_usable

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    e7e9fbc View commit details
    Browse the repository at this point in the history

  29. Refactor _determine_vcs_dirty

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    36ae4ed View commit details
    Browse the repository at this point in the history

  30. Refactor _determine_config_file

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    59b7cd6 View commit details
    Browse the repository at this point in the history

  31. Refactor _update_current_version

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    100f737 View commit details
    Browse the repository at this point in the history

  32. Refactor _assemble_current_version and _parse_phase_3

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    8af8cb1 View commit details
    Browse the repository at this point in the history

  33. Refactor arguments of _replace_version_in_files

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    e012ea7 View commit details
    Browse the repository at this point in the history

  34. Refactor arguments of _log_list

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    fb1f2d3 View commit details
    Browse the repository at this point in the history

  35. Refactor: optimize arguments of _update_config_file

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    1d76403 View commit details
    Browse the repository at this point in the history

  36. Refector arguments of _determine_current_version

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    e0518e4 View commit details
    Browse the repository at this point in the history

  37. Refactor arguments of load_configuration

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    9b60e06 View commit details
    Browse the repository at this point in the history

  38. Refactor name of _parse_phase_1

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    98895ca View commit details
    Browse the repository at this point in the history

  39. Refactor arguments and name of _parse_phase_2

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    274931e View commit details
    Browse the repository at this point in the history

  40. Refactor arguments and name of _parse_phase_3

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    03eab5b View commit details
    Browse the repository at this point in the history

  41. Refactor arguments of _check_files_contain_version

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    401f6b3 View commit details
    Browse the repository at this point in the history

  42. Refactor: move helper function below main()

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    3e31a02 View commit details
    Browse the repository at this point in the history

  43. Refactor arguments of _commit_to_vcs

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    4bc4c68 View commit details
    Browse the repository at this point in the history

  44. Refactor arguments of _tag_in_vcs

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    3f2d250 View commit details
    Browse the repository at this point in the history

  45. Satisfy pylint 

    Pylint config: see c4urself#67
    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    99e2c73 View commit details
    Browse the repository at this point in the history

  46. Use open() context manager to read configuration content 

    Also avoid reading the file twice.
    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    9fcafdb View commit details
    Browse the repository at this point in the history

  47. Use itertools.chain to assemble context dictionary

    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    97c7f0f View commit details
    Browse the repository at this point in the history

  48. Cleanup some cases of 'pointers' being passed 

    (arguments which are modified in-place instead of copied/modified/returned)
    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    6bc9323 View commit details
    Browse the repository at this point in the history

  49. Upgrade packaging dependencies (fix AppVeyor) 

    These used to come along with installing tox, but this is no longer
the case since version 3.10.
See similar fix h5py/h5py@b183c74
and tox issue tox-dev/tox#1304 .
    @florisla
    florisla committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    e198fe6 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2019

  1. Restore newline-retaining functionality from c4urself#59 

    This got lost in the recent rebase.
    @florisla
    florisla committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    f317bb4 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2019

  1. Rename vc to version_config 

    Similar to its class VersionConfig.
    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    dd34f59 View commit details
    Browse the repository at this point in the history

  2. Inline method _assemble_context

    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    8e809b5 View commit details
    Browse the repository at this point in the history

  3. Use a single context dict 

    Versus context and vcs_context.
    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    7c78bc8 View commit details
    Browse the repository at this point in the history

  4. Compile regex outside of the loop

    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    0474179 View commit details
    Browse the repository at this point in the history

  5. Drop method _parse_current_version 

    Handle the None case in VersionConfig.parse.
    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    7c8874b View commit details
    Browse the repository at this point in the history

  6. Inline method _determine_files

    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    501eac3 View commit details
    Browse the repository at this point in the history

  7. Split up main() in a couple of sections

    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    e5f1022 View commit details
    Browse the repository at this point in the history

  8. Move TODO comment to the correct line

    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    de01bcb View commit details
    Browse the repository at this point in the history

  9. Use config.has_option instead of dict'ing the config

    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    22d981f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'ekohl-review-suggestions' into shorter-main

    @florisla
    florisla committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    4659ac6 View commit details
    Browse the repository at this point in the history