Skip to content

Use ">>" in place of "-" between package index ID components #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2021
Merged

Use ">>" in place of "-" between package index ID components #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions internal/project/projectdata/packageindex.go
View file
Open in desktop
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
Open in desktop
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:avr@1.0.0 - My Board",
ID: "foopackager1:avr@1.0.0 >> My Board",
JSONPointer: "/packages/0/platforms/0/boards/0",
},
{
ID: "foopackager1:avr@1.0.0 - My Board Pro",
ID: "foopackager1:avr@1.0.0 >> My Board Pro",
JSONPointer: "/packages/0/platforms/0/boards/1",
},
{
ID: "foopackager1:avr@1.0.1 - My Board",
ID: "foopackager1:avr@1.0.1 >> My Board",
JSONPointer: "/packages/0/platforms/1/boards/0",
},
{
ID: "foopackager1:avr@1.0.1 - My Board Pro",
ID: "foopackager1:avr@1.0.1 >> My Board Pro",
JSONPointer: "/packages/0/platforms/1/boards/1",
},
{
ID: "foopackager2:samd@2.0.0 - My Board",
ID: "foopackager2:samd@2.0.0 >> My Board",
JSONPointer: "/packages/1/platforms/0/boards/0",
},
{
ID: "foopackager2:samd@2.0.0 - My Board Pro",
ID: "foopackager2:samd@2.0.0 >> My Board Pro",
JSONPointer: "/packages/1/platforms/0/boards/1",
},
{
ID: "foopackager2:mbed@1.1.1 - My Board",
ID: "foopackager2:mbed@1.1.1 >> My Board",
JSONPointer: "/packages/1/platforms/1/boards/0",
},
{
ID: "foopackager2:mbed@1.1.1 - My Board Pro",
ID: "foopackager2:mbed@1.1.1 >> My Board Pro",
JSONPointer: "/packages/1/platforms/1/boards/1",
},
},
packageIndexToolsDependenciesAssertion: assert.NotNil,
packageIndexToolsDependenciesDataAssertion: []PackageIndexData{
{
ID: "foopackager1:avr@1.0.0 - arduino:avr-gcc@4.8.1-arduino5",
ID: "foopackager1:avr@1.0.0 >> arduino:avr-gcc@4.8.1-arduino5",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/0",
},
{
ID: "foopackager1:avr@1.0.0 - arduino:avrdude@6.0.1-arduino5",
ID: "foopackager1:avr@1.0.0 >> arduino:avrdude@6.0.1-arduino5",
JSONPointer: "/packages/0/platforms/0/toolsDependencies/1",
},
{
ID: "foopackager1:avr@1.0.1 - arduino:avr-gcc@7.3.0-atmel3.6.1-arduino7",
ID: "foopackager1:avr@1.0.1 >> arduino:avr-gcc@7.3.0-atmel3.6.1-arduino7",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/0",
},
{
ID: "foopackager1:avr@1.0.1 - arduino:avrdude@6.3.0-arduino17",
ID: "foopackager1:avr@1.0.1 >> arduino:avrdude@6.3.0-arduino17",
JSONPointer: "/packages/0/platforms/1/toolsDependencies/1",
},
{
ID: "foopackager2:samd@2.0.0 - arduino:arm-none-eabi-gcc@7-2017q4",
ID: "foopackager2:samd@2.0.0 >> arduino:arm-none-eabi-gcc@7-2017q4",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/0",
},
{
ID: "foopackager2:samd@2.0.0 - arduino:bossac@1.7.0-arduino3",
ID: "foopackager2:samd@2.0.0 >> arduino:bossac@1.7.0-arduino3",
JSONPointer: "/packages/1/platforms/0/toolsDependencies/1",
},
{
ID: "foopackager2:mbed@1.1.1 - arduino:openocd@0.11.0-arduino2",
ID: "foopackager2:mbed@1.1.1 >> arduino:openocd@0.11.0-arduino2",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/0",
},
{
ID: "foopackager2:mbed@1.1.1 - arduino:arm-none-eabi-gcc@7-2017q4",
ID: "foopackager2:mbed@1.1.1 >> arduino:arm-none-eabi-gcc@7-2017q4",
JSONPointer: "/packages/1/platforms/1/toolsDependencies/1",
},
},
packageIndexDiscoveryDependenciesAssertion: assert.NotNil,
packageIndexDiscoveryDependenciesDataAssertion: []PackageIndexData{
{
ID: "foopackager1:avr@1.0.1 - arduino:ble-discovery",
ID: "foopackager1:avr@1.0.1 >> arduino:ble-discovery",
JSONPointer: "/packages/0/platforms/1/discoveryDependencies/0",
},
{
ID: "foopackager1:avr@1.0.1 - barpackager:carrier-pigeon-discovery",
ID: "foopackager1:avr@1.0.1 >> barpackager:carrier-pigeon-discovery",
JSONPointer: "/packages/0/platforms/1/discoveryDependencies/1",
},
{
ID: "foopackager2:samd@2.0.0 - arduino:ble-discovery",
ID: "foopackager2:samd@2.0.0 >> arduino:ble-discovery",
JSONPointer: "/packages/1/platforms/0/discoveryDependencies/0",
},
{
ID: "foopackager2:samd@2.0.0 - bazpackager:signal-flag-discovery",
ID: "foopackager2:samd@2.0.0 >> bazpackager:signal-flag-discovery",
JSONPointer: "/packages/1/platforms/0/discoveryDependencies/1",
},
{
ID: "foopackager2:mbed@1.1.1 - quxpackager:sneakernet-discovery",
ID: "foopackager2:mbed@1.1.1 >> 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:openocd@0.10.0-arduino1-static - i386-apple-darwin11",
ID: "foopackager2:openocd@0.10.0-arduino1-static >> i386-apple-darwin11",
JSONPointer: "/packages/1/tools/0/systems/0",
},
{
ID: "foopackager2:openocd@0.10.0-arduino1-static - x86_64-linux-gnu",
ID: "foopackager2:openocd@0.10.0-arduino1-static >> x86_64-linux-gnu",
JSONPointer: "/packages/1/tools/0/systems/1",
},
{
ID: "foopackager2:CMSIS@4.0.0-atmel - arm-linux-gnueabihf",
ID: "foopackager2:CMSIS@4.0.0-atmel >> arm-linux-gnueabihf",
JSONPointer: "/packages/1/tools/1/systems/0",
},
{
ID: "foopackager2:CMSIS@4.0.0-atmel - i686-mingw32",
ID: "foopackager2:CMSIS@4.0.0-atmel >> 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:megaavr@1.0.0 - My Board Pro",
ID: "foopackager2:megaavr@1.0.0 >> 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:megaavr@1.0.0 - arduino:CMSIS@4.5.0",
ID: "foopackager2:megaavr@1.0.0 >> arduino:CMSIS@4.5.0",
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:megaavr@1.0.0 - quxpackager:sneakernet-discovery",
ID: "foopackager2:megaavr@1.0.0 >> 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:megaavr@1.0.0 - My Board Pro",
ID: "foopackager2:megaavr@1.0.0 >> 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:megaavr@1.0.0 - arduino:CMSIS@4.5.0",
ID: "foopackager2:megaavr@1.0.0 >> arduino:CMSIS@4.5.0",
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:megaavr@1.0.0 - quxpackager:sneakernet-discovery",
ID: "foopackager2:megaavr@1.0.0 >> quxpackager:sneakernet-discovery",
JSONPointer: "/packages/1/platforms/2/discoveryDependencies/3",
},
},
Expand Down
Loading