From 237764149f1558e8fc415fc30bfe376ba564fd12 Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Mon, 3 Feb 2020 19:31:31 +0200 Subject: [PATCH] minor --- src/core/gitversion.ts | 26 +++++++++++++------------- src/tasks/gitversion/main.ts | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/core/gitversion.ts b/src/core/gitversion.ts index 2e2604e..827fbc3 100644 --- a/src/core/gitversion.ts +++ b/src/core/gitversion.ts @@ -2,7 +2,7 @@ import { IBuildAgent, IDotnetTool, IExecResult, TYPES } from "./common"; import { injectable, inject } from "inversify"; import path = require("path"); -export interface IGitVersionOptions { +export interface IGitVersionArguments { targetPath: string; useConfigFile: boolean; configFilePath: string; @@ -12,7 +12,7 @@ export interface IGitVersionOptions { srcDir: string; } -export const RunOptions = { +export const GitVersionRunOptions = { targetPath: "targetPath", useConfigFile: "useConfigFile", @@ -59,9 +59,9 @@ export interface IGitVersion { export interface IGitVersionTool { install(versionSpec: string, includePrerelease: boolean): Promise; - run(options: IGitVersionOptions): Promise; + run(options: IGitVersionArguments): Promise; writeGitVersionToAgent(gitversion: IGitVersion): void; - getGitVersionOptions(): IGitVersionOptions; + getGitVersionOptions(): IGitVersionArguments; } @injectable() @@ -82,7 +82,7 @@ export class GitVersionTool implements IGitVersionTool { await this.dotnetTool.toolInstall("GitVersion.Tool", versionSpec, false, includePrerelease); } - public run(options: IGitVersionOptions): Promise { + public run(options: IGitVersionArguments): Promise { const workDir = this.getRepoDir(options.targetPath); const args = this.getArguments(workDir, options); @@ -105,7 +105,7 @@ export class GitVersionTool implements IGitVersionTool { return workDir.replace(/\\/g, "/"); } - private getArguments(workDir: string, options: IGitVersionOptions): string[] { + private getArguments(workDir: string, options: IGitVersionArguments): string[] { const args = [ workDir, "/output", @@ -140,17 +140,17 @@ export class GitVersionTool implements IGitVersionTool { return args; } - public getGitVersionOptions(): IGitVersionOptions { + public getGitVersionOptions(): IGitVersionArguments { - const targetPath = this.buildAgent.getInput(RunOptions.targetPath); + const targetPath = this.buildAgent.getInput(GitVersionRunOptions.targetPath); - const useConfigFile = this.buildAgent.getBooleanInput(RunOptions.useConfigFile); - const configFilePath = this.buildAgent.getInput(RunOptions.configFilePath); + const useConfigFile = this.buildAgent.getBooleanInput(GitVersionRunOptions.useConfigFile); + const configFilePath = this.buildAgent.getInput(GitVersionRunOptions.configFilePath); - const updateAssemblyInfo = this.buildAgent.getBooleanInput(RunOptions.updateAssemblyInfo); - const updateAssemblyInfoFilename = this.buildAgent.getInput(RunOptions.updateAssemblyInfoFilename); + const updateAssemblyInfo = this.buildAgent.getBooleanInput(GitVersionRunOptions.updateAssemblyInfo); + const updateAssemblyInfoFilename = this.buildAgent.getInput(GitVersionRunOptions.updateAssemblyInfoFilename); - const additionalArguments = this.buildAgent.getInput(RunOptions.additionalArguments); + const additionalArguments = this.buildAgent.getInput(GitVersionRunOptions.additionalArguments); const srcDir = this.buildAgent.getSourceDir().replace(/\\/g, "/"); diff --git a/src/tasks/gitversion/main.ts b/src/tasks/gitversion/main.ts index ce862f3..433c162 100644 --- a/src/tasks/gitversion/main.ts +++ b/src/tasks/gitversion/main.ts @@ -1,5 +1,5 @@ import { container, IBuildAgent, TYPES, SetupOptions } from "../../core/common"; -import { IGitVersionTool, IGitVersionOptions, IGitVersion, GitVersionTool } from "../../core/gitversion"; +import { IGitVersionTool, IGitVersionArguments, IGitVersion, GitVersionTool } from "../../core/gitversion"; container.bind(TYPES.IGitVersionTool).to(GitVersionTool); @@ -24,7 +24,7 @@ export async function setup() { export async function run() { try { - const inputOptions: IGitVersionOptions = gitVersionTool.getGitVersionOptions(); + const inputOptions: IGitVersionArguments = gitVersionTool.getGitVersionOptions(); const result = await gitVersionTool.run(inputOptions);