Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit84400a9

Browse files
committed
refactor(cmd): rename scriptFilter to cmd
- remove script
1 parentd2e69e0 commit84400a9

File tree

4 files changed

+73
-142
lines changed

4 files changed

+73
-142
lines changed

‎cmd/scriptFilter.gorenamed to ‎cmd/cmd.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@ import (
1010
"github.com/cage1016/ak/generator"
1111
)
1212

13-
//scriptFilterCmd represents the cobra command
14-
varscriptFilterCmd=&cobra.Command{
15-
Use:"scriptFilter",
16-
Short:"createscriptFilter items feedback",
13+
//cmdCmd represents the cobra command
14+
varcmdCmd=&cobra.Command{
15+
Use:"cmd",
16+
Short:"createcobra command",
1717
Aliases: []string{"sf"},
1818
Run:func(cmd*cobra.Command,args []string) {
1919
e,err:=cmd.Flags().GetBool("enabled-auto-update")
2020
iferr!=nil {
2121
logrus.Fatal(err)
2222
}
2323

24-
iferr:=generator.NewScriptFilterGenerator(e).Generate();err!=nil {
24+
iferr:=generator.NewCmdGenerator(e).Generate();err!=nil {
2525
logrus.Fatal(err)
2626
}
2727
},
2828
}
2929

3030
funcinit() {
31-
newCmd.AddCommand(scriptFilterCmd)
32-
scriptFilterCmd.Flags().BoolP("enabled-auto-update","e",false,"enable auto update")
31+
newCmd.AddCommand(cmdCmd)
32+
cmdCmd.Flags().BoolP("enabled-auto-update","e",false,"enable auto update")
3333
}

‎cmd/script.go

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎generator/scriptFilter.gorenamed to ‎generator/cmd.go

Lines changed: 66 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,36 @@
11
package generator
22

33
import (
4+
"fmt"
5+
"os"
6+
"path"
7+
"path/filepath"
48
"strings"
59

10+
"github.com/Songmu/prompter"
611
"github.com/sirupsen/logrus"
712
"github.com/spf13/viper"
813

14+
"github.com/cage1016/ak/alfred"
915
"github.com/cage1016/ak/fs"
10-
template"github.com/cage1016/ak/templates"
16+
"github.com/cage1016/ak/template"
1117
)
1218

13-
typeScriptFilterGeneratorstruct {
19+
const (
20+
goMod="go.mod"
21+
goSum="go.sum"
22+
)
23+
24+
typeCmdGeneratorstruct {
1425
EnabledAutoUpdatebool
1526
}
1627

17-
func (ig*ScriptFilterGenerator)Generate()error {
28+
func (ig*CmdGenerator)Generate()error {
1829
te:=template.NewEngine()
1930

2031
// generate main.go
2132
{
22-
m,err:=te.Execute("scriptFilter.main",map[string]interface{}{
33+
m,err:=te.Execute("cmd.main",map[string]interface{}{
2334
"GoModPackage":viper.GetString("go_mod_package"),
2435
"Year":viper.GetString("license.year"),
2536
"Author":viper.GetString("license.name"),
@@ -38,7 +49,7 @@ func (ig *ScriptFilterGenerator) Generate() error {
3849

3950
// generate cmd/root.go
4051
{
41-
m,err:=te.Execute("scriptFilter.root",map[string]interface{}{
52+
m,err:=te.Execute("cmd.root",map[string]interface{}{
4253
"EnabledAutoUpdate":ig.EnabledAutoUpdate,
4354
"GithubRepo":strings.Replace(viper.GetString("go_mod_package"),"github.com/","",1),
4455
"Name":viper.GetString("workflow.name"),
@@ -63,7 +74,7 @@ func (ig *ScriptFilterGenerator) Generate() error {
6374
logrus.Debugf("generating cmd/root.go")
6475

6576
ifig.EnabledAutoUpdate {
66-
m,err=te.Execute("scriptFilter.update",map[string]interface{}{
77+
m,err=te.Execute("cmd.update",map[string]interface{}{
6778
"Name":viper.GetString("workflow.name"),
6879
"Year":viper.GetString("license.year"),
6980
"Author":viper.GetString("license.name"),
@@ -101,8 +112,55 @@ func (ig *ScriptFilterGenerator) Generate() error {
101112
returnnil
102113
}
103114

104-
funcNewScriptFilterGenerator(ebool)*ScriptFilterGenerator {
105-
return&ScriptFilterGenerator{
115+
funcGoModGenerator() {
116+
fn:=func() {
117+
ifviper.GetString("ak_folder")!="" {
118+
pwd,_:=filepath.Abs(".")
119+
iferr:=os.Chdir(path.Join(pwd,viper.GetString("ak_folder")));err!=nil {
120+
logrus.Fatalf("failed to change directory: %s",err)
121+
}
122+
123+
alfred.Run("rm","-f",goMod,goSum)
124+
logrus.Debugf("removed go mod and go sum")
125+
126+
alfred.Run("go","mod","init",viper.GetString("go_mod_package"))
127+
logrus.Debugf("go mod init: %s",viper.GetString("go_mod_package"))
128+
129+
iferr:=os.Chdir("..");err!=nil {
130+
logrus.Fatalf("failed to change directory: %s",err)
131+
}
132+
}else {
133+
alfred.Run("rm","-f",goMod,goSum)
134+
logrus.Debugf("removed go mod and go sum")
135+
136+
alfred.Run("go","mod","init",viper.GetString("go_mod_package"))
137+
logrus.Debugf("go mod init: %s",viper.GetString("go_mod_package"))
138+
}
139+
}
140+
141+
ifviper.GetString("go_mod_package")=="" {
142+
logrus.Fatalf("ak.json 'go_mod_package' is required")
143+
}
144+
145+
defaultFs:=fs.Get()
146+
ifb,_:=defaultFs.Exists(goMod);b&&!viper.GetBool("ak_force") {
147+
b:=prompter.YN(fmt.Sprintf("`%s` already exists do you want to override it ?",goMod),false)
148+
ifb {
149+
fn()
150+
}
151+
}else {
152+
fn()
153+
}
154+
}
155+
156+
funcVerifyWorkflowFolder() {
157+
ifb,_:=fs.Get().Exists(viper.GetString("workflow.folder"));!b {
158+
logrus.Fatalf("workflow folder does not exist: %s",viper.GetString("workflow.folder"))
159+
}
160+
}
161+
162+
funcNewCmdGenerator(ebool)*CmdGenerator {
163+
return&CmdGenerator{
106164
EnabledAutoUpdate:e,
107165
}
108166
}

‎generator/script.go

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp