Skip to content
This repository has been archived by the owner on Sep 9, 2020. It is now read-only.

Move to TOML for manifest and lock #342

Merged
merged 20 commits into from
Apr 13, 2017
Merged

Move to TOML for manifest and lock #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
49136f2
Vendor pelletier/go-toml TOM library and deps
carolynvs Mar 20, 2017
d3135b8
Add MarshalTOML to manifest and lock
carolynvs Mar 20, 2017
6366f9e
Write manifest and lock in TOML
carolynvs Mar 20, 2017
7b22cd8
Represent manifest dependencies as an array of tables, not a map
carolynvs Mar 21, 2017
d2a557e
Change manifest and lock file names to manifest.toml and lock.toml
carolynvs Mar 21, 2017
12e713b
Update test files from JSON to TOML
carolynvs Mar 21, 2017
d82a114
Update dep's own manifest and lock to TOML
carolynvs Mar 21, 2017
56476c3
Remove JSON marshaling for lock and manifest
carolynvs Mar 21, 2017
28c2316
Map manifest and lock TOML to structs
carolynvs Mar 21, 2017
23facf8
Move lock diff to TOML
carolynvs Mar 22, 2017
2cfa3c7
Update vendored go-toml
carolynvs Mar 30, 2017
fb7c3fa
Replace manual toml mapping
carolynvs Mar 30, 2017
0f9b941
Use filepath.Join and filename constants instead of hardcoding test f…
carolynvs Apr 2, 2017
9065775
Do not export the TOML marshaler interface
carolynvs Apr 2, 2017
f67fc98
Validate manifest for duplicate dependencies
carolynvs Apr 2, 2017
9b835ca
Remove TODO comment
carolynvs Apr 2, 2017
b30a25c
Use reflection-based TOML mapping for the LockDiff
carolynvs Apr 2, 2017
0afa554
Update go-toml for nested custom Marshaler support
carolynvs Apr 5, 2017
a068a3c
Use a constant for the manifest/lock file names
carolynvs Apr 5, 2017
e31a186
New filenames: Gopkg.toml and Gopkg.lock
carolynvs Apr 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

[[dependencies]]
branch = "2.x"
name = "github.com/Masterminds/semver"

[[dependencies]]
name = "github.com/Masterminds/vcs"
version = "^1.8.0"

[[dependencies]]
branch = "master"
name = "github.com/pelletier/go-toml"

[[dependencies]]
name = "github.com/pkg/errors"
version = ">=0.8.0, <1.0.0"

[[dependencies]]
name = "github.com/sdboyer/gps"
version = ">=0.15.0, <1.0.0"
4 changes: 2 additions & 2 deletions analyzer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestDeriveManifestAndLock(t *testing.T) {
defer h.Cleanup()

h.TempDir("dep")
golden := "analyzer/manifest.json"
golden := filepath.Join("analyzer", ManifestName)
want := h.GetTestFileString(golden)
h.TempCopy(filepath.Join("dep", ManifestName), golden)

Expand All @@ -29,7 +29,7 @@ func TestDeriveManifestAndLock(t *testing.T) {
t.Fatal(err)
}

got, err := m.(*Manifest).MarshalJSON()
got, err := m.(*Manifest).MarshalTOML()
if err != nil {
t.Fatal(err)
}
Expand Down
5 changes: 3 additions & 2 deletions cmd/dep/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"strings"
"testing"

"github.com/golang/dep"
"github.com/golang/dep/test"
)

Expand Down Expand Up @@ -56,8 +57,8 @@ func TestIntegration(t *testing.T) {
}

// Check final manifest and lock
testCase.CompareFile("manifest.json", testProj.ProjPath("manifest.json"))
testCase.CompareFile("lock.json", testProj.ProjPath("lock.json"))
testCase.CompareFile(dep.ManifestName, testProj.ProjPath(dep.ManifestName))
testCase.CompareFile(dep.LockName, testProj.ProjPath(dep.LockName))

// Check vendor paths
testProj.CompareImportPaths()
Expand Down
6 changes: 3 additions & 3 deletions cmd/dep/testdata/harness_tests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ The directory structure is as follows:
testcase.json
initial/
file1.go
manifest.json
Gopkg.toml
...
final/
manifest.json
lock.json
Gopkg.toml
Gopkg.lock
case2/
...

Expand Down
7 changes: 7 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 testdata/rootfind/manifest.json → ...tests/ensure/empty/case1/final/Gopkg.toml
View file
Open in desktop
File renamed without changes.
13 changes: 0 additions & 13 deletions cmd/dep/testdata/harness_tests/ensure/empty/case1/final/lock.json
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion cmd/dep/testdata/harness_tests/ensure/empty/case1/final/manifest.json
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

[[dependencies]]
name = "github.com/sdboyer/deptest"
version = "^0.8.0"
13 changes: 0 additions & 13 deletions cmd/dep/testdata/harness_tests/ensure/empty/case2/final/lock.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions cmd/dep/testdata/harness_tests/ensure/empty/case2/final/manifest.json
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[[dependencies]]
name = "github.com/sdboyer/deptest"
version = "~0.8.0"
7 changes: 0 additions & 7 deletions cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/manifest.json
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

[[overrides]]
name = "github.com/sdboyer/deptest"
version = "1.0.0"
13 changes: 0 additions & 13 deletions cmd/dep/testdata/harness_tests/ensure/override/case1/final/lock.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions cmd/dep/testdata/harness_tests/ensure/override/case1/final/manifest.json
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[[dependencies]]
name = "github.com/sdboyer/deptest"
version = "~0.8.0"
21 changes: 0 additions & 21 deletions cmd/dep/testdata/harness_tests/ensure/update/case1/final/lock.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions cmd/dep/testdata/harness_tests/ensure/update/case1/final/manifest.json
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[[dependencies]]
name = "github.com/sdboyer/deptest"
version = "~0.8.0"
21 changes: 0 additions & 21 deletions cmd/dep/testdata/harness_tests/ensure/update/case1/initial/lock.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions cmd/dep/testdata/harness_tests/ensure/update/case1/initial/manifest.json
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/update/case2/final/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/update/case2/final/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[[dependencies]]
name = "github.com/sdboyer/deptest"
version = "~0.8.0"
21 changes: 0 additions & 21 deletions cmd/dep/testdata/harness_tests/ensure/update/case2/final/lock.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions cmd/dep/testdata/harness_tests/ensure/update/case2/final/manifest.json
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/update/case2/initial/Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions cmd/dep/testdata/harness_tests/ensure/update/case2/initial/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[[dependencies]]
name = "github.com/sdboyer/deptest"
version = "~0.8.0"
Loading