From 52ec9a0686a9455336fb33ef0244a4692b5ea476 Mon Sep 17 00:00:00 2001 From: loveuer Date: Sun, 14 Jul 2024 17:26:48 +0800 Subject: [PATCH] chore: nfctl version, check cmd --- .github/workflows/nfctl.yml | 2 +- go.mod | 14 ++-- go.sum | 37 +++++++--- nft/nfctl/cmd/check.go | 16 +++++ nft/nfctl/cmd/cmd.go | 13 +++- nft/nfctl/cmd/new.go | 6 +- nft/nfctl/cmd/version.go | 5 +- nft/nfctl/main.go | 13 +--- nft/nfctl/version/var.go | 3 + nft/nfctl/version/version.go | 111 +++++++++++++++++------------- nft/nfctl/version/version_test.go | 16 +++++ 11 files changed, 156 insertions(+), 80 deletions(-) create mode 100644 nft/nfctl/cmd/check.go create mode 100644 nft/nfctl/version/var.go create mode 100644 nft/nfctl/version/version_test.go diff --git a/.github/workflows/nfctl.yml b/.github/workflows/nfctl.yml index 7f47a13..1993451 100644 --- a/.github/workflows/nfctl.yml +++ b/.github/workflows/nfctl.yml @@ -5,7 +5,7 @@ on: - 'master' env: - RELEASE_VERSION: v24.07.13-r1 + RELEASE_VERSION: v24.07.14-r1 jobs: build-job: diff --git a/go.mod b/go.mod index 7b70dc0..647c12b 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,11 @@ go 1.20 require ( github.com/fatih/color v1.17.0 - github.com/go-git/go-billy/v5 v5.5.0 github.com/go-git/go-git/v5 v5.12.0 + github.com/go-resty/resty/v2 v2.13.1 github.com/google/uuid v1.6.0 + github.com/jedib0t/go-pretty/v6 v6.5.9 + github.com/savioxavier/termlink v1.3.0 github.com/spf13/cobra v1.8.1 ) @@ -18,22 +20,24 @@ require ( github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-git/go-billy/v5 v5.5.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect github.com/pjbgf/sha1cd v0.3.0 // indirect - github.com/savioxavier/termlink v1.3.0 // indirect + github.com/rivo/uniseg v0.2.0 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/skeema/knownhosts v1.2.2 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - golang.org/x/crypto v0.21.0 // indirect + golang.org/x/crypto v0.23.0 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.22.0 // indirect - golang.org/x/sys v0.18.0 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect golang.org/x/tools v0.13.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index 6f8e7c8..d6a44ad 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgF github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= +github.com/go-resty/resty/v2 v2.13.1 h1:x+LHXBI2nMB1vqndymf26quycC4aggYJ7DECYbiz03g= +github.com/go-resty/resty/v2 v2.13.1/go.mod h1:GznXlLxkq6Nh4sU59rPmUw3VtgpO3aS96ORAI6Q7d+0= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -39,6 +41,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+UV8OU= +github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -51,6 +55,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= @@ -58,6 +64,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/savioxavier/termlink v1.3.0 h1:3Gl4FzQjUyiHzmoEDfmWEhgIwDiJY4poOQHP+k8ReA4= @@ -83,8 +91,9 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= @@ -96,8 +105,10 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -116,14 +127,19 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -131,7 +147,12 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= diff --git a/nft/nfctl/cmd/check.go b/nft/nfctl/cmd/check.go new file mode 100644 index 0000000..e06c7a4 --- /dev/null +++ b/nft/nfctl/cmd/check.go @@ -0,0 +1,16 @@ +package cmd + +import ( + "github.com/loveuer/nf/nft/nfctl/version" + "github.com/spf13/cobra" +) + +var ( + checkCmd = &cobra.Command{ + Use: "check", + Short: "nfctl new version check", + Run: func(cmd *cobra.Command, args []string) { + version.Check(true, true, 30) + }, + } +) diff --git a/nft/nfctl/cmd/cmd.go b/nft/nfctl/cmd/cmd.go index a13676a..68fb2dc 100644 --- a/nft/nfctl/cmd/cmd.go +++ b/nft/nfctl/cmd/cmd.go @@ -1,19 +1,30 @@ package cmd -import "github.com/spf13/cobra" +import ( + "github.com/loveuer/nf/nft/log" + "github.com/loveuer/nf/nft/nfctl/opt" + "github.com/spf13/cobra" +) var ( Root = &cobra.Command{ Use: "nfctl", Short: "nfctl: easy start your nf backend work", + PersistentPreRun: func(cmd *cobra.Command, args []string) { + if opt.Debug == true { + log.SetLogLevel(log.LogLevelDebug) + } + }, } ) func init() { initNew() + Root.PersistentFlags().BoolVar(&opt.Debug, "debug", false, "debug mode") Root.AddCommand( versionCmd, + checkCmd, cmdNew, ) } diff --git a/nft/nfctl/cmd/new.go b/nft/nfctl/cmd/new.go index dad9ba8..b8af15c 100644 --- a/nft/nfctl/cmd/new.go +++ b/nft/nfctl/cmd/new.go @@ -7,6 +7,7 @@ import ( "github.com/loveuer/nf/nft/nfctl/clone" "github.com/loveuer/nf/nft/nfctl/opt" "github.com/loveuer/nf/nft/nfctl/tp" + "github.com/loveuer/nf/nft/nfctl/version" "github.com/spf13/cobra" "net/url" "os" @@ -33,14 +34,11 @@ nfctl new {project} --template http://username:token@my.gitlab.com/my-zone/my-re ) func initNew() { - cmdNew.Flags().BoolVar(&opt.Debug, "debug", false, "debug mode") cmdNew.Flags().StringVarP(&template, "template", "t", "", "template name/url[example:ultone, https://github.com/xxx/yyy.git]") cmdNew.Flags().BoolVar(&disableInit, "without-init", false, "don't run template init script") cmdNew.RunE = func(cmd *cobra.Command, args []string) error { - if opt.Debug { - log.SetLogLevel(log.LogLevelDebug) - } + version.Check(true, false, 5) var ( err error diff --git a/nft/nfctl/cmd/version.go b/nft/nfctl/cmd/version.go index 1fde2ce..3869263 100644 --- a/nft/nfctl/cmd/version.go +++ b/nft/nfctl/cmd/version.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/loveuer/nf/nft/log" + "github.com/fatih/color" "github.com/loveuer/nf/nft/nfctl/version" "github.com/spf13/cobra" ) @@ -11,7 +11,8 @@ var ( Use: "version", Short: "print nfctl version and exit", Run: func(cmd *cobra.Command, args []string) { - log.Info("version: %s", version.Version) + color.Cyan("nfctl - version: %s", version.Version) + version.Check(true, false, 5) }, } ) diff --git a/nft/nfctl/main.go b/nft/nfctl/main.go index 200de16..9ad2ad1 100644 --- a/nft/nfctl/main.go +++ b/nft/nfctl/main.go @@ -3,24 +3,17 @@ package main import ( "context" "github.com/loveuer/nf/nft/nfctl/cmd" - "github.com/loveuer/nf/nft/nfctl/version" "os/signal" "syscall" - "time" ) func main() { ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT) defer cancel() - version.Check() - defer version.Fn() + //if !(len(os.Args) >= 2 && os.Args[1] == "version") { + // version.Check(5) + //} _ = cmd.Root.ExecuteContext(ctx) - - select { - case <-time.After(3 * time.Second): - case <-ctx.Done(): - case <-version.OkCh: - } } diff --git a/nft/nfctl/version/var.go b/nft/nfctl/version/var.go new file mode 100644 index 0000000..6ceac14 --- /dev/null +++ b/nft/nfctl/version/var.go @@ -0,0 +1,3 @@ +package version + +const Version = "v24.07.14-r1" diff --git a/nft/nfctl/version/version.go b/nft/nfctl/version/version.go index 09d7234..8d42186 100644 --- a/nft/nfctl/version/version.go +++ b/nft/nfctl/version/version.go @@ -1,68 +1,81 @@ package version import ( - "bufio" + "context" + "crypto/tls" "fmt" "github.com/fatih/color" + "github.com/go-resty/resty/v2" + "github.com/jedib0t/go-pretty/v6/table" "github.com/loveuer/nf/nft/log" "github.com/savioxavier/termlink" - "net/http" "strings" - "sync" + "time" ) -const Version = "v24.07.13-r1" - var ( - lk = &sync.Mutex{} - empty = func() {} - upgrade = func(v string) func() { - return func() { - color.Green("\nšŸŽ‰ šŸŽ‰ šŸŽ‰ [nfctl] New Version Found: %s", v) - color.Cyan("Upgrade it with: [go install github.com/loveuer/nf/nft/nfctl@master]") - fmt.Print("Or Download by: ") - color.Cyan(termlink.Link("Releases", "https://github.com/loveuer/nf/releases")) - fmt.Println() - } - } - Fn = empty - OkCh = make(chan struct{}, 1) + client = resty.New().SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true}) + uri = "https://raw.gitcode.com/loveuer/nf/raw/master/nft/nfctl/version/var.go" + prefix = "const Version = " ) -func Check() { - ready := make(chan struct{}) - go func() { - ready <- struct{}{} - uri := "https://raw.gitcode.com/loveuer/nf/raw/master/nft/nfctl/version/version.go" - prefix := "const Version = " - resp, err := http.Get(uri) - if err != nil { - log.Debug("[Check] http get[%s] err: %v", uri, err.Error()) - return +func UpgradePrint(newVersion string) { + t := table.NewWriter() + t.AppendRows([]table.Row{ + {color.GreenString("New Version Found: %s", newVersion)}, + {color.CyanString("Upgrade it with: [go install github.com/loveuer/nf/nft/nfctl@master]")}, + {fmt.Sprint("Or Download by: ")}, + {color.CyanString(termlink.Link("Releases", "https://github.com/loveuer/nf/releases"))}, + {color.CyanString(termlink.Link("Releases", "https://gitcode.com/loveuer/nf/releases"))}, + }) + + fmt.Println(t.Render()) +} + +func Check(printUpgradable bool, printNoNeedUpgrade bool, timeout ...int) string { + var ( + v string + ) + + defer func() { + if printUpgradable { + if v > Version { + UpgradePrint(v) + } } - defer resp.Body.Close() - scanner := bufio.NewScanner(resp.Body) - scanner.Buffer(make([]byte, 16*1024), 1024*1024) - - for scanner.Scan() { - line := scanner.Text() - log.Debug("[Check] version.go line: %s", line) - if strings.HasPrefix(line, prefix) { - v := strings.TrimPrefix(line, prefix) - if len(v) > 2 { - v = v[1 : len(v)-1] - } - - if v != "" && v > Version { - lk.Lock() - Fn = upgrade(v) - lk.Unlock() - OkCh <- struct{}{} - return - } + if printNoNeedUpgrade { + if v == Version { + color.Cyan("Your Version: %s is Newest", Version) } } }() - <-ready + + ctx, _ := context.WithTimeout(context.Background(), time.Duration(30)*time.Second) + if len(timeout) > 0 && timeout[0] > 0 { + ctx, _ = context.WithTimeout(context.Background(), time.Duration(timeout[0])*time.Second) + } + + resp, err := client.R().SetContext(ctx). + Get(uri) + if err != nil { + log.Debug("[Check] http get[%s] err: %v", uri, err.Error()) + return "" + } + + log.Debug("[Check] http get[%s] body:\n%s", uri, resp.String()) + + for _, line := range strings.Split(resp.String(), "\n") { + log.Debug("[Check] version.go line: %s", line) + if strings.HasPrefix(line, prefix) { + may := strings.TrimPrefix(line, prefix) + if len(may) > 2 { + v = may[1 : len(may)-1] + } + + return v + } + } + + return "" } diff --git a/nft/nfctl/version/version_test.go b/nft/nfctl/version/version_test.go new file mode 100644 index 0000000..844ad1d --- /dev/null +++ b/nft/nfctl/version/version_test.go @@ -0,0 +1,16 @@ +package version + +import ( + "github.com/loveuer/nf/nft/log" + "testing" +) + +func TestUpgradePrint(t *testing.T) { + UpgradePrint("v24.07.14-r5") +} + +func TestCheck(t *testing.T) { + log.SetLogLevel(log.LogLevelDebug) + v := Check(15) + t.Logf("got version: %s", v) +}