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

For local dependencies check if abs path exists

Browse source
This commit is contained in:
Matthias Loibl 2019-08-12 11:50:56 +02:00
parent e655fcaf60
commit 6ed6c3f3ec
No known key found for this signature in database
GPG key ID: 78A796CA74CA38BA
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/jb/install.go
View file

@ -46,7 +46,7 @@ func installCommand(dir, jsonnetHome string, paths ...string) int {
if len(paths) > 0 { if len(paths) > 0 {
for _, path := range paths { for _, path := range paths {
newDep := parseDependency(path) newDep := parseDependency(dir, path)
if newDep == nil { if newDep == nil {
kingpin.Errorf("ignoring unrecognized path: %s", path) kingpin.Errorf("ignoring unrecognized path: %s", path)
continue continue

6
cmd/jb/install_test.go
View file

@ -49,8 +49,8 @@ func TestInstallCommand(t *testing.T) {
Name: "Relative", Name: "Relative",
URLs: []string{"test/jsonnet/foobar"}, URLs: []string{"test/jsonnet/foobar"},
ExpectedCode: 0, ExpectedCode: 0,
ExpectedJsonnetFile: []byte(`{"dependencies":null}`), ExpectedJsonnetFile: []byte(`{"dependencies": [{"name": "foobar", "source": {"local": {"directory": "test/jsonnet/foobar"}}, "version": ""}]}`),
ExpectedJsonnetLockFile: []byte(`{"dependencies":null}`), ExpectedJsonnetLockFile: []byte(`{"dependencies": [{"name": "foobar", "source": {"local": {"directory": "test/jsonnet/foobar"}}, "version": ""}]}`),
}, },
} }
@ -81,6 +81,8 @@ func TestInstallCommand(t *testing.T) {
} }
func jsonnetFileContent(t *testing.T, filename string, content []byte) { func jsonnetFileContent(t *testing.T, filename string, content []byte) {
t.Helper()
bytes, err := ioutil.ReadFile(filename) bytes, err := ioutil.ReadFile(filename)
assert.NoError(t, err) assert.NoError(t, err)
if eq := assert.JSONEq(t, string(content), string(bytes)); !eq { if eq := assert.JSONEq(t, string(content), string(bytes)); !eq {

9
cmd/jb/main.go
View file

@ -93,7 +93,7 @@ func Main() int {
return 0 return 0
} }
func parseDependency(path string) *spec.Dependency { func parseDependency(dir, path string) *spec.Dependency {
if d := parseGitSSHDependency(path); d != nil { if d := parseGitSSHDependency(path); d != nil {
return d return d
} }
@ -102,7 +102,7 @@ func parseDependency(path string) *spec.Dependency {
return d return d
} }
if d := parseLocalDependency(path); d != nil { if d := parseLocalDependency(dir, path); d != nil {
return d return d
} }
@ -211,7 +211,7 @@ func parseGithubDependency(p string) *spec.Dependency {
} }
} }
func parseLocalDependency(p string) *spec.Dependency { func parseLocalDependency(dir, p string) *spec.Dependency {
if p == "" { if p == "" {
return nil return nil
} }
@ -223,8 +223,9 @@ func parseLocalDependency(p string) *spec.Dependency {
} }
clean := filepath.Clean(p) clean := filepath.Clean(p)
abs := filepath.Join(dir, clean)
info, err := os.Stat(clean) info, err := os.Stat(abs)
if err != nil { if err != nil {
return nil return nil
} }

2
cmd/jb/main_test.go
View file

@ -89,7 +89,7 @@ func TestParseDependency(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
_ = t.Run(tt.name, func(t *testing.T) { _ = t.Run(tt.name, func(t *testing.T) {
dependency := parseDependency(tt.path) dependency := parseDependency("", tt.path)
if tt.path == "" { if tt.path == "" {
assert.Nil(t, dependency) assert.Nil(t, dependency)