Url command (#5)

增加url子命令实现
增加gl子命令实现
优化部分功能

Author: yesAnd92

Makefile

@@ -38,5 +38,11 @@ clean:
 	rm -rf ./*.gz
 
 
+#安装到当前mac
+installMac:
+	go build
+	sudo -S rm /usr/local/bin/lwe
+	sudo cp ./lwe /usr/local/bin/
+
 # 发版命令
 # make release VERSION=1.0.0

README.md

@@ -10,7 +10,9 @@ lwe是leave work early的缩写，也就是"早点下班"！🤣🤣🤣
 
 [3.获取Navicat连接配置中的密码](#3)
 
-[4.增强Git日志功能：查看给定目录下所有git仓库提交日志](#4)
+[4.Git增强功能：glog、gl](#4)
+
+[5.其它小工具](#5)
 
 ## 安装
 
@@ -34,6 +36,8 @@ cp <下载的lwe文件路径> /usr/local/bin
 #### Win平台添加到环境变量的方法:
 可以参照maven的配置方法
 
+>windows平台可能会被防火墙误识别成有害程序，建议关闭防火墙
+
 ### Homebrew
 
 Mac平台后续支持从Homebrew直接安装
@@ -238,7 +242,9 @@ Connection username: root
 Connection password: This is a test
 ```
 
-<h3 id="4">4、增强Git日志功能：查看给定目录下所有git仓库提交日志</h3>
+<h3 id="4">4、Git增强功能：glog、gl</h3>
+#### glog 增强Git日志功能
+查看给定目录下所有git仓库提交日志 
 开发人员可能同时维护多个项目或者一个项目中多个模块在不同git仓库，如果有跨仓库查看多个仓库提交日志的需求，glog子命令就派上用场了。
 
 ```bash
@@ -260,7 +266,7 @@ lwe glog /Users/yesand/work/  -a=yesand -f=false -n=20 -s=2023-05-15 -e=2023-05-
 `-f, --file bool`,可选参数，该参数决定将查询结果写到文件中，默认在控制台输出。\
 `-n, --recentN int16`,可选参数，该参数指定每个仓库查询最近N条的提交记录。\
 `-s, --start string`,可选参数，该参数指定筛选提交记录的开始日期，格式：'yyyy-MM-dd'。\
-`-e, --end string`,可选参数，该参数指定筛选提交记录的结束日期，格式：'yyyy-MM-dd'。\
+`-e, --end string`,可选参数，该参数指定筛选提交记录的结束日期，格式：'yyyy-MM-dd'。
 
 结果:示例
 
@@ -278,6 +284,36 @@ lwe glog /Users/yesand/work/  -a=yesand -f=false -n=20 -s=2023-05-15 -e=2023-05-
 ...
 ```
 
+#### gl 增强拉取代码功能
+拉取给定目录下的所有git仓库最新代码(使用的git pull --rebase的方式)
+```bash
+lwe gl [仓库所在目录]
+```
+> 如果当前仓库存在未提交的文件，则跳过此仓库的更新
+
+<h3 id="5">5、其它小工具</h3>
+一些小的功能
+
+<h4>格式化请求url</h4>
+有时请求的url很长，不利于我们找到目标参数，可以使用url命令进行格式化，增加请求的可读性
+示例：
+
+```bash
+lwe url  http://api.demo.com/api/user/getList?platform=ios&signature=bd7e1fd4e65e8199fd817006e709fb33&currentTimeMillis=1685673384000&pageNum=1
+```
+格式化结果：
+
+```text
+Host: api.demo.com
+Path: /api/user/getList
+-----------------------
+pageNum                 1
+platform                ios
+signature               bd7e1fd4e65e8199fd817006e709fb33
+currentTimeMillis       1685673384000
+```
+
+> 某些bash下请求url需要用' '引起来才能正常使用
 
 
 ## 说明

cmd/git.go

@@ -16,7 +16,7 @@ var (
 	start     string  //开始时间
 	end       string  //结束时间
 
-	gitCmd = &cobra.Command{
+	glogCmd = &cobra.Command{
 		Use:   "glog",
 		Short: "Get all git repository commit log under the given dir ",
 		Long:  `Get all git repository commit log under the given dir ,and  specify author，date etc. supported!`,
@@ -45,14 +45,31 @@ var (
 
 		},
 	}
+
+	gplCmd = &cobra.Command{
+		Use:   "gl",
+		Short: "Update all git repository under the given dir ",
+		Long:  `Update all git repository under the given dir ,the repository that has modified files will not be updated!`,
+		Args:  cobra.MatchAll(cobra.MinimumNArgs(1)),
+		Run: func(cmd *cobra.Command, args []string) {
+
+			var dir = "."
+			if len(args) > 0 {
+				dir = args[0]
+			}
+
+			gitcmd.UpdateAllGitRepo(dir)
+
+		},
+	}
 )
 
 func init() {
 
 	//gitCmd.PersistentFlags().BoolVarP(&detail, "detail", "d", false, "")
-	gitCmd.PersistentFlags().BoolVarP(&file, "file", "f", false, "result output to file,default value is false (meaning output to console). ")
-	gitCmd.PersistentFlags().StringVarP(&committer, "author", "a", "", "specify name of committer ")
-	gitCmd.PersistentFlags().StringVarP(&start, "start", "s", "", "specify the start of commit date. eg.'yyyy-MM-dd'")
-	gitCmd.PersistentFlags().StringVarP(&end, "end", "e", "", "specify the end of commit date. eg.'yyyy-MM-dd'")
-	gitCmd.PersistentFlags().Int16VarP(&recentN, "recentN", "n", 10, "specify the number of commit log for each git repo.")
+	glogCmd.PersistentFlags().BoolVarP(&file, "file", "f", false, "result output to file,default value is false (meaning output to console). ")
+	glogCmd.PersistentFlags().StringVarP(&committer, "author", "a", "", "specify name of committer ")
+	glogCmd.PersistentFlags().StringVarP(&start, "start", "s", "", "specify the start of commit date. eg.'yyyy-MM-dd'")
+	glogCmd.PersistentFlags().StringVarP(&end, "end", "e", "", "specify the end of commit date. eg.'yyyy-MM-dd'")
+	glogCmd.PersistentFlags().Int16VarP(&recentN, "recentN", "n", 10, "specify the number of commit log for each git repo.")
 }

cmd/root.go

@@ -24,5 +24,7 @@ func init() {
 	rootCmd.AddCommand(md5Cmd)
 	rootCmd.AddCommand(esCmd)
 	rootCmd.AddCommand(navicatCmd)
-	rootCmd.AddCommand(gitCmd)
+	rootCmd.AddCommand(glogCmd)
+	rootCmd.AddCommand(gplCmd)
+	rootCmd.AddCommand(urlCmd)
 }

cmd/url.go

@@ -0,0 +1,14 @@
+package cmd
+
+import "github.com/spf13/cobra"
+import "lwe/handler/url"
+
+var urlCmd = &cobra.Command{
+	Use:   "url",
+	Short: "format request url to increase readability",
+	Long:  `format request url to increase readability`,
+	Args:  cobra.MatchAll(cobra.ExactArgs(1)),
+	Run: func(cmd *cobra.Command, args []string) {
+		url.HandleUrlPathParams(args[0])
+	},
+}

handler/gitcmd/common.go

@@ -0,0 +1,33 @@
+package gitcmd
+
+import (
+	"fmt"
+	"github.com/spf13/cobra"
+	"io/ioutil"
+	"path/filepath"
+)
+
+func findGitRepo(dir string, res *[]string) {
+	var files []string
+	fileInfo, err := ioutil.ReadDir(dir)
+	if err != nil {
+		cobra.CheckErr(fmt.Errorf(" The dir '%s' is not exist!\n", dir))
+		return
+	}
+
+	for _, file := range fileInfo {
+		//当前目录是git仓库，没必要继续遍历
+		if ".git" == file.Name() {
+			*res = append(*res, dir)
+			return
+		}
+		if file.IsDir() {
+			files = append(files, file.Name())
+		}
+	}
+
+	//目录下的子目录递归遍历
+	for _, fName := range files {
+		findGitRepo(filepath.Join(dir, fName), res)
+	}
+}

handler/gitcmd/gitlog.go

@@ -4,9 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/spf13/cobra"
-	"io/ioutil"
 	"lwe/utils"
-	"os"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -17,7 +15,7 @@ import (
 const (
 
 	//git log
-	LOG_TPL            = "git --no-pager log  --no-merges "
+	LOG_TPL            = "git -C %s --no-pager log  --no-merges "
 	LOG_FORMAT_TPL     = `--format=format:'%h*-*%an*-*%ct*-*%s' ` //使用*-*作为分隔符
 	LOG_AUTHOR_TPL     = `--author=%s `
 	LOG_START_DATE_TPL = `--since=%s `
@@ -37,7 +35,7 @@ type CommitLog struct {
 	FilesChanged []string //changed file arr
 }
 
-//ResultLog 封装日志分析结果
+// ResultLog 封装日志分析结果
 type ResultLog struct {
 	RepoName   string //git repository name
 	CommitLogs *[]CommitLog
@@ -46,15 +44,10 @@ type ResultLog struct {
 // GetCommitLog 获取提交日志
 func GetCommitLog(detail bool, recentN int16, dir, author, start, end string) (*[]CommitLog, error) {
 
-	if len(dir) > 0 {
-		//指定了目录，切换到指定目录执行命令
-		if err := os.Chdir(dir); err != nil {
-			cobra.CheckErr(err)
-		}
-	}
-
 	//使用bytes.Buffer这种方式拼接字符串会%!h(MISSING)？
-	var cmdline = LOG_TPL
+	//指定仓库地址
+	var cmdline = fmt.Sprintf(LOG_TPL, dir)
+
 	if recentN >= 0 {
 		cmdline += fmt.Sprintf(LOG_RECENTN_TPL, recentN)
 	}
@@ -140,10 +133,6 @@ func GetAllGitRepoCommitLog(detail bool, recentN int16, dir, author, start, end
 	var res []string
 	var reLog []ResultLog
 
-	//由于操作中切换了工作目录，结束后重新定位到当前工作目录
-	currWd, _ := os.Getwd()
-	defer os.Chdir(currWd)
-
 	//相对路径转换成绝对路径进行处理
 	if !filepath.IsAbs(dir) {
 		absDir, err := filepath.Abs(dir)
@@ -168,30 +157,5 @@ func GetAllGitRepoCommitLog(detail bool, recentN int16, dir, author, start, end
 	}
 
 	return &reLog, nil
-
 }
 
-func findGitRepo(dir string, res *[]string) {
-	var files []string
-	fileInfo, err := ioutil.ReadDir(dir)
-	if err != nil {
-		cobra.CheckErr(fmt.Errorf(" The dir '%s' is not exist!\n", dir))
-		return
-	}
-
-	for _, file := range fileInfo {
-		//当前目录是git仓库，没必要继续遍历
-		if ".git" == file.Name() {
-			*res = append(*res, dir)
-			return
-		}
-		if file.IsDir() {
-			files = append(files, file.Name())
-		}
-	}
-
-	//目录下的子目录递归遍历
-	for _, fName := range files {
-		findGitRepo(filepath.Join(dir, fName), res)
-	}
-}

handler/gitcmd/gitpull.go

@@ -0,0 +1,85 @@
+package gitcmd
+
+import (
+	"fmt"
+	"github.com/spf13/cobra"
+	"lwe/utils"
+	"path/filepath"
+	"time"
+)
+
+// git pull
+const (
+
+	//查看仓库状态，结果以简短形式呈现
+	STATUS_CHECK_TPL = "git -C %s status -s"
+	//更新仓库
+	GIT_PULL = `git -C %s pull --rebase`
+)
+
+func updateRepo(dir string) (string, error) {
+
+	//指定仓库地址
+	var cmdline = fmt.Sprintf(GIT_PULL, dir)
+
+	result := utils.RunCmd(cmdline, time.Second*30)
+	if result.Err() != nil {
+		return "", result.Err()
+	}
+
+	reStr := result.String()
+	return reStr, nil
+}
+
+// checkRepoClean 检测当前仓库是否干净
+func checkRepoClean(dir string) (bool, string) {
+	var cmdline = fmt.Sprintf(STATUS_CHECK_TPL, dir)
+
+	result := utils.RunCmd(cmdline, time.Second*30)
+	if result.Err() != nil {
+		return false, result.Err().Error()
+	}
+
+	commitMsg := result.String()
+	if len(commitMsg) == 0 {
+		return true, ""
+	}
+	return false, commitMsg
+}
+
+// UpdateAllGitRepo 更新所有仓库
+func UpdateAllGitRepo(dir string) {
+	var res []string
+
+	//相对路径转换成绝对路径进行处理
+	if !filepath.IsAbs(dir) {
+		absDir, err := filepath.Abs(dir)
+		if err != nil {
+			cobra.CheckErr(err)
+		}
+		dir = absDir
+	}
+
+	//递归找到所有的git仓库
+	findGitRepo(dir, &res)
+
+	//遍历获取每个仓库的提交信息
+	for idx, gitDir := range res {
+		fmt.Printf("#%d Git Repo >> %s\n", idx+1, gitDir)
+		if clean, msg := checkRepoClean(gitDir); !clean {
+			//存在未提交的变动，防止冲突等问题，不进行更新
+			fmt.Println(msg)
+			fmt.Println(">> Modified Files in this Repo have not been submitted yet, terminating the update!")
+			fmt.Println()
+			continue
+		}
+
+		result, err := updateRepo(gitDir)
+		if err != nil {
+			fmt.Println(err)
+		}
+		fmt.Println(result)
+		fmt.Println()
+	}
+
+}