Merge pull request #990 from Yamato-Security/989-part-of-hayabusa-hel…

…p-menu-is-green-in-233-dev UI(main): fixed part of help menu green color #989
Yamato-Security · Apr 6, 2023 · 927e326 · 927e326
2 parents 1e7e7e2 + 443cbe8
commit 927e326
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/CHANGELOG-Japanese.md b/CHANGELOG-Japanese.md
@@ -1,12 +1,13 @@
 # 変更点
 
-## 2.3.3 [2023/04/05] "Sakura Release"
+## 2.3.3 [2023/04/07] "Sakura Release"
 
 **改善:**
 
 - ファイル(CSV, JSON, JSONL)出力の際にルールの`level`の余分なスペースを削除した。 (#979) (@hitenkoku)
 - `-M, --multiline`オプション利用時にルール作者名の出力を複数行出力対応をした。 (#980) (@hitenkoku)
 - Stringの代わりにCoWを利用することで、約5%の速度向上を実現した。 (#984) (@hitenkoku)
+- Clapの新バージョンでロゴ後のメッセージとUsageテキストの出力色が緑にならないように修正した。 (#989) (@hitenkoku)
 
 **バグ修正:**
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,13 @@
 # Changes
 
-## 2.3.3 [2023/04/05] "Sakura Release"
+## 2.3.3 [2023/04/07] "Sakura Release"
 
 **Enhancements:**
 
 - Removed an extra space when outputting the rule `level` to files (CSV, JSON, JSONL). (#979) (@hitenkoku)
 - Rule authors are now outputted in multiple lines with the `-M, --multiline` option. (#980) (@hitenkoku)
 - Approximately 3-5% speed increase by replacing String with CoW. (#984) (@hitenkoku)
+- Made sure text after the logo does not turn green with recent clap versions. (#989) (@hitenkoku)
 
 **Bug Fixes:**
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/main.rs b/src/main.rs
@@ -110,7 +110,7 @@ impl App {
         {
             if !stored_static.common_options.quiet {
                 self.output_logo(stored_static);
-                println!();
+                write_color_buffer(&BufferWriter::stdout(ColorChoice::Always), None, "", true).ok();
             }
             app.find_subcommand(subcommand_name)
                 .unwrap()
@@ -125,15 +125,15 @@ impl App {
         if stored_static.config.action.is_none() {
             if !stored_static.common_options.quiet {
                 self.output_logo(stored_static);
-                println!();
+                write_color_buffer(&BufferWriter::stdout(ColorChoice::Always), None, "", true).ok();
             }
             app.print_help().ok();
             println!();
             return;
         }
         if !stored_static.common_options.quiet {
             self.output_logo(stored_static);
-            println!();
+            write_color_buffer(&BufferWriter::stdout(ColorChoice::Always), None, "", true).ok();
             self.output_eggs(&format!(
                 "{:02}/{:02}",
                 &analysis_start_time.month(),