Merge pull request #70 from lighttiger2505/update-new-config

Update new config

Author: lighttiger2505

Makefile

@@ -1,5 +1,5 @@
 NAME := lab
-VERSION := v0.5.4
+VERSION := v0.6.0
 REVISION := $(shell git rev-parse --short HEAD)
 GOVERSION := $(go version)
 

commands/browse.go

@@ -5,49 +5,31 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/atotto/clipboard"
 	flags "github.com/jessevdk/go-flags"
 	"github.com/lighttiger2505/lab/cmd"
+	"github.com/lighttiger2505/lab/commands/internal"
 	"github.com/lighttiger2505/lab/git"
 	gitpath "github.com/lighttiger2505/lab/git/path"
-	lab "github.com/lighttiger2505/lab/gitlab"
+	"github.com/lighttiger2505/lab/internal/gitutil"
 	"github.com/lighttiger2505/lab/ui"
 )
 
+type BrowseCommandOption struct {
+	ProjectProfileOption *internal.ProjectProfileOption `group:"Project, Profile Options"`
+	BrowseOption         *BrowseOption                  `group:"Browse Options"`
+}
+
 type BrowseOption struct {
 	Subpage string `short:"s" long:"subpage" description:"open project sub page"`
 	URL     bool   `short:"u" long:"url" description:"show project url"`
 	Copy    bool   `short:"c" long:"copy" description:"copy project url to clipboard"`
-	Project string `short:"p" long:"project" description:"command target specific project"`
-}
-
-func newBrowseOption() *BrowseOption {
-	browse := flags.NewNamedParser("lab", flags.Default)
-	browse.AddGroup("Browse Options", "", &BrowseOption{})
-	return &BrowseOption{}
-}
-
-func (g *BrowseOption) NameSpaceAndProject() (group, subgroup, project string) {
-	splited := strings.Split(g.Project, "/")
-	if len(splited) == 3 {
-		group = splited[0]
-		subgroup = splited[1]
-		project = splited[2]
-		return
-	}
-	group = splited[0]
-	project = splited[1]
-	return
-}
-
-type BrowseCommandOption struct {
-	BrowseOption *BrowseOption `group:"Global Options"`
 }
 
 func newBrowseOptionParser(opt *BrowseCommandOption) *flags.Parser {
-	opt.BrowseOption = newBrowseOption()
+	opt.ProjectProfileOption = &internal.ProjectProfileOption{}
+	opt.BrowseOption = &BrowseOption{}
 	parser := flags.NewParser(opt, flags.HelpFlag|flags.PassDoubleDash)
 	parser.Usage = `browse - Browse project page
 
@@ -67,10 +49,10 @@ Synopsis:
 }
 
 type BrowseCommand struct {
-	Ui        ui.Ui
-	Provider  lab.Provider
-	GitClient git.Client
-	Opener    cmd.URLOpener
+	Ui              ui.Ui
+	RemoteCollecter gitutil.Collecter
+	GitClient       git.Client
+	Opener          cmd.URLOpener
 }
 
 func (c *BrowseCommand) Synopsis() string {
@@ -79,50 +61,46 @@ func (c *BrowseCommand) Synopsis() string {
 
 func (c *BrowseCommand) Help() string {
 	buf := &bytes.Buffer{}
-	var browseCommnadOption BrowseCommandOption
-	browseOptionParser := newBrowseOptionParser(&browseCommnadOption)
+	var opt BrowseCommandOption
+	browseOptionParser := newBrowseOptionParser(&opt)
 	browseOptionParser.WriteHelp(buf)
 	return buf.String()
 }
 
 func (c *BrowseCommand) Run(args []string) int {
-	var browseCommnadOption BrowseCommandOption
-	browseOptionParser := newBrowseOptionParser(&browseCommnadOption)
-	// Parse option
+	var opt BrowseCommandOption
+	browseOptionParser := newBrowseOptionParser(&opt)
 	parseArgs, err := browseOptionParser.ParseArgs(args)
 	if err != nil {
 		c.Ui.Error(err.Error())
 		return ExitCodeError
 	}
 
-	browseOption := browseCommnadOption.BrowseOption
-
-	// Initialize provider
-	if err := c.Provider.Init(); err != nil {
-		c.Ui.Error(err.Error())
-		return ExitCodeError
-	}
-
-	// Getting git remote info
-	gitlabRemote, err := c.Provider.GetCurrentRemote()
+	pInfo, err := c.RemoteCollecter.CollectTarget(
+		opt.ProjectProfileOption.Project,
+		opt.ProjectProfileOption.Profile,
+	)
 	if err != nil {
 		c.Ui.Error(err.Error())
 		return ExitCodeError
 	}
-	if browseOption.Project != "" {
-		group, subgroup, project := browseOption.NameSpaceAndProject()
-		gitlabRemote.Group = group
-		gitlabRemote.SubGroup = subgroup
-		gitlabRemote.Repository = project
-	}
 
-	branch, err := c.GitClient.CurrentRemoteBranch(gitlabRemote)
+	var branch = "master"
+	isGitDir, err := git.IsGitDirReverseTop()
 	if err != nil {
 		c.Ui.Error(err.Error())
 		return ExitCodeError
 	}
+	if isGitDir {
+		branch, err = c.GitClient.CurrentRemoteBranch()
+		if err != nil {
+			c.Ui.Error(err.Error())
+			return ExitCodeError
+		}
+	}
 
-	url, err := c.getURL(parseArgs, gitlabRemote, branch, browseOption)
+	browseOption := opt.BrowseOption
+	url, err := c.getURL(parseArgs, pInfo, branch, browseOption)
 	if err != nil {
 		c.Ui.Error(err.Error())
 		return ExitCodeError
@@ -147,7 +125,7 @@ func (c *BrowseCommand) Run(args []string) int {
 	return ExitCodeOK
 }
 
-func (c *BrowseCommand) getURL(args []string, remote *git.RemoteInfo, branch string, opt *BrowseOption) (string, error) {
+func (c *BrowseCommand) getURL(args []string, pInfo *gitutil.GitLabProjectInfo, branch string, opt *BrowseOption) (string, error) {
 	if len(args) > 0 {
 		arg := args[0]
 		if !isFilePath(arg) {
@@ -173,20 +151,20 @@ func (c *BrowseCommand) getURL(args []string, remote *git.RemoteInfo, branch str
 		}
 
 		if opt.Subpage != "" {
-			return remote.BranchFileWithLine(branch, gitAbsPath, opt.Subpage), nil
+			return pInfo.BranchFileWithLine(branch, gitAbsPath, opt.Subpage), nil
 		}
-		return remote.BranchPath(branch, gitAbsPath), nil
+		return pInfo.BranchPath(branch, gitAbsPath), nil
 	}
 
 	if opt.Subpage != "" {
-		return remote.Subpage(opt.Subpage), nil
+		return pInfo.Subpage(opt.Subpage), nil
 	}
 
 	// TODO You need to ignore the branch when the project is specified as an option
 	if branch == "master" {
-		return remote.RepositoryUrl(), nil
+		return pInfo.RepositoryUrl(), nil
 	}
-	return remote.BranchUrl(branch), nil
+	return pInfo.BranchUrl(branch), nil
 }
 
 func isFilePath(value string) bool {

commands/browse_test.go

@@ -1,13 +1,10 @@
 package commands
 
 import (
-	"io/ioutil"
-	"os"
 	"testing"
 
-	"github.com/lighttiger2505/lab/config"
 	"github.com/lighttiger2505/lab/git"
-	"github.com/lighttiger2505/lab/gitlab"
+	"github.com/lighttiger2505/lab/internal/gitutil"
 	"github.com/lighttiger2505/lab/ui"
 )
 
@@ -34,23 +31,11 @@ func (m *MockURLOpener) Open(url string) error {
 
 func TestBrowseCommandRun(t *testing.T) {
 	mockUI := ui.NewMockUi()
-
-	f, _ := ioutil.TempFile("", "test")
-	tmppath := f.Name()
-	f.Write([]byte(config.ConfigDataTest))
-	f.Close()
-	defer os.Remove(tmppath)
-	configManager := config.NewConfigManagerPath(tmppath)
-
-	// Initialize provider
-	provider := gitlab.NewProvider(mockUI, mockGitClient, configManager)
-	provider.Init()
-
 	c := BrowseCommand{
-		Ui:        mockUI,
-		Provider:  provider,
-		GitClient: mockGitClient,
-		Opener:    &MockURLOpener{},
+		Ui:              mockUI,
+		RemoteCollecter: &gitutil.MockCollecter{},
+		GitClient:       mockGitClient,
+		Opener:          &MockURLOpener{},
 	}
 	args := []string{}
 	if code := c.Run(args); code != 0 {

commands/internal/flag.go

@@ -0,0 +1,6 @@
+package internal
+
+type ProjectProfileOption struct {
+	Project string `long:"project" value-name:"<group>/<name>" description:"Specify the project to be processed"`
+	Profile string `long:"profile" value-name:"<profile>" description:"Specify the profile defined in the config file"`
+}

commands/internal/internal.go

@@ -1,6 +1,9 @@
 package internal
 
-import "regexp"
+import (
+	"regexp"
+	"strings"
+)
 
 type Method interface {
 	Process() (string, error)
@@ -16,3 +19,22 @@ func SweepMarkdownComment(text string) string {
 	r := regexp.MustCompile("<!--[\\s\\S]*?-->[\\n]*")
 	return r.ReplaceAllString(text, "")
 }
+
+func ParceRepositoryFullName(webURL string) string {
+	splitURL := strings.Split(webURL, "/")[3:]
+
+	subPageWords := []string{
+		"issues",
+		"merge_requests",
+	}
+	var subPageIndex int
+	for i, word := range splitURL {
+		for _, subPageWord := range subPageWords {
+			if word == subPageWord {
+				subPageIndex = i
+			}
+		}
+	}
+
+	return strings.Join(splitURL[:subPageIndex], "/")
+}

commands/issue/browse.go

@@ -1,27 +1,24 @@
 package issue
 
 import (
-	"fmt"
+	"strconv"
+	"strings"
 
 	"github.com/lighttiger2505/lab/cmd"
-	"github.com/lighttiger2505/lab/git"
 )
 
 type browseMethod struct {
 	opener cmd.URLOpener
-	remote *git.RemoteInfo
+	url    string
 	id     int
 }
 
 func (m *browseMethod) Process() (string, error) {
-	var subpage string
+	url := m.url
 	if m.id > 0 {
-		subpage = fmt.Sprintf("issues/%d", m.id)
-	} else {
-		subpage = "issues"
+		url = strings.Join([]string{url, strconv.Itoa(m.id)}, "/")
 	}
 
-	url := m.remote.Subpage(subpage)
 	if err := m.opener.Open(url); err != nil {
 		return "", err
 	}

commands/issue/browse_test.go

@@ -4,13 +4,12 @@ import (
 	"testing"
 
 	"github.com/lighttiger2505/lab/cmd"
-	"github.com/lighttiger2505/lab/git"
 )
 
 func Test_browseMethod_Process(t *testing.T) {
 	type fields struct {
 		opener cmd.URLOpener
-		remote *git.RemoteInfo
+		url    string
 		id     int
 	}
 	tests := []struct {
@@ -33,12 +32,8 @@ func Test_browseMethod_Process(t *testing.T) {
 						return nil
 					},
 				},
-				remote: &git.RemoteInfo{
-					Domain:     "domain",
-					Group:      "group",
-					Repository: "repository",
-				},
-				id: 0,
+				url: "https://domain/group/repository/issues",
+				id:  0,
 			},
 			want:    "",
 			wantErr: false,
@@ -57,12 +52,8 @@ func Test_browseMethod_Process(t *testing.T) {
 						return nil
 					},
 				},
-				remote: &git.RemoteInfo{
-					Domain:     "domain",
-					Group:      "group",
-					Repository: "repository",
-				},
-				id: 12,
+				url: "https://domain/group/repository/issues",
+				id:  12,
 			},
 			want:    "",
 			wantErr: false,
@@ -72,7 +63,7 @@ func Test_browseMethod_Process(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			m := &browseMethod{
 				opener: tt.fields.opener,
-				remote: tt.fields.remote,
+				url:    tt.fields.url,
 				id:     tt.fields.id,
 			}
 			got, err := m.Process()