Merge branch 'feature/flow' into develop

Author: GavZheng

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "wutong"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 authors = ["Gavin Zheng<gav.zheng@outlook.com"]
 description = "A Swiss Army Knife for Developers.🌳"
@@ -12,6 +12,6 @@ license = "MIT"
 readme = "README.md"
 
 [dependencies]
-clap = "4.5.26"
+clap = "4.5.34"
 colored = "3.0.0"
 md5 = "0.7.0"

Cargo.toml

@@ -24,8 +24,9 @@ In our daily project development, we frequently encounter situations where we ne
 ---
 
 ## How to Install Wutong
-If you are a MacOS user, you can use:
+If you are a macOS user, you can use:
 ```bash
+brew tap GavZheng/wutong
 brew install wutong
 ```
 If you are a Windows or Linux user, please wait for the subsequent version.  
@@ -35,7 +36,7 @@ P.S.: Of course, you can compile Wutong yourself.
 
 ## How to Use Wutong
 You can obtain detailed information by typing `wutong --help` in the command line.  
-The general functions of Wutong are listed below (v0.1.0-beta):
+The general functions of Wutong are listed below (v0.2.0):
 
 | Function | Description                                                  |
 |----------|--------------------------------------------------------------|
@@ -44,6 +45,7 @@ The general functions of Wutong are listed below (v0.1.0-beta):
 | color    | Convert between RGB and Hex colors                           |
 | md5      | Hash input strings using MD5                                 |
 | charcode | Convert string encodings                                     |
+| flow     | Manage git repositories according to the Gitflow workflow    |
 
 ---
 
@@ -71,5 +73,21 @@ We sincerely thank the following individuals who have made outstanding contribut
 
 ---
 
