diff --git a/src/cfengine_cli/dev.py b/src/cfengine_cli/dev.py index d2bcf2f..ba0c879 100644 --- a/src/cfengine_cli/dev.py +++ b/src/cfengine_cli/dev.py @@ -64,10 +64,12 @@ def lint_docs() -> int: return 1 -def generate_release_information() -> int: +def generate_release_information( + omit_download=False, check=False, min_version=None +) -> int: answer = _expect_repo("release-information") if answer: - generate_release_information_command() + generate_release_information_command(omit_download, check, min_version) return 0 return 1 @@ -82,6 +84,8 @@ def dispatch_dev_subcommand(subcommand, args) -> int: if subcommand == "lint-docs": return lint_docs() if subcommand == "generate-release-information": - return generate_release_information() + return generate_release_information( + args.omit_download, args.check_against_git, args.minimum_version + ) raise UserError("Invalid cfengine dev subcommand - " + subcommand) diff --git a/src/cfengine_cli/docs.py b/src/cfengine_cli/docs.py index 87a0eaa..76b6525 100644 --- a/src/cfengine_cli/docs.py +++ b/src/cfengine_cli/docs.py @@ -18,7 +18,6 @@ from cfengine_cli.lint import lint_policy_file from cfengine_cli.utils import UserError - IGNORED_DIRS = [".git"] diff --git a/src/cfengine_cli/main.py b/src/cfengine_cli/main.py index ab936aa..19feefe 100644 --- a/src/cfengine_cli/main.py +++ b/src/cfengine_cli/main.py @@ -87,7 +87,23 @@ def _get_arg_parser(): ) dev_subparsers.add_parser("format-docs") dev_subparsers.add_parser("lint-docs") - dev_subparsers.add_parser("generate-release-information") + parser = dev_subparsers.add_parser("generate-release-information") + + parser.add_argument( + "--omit-download", + help="Use existing masterfiles instead of downloading in 'cfbs generate-release-information'", + action="store_true", + ) + parser.add_argument( + "--check-against-git", + help="Check whether masterfiles from cfengine.com and github.com match in 'cfbs generate-release-information'", + action="store_true", + ) + parser.add_argument( + "--from", + help="Specify minimum version in 'cfbs generate-release-information'", + dest="minimum_version", + ) return ap