rmcguire/git-project-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix first-time config gen, improve project_go

Browse Source
This commit is contained in:
Ryan McGuire 2023-12-19 12:16:45 -05:00
parent c45bc61e41
commit 2082287bdd
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/util_constants.go
View File

@ -1,7 +1,7 @@
package cmd package cmd
const ( const (
defGitlabHost = "gitlab.sweetwater.com" defGitlabHost = "https://gitlab.com"
defLogLevel = "info" defLogLevel = "info"
defConfigPath = "~/.config/gitlab-project-manager.yaml" defConfigPath = "~/.config/gitlab-project-manager.yaml"
) )

3
cmd/util_init.go
View File

@ -56,6 +56,7 @@ func initProjectPath(cmd *cobra.Command, args []string) {
var err error var err error
if conf.ProjectPath == "" { if conf.ProjectPath == "" {
conf.ProjectPath = config.DefaultConfig.ProjectPath conf.ProjectPath = config.DefaultConfig.ProjectPath
return
} }
if conf.ProjectPath, err = resolvePath(conf.ProjectPath); err != nil { if conf.ProjectPath, err = resolvePath(conf.ProjectPath); err != nil {
plog.Error("Failed to determine project path", plog.Args("error", err)) plog.Error("Failed to determine project path", plog.Args("error", err))
@ -64,7 +65,7 @@ func initProjectPath(cmd *cobra.Command, args []string) {
_, err = os.Stat(conf.ProjectPath) _, err = os.Stat(conf.ProjectPath)
if err != nil { if err != nil {
plog.Error("Failed to stat project path, trying to create", plog.Args("error", err)) plog.Error("Failed to stat project path, trying to create", plog.Args("error", err))
if err := os.Mkdir(conf.ProjectPath, 0750); err != nil { if err := os.MkdirAll(conf.ProjectPath, 0750); err != nil {
plog.Error("Failed to create project path", plog.Args("error", err)) plog.Error("Failed to create project path", plog.Args("error", err))
os.Exit(1) os.Exit(1)
} }

13
internal/gitlab/gitlab.go
View File

@ -79,18 +79,25 @@ func (p *Project) GetGitInfo() string {
} }
var str string var str string
str += "\n" + pterm.LightRed("Project: ") + pterm.Bold.Sprint(p.Name) + "\n"
head, _ := repo.Head() head, _ := repo.Head()
branch := head.Name().String()[11:] branch := head.Name().String()[11:]
b, _ := repo.Branch(branch) b, _ := repo.Branch(branch)
if b != nil { if b != nil {
str = "\n" + pterm.LightCyan("Branch: ") + pterm.Bold.Sprint(b.Name) + "\n" str += pterm.LightCyan("Branch: ") + pterm.Bold.Sprint(b.Name) + "\n"
} else { } else {
str = "\n" + pterm.LightCyan("NEW Branch: ") + pterm.Bold.Sprint(branch) + "\n" str += pterm.LightCyan("NEW Branch: ") + pterm.Bold.Sprint(branch) + "\n"
} }
commit, _ := repo.CommitObject(head.Hash()) commit, _ := repo.CommitObject(head.Hash())
str += commit.String() str += "\n" + commit.String()
str += pterm.LightMagenta("GitLab: ") + pterm.Bold.Sprint(p.HTTPURLToRepo) + "\n"
if remotes, _ := repo.Remotes(); len(remotes) > 0 {
str += pterm.LightBlue("Remote: ") + pterm.Bold.Sprint(remotes[0].Config().URLs[0])
}
return pterm.DefaultBox. return pterm.DefaultBox.
WithLeftPadding(5).WithRightPadding(5). WithLeftPadding(5).WithRightPadding(5).