+FAQ
+
+Q1: Why is it named "Wutong"?
+A: The name originates from developer Gavin's friend, Silent, whose favorite tree species is the Chinese parasol tree (梧桐). "Wutong" is the Pinyin transliteration of the tree's Chinese name.
+
+Q2: Why was Rust chosen as the development language?
+A: Rust was selected as the optimal technical choice after evaluating languages like Python, C++, and C, due to its cross-platform capabilities, memory safety features, and high-performance execution that align with the project's requirements.
+
+Q3: Why is only macOS currently supported?
+A: Current development prioritizes core feature refinement and rapid iteration. Windows and Linux versions are on the roadmap, with multi-platform adaptation scheduled to commence once core functionalities are stabilized.
+
+Q4: Where can I learn more about Gavin?
+A: Visit [Gavin's GitHub profile](https://github.com/GavZheng) to explore his technical contributions and open-source projects.
+
+---
+
 ## License
 [MIT](./LICENSE) © 2025 Gavin Zheng

README.md

@@ -32,14 +32,18 @@
 ---
 
 ## 如何安装梧桐
-> [!NOTE]  
-> 梧桐在测试阶段不提供安装方式，如希望体验请自行编译。在正式版发布后，梧桐将会提供安装方式。
-
+如果您是 macOS 用户，则可以使用：
+```bash
+brew tap GavZheng/wutong
+brew install wutong
+```
+如果您是 Windows 或 Linux 用户，请等待后续版本。 
+P.S.：当然可以自己编译梧桐。
 ---
 
 ## 如何使用梧桐
 你可以通过在命令行键入`wutong --help`来获取详细信息。  
-梧桐的大致功能如下表（v0.1.0-alpha）
+梧桐的大致功能如下表（v0.2.0）
 
 | 功能       | 描述                         |
 |----------|----------------------------|
@@ -48,6 +52,7 @@
 | color    | RGB和Hex颜色的相互转换             |
 | md5      | 将输入的字符串进行md5哈希             |
 | charcode | 字符串编码转换                    |
+| flow     | 根据 Gitflow 工作流程管理 git 存储库  |
 
 ---
 
@@ -73,5 +78,20 @@
 
 ---
 
+## FAQ
+Q1: 为什么叫梧桐？  
+A：这个名字来自我（Gavin）的一个朋友（Silent），梧桐是她最喜欢的树。“Wutong”是梧桐的拼音。
+
+Q2: 为何选择Rust作为开发语言？  
+A: Rust凭借其卓越的跨平台能力、内存安全特性和高效执行性能，在综合评估Python/C++/C等候选语言后，被确认为满足项目需求的最佳技术选型。
+
+Q3: 当前为何仅支持macOS平台？
+A: 现阶段开发重心聚焦于核心功能完善与快速迭代。Windows/Linux版本已列入roadmap，将在主体功能稳定后启动多平台适配工作。
+
+Q4：更多关于Gavin？  
+A：你可以访问[Gavin的Github主页](https://github.com/GavZheng)。
+
+---
+
 ## 许可证
 [MIT](../../LICENSE) © 2025 Gavin Zheng

docs/zh/README_zh.md

@@ -0,0 +1,31 @@
+use crate::BranchType;
+use std::process;
+
+pub fn branch(branch_type: BranchType, branch_name: &str) -> Result<(), String> {
+    let git_path = crate::flow::git::which_git().map_err(|e| e.to_string())?;
+
+    let prefix = match branch_type {
+        BranchType::Feature => "feature",
+        BranchType::Release => "release",
+        BranchType::Hotfix => "hotfix",
+    };
+
+    let branch = format!("{}/{}", prefix, branch_name);
+
+    let output = process::Command::new(&git_path)
+        .arg("checkout")
+        .arg("-b")
+        .arg(&branch)
+        .output()
+        .map_err(|e| format!("Failed to execute Git command: {}", e))?;
+
+    if !output.status.success() {
+        let error_msg = String::from_utf8_lossy(&output.stderr);
+        return Err(format!(
+            "Failed to create branch '{}': {}",
+            branch, error_msg
+        ));
+    }
+
+    Ok(())
+}

src/flow/branch.rs

@@ -0,0 +1,32 @@
+use std::env::consts::OS;
+use std::process;
+
+pub fn which_git() -> Result<String, String> {
+    let (cmd, arg) = if OS == "windows" {
+        ("where", "git")
+    } else {
+        ("which", "git")
+    };
+
+    let output = process::Command::new(cmd)
+        .arg(arg)
+        .output()
+        .map_err(|e| format!("Command execution failed:{}", e))?;
+
+    if !output.status.success() {
+        return Err("The Git executable could not be found".to_string());
+    }
+
+    let path_str = String::from_utf8_lossy(&output.stdout)
+        .trim()
+        .lines()
+        .next()
+        .ok_or("No valid path found")?
+        .to_string();
+
+    if path_str.is_empty() || !std::path::Path::new(&path_str).exists() {
+        return Err("The found Git path is invalid".to_string());
+    }
+
+    Ok(path_str)
+}

src/flow/git.rs

@@ -0,0 +1,22 @@
+use std::process;
+
+pub fn merge(branch_name: &str) -> Result<(), String> {
+    let git_path = crate::flow::git::which_git().map_err(|e| e.to_string())?;
+
+    let output = process::Command::new(&git_path)
+        .arg("merge")
+        .arg("--no-ff")
+        .arg(branch_name)
+        .output()
+        .map_err(|e| format!("Failed to execute Git command: {}", e))?;
+
+    if !output.status.success() {
+        let error_msg = String::from_utf8_lossy(&output.stderr);
+        return Err(format!(
+            "Failed to merge branch '{}': {}",
+            branch_name, error_msg
+        ));
+    }
+
+    Ok(())
+}

src/flow/merge.rs

@@ -0,0 +1,3 @@
+pub mod branch;
+pub mod git;
+pub mod merge;

src/flow/mod.rs

@@ -2,14 +2,22 @@ mod base;
 mod base_conversion;
 mod charcode;
 mod color;
+mod flow;
 mod md5;
 
 use clap::{Arg, ArgGroup, Command};
-use colored::*;
+use colored::Colorize;
+
+#[derive(Debug, Clone, Copy)]
+pub enum BranchType {
+    Feature,
+    Release,
+    Hotfix,
+}
 
 fn main() {
     let matches = Command::new("Wutong")
-        .version("0.1.0")
+        .version("0.2.0")
         .about("Wutong - A Swiss Army Knife of Developers.🌳")
         .author("Gavin Zheng<gav.zheng@outlook.com>")
         .subcommand(
@@ -82,6 +90,40 @@ fn main() {
                     .index(1),
             ),
         )
+        .subcommand(
+            Command::new("flow")
+                .about("Create and merge branches and release versions according to GitFlow.")
+                .arg(
+                    Arg::new("feature")
+                        .short('f')
+                        .long("feature")
+                        .help("Create a new feature branch."),
+                )
+                .arg(
+                    Arg::new("release")
+                        .short('r')
+                        .long("release")
+                        .help("Create a new release branch."),
+                )
+                .arg(
+                    Arg::new("hotfix")
+                        .short('H')
+                        .long("hotfix")
+                        .help("Create a new hotfix branch."),
+                )
+                .arg(
+                    Arg::new("merge")
+                        .short('m')
+                        .long("merge")
+                        .help("Merge branches."),
+                )
+                .group(
+                    ArgGroup::new("branch_type_option")
+                        .args(["feature", "release", "hotfix", "merge"])
+                        .required(true)
+                        .multiple(false),
+                ),
+        )
         .get_matches();
 
     match matches.subcommand() {
@@ -214,6 +256,39 @@ fn main() {
                 Err(error) => println!("{} {}", "Error:".red(), error),
             }
         }
+        Some(("flow", subcommand_flow)) => {
+            let subcommands = [
+                ("feature", BranchType::Feature),
+                ("release", BranchType::Release),
+                ("hotfix", BranchType::Hotfix),
+            ];
+
+            if let Some((sub_cmd, branch_type)) = subcommands
+                .iter()
+                .find(|(name, _)| subcommand_flow.contains_id(name))
+                .copied()
+            {
+                let arg = subcommand_flow.get_one::<String>(sub_cmd).unwrap();
+                match flow::branch::branch(branch_type, arg) {
+                    Ok(_) => println!("Done."),
+                    Err(e) => {
+                        eprintln!("{} {}", "Error:".red(), e);
+                        std::process::exit(1);
+                    }
+                }
+            }
+
+            if subcommand_flow.contains_id("merge") {
+                let arg = subcommand_flow.get_one::<String>("merge").unwrap();
+                match flow::merge::merge(arg) {
+                    Ok(_) => println!("Done."),
+                    Err(e) => {
+                        eprintln!("{} {}", "Error:".red(), e);
+                        std::process::exit(1);
+                    }
+                }
+            }
+        }
         _ => {}
     }
 }