Merge pull request #1155 from kjjuno/feature/#947_display_own_version

Adds /version switch

Author: JakeGinnivan

src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

@@ -100,6 +100,7 @@
     <Compile Include="MsBuildProjectArgTest.cs" />
     <Compile Include="PullRequestInTeamCityTest.cs" />
     <Compile Include="AssemblyInfoFileUpdateTests.cs" />
+    <Compile Include="VersionWriterTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

src/GitVersionExe.Tests/HelpWriterTests.cs

@@ -16,7 +16,8 @@ public void AllArgsAreInHelp()
             { "TargetBranch", "/b" },
             { "LogFilePath" , "/l" },
             { "DynamicRepositoryLocation" , "/dynamicRepoLocation" },
-            { "IsHelp", "/?" }
+            { "IsHelp", "/?" },
+            { "IsVersion", "/version" }
         };
         string helpText = null;
 

src/GitVersionExe.Tests/VersionWriterTests.cs

@@ -0,0 +1,56 @@
+namespace GitVersionExe.Tests
+{
+    using System;
+    using System.IO;
+    using System.Reflection;
+    using GitVersion;
+    using Mono.Cecil;
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class VersionWriterTests
+    {
+        [Test]
+        public void WriteVersion_ShouldWriteFileVersion_WithNoPrereleaseTag()
+        {
+            var asm = GenerateAssembly(new Version(1, 0, 0), "");
+
+            string version = null;
+            VersionWriter.WriteTo(asm, v => version = v);
+
+            Assert.IsNotNull(asm);
+            Assert.AreEqual("1.0.0", version);
+        }
+
+        [Test]
+        public void WriteVersion_ShouldWriteFileVersion_WithPrereleaseTag()
+        {
+            var asm = GenerateAssembly(new Version(1, 0, 0), "-beta0004");
+
+            string version = null;
+            VersionWriter.WriteTo(asm, v => version = v);
+
+            Assert.IsNotNull(asm);
+            Assert.AreEqual("1.0.0-beta0004", version);
+        }
+
+        private Assembly GenerateAssembly(Version fileVersion, string prereleaseInfo)
+        {
+            var definition = new AssemblyNameDefinition("test-asm", fileVersion);
+
+            var asmDef = AssemblyDefinition.CreateAssembly(definition, "test-asm", ModuleKind.Dll);
+            var constructor = typeof(AssemblyInformationalVersionAttribute).GetConstructor(new[] { typeof(string) });
+            var methodReference = asmDef.MainModule.Import(constructor);
+            var customAttribute = new CustomAttribute(methodReference);
+            customAttribute.ConstructorArguments.Add(new CustomAttributeArgument(asmDef.MainModule.TypeSystem.String, fileVersion + prereleaseInfo));
+            asmDef.CustomAttributes.Add(customAttribute);
+
+            using (var memoryStream = new MemoryStream())
+            {
+                asmDef.Write(memoryStream);
+
+                return Assembly.Load(memoryStream.ToArray());
+            }
+        }
+    }
+}

src/GitVersionExe/ArgumentParser.cs

@@ -65,6 +65,13 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
                 var values = switchesAndValues.GetValues(name);
                 var value = values != null ? values.FirstOrDefault() : null;
 
+                if (name.IsSwitch("version"))
+                {
+                    EnsureArgumentValueCount(values);
+                    arguments.IsVersion = true;
+                    continue;
+                }
+
                 if (name.IsSwitch("l"))
                 {
                     EnsureArgumentValueCount(values);

src/GitVersionExe/Arguments.cs

@@ -28,6 +28,7 @@ public Arguments()
         public bool Init;
         public bool Diag;
 
+        public bool IsVersion;
         public bool IsHelp;
         public string LogFilePath;
         public string ShowVariable;

src/GitVersionExe/GitVersionExe.csproj

@@ -72,6 +72,7 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="AssemblyInfoFileUpdate.cs" />
     <Compile Include="SpecifiedArgumentRunner.cs" />
+    <Compile Include="VersionWriter.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

src/GitVersionExe/HelpWriter.cs

@@ -1,6 +1,7 @@
 namespace GitVersion
 {
     using System;
+    using System.Reflection;
 
     class HelpWriter
     {
@@ -11,12 +12,18 @@ public static void Write()
 
         public static void WriteTo(Action<string> writeAction)
         {
-            const string message = @"Use convention to derive a SemVer product version from a GitFlow or GitHub based repository.
+            string version = string.Empty;
+            Assembly assembly = Assembly.GetExecutingAssembly();
+            VersionWriter.WriteTo(assembly, v => version = v);
+
+            string message = "GitVersion " + version + @"
+Use convention to derive a SemVer product version from a GitFlow or GitHub based repository.
 
 GitVersion [path]
 
     path            The directory containing .git. If not defined current directory is used. (Must be first argument)
     init            Configuration utility for gitversion
+    /version        Displays the version of GitVersion
     /diag           Runs GitVersion with additional diagnostic information (requires git.exe to be installed)
     /h or /?        Shows Help
 

src/GitVersionExe/Program.cs

@@ -7,6 +7,7 @@ namespace GitVersion
     using System.Diagnostics;
     using System.IO;
     using System.Linq;
+    using System.Reflection;
     using System.Text;
 
     class Program
@@ -57,6 +58,13 @@ static int VerifyArgumentsAndRun()
                     return 1;
                 }
 
+                if (arguments.IsVersion)
+                {
+                    var assembly = Assembly.GetExecutingAssembly();
+                    VersionWriter.Write(assembly);
+                    return 0;
+                }
+
                 if (arguments.IsHelp)
                 {
                     HelpWriter.Write();

src/GitVersionExe/VersionWriter.cs

@@ -0,0 +1,34 @@
+namespace GitVersion
+{
+    using System;
+    using System.Linq;
+    using System.Reflection;
+
+    class VersionWriter
+    {
+        public static void Write(Assembly assembly)
+        {
+            WriteTo(assembly, Console.WriteLine);
+        }
+
+        public static void WriteTo(Assembly assembly, Action<string> writeAction)
+        {
+            var version = GetAssemblyVersion(assembly);
+            writeAction(version);
+        }
+
+        private static string GetAssemblyVersion(Assembly assembly)
+        {
+            var attribute = assembly
+                    .GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false)
+                    .FirstOrDefault() as AssemblyInformationalVersionAttribute;
+
+            if (attribute != null)
+            {
+                return attribute.InformationalVersion;
+            }
+
+            return assembly.GetName().Version.ToString();
+        }
+    }
+}