added prettier tool

2020-03-10 11:42:51 +02:00
parent 5c4fb6ec6b
commit 2690f37786
32 changed files with 930 additions and 902 deletions
--- a/src/tools/gitversion/models.ts
+++ b/src/tools/gitversion/models.ts
@@ -1,52 +1,52 @@
 export enum ExecuteFields {
-    targetPath = "targetPath",
-    useConfigFile = "useConfigFile",
-    configFilePath = "configFilePath",
-    updateAssemblyInfo = "updateAssemblyInfo",
-    updateAssemblyInfoFilename = "updateAssemblyInfoFilename",
-    additionalArguments = "additionalArguments",
-    srcDir = "srcDir",
-};
+    targetPath = 'targetPath',
+    useConfigFile = 'useConfigFile',
+    configFilePath = 'configFilePath',
+    updateAssemblyInfo = 'updateAssemblyInfo',
+    updateAssemblyInfoFilename = 'updateAssemblyInfoFilename',
+    additionalArguments = 'additionalArguments',
+    srcDir = 'srcDir'
+}

 export interface GitVersionSettings {
-    [ExecuteFields.targetPath]: string;
-    [ExecuteFields.useConfigFile]: boolean;
-    [ExecuteFields.configFilePath]: string;
-    [ExecuteFields.updateAssemblyInfo]: boolean;
-    [ExecuteFields.updateAssemblyInfoFilename]: string;
-    [ExecuteFields.additionalArguments]: string;
-    [ExecuteFields.srcDir]: string;
+    [ExecuteFields.targetPath]: string
+    [ExecuteFields.useConfigFile]: boolean
+    [ExecuteFields.configFilePath]: string
+    [ExecuteFields.updateAssemblyInfo]: boolean
+    [ExecuteFields.updateAssemblyInfoFilename]: string
+    [ExecuteFields.additionalArguments]: string
+    [ExecuteFields.srcDir]: string
 }

 export interface GitVersionOutput {
-    Major: number;
-    Minor: number;
-    Patch: number;
-    PreReleaseTag: string;
-    PreReleaseTagWithDash: string;
-    PreReleaseLabel: string;
-    PreReleaseNumber: number;
-    WeightedPreReleaseNumber: number;
-    BuildMetaData: number;
-    BuildMetaDataPadded: string;
-    FullBuildMetaData: string;
-    MajorMinorPatch: string;
-    SemVer: string;
-    LegacySemVer: string;
-    LegacySemVerPadded: string;
-    AssemblySemVer: string;
-    AssemblySemFileVer: string;
-    FullSemVer: string;
-    InformationalVersion: string;
-    BranchName: string;
-    Sha: string;
-    ShortSha: string;
-    NuGetVersionV2: string;
-    NuGetVersion: string;
-    NuGetPreReleaseTagV2: string;
-    NuGetPreReleaseTag: string;
-    VersionSourceSha: string;
-    CommitsSinceVersionSource: number;
-    CommitsSinceVersionSourcePadded: string;
-    CommitDate: string;
+    Major: number
+    Minor: number
+    Patch: number
+    PreReleaseTag: string
+    PreReleaseTagWithDash: string
+    PreReleaseLabel: string
+    PreReleaseNumber: number
+    WeightedPreReleaseNumber: number
+    BuildMetaData: number
+    BuildMetaDataPadded: string
+    FullBuildMetaData: string
+    MajorMinorPatch: string
+    SemVer: string
+    LegacySemVer: string
+    LegacySemVerPadded: string
+    AssemblySemVer: string
+    AssemblySemFileVer: string
+    FullSemVer: string
+    InformationalVersion: string
+    BranchName: string
+    Sha: string
+    ShortSha: string
+    NuGetVersionV2: string
+    NuGetVersion: string
+    NuGetPreReleaseTagV2: string
+    NuGetPreReleaseTag: string
+    VersionSourceSha: string
+    CommitsSinceVersionSource: number
+    CommitsSinceVersionSourcePadded: string
+    CommitDate: string
 }
--- a/src/tools/gitversion/settings.ts
+++ b/src/tools/gitversion/settings.ts
@@ -1,21 +1,30 @@
-import { IBuildAgent } from "../../core/models";
+import {IBuildAgent} from '../../core/models'

