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

refactor in preparation for git+ssh

Browse source
This commit is contained in:
Jacob Straszynski 2018-05-23 11:20:42 -07:00
parent 8ff5580971
commit 562ffd6486
1 changed files with 75 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

55
cmd/jb/main.go
View file

@ -45,6 +45,7 @@ var (
initActionName, initActionName,
installActionName, installActionName,
} }
gitSSHRegex = regexp.MustCompile("git@([^:])([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)")
githubSlugRegex = regexp.MustCompile("github.com/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)") 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]+)@(.*)") 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]+)/(.*)") githubSlugWithPathRegex = regexp.MustCompile("github.com/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/(.*)")
@ -100,29 +101,17 @@ func initCommand() int {
return 0 return 0
} }
func installCommand(jsonnetHome string, urls ...*url.URL) int { func parseGithubDependency(urlString string) *spec.Dependency {
m, err := pkg.LoadJsonnetfile(pkg.JsonnetFile) if !githubSlugRegex.MatchString(urlString) {
if err != nil { return 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()
if githubSlugRegex.MatchString(urlString) {
name := "" name := ""
user := "" user := ""
repo := "" repo := ""
subdir := "" subdir := ""
version := "master" version := "master"
if githubSlugWithPathRegex.MatchString(urlString) { if githubSlugWithPathRegex.MatchString(urlString) {
if githubSlugWithPathAndVersionRegex.MatchString(urlString) { if githubSlugWithPathAndVersionRegex.MatchString(urlString) {
matches := githubSlugWithPathAndVersionRegex.FindStringSubmatch(urlString) matches := githubSlugWithPathAndVersionRegex.FindStringSubmatch(urlString)
@ -153,7 +142,7 @@ func installCommand(jsonnetHome string, urls ...*url.URL) int {
} }
} }
newDep := spec.Dependency{ return &spec.Dependency{
Name: name, Name: name,
Source: spec.Source{ Source: spec.Source{
GitSource: &spec.GitSource{ GitSource: &spec.GitSource{
@ -163,12 +152,37 @@ func installCommand(jsonnetHome string, urls ...*url.URL) int {
}, },
Version: version, 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 := parseGithubDependency(urlString)
if newDep == nil {
kingpin.Errorf("ignoring unrecognized url: %s", url)
continue
}
oldDeps := m.Dependencies oldDeps := m.Dependencies
newDeps := []spec.Dependency{} newDeps := []spec.Dependency{}
oldDepReplaced := false oldDepReplaced := false
for _, d := range oldDeps { for _, d := range oldDeps {
if d.Name == newDep.Name { if d.Name == newDep.Name {
newDeps = append(newDeps, newDep) newDeps = append(newDeps, *newDep)
oldDepReplaced = true oldDepReplaced = true
} else { } else {
newDeps = append(newDeps, d) newDeps = append(newDeps, d)
@ -176,13 +190,10 @@ func installCommand(jsonnetHome string, urls ...*url.URL) int {
} }
if !oldDepReplaced { if !oldDepReplaced {
newDeps = append(newDeps, newDep) newDeps = append(newDeps, *newDep)
} }
m.Dependencies = newDeps m.Dependencies = newDeps
} else {
kingpin.Errorf("ignoring unrecognized url: %s", url)
}
} }
} }