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

Merge pull request #10 from jacobstr/gitssh

Browse source 
git+ssh support
This commit is contained in:
Frederic Branczyk 2018-05-24 09:49:16 +02:00 • committed by GitHub
commit 061fe0fb19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 141 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

116
cmd/jb/main.go
View file

@ -45,6 +45,11 @@ var (
initActionName,
installActionName,
}
gitSSHRegex = regexp.MustCompile("git\\+ssh://git@([^:]+):([^/]+)/([^/]+).git")
gitSSHWithVersionRegex = regexp.MustCompile("git\\+ssh://git@([^:]+):([^/]+)/([^/]+).git@(.*)")
gitSSHWithPathRegex = regexp.MustCompile("git\\+ssh://git@([^:]+):([^/]+)/([^/]+).git/(.*)")
gitSSHWithPathAndVersionRegex = regexp.MustCompile("git\\+ssh://git@([^:]+):([^/]+)/([^/]+).git/(.*)@(.*)")
githubSlugRegex = regexp.MustCompile("github.com/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)")
githubSlugWithVersionRegex = regexp.MustCompile("github.com/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)@(.*)")
githubSlugWithPathRegex = regexp.MustCompile("github.com/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/(.*)")
@ -100,29 +105,78 @@ func initCommand() int {
return 0
}
func installCommand(jsonnetHome string, urls ...*url.URL) int {
m, err := pkg.LoadJsonnetfile(pkg.JsonnetFile)
if err != nil {
kingpin.Fatalf("failed to load jsonnetfile: %v", err)
return 1
func parseDepedency(urlString string) *spec.Dependency {
if spec := parseGitSSHDependency(urlString); spec != nil {
return spec
}
if len(urls) > 0 {
for _, url := range urls {
// install package specified in command
// $ jsonnetpkg install ksonnet git@github.com:ksonnet/ksonnet-lib
// $ jsonnetpkg install grafonnet git@github.com:grafana/grafonnet-lib grafonnet
// $ jsonnetpkg install github.com/grafana/grafonnet-lib/grafonnet
//
// github.com/(slug)/(dir)
if spec := parseGithubDependency(urlString); spec != nil {
return spec
}
return nil
}
func parseGitSSHDependency(urlString string) *spec.Dependency {
if !gitSSHRegex.MatchString(urlString) {
return nil
}
subdir := ""
host := ""
org := ""
repo := ""
version := "master"
if gitSSHWithPathAndVersionRegex.MatchString(urlString) {
matches := gitSSHWithPathAndVersionRegex.FindStringSubmatch(urlString)
host = matches[1]
org = matches[2]
repo = matches[3]
subdir = matches[4]
version = matches[5]
} else if gitSSHWithPathRegex.MatchString(urlString) {
matches := gitSSHWithPathRegex.FindStringSubmatch(urlString)
host = matches[1]
org = matches[2]
repo = matches[3]
subdir = matches[4]
} else if gitSSHWithVersionRegex.MatchString(urlString) {
matches := gitSSHWithVersionRegex.FindStringSubmatch(urlString)
host = matches[1]
org = matches[2]
repo = matches[3]
version = matches[4]
} else {
matches := gitSSHRegex.FindStringSubmatch(urlString)
host = matches[1]
org = matches[2]
repo = matches[3]
}
return &spec.Dependency{
Name: repo,
Source: spec.Source{
GitSource: &spec.GitSource{
Remote: fmt.Sprintf("git@%s:%s/%s", host, org, repo),
Subdir: subdir,
},
},
Version: version,
}
}
func parseGithubDependency(urlString string) *spec.Dependency {
if !githubSlugRegex.MatchString(urlString) {
return nil
}
urlString := url.String()
if githubSlugRegex.MatchString(urlString) {
name := ""
user := ""
repo := ""
subdir := ""
version := "master"
if githubSlugWithPathRegex.MatchString(urlString) {
if githubSlugWithPathAndVersionRegex.MatchString(urlString) {
matches := githubSlugWithPathAndVersionRegex.FindStringSubmatch(urlString)
@ -153,7 +207,7 @@ func installCommand(jsonnetHome string, urls ...*url.URL) int {
}
}
newDep := spec.Dependency{
return &spec.Dependency{
Name: name,
Source: spec.Source{
GitSource: &spec.GitSource{
@ -163,12 +217,37 @@ func installCommand(jsonnetHome string, urls ...*url.URL) int {
},
Version: version,
}
}
func installCommand(jsonnetHome string, urls ...*url.URL) int {
m, err := pkg.LoadJsonnetfile(pkg.JsonnetFile)
if err != nil {
kingpin.Fatalf("failed to load jsonnetfile: %v", err)
return 1
}
if len(urls) > 0 {
for _, url := range urls {
// install package specified in command
// $ jsonnetpkg install ksonnet git@github.com:ksonnet/ksonnet-lib
// $ jsonnetpkg install grafonnet git@github.com:grafana/grafonnet-lib grafonnet
// $ jsonnetpkg install github.com/grafana/grafonnet-lib/grafonnet
//
// github.com/(slug)/(dir)
urlString := url.String()
newDep := parseDepedency(urlString)
if newDep == nil {
kingpin.Errorf("ignoring unrecognized url: %s", url)
continue
}
oldDeps := m.Dependencies
newDeps := []spec.Dependency{}
oldDepReplaced := false
for _, d := range oldDeps {
if d.Name == newDep.Name {
newDeps = append(newDeps, newDep)
newDeps = append(newDeps, *newDep)
oldDepReplaced = true
} else {
newDeps = append(newDeps, d)
@ -176,13 +255,12 @@ func installCommand(jsonnetHome string, urls ...*url.URL) int {
}
if !oldDepReplaced {
newDeps = append(newDeps, newDep)
newDeps = append(newDeps, *newDep)
}
m.Dependencies = newDeps
}
}
}
srcPath := filepath.Join(jsonnetHome)
err = os.MkdirAll(srcPath, os.ModePerm)