-import { GitVersionSettings, ExecuteFields } from "./models";
+import {GitVersionSettings, ExecuteFields} from './models'

 export class Settings {
+    public static getGitVersionSettings(
+        buildAgent: IBuildAgent
+    ): GitVersionSettings {
+        const targetPath = buildAgent.getInput(ExecuteFields.targetPath)

-    public static getGitVersionSettings(buildAgent: IBuildAgent): GitVersionSettings {
-        const targetPath = buildAgent.getInput(ExecuteFields.targetPath);
+        const useConfigFile = buildAgent.getBooleanInput(
+            ExecuteFields.useConfigFile
+        )
+        const configFilePath = buildAgent.getInput(ExecuteFields.configFilePath)

-        const useConfigFile = buildAgent.getBooleanInput(ExecuteFields.useConfigFile);
-        const configFilePath = buildAgent.getInput(ExecuteFields.configFilePath);
+        const updateAssemblyInfo = buildAgent.getBooleanInput(
+            ExecuteFields.updateAssemblyInfo
+        )
+        const updateAssemblyInfoFilename = buildAgent.getInput(
+            ExecuteFields.updateAssemblyInfoFilename
+        )

-        const updateAssemblyInfo = buildAgent.getBooleanInput(ExecuteFields.updateAssemblyInfo);
-        const updateAssemblyInfoFilename = buildAgent.getInput(ExecuteFields.updateAssemblyInfoFilename);
+        const additionalArguments = buildAgent.getInput(
+            ExecuteFields.additionalArguments
+        )

-        const additionalArguments = buildAgent.getInput(ExecuteFields.additionalArguments);
-
-        const srcDir = buildAgent.getSourceDir().replace(/\\/g, "/");
+        const srcDir = buildAgent.getSourceDir().replace(/\\/g, '/')

        return {
            targetPath,
@@ -24,7 +33,7 @@ export class Settings {
            updateAssemblyInfo,
            updateAssemblyInfoFilename,
            additionalArguments,
-            srcDir,
-        };
+            srcDir
+        }
    }
-}
+}
--- a/src/tools/gitversion/tool.ts
+++ b/src/tools/gitversion/tool.ts
@@ -1,120 +1,183 @@
-import path = require("path");
+import path = require('path')

-import { injectable, inject } from "inversify";
-import { IExecResult, IBuildAgent, TYPES } from "../../core/models";
-import { DotnetTool, IDotnetTool } from "../../core/dotnet-tool";
-import { GitVersionSettings, GitVersionOutput, ExecuteFields } from "./models";
-import { IVersionManager } from "../../core/versionManager";
+import {injectable, inject} from 'inversify'
+import {IExecResult, IBuildAgent, TYPES} from '../../core/models'
+import {DotnetTool, IDotnetTool} from '../../core/dotnet-tool'
+import {GitVersionSettings, GitVersionOutput, ExecuteFields} from './models'
+import {IVersionManager} from '../../core/versionManager'

 export interface IGitVersionTool extends IDotnetTool {
-    install(versionSpec: string, includePrerelease: boolean): Promise<void>;
-    run(options: GitVersionSettings): Promise<IExecResult>;
-    writeGitVersionToAgent(gitversion: GitVersionOutput): void;
+    install(versionSpec: string, includePrerelease: boolean): Promise<void>
+    run(options: GitVersionSettings): Promise<IExecResult>
+    writeGitVersionToAgent(gitversion: GitVersionOutput): void
 }

