technofab/jsonnet-bundler
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/jsonnet-bundler.git synced 2025-12-11 23:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ability to parse local dependency

Browse source
This commit is contained in:
Matthias Loibl 2019-07-22 19:42:43 +02:00
parent e5199342ea
commit 6ee790d911
No known key found for this signature in database
GPG key ID: 78A796CA74CA38BA
2 changed files with 86 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

87
cmd/jb/main.go
View file

@ -20,6 +20,7 @@ import (
"path"
"path/filepath"
"regexp"
"strings"
"github.com/jsonnet-bundler/jsonnet-bundler/spec"
"github.com/pkg/errors"
@ -92,20 +93,24 @@ func Main() int {
return 0
}
func parseDependency(urlString string) *spec.Dependency {
if spec := parseGitSSHDependency(urlString); spec != nil {
return spec
func parseDependency(path string) *spec.Dependency {
if d := parseGitSSHDependency(path); d != nil {
return d
}
if spec := parseGithubDependency(urlString); spec != nil {
return spec
if d := parseGithubDependency(path); d != nil {
return d
}
if d := parseLocalDependency(path); d != nil {
return d
}
return nil
}
func parseGitSSHDependency(urlString string) *spec.Dependency {
if !gitSSHRegex.MatchString(urlString) {
func parseGitSSHDependency(p string) *spec.Dependency {
if !gitSSHRegex.MatchString(p) {
return nil
}
@ -115,27 +120,27 @@ func parseGitSSHDependency(urlString string) *spec.Dependency {
repo := ""
version := "master"
if gitSSHWithPathAndVersionRegex.MatchString(urlString) {
matches := gitSSHWithPathAndVersionRegex.FindStringSubmatch(urlString)
if gitSSHWithPathAndVersionRegex.MatchString(p) {
matches := gitSSHWithPathAndVersionRegex.FindStringSubmatch(p)
host = matches[1]
org = matches[2]
repo = matches[3]
subdir = matches[4]
version = matches[5]
} else if gitSSHWithPathRegex.MatchString(urlString) {
matches := gitSSHWithPathRegex.FindStringSubmatch(urlString)
} else if gitSSHWithPathRegex.MatchString(p) {
matches := gitSSHWithPathRegex.FindStringSubmatch(p)
host = matches[1]
org = matches[2]
repo = matches[3]
subdir = matches[4]
} else if gitSSHWithVersionRegex.MatchString(urlString) {
matches := gitSSHWithVersionRegex.FindStringSubmatch(urlString)
} else if gitSSHWithVersionRegex.MatchString(p) {
matches := gitSSHWithVersionRegex.FindStringSubmatch(p)
host = matches[1]
org = matches[2]
repo = matches[3]
version = matches[4]
} else {
matches := gitSSHRegex.FindStringSubmatch(urlString)
matches := gitSSHRegex.FindStringSubmatch(p)
host = matches[1]
org = matches[2]
repo = matches[3]
@ -153,8 +158,8 @@ func parseGitSSHDependency(urlString string) *spec.Dependency {
}
}
func parseGithubDependency(urlString string) *spec.Dependency {
if !githubSlugRegex.MatchString(urlString) {
func parseGithubDependency(p string) *spec.Dependency {
if !githubSlugRegex.MatchString(p) {
return nil
}
@ -164,30 +169,30 @@ func parseGithubDependency(urlString string) *spec.Dependency {
subdir := ""
version := "master"
if githubSlugWithPathRegex.MatchString(urlString) {
if githubSlugWithPathAndVersionRegex.MatchString(urlString) {
matches := githubSlugWithPathAndVersionRegex.FindStringSubmatch(urlString)
if githubSlugWithPathRegex.MatchString(p) {
if githubSlugWithPathAndVersionRegex.MatchString(p) {
matches := githubSlugWithPathAndVersionRegex.FindStringSubmatch(p)
user = matches[1]
repo = matches[2]
subdir = matches[3]
version = matches[4]
name = path.Base(subdir)
} else {
matches := githubSlugWithPathRegex.FindStringSubmatch(urlString)
matches := githubSlugWithPathRegex.FindStringSubmatch(p)
user = matches[1]
repo = matches[2]
subdir = matches[3]
name = path.Base(subdir)
}
} else {
if githubSlugWithVersionRegex.MatchString(urlString) {
matches := githubSlugWithVersionRegex.FindStringSubmatch(urlString)
if githubSlugWithVersionRegex.MatchString(p) {
matches := githubSlugWithVersionRegex.FindStringSubmatch(p)
user = matches[1]
repo = matches[2]
name = repo
version = matches[3]
} else {
matches := githubSlugRegex.FindStringSubmatch(urlString)
matches := githubSlugRegex.FindStringSubmatch(p)
user = matches[1]
repo = matches[2]
name = repo
@ -205,3 +210,39 @@ func parseGithubDependency(urlString string) *spec.Dependency {
Version: version,
}
}
func parseLocalDependency(p string) *spec.Dependency {
if p == "" {
return nil
}
if strings.HasPrefix(p, "github.com") {
return nil
}
if strings.HasPrefix(p, "git+ssh") {
return nil
}
clean := filepath.Clean(p)
info, err := os.Stat(clean)
if err != nil {
wd, _ := os.Getwd()
fmt.Println(err, wd)
return nil
}
if !info.IsDir() {
return nil
}
return &spec.Dependency{
Name: info.Name(),
Source: spec.Source{
GitSource: &spec.GitSource{
Remote: ".",
Subdir: clean,
},
},
Version: ".",
}
}

22
cmd/jb/main_test.go
View file

@ -15,6 +15,7 @@
package main
import (
"os"
"testing"
"github.com/jsonnet-bundler/jsonnet-bundler/spec"
@ -22,6 +23,13 @@ import (
)
func TestParseDepedency(t *testing.T) {
const testFolder = "test/jsonnet/foobar"
err := os.MkdirAll(testFolder, os.ModePerm)
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll("test")
tests := []struct {
name string
path string
@ -65,6 +73,20 @@ func TestParseDepedency(t *testing.T) {
Version: "master",
},
},
{
name: "local",
path: testFolder,
want: &spec.Dependency{
Name: "foobar",
Source: spec.Source{
GitSource: &spec.GitSource{
Remote: ".",
Subdir: "test/jsonnet/foobar",
},
},
Version: ".",
},
},
}
for _, tt := range tests {
_ = t.Run(tt.name, func(t *testing.T) {