Some small improvements

Author: JakeGinnivan

GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -47,7 +47,9 @@ public static void Init(string workingDirectory, IFileSystem fileSystem)
             using (var stream = fileSystem.OpenWrite(configFilePath))
             using (var writer = new StreamWriter(stream))
             {
+                Logger.WriteInfo("Saving config file");
                 ConfigSerialiser.Write(config, writer);
+                stream.Flush();
             }
         }
     }

GitVersionCore/Configuration/Wizard/ConfigInitWizardStep.cs

@@ -7,25 +7,46 @@ public abstract class ConfigInitWizardStep
     {
         public bool Apply(Queue<ConfigInitWizardStep> steps, Config config)
         {
+            Console.WriteLine();
             Console.WriteLine(GetPrompt(config));
             var input = Console.ReadLine();
             if (input == null)
             {
-                return false;
+                Console.WriteLine("Would you like to save changes? (y/n)");
+                input = Console.ReadLine();
+                if (input == null || input.ToLower() == "n") return false;
+                if (input.ToLower() == "y")
+                {
+                    steps.Clear();
+                    return true;
+                }
+
+                InvalidResponse(steps);
+                return true;
             }
             var resultWithDefaultApplied = string.IsNullOrEmpty(input) ? DefaultResult : input;
             var stepResult = HandleResult(resultWithDefaultApplied, steps, config);
             if (stepResult.InvalidResponse)
             {
-                Console.WriteLine();
-                Console.ForegroundColor = ConsoleColor.Red;
-                Console.WriteLine("Invalid response!");
-                Console.ResetColor();
-                steps.Enqueue(this);
+                InvalidResponse(steps);
+            }
+            else if (stepResult.Exit)
+            {
+                steps.Clear();
+                return stepResult.Save;
             }
             return true;
         }
 
+        void InvalidResponse(Queue<ConfigInitWizardStep> steps)
+        {
+            Console.WriteLine();
+            Console.ForegroundColor = ConsoleColor.Red;
+            Console.WriteLine("Invalid response!");
+            Console.ResetColor();
+            steps.Enqueue(this);
+        }
+
         protected abstract StepResult HandleResult(string result, Queue<ConfigInitWizardStep> steps, Config config);
         protected abstract string GetPrompt(Config config);
         protected abstract string DefaultResult { get; }

GitVersionCore/Configuration/Wizard/ConfigureBranch.cs

@@ -33,10 +33,11 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
 
         protected override string GetPrompt(Config config)
         {
-            return @"What would you like to change for config:
+            return string.Format(@"What would you like to change for '{0}':
+
 0) Back
-1) Branch Pre-release tag
-2) Branch Increment mode (per commit/after tag)";
+1) Branch Pre-release tag (Current: {1})
+2) Branch Increment mode (per commit/after tag) (Current: {2})", name, branchConfig.Tag, branchConfig.VersioningMode);
         }
 
         protected override string DefaultResult

GitVersionCore/Configuration/Wizard/ConfigureBranches.cs

@@ -35,7 +35,7 @@ protected override string GetPrompt(Config config)
             return @"Which branch would you like to configure:
 
 0) Back
-" + OrderedBranches(config).Select((c, i) => string.Format("{0}) {1}", i + 1, c.Key));
+" + string.Join("\r\n", OrderedBranches(config).Select((c, i) => string.Format("{0}) {1}", i + 1, c.Key)));
         }
 
         static IOrderedEnumerable<KeyValuePair<string, BranchConfig>> OrderedBranches(Config config)

GitVersionCore/Configuration/Wizard/EditConfigStep.cs

@@ -10,12 +10,16 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
             switch (result)
             {
                 case "0":
+                    return StepResult.SaveAndExit();
+                case "1":
+                    return StepResult.ExitWithoutSaving();
+                case "2":
                     steps.Enqueue(new ConfigureBranches());
                     return StepResult.Ok();
-                case "1":
+                case "3":
                     steps.Enqueue(new GlobalModeSetting(new EditConfigStep(), false));
                     return StepResult.Ok();
-                case "2":
+                case "4":
                     steps.Enqueue(new AssemblyVersioningSchemeSetting());
                     return StepResult.Ok();
             }
@@ -24,11 +28,13 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
 
         protected override string GetPrompt(Config config)
         {
-            return @"What parts of the configuration would you like to edit?
+            return string.Format(@"Which would you like to change?
 
-0) Branch specific configuration
-1) Branch Increment mode (per commit/after tag)
-2) Assembly versioning scheme";
+0) Save changes
+1) Exit without saving
+2) Branch specific configuration
+3) Branch Increment mode (per commit/after tag) (Current: {0})
+4) Assembly versioning scheme (Current: {1})", config.VersioningMode, config.AssemblyVersioningScheme);
         }
 
         protected override string DefaultResult

GitVersionCore/Configuration/Wizard/FinishedSetupStep.cs

@@ -0,0 +1,10 @@
+namespace GitVersion
+{
+    public class FinishedSetupStep : EditConfigStep
+    {
+        protected override string GetPrompt(Config config)
+        {
+            return "Questions are all done, you can now edit GitVersion's configuration further\r\n" + base.GetPrompt(config);
+        }
+    }
+}

GitVersionCore/Configuration/Wizard/GitFlowSetupStep.cs

@@ -4,7 +4,7 @@ namespace GitVersion
 
     public class GitFlowSetupStep : GlobalModeSetting
     {
-        public GitFlowSetupStep() : base(new ConfigureBranches(), true)
+        public GitFlowSetupStep() : base(new FinishedSetupStep(), true)
         {
         }
 

GitVersionCore/Configuration/Wizard/GitHubFlowStep.cs

@@ -4,7 +4,7 @@ namespace GitVersion
 
     public class GitHubFlowStep : GlobalModeSetting
     {
-        public GitHubFlowStep() : base(new ConfigureBranches(), true)
+        public GitHubFlowStep() : base(new FinishedSetupStep(), true)
         {
         }
 

GitVersionCore/Configuration/Wizard/StepResult.cs

@@ -17,6 +17,28 @@ public static StepResult InvalidResponseSelected()
             };
         }
 
+        public static StepResult SaveAndExit()
+        {
+            return new StepResult
+            {
+                Save = true,
+                Exit = true
+            };
+        }
+
+        public static StepResult ExitWithoutSaving()
+        {
+            return new StepResult
+            {
+                Save = false,
+                Exit = true
+            };
+        }
+
+        public bool Exit { get; private set; }
+
+        public bool Save { get; private set; }
+
         public bool InvalidResponse { get; private set; }
     }
 }

GitVersionCore/GitVersionCore.csproj

@@ -86,6 +86,7 @@
     <Compile Include="Configuration\Wizard\ConfigureBranch.cs" />
     <Compile Include="Configuration\Wizard\ConfigureBranches.cs" />
     <Compile Include="Configuration\Wizard\EditConfigStep.cs" />
+    <Compile Include="Configuration\Wizard\FinishedSetupStep.cs" />
     <Compile Include="Configuration\Wizard\GitFlowSetupStep.cs" />
     <Compile Include="Configuration\Wizard\GitHubFlowStep.cs" />
     <Compile Include="Configuration\Wizard\PickBranchingStrategy2Step.cs" />