Skip to content

Commit

Permalink
refactor: rename splitMod to parseModURL
Browse files Browse the repository at this point in the history
  • Loading branch information
b4nst committed Aug 2, 2021
1 parent 31c131e commit 8851e71
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion lib/mod/cache/checksum.go
Expand Up @@ -7,7 +7,7 @@ import (
)

func Checksum(lang, mod, ver string) (string, error) {
remote, owner, repo := splitMod(mod)
remote, owner, repo := parseModURL(mod)
tag := ver

dir := Outdir(lang, remote, owner, repo, tag)
Expand Down
4 changes: 2 additions & 2 deletions lib/mod/cache/fetch.go
Expand Up @@ -21,7 +21,7 @@ import (
)

func Fetch(lang, mod, ver string) (err error) {
remote, owner, repo := splitMod(mod)
remote, owner, repo := parseModURL(mod)
tag := ver

dir := Outdir(lang, remote, owner, repo, tag)
Expand All @@ -44,7 +44,7 @@ func Fetch(lang, mod, ver string) (err error) {
}

func fetch(lang, mod, ver string) error {
remote, owner, repo := splitMod(mod)
remote, owner, repo := parseModURL(mod)
tag := ver

switch remote {
Expand Down
2 changes: 1 addition & 1 deletion lib/mod/cache/lookup.go
Expand Up @@ -8,7 +8,7 @@ import (
)

func Load(lang, mod, ver string) (FS billy.Filesystem, err error) {
remote, owner, repo := splitMod(mod)
remote, owner, repo := parseModURL(mod)
tag := ver

dir := Outdir(lang, remote, owner, repo, tag)
Expand Down
2 changes: 1 addition & 1 deletion lib/mod/cache/mod.go → lib/mod/cache/util.go
Expand Up @@ -2,7 +2,7 @@ package cache

import "strings"

func splitMod(mod string) (remote, owner, repo string) {
func parseModURL(mod string) (remote, owner, repo string) {
var flds []string
if i := strings.Index(mod, ".git"); i > -1 {
flds = strings.SplitN(mod[:i], "/", 3)
Expand Down
2 changes: 1 addition & 1 deletion lib/mod/cache/mod_test.go → lib/mod/cache/util_test.go
Expand Up @@ -19,7 +19,7 @@ func TestSplitMod(t *testing.T) {

for name, tc := range tests {
t.Run(name, func(t *testing.T) {
rm, o, rp := splitMod(tc.mod)
rm, o, rp := parseModURL(tc.mod)
if fmt.Sprintf("%s/%s/%s", rm, o, rp) != tc.expected {
t.Fatalf("expected: %v, got: %s/%s/%s", tc.expected, rm, o, rp)
}
Expand Down

0 comments on commit 8851e71

Please sign in to comment.