Fixed unprinted version when default usage of cli.

kekyo · kekyo · commit a97277f86368 · 2024-10-15T17:57:55.000+09:00
diff --git a/RelaxVersioner.Core/Logger.cs b/RelaxVersioner.Core/Logger.cs
@@ -10,6 +10,7 @@
 #nullable enable
 
 using System;
+using System.ComponentModel;
 using System.IO;
 
 namespace RelaxVersioner;
@@ -18,7 +19,9 @@ public enum LogImportance
 {
     Low = 1,
     Normal = 2,
-    High =3
+    High = 3,
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    Ignore = 100,
 }
 
 public abstract class Logger
@@ -28,6 +31,8 @@ public abstract class Logger
     protected Logger(string header) =>
         this.Header = header;
 
+    public abstract void SetImportance(LogImportance lowerImportance);
+
     public abstract void Message(LogImportance importance, string message);
 
     public virtual void Message(LogImportance importance, string format, params object?[] args) =>
@@ -55,11 +60,12 @@ public static Logger Create(string header, LogImportance lowerImportance, TextWr
 
 internal sealed class TextWriterLogger : Logger
 {
-    private readonly LogImportance lowerImportance;
     private readonly TextWriter @out;
     private readonly TextWriter warning;
     private readonly TextWriter error;
 
+    private LogImportance lowerImportance;
+
     public TextWriterLogger(string header, LogImportance lowerImportance, TextWriter @out, TextWriter warning, TextWriter error) :
         base(header)
     {
@@ -69,9 +75,12 @@ public TextWriterLogger(string header, LogImportance lowerImportance, TextWriter
         this.error = error;
     }
 
+    public override void SetImportance(LogImportance lowerImportance) =>
+        this.lowerImportance = lowerImportance;
+
     public override void Message(LogImportance importance, string message)
     {
-        if (importance >= lowerImportance)
+        if (importance >= this.lowerImportance)
         {
             @out.WriteLine(message);
         }
diff --git a/RelaxVersioner.Core/Processor.cs b/RelaxVersioner.Core/Processor.cs
@@ -41,6 +41,7 @@ public sealed class ProcessorContext
     public string BracketStart;
     public string BracketEnd;
     public bool IsDryRun;
+    public bool IsQuietOnStandardOutput;
     public string[] NpmPrefixes;
 }
 
@@ -60,21 +61,6 @@ public Processor(Logger logger)
 
     public string[] Languages { get; }
 
-    private readonly struct TargetCommit
-    {
-        public readonly int StartDepth;
-        public readonly Commit Commit;
-
-        public TargetCommit(int startDepth, Commit commit)
-        {
-            this.StartDepth = startDepth;
-            this.Commit = commit;
-        }
-
-        public override string ToString() =>
-            $"StartDepth={this.StartDepth}, {this.Commit}";
-    }
-
     private static async Task<Result> WriteVersionSourceFileAsync(
         Logger logger,
         WriteProviderBase writeProvider,
@@ -155,10 +141,7 @@ static string FormatSignature(Signature? sig) => sig is { } s ?
             keyValues[entry.key] = entry.value;
         }
 
-        if (!string.IsNullOrWhiteSpace(context.OutputPath))
-        {
-            writeProvider.Write(context, keyValues, generated);
-        }
+        writeProvider.Write(context, keyValues, generated);
 
         return new Result(
             versionLabel,
diff --git a/RelaxVersioner.Core/Writers/NpmReplaceProvider.cs b/RelaxVersioner.Core/Writers/NpmReplaceProvider.cs
@@ -102,6 +102,11 @@ void ReplaceSubKey(string key)
         }
         else
         {
+            if (context.IsQuietOnStandardOutput)
+            {
+                return;
+            }
+
             using var tr = context.ReplaceInputPath is { } rip ?
                 new StreamReader(rip, Encoding.UTF8, true) :
                 Console.In;
diff --git a/RelaxVersioner.Core/Writers/SourceCodeWriteProviderBase.cs b/RelaxVersioner.Core/Writers/SourceCodeWriteProviderBase.cs
@@ -129,16 +129,12 @@ public override sealed void Write(
         var importSet = Utilities.AggregateImports(elementSet);
         var ruleSet = Utilities.AggregateRules(elementSet);
 
-        if (context.IsDryRun)
+        if (context.IsDryRun ||
+            string.IsNullOrWhiteSpace(context.OutputPath))
         {
             return;
         }
 
-        if (string.IsNullOrWhiteSpace(context.OutputPath))
-        {
-            throw new ArgumentException("Output path required.");
-        }
-
         this.Write(context, keyValues, generated, ruleSet, importSet);
     }
 
diff --git a/RelaxVersioner.Core/Writers/TextReplaceProvider.cs b/RelaxVersioner.Core/Writers/TextReplaceProvider.cs
@@ -72,6 +72,11 @@ void Replace(TextReader tr, TextWriter tw)
         }
         else
         {
+            if (context.IsQuietOnStandardOutput)
+            {
+                return;
+            }
+
             using var tr = context.ReplaceInputPath is { } rip ?
                 new StreamReader(rip, Encoding.UTF8, true) :
                 Console.In;
diff --git a/RelaxVersioner.Core/Writers/TextWriteProvider.cs b/RelaxVersioner.Core/Writers/TextWriteProvider.cs
@@ -64,6 +64,11 @@ void Write(TextWriter tw, bool emitEol)
         }
         else
         {
+            if (context.IsQuietOnStandardOutput)
+            {
+                return;
+            }
+
             var tw = Console.Out;
             Write(tw, true);
         }
diff --git a/RelaxVersioner/Program.cs b/RelaxVersioner/Program.cs
@@ -27,9 +27,11 @@ public static async Task<int> Main(string[] args)
         {
             var processor = new Processor(logger);
             var languages = string.Join("|", processor.Languages);
+            var verbose = false;
 
             var context = new ProcessorContext
             {
+                IsDryRun = false,
                 Language = "Text",
                 GenerateStatic = true,
                 TextFormat = "{versionLabel}",
@@ -42,7 +44,12 @@ public static async Task<int> Main(string[] args)
 
             var options = new OptionSet
             {
-                { "language=", $"target language [{languages}]", v => context.Language = v },
+                { "l|language=", $"target language [{languages}]", v =>
+                    {
+                        context.Language = v;
+                        verbose = true;
+                    }
+                },
                 { "namespace=", "applying namespace", v => context.Namespace = v },
                 { "tfm=", "target framework moniker definition (TargetFramework)", v => context.TargetFramework = v },
                 { "tfid=", "target framework identity definition (TargetFrameworkIdentifier)", v => context.TargetFrameworkIdentity = v },
@@ -90,7 +97,9 @@ public static async Task<int> Main(string[] args)
                         context.OutputPath = "package.json";
                     }
                 },
+                { "quiet", "quiet on stdout", _ => context.IsQuietOnStandardOutput = true },
                 { "dryrun", "dryrun mode", _ => context.IsDryRun = true },
+                { "verbose", "verbose mode", _ => verbose = true },
                 { "launchDebugger", "Launch debugger", _ => launchDebugger = true },
                 { "help", "help", v => help = v != null },
             };
@@ -112,6 +121,11 @@ public static async Task<int> Main(string[] args)
                 logger.Error("");
                 return 1;
             }
+            
+            if (!verbose)
+            {
+                logger.SetImportance(LogImportance.Ignore);
+            }
 
             context.ProjectDirectory = trails[0];
 
@@ -122,29 +136,20 @@ public static async Task<int> Main(string[] args)
                 ResultWriter.Write(resultPath!, result);
             }
             
-            if (context.Language switch
-                {
-                    "Text" => context.IsDryRun,
-                    "Replace" => context.IsDryRun,
-                    "NPM" => context.IsDryRun,
-                    _ => true,
-                })
-            {
-                var dryrunDisplay = context.IsDryRun ?
-                    " (dryrun)" : string.Empty;
-                var languageDisplay = context.IsDryRun ?
-                    string.Empty : $"Language={context.Language}, ";
-                var tfmDisplay = context.IsDryRun ?
-                    string.Empty : $"TFM={context.TargetFramework}, ";
+            var dryrunDisplay = context.IsDryRun ?
+                " (dryrun)" : string.Empty;
+            var languageDisplay = context.IsDryRun ?
+                string.Empty : $"Language={context.Language}, ";
+            var tfmDisplay = (context.IsDryRun || string.IsNullOrWhiteSpace(context.TargetFramework)) ?
+                string.Empty : $"TFM={context.TargetFramework}, ";
 
-                logger.Message(
-                    LogImportance.High,
-                    "Generated versions code{0}: {1}{2}Version={3}",
-                    dryrunDisplay,
-                    languageDisplay,
-                    tfmDisplay,
-                    result.Version);
-            }
+            logger.Message(
+                LogImportance.High,
+                "Generated versions code{0}: {1}{2}Version={3}",
+                dryrunDisplay,
+                languageDisplay,
+                tfmDisplay,
+                result.Version);
         }
         catch (Exception ex)
         {
diff --git a/RelaxVersioner/build/RelaxVersioner.targets b/RelaxVersioner/build/RelaxVersioner.targets
@@ -156,7 +156,7 @@
     </ItemGroup>
 
     <Exec WorkingDirectory="$(RelaxVersionerToolingDir)"
-          Command="$(RelaxVersionerToolingRuntimeName)&quot;$(RelaxVersionerToolingPath)&quot; $(_RVB_LaunchDebuggerOption) --language=&quot;$(RelaxVersionerLanguage)&quot; --namespace=&quot;$(RelaxVersionerNamespace)&quot; --tfm=&quot;$(_RVB_TargetFramework)&quot; --tfid=&quot;$(_RVB_TargetFrameworkIdentifier)&quot; --tfv=&quot;$(_RVB_TargetFrameworkVersion)&quot; --tfp=&quot;$(_RVB_TargetFrameworkProfile)&quot; --genStatic=&quot;$(RelaxVersionerGenerateStatic)&quot; --buildIdentifier=&quot;$(RelaxVersionerBuildIdentifier)&quot; --propertiesPath=&quot;$(RelaxVersionerPropertiesPath)&quot; --outputPath=@(_RVB_OutputPath->'&quot;%(FullPath)&quot;',' ') --resultPath=&quot;$(RelaxVersionerResultPath)&quot; &quot;$(MSBuildProjectFullPath)&quot;" />
+          Command="$(RelaxVersionerToolingRuntimeName)&quot;$(RelaxVersionerToolingPath)&quot; $(_RVB_LaunchDebuggerOption) --verbose --language=&quot;$(RelaxVersionerLanguage)&quot; --namespace=&quot;$(RelaxVersionerNamespace)&quot; --tfm=&quot;$(_RVB_TargetFramework)&quot; --tfid=&quot;$(_RVB_TargetFrameworkIdentifier)&quot; --tfv=&quot;$(_RVB_TargetFrameworkVersion)&quot; --tfp=&quot;$(_RVB_TargetFrameworkProfile)&quot; --genStatic=&quot;$(RelaxVersionerGenerateStatic)&quot; --buildIdentifier=&quot;$(RelaxVersionerBuildIdentifier)&quot; --propertiesPath=&quot;$(RelaxVersionerPropertiesPath)&quot; --outputPath=@(_RVB_OutputPath->'&quot;%(FullPath)&quot;',' ') --resultPath=&quot;$(RelaxVersionerResultPath)&quot; &quot;$(MSBuildProjectFullPath)&quot;" />
 
     <ItemGroup>
       <FileWrites Include="$(RelaxVersionerResultPath)" />
@@ -328,7 +328,7 @@
     </ItemGroup>
 
     <Exec WorkingDirectory="$(RelaxVersionerToolingDir)"
-          Command="$(RelaxVersionerToolingRuntimeName)&quot;$(RelaxVersionerToolingPath)&quot; $(_RVB_LaunchDebuggerOption) --buildIdentifier=&quot;$(RelaxVersionerBuildIdentifier)&quot; --namespace=&quot;$(RelaxVersionerNamespace)&quot; --tfm=&quot;$(_RVB_TargetFramework)&quot; --tfid=&quot;$(_RVB_TargetFrameworkIdentifier)&quot; --tfv=&quot;$(_RVB_TargetFrameworkVersion)&quot; --tfp=&quot;$(_RVB_TargetFrameworkProfile)&quot; --genStatic=&quot;$(RelaxVersionerGenerateStatic)&quot; --propertiesPath=&quot;$(RelaxVersionerPropertiesPath)&quot; --resultPath=&quot;$(RelaxVersionerResultPath)&quot; &quot;$(MSBuildProjectFullPath)&quot;" />
+          Command="$(RelaxVersionerToolingRuntimeName)&quot;$(RelaxVersionerToolingPath)&quot; $(_RVB_LaunchDebuggerOption) --quiet --buildIdentifier=&quot;$(RelaxVersionerBuildIdentifier)&quot; --namespace=&quot;$(RelaxVersionerNamespace)&quot; --tfm=&quot;$(_RVB_TargetFramework)&quot; --tfid=&quot;$(_RVB_TargetFrameworkIdentifier)&quot; --tfv=&quot;$(_RVB_TargetFrameworkVersion)&quot; --tfp=&quot;$(_RVB_TargetFrameworkProfile)&quot; --genStatic=&quot;$(RelaxVersionerGenerateStatic)&quot; --propertiesPath=&quot;$(RelaxVersionerPropertiesPath)&quot; --resultPath=&quot;$(RelaxVersionerResultPath)&quot; &quot;$(MSBuildProjectFullPath)&quot;" />
 
     <ItemGroup>
       <FileWrites Include="$(RelaxVersionerResultPath)" />

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`#nullable enable`
`11`	`11`
`12`	`12`	`using System;`
	`13`	`+using System.ComponentModel;`
`13`	`14`	`using System.IO;`
`14`	`15`
`15`	`16`	`namespace RelaxVersioner;`
`@@ -18,7 +19,9 @@ public enum LogImportance`
`18`	`19`	`{`
`19`	`20`	`Low = 1,`
`20`	`21`	`Normal = 2,`
`21`		`- High =3`
	`22`	`+ High = 3,`
	`23`	`+ [EditorBrowsable(EditorBrowsableState.Never)]`
	`24`	`+ Ignore = 100,`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public abstract class Logger`
`@@ -28,6 +31,8 @@ public abstract class Logger`
`28`	`31`	`protected Logger(string header) =>`
`29`	`32`	`this.Header = header;`
`30`	`33`
	`34`	`+ public abstract void SetImportance(LogImportance lowerImportance);`
	`35`	`+`
`31`	`36`	`public abstract void Message(LogImportance importance, string message);`
`32`	`37`
`33`	`38`	`public virtual void Message(LogImportance importance, string format, params object?[] args) =>`
`@@ -55,11 +60,12 @@ public static Logger Create(string header, LogImportance lowerImportance, TextWr`
`55`	`60`
`56`	`61`	`internal sealed class TextWriterLogger : Logger`
`57`	`62`	`{`
`58`		`- private readonly LogImportance lowerImportance;`
`59`	`63`	`private readonly TextWriter @out;`
`60`	`64`	`private readonly TextWriter warning;`
`61`	`65`	`private readonly TextWriter error;`
`62`	`66`
	`67`	`+ private LogImportance lowerImportance;`
	`68`	`+`
`63`	`69`	`public TextWriterLogger(string header, LogImportance lowerImportance, TextWriter @out, TextWriter warning, TextWriter error) :`
`64`	`70`	`base(header)`
`65`	`71`	`{`
`@@ -69,9 +75,12 @@ public TextWriterLogger(string header, LogImportance lowerImportance, TextWriter`
`69`	`75`	`this.error = error;`
`70`	`76`	`}`
`71`	`77`
	`78`	`+ public override void SetImportance(LogImportance lowerImportance) =>`
	`79`	`+ this.lowerImportance = lowerImportance;`
	`80`	`+`
`72`	`81`	`public override void Message(LogImportance importance, string message)`
`73`	`82`	`{`
`74`		`- if (importance >= lowerImportance)`
	`83`	`+ if (importance >= this.lowerImportance)`
`75`	`84`	`{`
`76`	`85`	`@out.WriteLine(message);`
`77`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,11 @@ void ReplaceSubKey(string key)`
`102`	`102`	`}`
`103`	`103`	`else`
`104`	`104`	`{`
	`105`	`+ if (context.IsQuietOnStandardOutput)`
	`106`	`+ {`
	`107`	`+ return;`
	`108`	`+ }`
	`109`	`+`
`105`	`110`	`using var tr = context.ReplaceInputPath is { } rip ?`
`106`	`111`	`new StreamReader(rip, Encoding.UTF8, true) :`
`107`	`112`	`Console.In;`
Original file line number	Diff line number	Diff line change
`@@ -129,16 +129,12 @@ public override sealed void Write(`
`129`	`129`	`var importSet = Utilities.AggregateImports(elementSet);`
`130`	`130`	`var ruleSet = Utilities.AggregateRules(elementSet);`
`131`	`131`
`132`		`- if (context.IsDryRun)`
	`132`	`+ if (context.IsDryRun \|\|`
	`133`	`+ string.IsNullOrWhiteSpace(context.OutputPath))`
`133`	`134`	`{`
`134`	`135`	`return;`
`135`	`136`	`}`
`136`	`137`
`137`		`- if (string.IsNullOrWhiteSpace(context.OutputPath))`
`138`		`- {`
`139`		`- throw new ArgumentException("Output path required.");`
`140`		`- }`
`141`		`-`
`142`	`138`	`this.Write(context, keyValues, generated, ruleSet, importSet);`
`143`	`139`	`}`
`144`	`140`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,11 @@ void Replace(TextReader tr, TextWriter tw)`
`72`	`72`	`}`
`73`	`73`	`else`
`74`	`74`	`{`
	`75`	`+ if (context.IsQuietOnStandardOutput)`
	`76`	`+ {`
	`77`	`+ return;`
	`78`	`+ }`
	`79`	`+`
`75`	`80`	`using var tr = context.ReplaceInputPath is { } rip ?`
`76`	`81`	`new StreamReader(rip, Encoding.UTF8, true) :`
`77`	`82`	`Console.In;`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,11 @@ void Write(TextWriter tw, bool emitEol)`
`64`	`64`	`}`
`65`	`65`	`else`
`66`	`66`	`{`
	`67`	`+ if (context.IsQuietOnStandardOutput)`
	`68`	`+ {`
	`69`	`+ return;`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`var tw = Console.Out;`
`68`	`73`	`Write(tw, true);`
`69`	`74`	`}`