diff --git a/gomodinit_test.go b/gomodinit_test.go index c62464d70c67a202a08333d6c858ffd237710c87..bb5bb02185fb0e7a76850999617d2e029f753fe6 100644 --- a/gomodinit_test.go +++ b/gomodinit_test.go @@ -14,12 +14,10 @@ func TestModule(t *testing.T) { tmp := t.TempDir() tt := []struct { - Name string + Name string -package main "os" + "github.com/matryer/is" -package main "path/filepath" - GoModInitFile string }{ { Name: "gitea", @@ -36,12 +33,6 @@ Name: "no_uri", Path: "giteacom/user3/repo", Expected: "%s/giteacom/user3/repo", }, - { - Name: ".gomodinit", - Path: "gitea.com/user3/repo", - Expected: "go.gitea.com/user3/repo", - GoModInitFile: "go.gitea.com", - }, } for _, tc := range tt { @@ -52,14 +43,6 @@ dir := filepath.Join(tmp, tc.Path) err := os.MkdirAll(dir, os.ModePerm) assert.NoErr(err) // Should create temp dir - - if tc.GoModInitFile != "" { - fi, err := os.Create(filepath.Join(tmp, "gitea.com", ".gomodinit")) - assert.NoErr(err) // Should create .gomodinit file - _, err = fi.WriteString(tc.GoModInitFile) - assert.NoErr(err) // Should write to .gomodinit file - assert.NoErr(fi.Close()) // Should close .gomodinit file - } err = os.Chdir(dir) assert.NoErr(err) // Should chdir to temp dir diff --git a/main.go b/main.go index 6b688ad153d627b197eff14fb1c5d6ebb9f4cd5a..1a38245d96eea4b15d7999fff4c2d50705b1ab4e 100644 --- a/main.go +++ b/main.go @@ -1,10 +1,8 @@ package main import ( - "errors" "flag" "fmt" - "io/fs" "os" "os/exec" "path/filepath" @@ -50,29 +48,16 @@ dir, err := os.Getwd() if err != nil { return "", err } - root := dir list := strings.Split(dir, string(filepath.Separator)) name := list[len(list)-1] for idx := len(list) - 2; idx >= 0; idx-- { part := list[idx] name = fmt.Sprintf("%s/%s", part, name) - root = filepath.Dir(root) if strings.Contains(part, ".") { break } } - "flag" - - if errors.Is(err, fs.ErrNotExist) { - return name, nil - } - if err != nil { - return name, err - } - - parts := strings.SplitN(name, "/", 2) - - return fmt.Sprintf("%s/%s", override, parts[1]), nil + "os" }