Skip to content

Commit

Permalink
Merge pull request #210 from per1234/package-index-component-separator
Browse files Browse the repository at this point in the history 
Use ">>" in place of "-" between package index ID components
  • Loading branch information
@per1234
per1234 authored Jul 21, 2021
2 parents c87155d + a63d3a8 commit 3fb6daf
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 57 deletions.
8 changes: 4 additions & 4 deletions internal/project/projectdata/packageindex.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,23 @@ func InitializeForPackageIndex() {
}

for _, platformData := range PackageIndexPlatforms() {
packageIndexBoards = append(packageIndexBoards, getPackageIndexData(platformData.Object, platformData.JSONPointer, "boards", platformData.ID, " - {{index . 0}}", []string{"name"})...)
packageIndexBoards = append(packageIndexBoards, getPackageIndexData(platformData.Object, platformData.JSONPointer, "boards", platformData.ID, " >> {{index . 0}}", []string{"name"})...)
}

for _, platformData := range PackageIndexPlatforms() {
packageIndexToolsDependencies = append(packageIndexToolsDependencies, getPackageIndexData(platformData.Object, platformData.JSONPointer, "toolsDependencies", platformData.ID, " - {{index . 0}}:{{index . 1}}@{{index . 2}}", []string{"packager", "name", "version"})...)
packageIndexToolsDependencies = append(packageIndexToolsDependencies, getPackageIndexData(platformData.Object, platformData.JSONPointer, "toolsDependencies", platformData.ID, " >> {{index . 0}}:{{index . 1}}@{{index . 2}}", []string{"packager", "name", "version"})...)
}

for _, platformData := range PackageIndexPlatforms() {
packageIndexDiscoveryDependencies = append(packageIndexDiscoveryDependencies, getPackageIndexData(platformData.Object, platformData.JSONPointer, "discoveryDependencies", platformData.ID, " - {{index . 0}}:{{index . 1}}", []string{"packager", "name"})...)
packageIndexDiscoveryDependencies = append(packageIndexDiscoveryDependencies, getPackageIndexData(platformData.Object, platformData.JSONPointer, "discoveryDependencies", platformData.ID, " >> {{index . 0}}:{{index . 1}}", []string{"packager", "name"})...)
}

for _, packageData := range PackageIndexPackages() {
packageIndexTools = append(packageIndexTools, getPackageIndexData(packageData.Object, packageData.JSONPointer, "tools", packageData.ID, ":{{index . 0}}@{{index . 1}}", []string{"name", "version"})...)
}

for _, toolData := range PackageIndexTools() {
packageIndexSystems = append(packageIndexSystems, getPackageIndexData(toolData.Object, toolData.JSONPointer, "systems", toolData.ID, " - {{index . 0}}", []string{"host"})...)
packageIndexSystems = append(packageIndexSystems, getPackageIndexData(toolData.Object, toolData.JSONPointer, "systems", toolData.ID, " >> {{index . 0}}", []string{"host"})...)
}