@injectable()
 export class GitVersionTool extends DotnetTool implements IGitVersionTool {
-
    constructor(
        @inject(TYPES.IBuildAgent) buildAgent: IBuildAgent,
        @inject(TYPES.IVersionManager) versionManager: IVersionManager
    ) {
-        super(buildAgent, versionManager);
+        super(buildAgent, versionManager)
    }

-    public async install(versionSpec: string, includePrerelease: boolean): Promise<void> {
-        await this.toolInstall("GitVersion.Tool", versionSpec, false, includePrerelease);
+    public async install(
+        versionSpec: string,
+        includePrerelease: boolean
+    ): Promise<void> {
+        await this.toolInstall(
+            'GitVersion.Tool',
+            versionSpec,
+            false,
+            includePrerelease
+        )
    }

    public run(options: GitVersionSettings): Promise<IExecResult> {
-        const workDir = this.getRepoDir(options.targetPath);
+        const workDir = this.getRepoDir(options.targetPath)

-        const args = this.getArguments(workDir, options);
+        const args = this.getArguments(workDir, options)

-        return this.execute("dotnet-gitversion", args);
+        return this.execute('dotnet-gitversion', args)
    }

    private getRepoDir(targetPath: string): string {
-        let workDir: string;
-        const srcDir = this.buildAgent.getSourceDir();
+        let workDir: string
+        const srcDir = this.buildAgent.getSourceDir()
        if (!targetPath) {
-            workDir = srcDir;
+            workDir = srcDir
        } else {
            if (this.buildAgent.directoryExists(targetPath)) {
-                workDir = path.join(srcDir, targetPath);
+                workDir = path.join(srcDir, targetPath)
            } else {
-                throw new Error("Directory not found at " + targetPath);
+                throw new Error('Directory not found at ' + targetPath)
            }
        }
-        return workDir.replace(/\\/g, "/");
+        return workDir.replace(/\\/g, '/')
    }

-    private getArguments(workDir: string, options: GitVersionSettings): string[] {
-        const args = [
-            workDir,
-            "/output", "json",
-            "/output", "buildserver",
-        ];
+    private getArguments(
+        workDir: string,
+        options: GitVersionSettings
+    ): string[] {
+        const args = [workDir, '/output', 'json', '/output', 'buildserver']

        const {
            useConfigFile,
            configFilePath,
            updateAssemblyInfo,
            updateAssemblyInfoFilename,
-            additionalArguments,
-        } = options;
+            additionalArguments
+        } = options

        if (useConfigFile) {
-            if (this.buildAgent.isValidInputFile("configFilePath", configFilePath)) {
-                args.push("/config", configFilePath);
+            if (
+                this.buildAgent.isValidInputFile(
+                    'configFilePath',
+                    configFilePath
+                )
+            ) {
+                args.push('/config', configFilePath)
            } else {
-                throw new Error("GitVersion configuration file not found at " + configFilePath);
+                throw new Error(
+                    'GitVersion configuration file not found at ' +
+                        configFilePath
+                )
            }
        }
        if (updateAssemblyInfo) {
-            args.push("/updateassemblyinfo");
-            if (this.buildAgent.isValidInputFile("updateAssemblyInfoFilename", updateAssemblyInfoFilename)) {
-                args.push(updateAssemblyInfoFilename);
+            args.push('/updateassemblyinfo')
+            if (
+                this.buildAgent.isValidInputFile(
+                    'updateAssemblyInfoFilename',
+                    updateAssemblyInfoFilename
+                )
+            ) {
+                args.push(updateAssemblyInfoFilename)
            } else {
-                throw new Error("AssemblyInfoFilename file not found at " + updateAssemblyInfoFilename);
+                throw new Error(
+                    'AssemblyInfoFilename file not found at ' +
+                        updateAssemblyInfoFilename
+                )
            }
        }

-        args.push(additionalArguments);
-        return args;
+        args.push(additionalArguments)
+        return args
    }

    public writeGitVersionToAgent(gitversion: GitVersionOutput): void {
-
-        this.buildAgent.setOutput("major", gitversion.Major.toString());
-        this.buildAgent.setOutput("minor", gitversion.Minor.toString());
-        this.buildAgent.setOutput("patch", gitversion.Patch.toString());
-        this.buildAgent.setOutput("preReleaseTag", gitversion.PreReleaseTag);
-        this.buildAgent.setOutput("preReleaseTagWithDash", gitversion.PreReleaseTagWithDash);
-        this.buildAgent.setOutput("preReleaseLabel", gitversion.PreReleaseLabel);
-        this.buildAgent.setOutput("preReleaseNumber", gitversion.PreReleaseNumber.toString());
-        this.buildAgent.setOutput("weightedPreReleaseNumber", gitversion.WeightedPreReleaseNumber.toString());
-        this.buildAgent.setOutput("buildMetaData", gitversion.BuildMetaData.toString());
-        this.buildAgent.setOutput("buildMetaDataPadded", gitversion.BuildMetaDataPadded);
-        this.buildAgent.setOutput("fullBuildMetaData", gitversion.FullBuildMetaData);
-        this.buildAgent.setOutput("majorMinorPatch", gitversion.MajorMinorPatch);
-        this.buildAgent.setOutput("semVer", gitversion.SemVer);
-        this.buildAgent.setOutput("legacySemVer", gitversion.LegacySemVer);
-        this.buildAgent.setOutput("legacySemVerPadded", gitversion.LegacySemVerPadded);
-        this.buildAgent.setOutput("assemblySemVer", gitversion.AssemblySemVer);
-        this.buildAgent.setOutput("assemblySemFileVer", gitversion.AssemblySemFileVer);
-        this.buildAgent.setOutput("fullSemVer", gitversion.FullSemVer);
-        this.buildAgent.setOutput("informationalVersion", gitversion.InformationalVersion);
-        this.buildAgent.setOutput("branchName", gitversion.BranchName);
-        this.buildAgent.setOutput("sha", gitversion.Sha);
-        this.buildAgent.setOutput("shortSha", gitversion.ShortSha);
-        this.buildAgent.setOutput("nuGetVersionV2", gitversion.NuGetVersionV2);
-        this.buildAgent.setOutput("nuGetVersion", gitversion.NuGetVersion);
-        this.buildAgent.setOutput("nuGetPreReleaseTagV2", gitversion.NuGetPreReleaseTagV2);
-        this.buildAgent.setOutput("nuGetPreReleaseTag", gitversion.NuGetPreReleaseTag);
-        this.buildAgent.setOutput("versionSourceSha", gitversion.VersionSourceSha);
-        this.buildAgent.setOutput("commitsSinceVersionSource", gitversion.CommitsSinceVersionSource.toString());
-        this.buildAgent.setOutput("commitsSinceVersionSourcePadded", gitversion.CommitsSinceVersionSourcePadded);
-        this.buildAgent.setOutput("commitDate", gitversion.CommitDate);
+        this.buildAgent.setOutput('major', gitversion.Major.toString())
+        this.buildAgent.setOutput('minor', gitversion.Minor.toString())
+        this.buildAgent.setOutput('patch', gitversion.Patch.toString())
+        this.buildAgent.setOutput('preReleaseTag', gitversion.PreReleaseTag)
+        this.buildAgent.setOutput(
+            'preReleaseTagWithDash',
+            gitversion.PreReleaseTagWithDash
+        )
+        this.buildAgent.setOutput('preReleaseLabel', gitversion.PreReleaseLabel)
+        this.buildAgent.setOutput(
+            'preReleaseNumber',
+            gitversion.PreReleaseNumber.toString()
+        )
+        this.buildAgent.setOutput(
+            'weightedPreReleaseNumber',
+            gitversion.WeightedPreReleaseNumber.toString()
+        )
+        this.buildAgent.setOutput(
+            'buildMetaData',
+            gitversion.BuildMetaData.toString()
+        )
+        this.buildAgent.setOutput(
+            'buildMetaDataPadded',
+            gitversion.BuildMetaDataPadded
+        )
+        this.buildAgent.setOutput(
+            'fullBuildMetaData',
+            gitversion.FullBuildMetaData
+        )
+        this.buildAgent.setOutput('majorMinorPatch', gitversion.MajorMinorPatch)
+        this.buildAgent.setOutput('semVer', gitversion.SemVer)
+        this.buildAgent.setOutput('legacySemVer', gitversion.LegacySemVer)
+        this.buildAgent.setOutput(
+            'legacySemVerPadded',
+            gitversion.LegacySemVerPadded
+        )
+        this.buildAgent.setOutput('assemblySemVer', gitversion.AssemblySemVer)
+        this.buildAgent.setOutput(
+            'assemblySemFileVer',
+            gitversion.AssemblySemFileVer
+        )
+        this.buildAgent.setOutput('fullSemVer', gitversion.FullSemVer)
+        this.buildAgent.setOutput(
+            'informationalVersion',
+            gitversion.InformationalVersion
+        )
+        this.buildAgent.setOutput('branchName', gitversion.BranchName)
+        this.buildAgent.setOutput('sha', gitversion.Sha)
+        this.buildAgent.setOutput('shortSha', gitversion.ShortSha)
+        this.buildAgent.setOutput('nuGetVersionV2', gitversion.NuGetVersionV2)
+        this.buildAgent.setOutput('nuGetVersion', gitversion.NuGetVersion)
+        this.buildAgent.setOutput(
+            'nuGetPreReleaseTagV2',
+            gitversion.NuGetPreReleaseTagV2
+        )
+        this.buildAgent.setOutput(
+            'nuGetPreReleaseTag',
+            gitversion.NuGetPreReleaseTag
+        )
+        this.buildAgent.setOutput(
+            'versionSourceSha',
+            gitversion.VersionSourceSha
+        )
+        this.buildAgent.setOutput(
+            'commitsSinceVersionSource',
+            gitversion.CommitsSinceVersionSource.toString()
+        )
+        this.buildAgent.setOutput(
+            'commitsSinceVersionSourcePadded',
+            gitversion.CommitsSinceVersionSourcePadded
+        )
+        this.buildAgent.setOutput('commitDate', gitversion.CommitDate)
    }
 }