From 2d2a17becdc61131c5df4fcf66934f02dbf8a28a Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Mon, 10 Feb 2020 15:54:38 +0200 Subject: [PATCH] minor --- .editorconfig | 13 +++++ gitreleasemanager/close/action.yml | 4 +- gitreleasemanager/create/action.yml | 8 ++- gitreleasemanager/discard/action.yml | 4 +- gitreleasemanager/open/action.yml | 4 +- gitreleasemanager/publish/action.yml | 4 +- gitreleasemanager/setup/action.yml | 4 +- gitversion/setup/action.yml | 4 +- src/tools/gitreleasemanager/tool.ts | 84 ++++++++++++++-------------- 9 files changed, 73 insertions(+), 56 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..afcf269 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +# http://editorconfig.org +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.yml] +indent_size = 2 diff --git a/gitreleasemanager/close/action.yml b/gitreleasemanager/close/action.yml index 53870f2..b261dec 100644 --- a/gitreleasemanager/close/action.yml +++ b/gitreleasemanager/close/action.yml @@ -23,8 +23,8 @@ inputs: milestone: description: The milestone to use required: true - default: '' + default: '' targetDirectory: description: The directory on which GitReleaseManager should be executed. Defaults to current directory required: false - default: '' \ No newline at end of file + default: '' diff --git a/gitreleasemanager/create/action.yml b/gitreleasemanager/create/action.yml index c13196f..14727cd 100644 --- a/gitreleasemanager/create/action.yml +++ b/gitreleasemanager/create/action.yml @@ -23,7 +23,7 @@ inputs: milestone: description: The milestone to use required: false - default: '' + default: '' name: description: The name of the release required: false @@ -40,7 +40,11 @@ inputs: description: The commit to tag. Can be a branch or SHA. Defaults to repository's default branch required: false default: '' + assets: + description: Path(s) to the file(s) to include in the release + required: false + default: '' targetDirectory: description: The directory on which GitReleaseManager should be executed. Defaults to current directory required: false - default: '' \ No newline at end of file + default: '' diff --git a/gitreleasemanager/discard/action.yml b/gitreleasemanager/discard/action.yml index 554a222..9e61356 100644 --- a/gitreleasemanager/discard/action.yml +++ b/gitreleasemanager/discard/action.yml @@ -23,8 +23,8 @@ inputs: milestone: description: The milestone to use required: true - default: '' + default: '' targetDirectory: description: The directory on which GitReleaseManager should be executed. Defaults to current directory required: false - default: '' \ No newline at end of file + default: '' diff --git a/gitreleasemanager/open/action.yml b/gitreleasemanager/open/action.yml index d295f83..1ceaece 100644 --- a/gitreleasemanager/open/action.yml +++ b/gitreleasemanager/open/action.yml @@ -23,8 +23,8 @@ inputs: milestone: description: The milestone to use required: true - default: '' + default: '' targetDirectory: description: The directory on which GitReleaseManager should be executed. Defaults to current directory required: false - default: '' \ No newline at end of file + default: '' diff --git a/gitreleasemanager/publish/action.yml b/gitreleasemanager/publish/action.yml index aa03937..3c47834 100644 --- a/gitreleasemanager/publish/action.yml +++ b/gitreleasemanager/publish/action.yml @@ -23,8 +23,8 @@ inputs: milestone: description: The milestone to use required: true - default: '' + default: '' targetDirectory: description: The directory on which GitReleaseManager should be executed. Defaults to current directory required: false - default: '' \ No newline at end of file + default: '' diff --git a/gitreleasemanager/setup/action.yml b/gitreleasemanager/setup/action.yml index 767c334..2b2117e 100644 --- a/gitreleasemanager/setup/action.yml +++ b/gitreleasemanager/setup/action.yml @@ -13,6 +13,6 @@ inputs: required: true default: '' includePrerelease: - description: Include pre-release versions when matching a version + description: Include pre-release versions when matching a version required: false - default: false \ No newline at end of file + default: 'false' diff --git a/gitversion/setup/action.yml b/gitversion/setup/action.yml index c1bffff..44f181b 100644 --- a/gitversion/setup/action.yml +++ b/gitversion/setup/action.yml @@ -13,6 +13,6 @@ inputs: required: true default: '' includePrerelease: - description: Include pre-release versions when matching a version + description: Include pre-release versions when matching a version required: false - default: false \ No newline at end of file + default: 'false' diff --git a/src/tools/gitreleasemanager/tool.ts b/src/tools/gitreleasemanager/tool.ts index d6d89f7..9eb0a23 100644 --- a/src/tools/gitreleasemanager/tool.ts +++ b/src/tools/gitreleasemanager/tool.ts @@ -67,7 +67,7 @@ export class GitReleaseManagerTool extends DotnetTool implements IGitReleaseMana return this.execute("dotnet-gitreleasemanager", args); } - getCommonArguments(settings: GitReleaseManagerSettings): string[] { + private getCommonArguments(settings: GitReleaseManagerSettings): string[] { const args: string[] = []; args.push("--owner", settings.owner); @@ -81,47 +81,7 @@ export class GitReleaseManagerTool extends DotnetTool implements IGitReleaseMana return args; } - getDiscardArguments(settings: GitReleaseManagerDiscardSettings): string[] { - const args: string[] = ['discard', ...this.getCommonArguments(settings)]; - - if (settings.milestone) { - args.push("--milestone", settings.milestone); - } - - return args; - } - - getCloseArguments(settings: GitReleaseManagerCloseSettings): string[] { - const args: string[] = ['close', ...this.getCommonArguments(settings)]; - - if (settings.milestone) { - args.push("--milestone", settings.milestone); - } - - return args; - } - - getOpenArguments(settings: GitReleaseManagerOpenSettings): string[] { - const args: string[] = ['open', ...this.getCommonArguments(settings)]; - - if (settings.milestone) { - args.push("--milestone", settings.milestone); - } - - return args; - } - - getPublishArguments(settings: GitReleaseManagerPublishSettings): string[] { - const args: string[] = ['publish', ...this.getCommonArguments(settings)]; - - if (settings.tagName) { - args.push("--tagName", settings.tagName); - } - - return args; - } - - getCreateArguments(settings: GitReleaseManagerCreateSettings): string[] { + private getCreateArguments(settings: GitReleaseManagerCreateSettings): string[] { const args: string[] = ['create', ...this.getCommonArguments(settings)]; if (settings.milestone) { @@ -155,6 +115,46 @@ export class GitReleaseManagerTool extends DotnetTool implements IGitReleaseMana return args; } + private getDiscardArguments(settings: GitReleaseManagerDiscardSettings): string[] { + const args: string[] = ['discard', ...this.getCommonArguments(settings)]; + + if (settings.milestone) { + args.push("--milestone", settings.milestone); + } + + return args; + } + + private getCloseArguments(settings: GitReleaseManagerCloseSettings): string[] { + const args: string[] = ['close', ...this.getCommonArguments(settings)]; + + if (settings.milestone) { + args.push("--milestone", settings.milestone); + } + + return args; + } + + private getOpenArguments(settings: GitReleaseManagerOpenSettings): string[] { + const args: string[] = ['open', ...this.getCommonArguments(settings)]; + + if (settings.milestone) { + args.push("--milestone", settings.milestone); + } + + return args; + } + + private getPublishArguments(settings: GitReleaseManagerPublishSettings): string[] { + const args: string[] = ['publish', ...this.getCommonArguments(settings)]; + + if (settings.tagName) { + args.push("--tagName", settings.tagName); + } + + return args; + } + private getRepoDir(targetPath: string): string { let workDir: string; const srcDir = this.buildAgent.getSourceDir();