packageIndexSchemaValidationResult = packageindex.Validate(PackageIndex())
Expand Down
62 changes: 31 additions & 31 deletions internal/project/projectdata/packageindex_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,93 +96,93 @@ func TestInitializeForPackageIndex(t *testing.T) {
packageIndexBoardsAssertion: assert.NotNil,
packageIndexBoardsDataAssertion: []PackageIndexData{
{
ID: "foopackager1:[email protected] - My Board",
ID: "foopackager1:[email protected] >> My Board",
JSONPointer: "/packages/0/platforms/0/boards/0",
},
{
ID: "foopackager1:[email protected] - My Board Pro",
ID: "foopackager1:[email protected] >> My Board Pro",
JSONPointer: "/packages/0/platforms/0/boards/1",
},
{
ID: "foopackager1:[email protected] - My Board",
ID: "foopackager1:[email protected] >> My Board",
JSONPointer: "/packages/0/platforms/1/boards/0",
},
{
ID: "foopackager1:[email protected] - My Board Pro",
ID: "foopackager1:[email protected] >> My Board Pro",
JSONPointer: "/packages/0/platforms/1/boards/1",
},
{
ID: "foopackager2:[email protected] - My Board",
ID: "foopackager2:[email protected] >> My Board",
JSONPointer: "/packages/1/platforms/0/boards/0",
},
{
ID: "foopackager2:[email protected] - My Board Pro",
ID: "foopackager2:[email protected] >> My Board Pro",
JSONPointer: "/packages/1/platforms/0/boards/1",
},
{
ID: "foopackager2:[email protected] - My Board",
ID: "foopackager2:[email protected] >> My Board",
JSONPointer: "/packages/1/platforms/1/boards/0",
},
{
ID: "foopackager2:[email protected] - My Board Pro",
ID: "foopackager2:[email protected] >> My Board Pro",
JSONPointer: "/packages/1/platforms/1/boards/1",
},
},
packageIndexToolsDependenciesAssertion: assert.NotNil,
packageIndexToolsDependenciesDataAssertion: []PackageIndexData{
{
ID: "foopackager1:[email protected] - arduino:[email protected]",
ID: "foopackager1:[email protected] >> arduino:[email protected]",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/0",
},
{
ID: "foopackager1:[email protected] - arduino:[email protected]",
ID: "foopackager1:[email protected] >> arduino:[email protected]",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/1",
},
{
ID: "foopackager1:[email protected] - arduino:[email protected]",
ID: "foopackager1:[email protected] >> arduino:[email protected]",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/0",
},
{
ID: "foopackager1:[email protected] - arduino:[email protected]",
ID: "foopackager1:[email protected] >> arduino:[email protected]",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/1",
},
{
ID: "foopackager2:[email protected] - arduino:arm-none-eabi-gcc@7-2017q4",
ID: "foopackager2:[email protected] >> arduino:arm-none-eabi-gcc@7-2017q4",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/0",
},
{
ID: "foopackager2:[email protected] - arduino:[email protected]",
ID: "foopackager2:[email protected] >> arduino:[email protected]",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/1",
},
{
ID: "foopackager2:[email protected] - arduino:[email protected]",
ID: "foopackager2:[email protected] >> arduino:[email protected]",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/0",
},
{
ID: "foopackager2:[email protected] - arduino:arm-none-eabi-gcc@7-2017q4",
ID: "foopackager2:[email protected] >> arduino:arm-none-eabi-gcc@7-2017q4",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/1",
},
},
packageIndexDiscoveryDependenciesAssertion: assert.NotNil,
packageIndexDiscoveryDependenciesDataAssertion: []PackageIndexData{
{
ID: "foopackager1:[email protected] - arduino:ble-discovery",
ID: "foopackager1:[email protected] >> arduino:ble-discovery",
JSONPointer: "/packages/0/platforms/1/discoveryDependencies/0",
},
{
ID: "foopackager1:[email protected] - barpackager:carrier-pigeon-discovery",
ID: "foopackager1:[email protected] >> barpackager:carrier-pigeon-discovery",
JSONPointer: "/packages/0/platforms/1/discoveryDependencies/1",
},
{
ID: "foopackager2:[email protected] - arduino:ble-discovery",
ID: "foopackager2:[email protected] >> arduino:ble-discovery",
JSONPointer: "/packages/1/platforms/0/discoveryDependencies/0",
},
{
ID: "foopackager2:[email protected] - bazpackager:signal-flag-discovery",
ID: "foopackager2:[email protected] >> bazpackager:signal-flag-discovery",
JSONPointer: "/packages/1/platforms/0/discoveryDependencies/1",
},
{
ID: "foopackager2:[email protected] - quxpackager:sneakernet-discovery",
ID: "foopackager2:[email protected] >> quxpackager:sneakernet-discovery",
JSONPointer: "/packages/1/platforms/1/discoveryDependencies/0",
},
},
Expand All @@ -200,19 +200,19 @@ func TestInitializeForPackageIndex(t *testing.T) {
packageIndexSystemsAssertion: assert.NotNil,
packageIndexSystemsDataAssertion: []PackageIndexData{
{
ID: "foopackager2:[email protected] - i386-apple-darwin11",
ID: "foopackager2:[email protected] >> i386-apple-darwin11",
JSONPointer: "/packages/1/tools/0/systems/0",
},
{
ID: "foopackager2:[email protected] - x86_64-linux-gnu",
ID: "foopackager2:[email protected] >> x86_64-linux-gnu",
JSONPointer: "/packages/1/tools/0/systems/1",
},
{
ID: "foopackager2:[email protected] - arm-linux-gnueabihf",
ID: "foopackager2:[email protected] >> arm-linux-gnueabihf",
JSONPointer: "/packages/1/tools/1/systems/0",
},
{
ID: "foopackager2:[email protected] - i686-mingw32",
ID: "foopackager2:[email protected] >> i686-mingw32",
JSONPointer: "/packages/1/tools/1/systems/1",
},
},
Expand Down Expand Up @@ -297,7 +297,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/2/boards/0",
},
{
ID: "foopackager2:[email protected] - My Board Pro",
ID: "foopackager2:[email protected] >> My Board Pro",
JSONPointer: "/packages/1/platforms/2/boards/1",
},
},
Expand Down Expand Up @@ -348,7 +348,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/2/toolsDependencies/2",
},
{
ID: "foopackager2:[email protected] - arduino:[email protected]",
ID: "foopackager2:[email protected] >> arduino:[email protected]",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/3",
},
},
Expand Down Expand Up @@ -395,7 +395,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/2/discoveryDependencies/1",
},
{
ID: "foopackager2:[email protected] - quxpackager:sneakernet-discovery",
ID: "foopackager2:[email protected] >> quxpackager:sneakernet-discovery",
JSONPointer: "/packages/1/platforms/2/discoveryDependencies/3",
},
},
Expand Down Expand Up @@ -518,7 +518,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/2/boards/0",
},
{
ID: "foopackager2:[email protected] - My Board Pro",
ID: "foopackager2:[email protected] >> My Board Pro",
JSONPointer: "/packages/1/platforms/2/boards/1",
},
},
Expand Down Expand Up @@ -569,7 +569,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/2/toolsDependencies/2",
},
{
ID: "foopackager2:[email protected] - arduino:[email protected]",
ID: "foopackager2:[email protected] >> arduino:[email protected]",
JSONPointer: "/packages/1/platforms/2/toolsDependencies/3",
},
},
Expand Down Expand Up @@ -616,7 +616,7 @@ func TestInitializeForPackageIndex(t *testing.T) {
JSONPointer: "/packages/1/platforms/2/discoveryDependencies/1",
},
{
ID: "foopackager2:[email protected] - quxpackager:sneakernet-discovery",
ID: "foopackager2:[email protected] >> quxpackager:sneakernet-discovery",
JSONPointer: "/packages/1/platforms/2/discoveryDependencies/3",
},
},
Expand Down
Loading

0 comments on commit 3fb6daf

Please sign in to comment.