refactor: change Command.Verbosity to an enum

adamralph · Nov 21, 2014 · 48745e6 · 48745e6
1 parent c686f10
commit 48745e6
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 19 deletions.
diff --git a/src/Bau.NuGet/Bau.NuGet.csproj b/src/Bau.NuGet/Bau.NuGet.csproj
@@ -48,6 +48,7 @@
     <Compile Include="..\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Verbosity.cs" />
     <Compile Include="Guard.cs" />
     <Compile Include="Command.cs" />
     <Compile Include="Pack.cs" />

diff --git a/src/Bau.NuGet/Command.cs b/src/Bau.NuGet/Command.cs
@@ -20,7 +20,7 @@ protected Command()
 
         public string NuGetExePathOverride { get; set; }
 
-        public string Verbosity { get; set; }
+        public Verbosity? Verbosity { get; set; }
 
         public bool NonInteractive { get; set; }
 
@@ -33,18 +33,18 @@ public IEnumerable<string> CreateCommandLineArguments()
                 yield return argument;
             }
 
-            if (!string.IsNullOrWhiteSpace(this.Verbosity))
+            if (this.Verbosity.HasValue)
             {
                 // NOTE: Verbose is a valid flag but it is deprecated in favor of Verbosity and should not be used
-                yield return "-Verbosity " + this.Verbosity;
+                yield return "-Verbosity " + this.Verbosity.ToString().ToLowerInvariant();
             }
 
             if (this.NonInteractive)
             {
                 yield return "-NonInteractive";
             }
 
-            if (!string.IsNullOrWhiteSpace(this.ConfigFile))
+            if (this.ConfigFile != null)
             {
                 yield return "-ConfigFile " + this.QuoteWrapCliValue(this.ConfigFile);
             }

diff --git a/src/Bau.NuGet/CommandExtensions.cs b/src/Bau.NuGet/CommandExtensions.cs
@@ -18,25 +18,25 @@ public static T WithNuGetExePathOverride<T>(this T command, string nugetExePath)
             return command;
         }
 
-        public static T WithVerbosity<T>(this T command, string verbosity) where T : Command
+        public static T WithVerbosity<T>(this T command, Verbosity? verbosity) where T : Command
         {
             command.Verbosity = verbosity;
             return command;
         }
 
         public static T WithVerbosityDetailed<T>(this T command) where T : Command
         {
-            return command.WithVerbosity("detailed");
+            return command.WithVerbosity(Verbosity.Detailed);
         }
 
         public static T WithVerbosityQuiet<T>(this T command) where T : Command
         {
-            return command.WithVerbosity("quiet");
+            return command.WithVerbosity(Verbosity.Quiet);
         }
 
         public static T WithVerbosityNormal<T>(this T command) where T : Command
         {
-            return command.WithVerbosity("normal");
+            return command.WithVerbosity(Verbosity.Normal);
         }
 
         public static T WithInteraction<T>(this T command) where T : Command

diff --git a/src/Bau.NuGet/Verbosity.cs b/src/Bau.NuGet/Verbosity.cs
@@ -0,0 +1,13 @@
+// <copyright file="Verbosity.cs" company="Bau contributors">
+//  Copyright (c) Bau contributors. (baubuildch@gmail.com)
+// </copyright>
+
+namespace BauNuGet
+{
+    public enum Verbosity
+    {
+        Normal,
+        Quiet,
+        Detailed,
+    }
+}
diff --git a/src/test/Bau.NuGet.Test.Unit/CommandFacts.cs b/src/test/Bau.NuGet.Test.Unit/CommandFacts.cs
@@ -27,10 +27,10 @@ public static void DoesNotCreateVerbosityArgumentWhenNotSpecified()
         }
 
         [Theory]
-        [InlineData("normal")]
-        [InlineData("quiet")]
-        [InlineData("detailed")]
-        public static void CreatesVerbosityArgumentWhenSpecified(string verbosity)
+        [InlineData(Verbosity.Normal)]
+        [InlineData(Verbosity.Quiet)]
+        [InlineData(Verbosity.Detailed)]
+        public static void CreatesVerbosityArgumentWhenSpecified(Verbosity verbosity)
         {
             // arrange
             var command = new DummyCommand { Verbosity = verbosity };
@@ -39,29 +39,26 @@ public static void CreatesVerbosityArgumentWhenSpecified(string verbosity)
             var arguments = command.CreateCommandLineArguments().ToArray();
 
             // assert
-            arguments.Should().Contain("-Verbosity " + verbosity);
+            arguments.Should().Contain("-Verbosity " + verbosity.ToString().ToLowerInvariant());
         }
 
         [Fact]
         public static void PropertyVerbosityFluent()
         {
             // arrange
-            var command = new DummyCommand();
             var normal = new DummyCommand();
             var quiet = new DummyCommand();
             var detailed = new DummyCommand();
 
             // act
-            command.WithVerbosity("Grumbling");
             normal.WithVerbosityNormal();
             quiet.WithVerbosityQuiet();
             detailed.WithVerbosityDetailed();
 
             // assert
-            command.Verbosity.Should().Be("Grumbling");
-            Assert.Equal("Normal", normal.Verbosity, StringComparer.OrdinalIgnoreCase);
-            Assert.Equal("Quiet", quiet.Verbosity, StringComparer.OrdinalIgnoreCase);
-            Assert.Equal("Detailed", detailed.Verbosity, StringComparer.OrdinalIgnoreCase);
+            normal.Verbosity.Should().Be(Verbosity.Normal);
+            quiet.Verbosity.Should().Be(Verbosity.Quiet);
+            detailed.Verbosity.Should().Be(Verbosity.Detailed);
         }
 
         [Fact]