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

Create LocalSource as type for local dependencies

Browse source
This commit is contained in:
Matthias Loibl 2019-07-23 13:28:58 -07:00
parent 6ee790d911
commit 07801936c0
No known key found for this signature in database
GPG key ID: 78A796CA74CA38BA
6 changed files with 71 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cmd/jb/install_test.go
View file

@ -40,26 +40,28 @@ func TestInstallCommand(t *testing.T) {
ExpectedJsonnetFile: []byte(`{"dependencies":null}`),
ExpectedJsonnetLockFile: []byte(`{"dependencies":null}`),
}, {
Name: "OneURL",
URLs: []*url.URL{
{
Scheme: "https",
Host: "github.com",
Path: "jsonnet-bundler/jsonnet-bundler@v0.1.0",
},
},
Name: "OneURL",
URLs: []string{"github.com/jsonnet-bundler/jsonnet-bundler@v0.1.0"},
ExpectedCode: 0,
ExpectedJsonnetFile: []byte(`{"dependencies": [{"name": "jsonnet-bundler", "source": {"git": {"remote": "https://github.com/jsonnet-bundler/jsonnet-bundler", "subdir": ""}}, "version": "v0.1.0"}]}`),
ExpectedJsonnetLockFile: []byte(`{"dependencies": [{"name": "jsonnet-bundler", "source": {"git": {"remote": "https://github.com/jsonnet-bundler/jsonnet-bundler", "subdir": ""}}, "version": "080f157c7fb85ad0281ea78f6c641eaa570a582f"}]}`),
}, {
Name: "Relative",
URLs: []string{"test/jsonnet/foobar"},
ExpectedCode: 0,
ExpectedJsonnetFile: []byte(`{"dependencies":null}`),
ExpectedJsonnetLockFile: []byte(`{"dependencies":null}`),
},
}
for _, tc := range testcases {
t.Run(tc.Name, func(t *testing.T) {
_ = t.Run(tc.Name, func(t *testing.T) {
tempDir, err := ioutil.TempDir("", "jb-install")
assert.NoError(t, err)
err = os.MkdirAll(filepath.Join(tempDir, "test/jsonnet/foobar"), os.ModePerm)
assert.NoError(t, err)
defer os.Remove(tempDir)
defer os.RemoveAll("vendor") // delete test vendor folder
defer os.RemoveAll("vendor") // cloning jsonnet-bundler will create this folder
jsonnetFile := filepath.Join(tempDir, jsonnetfile.File)
jsonnetLockFile := filepath.Join(tempDir, jsonnetfile.LockFile)

9
cmd/jb/main.go
View file

@ -226,8 +226,6 @@ func parseLocalDependency(p string) *spec.Dependency {
info, err := os.Stat(clean)
if err != nil {
wd, _ := os.Getwd()
fmt.Println(err, wd)
return nil
}
@ -238,11 +236,10 @@ func parseLocalDependency(p string) *spec.Dependency {
return &spec.Dependency{
Name: info.Name(),
Source: spec.Source{
GitSource: &spec.GitSource{
Remote: ".",
Subdir: clean,
LocalSource: &spec.LocalSource{
Directory: clean,
},
},
Version: ".",
Version: "",
}
}

9
cmd/jb/main_test.go
View file

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
)
func TestParseDepedency(t *testing.T) {
func TestParseDependency(t *testing.T) {
const testFolder = "test/jsonnet/foobar"
err := os.MkdirAll(testFolder, os.ModePerm)
if err != nil {
@ -79,12 +79,11 @@ func TestParseDepedency(t *testing.T) {
want: &spec.Dependency{
Name: "foobar",
Source: spec.Source{
GitSource: &spec.GitSource{
Remote: ".",
Subdir: "test/jsonnet/foobar",
LocalSource: &spec.LocalSource{
Directory: "test/jsonnet/foobar",
},
},
Version: ".",
Version: "",
},
},
}