Skip to content

Commit bbbe7bb

Browse files
Make PkgInfo exportable. (#2)
1 parent 3a84086 commit bbbe7bb

File tree

7 files changed

+41
-41
lines changed

7 files changed

+41
-41
lines changed

pmm/apk.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
type apkManager struct {
1010
}
1111

12-
func (this *apkManager) List() []pkgInfo {
12+
func (this *apkManager) List() []PkgInfo {
1313

14-
var packages []pkgInfo
14+
var packages []PkgInfo
1515

1616
file, err := os.Open("/lib/apk/db/installed")
1717
if err != nil {
@@ -31,7 +31,7 @@ func (this *apkManager) List() []pkgInfo {
3131
line := scanner.Text()
3232
pkgVersion := line[2:len(line)]
3333

34-
packages = append(packages, pkgInfo{
34+
packages = append(packages, PkgInfo{
3535
Name: pkgName,
3636
Version: pkgVersion,
3737
Manager: "apk",

pmm/apt.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import "github.com/arduino/go-apt-client"
55
type aptManager struct {
66
}
77

8-
func (this *aptManager) List() []pkgInfo {
8+
func (this *aptManager) List() []PkgInfo {
99

10-
var packages []pkgInfo
10+
var packages []PkgInfo
1111

1212
allPackages, _ := apt.List()
1313

1414
for _, pkg := range allPackages {
1515

1616
if pkg.Status == "installed" {
1717

18-
packages = append(packages, pkgInfo{
18+
packages = append(packages, PkgInfo{
1919
Name: pkg.Name,
2020
Version: pkg.Version,
2121
Manager: "apt",

pmm/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func (i ManagerType) String() string {
2121

2222
type manager interface {
2323
//Available() []pkgInfo
24-
List() []pkgInfo
24+
List() []PkgInfo
2525
}
2626

2727
type managerNotAvailableError struct {

pmm/packages.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package pmm
22

3-
type pkgInfo struct {
3+
type PkgInfo struct {
44
Name string `json:"name"`
55
Version string `json:"version"`
66
Manager string `json:"manager"`
77
}
88

9-
func PkgMissingFromA(listA, listB []pkgInfo) []pkgInfo {
9+
func PkgMissingFromA(listA, listB []PkgInfo) []PkgInfo {
1010

11-
listAMap := make(map[string]pkgInfo, len(listA))
11+
listAMap := make(map[string]PkgInfo, len(listA))
1212

13-
bOnlyPkgs := []pkgInfo{}
13+
bOnlyPkgs := []PkgInfo{}
1414

1515
for _, v := range listA {
1616
listAMap[v.Name] = v

pmm/packages_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,46 @@ import (
88
func TestPkgMissingFromA(t *testing.T) {
99

1010
testCases := []struct {
11-
inputA []pkgInfo
12-
inputB []pkgInfo
13-
expected []pkgInfo
11+
inputA []PkgInfo
12+
inputB []PkgInfo
13+
expected []PkgInfo
1414
passing bool
1515
}{
1616
{
17-
[]pkgInfo{
18-
pkgInfo{Name: "cu-ddns"},
19-
pkgInfo{Name: "sonar"},
17+
[]PkgInfo{
18+
PkgInfo{Name: "cu-ddns"},
19+
PkgInfo{Name: "sonar"},
2020
},
21-
[]pkgInfo{
22-
pkgInfo{Name: "cu-ddns"},
23-
pkgInfo{Name: "sonar"},
24-
pkgInfo{Name: "gotham"},
21+
[]PkgInfo{
22+
PkgInfo{Name: "cu-ddns"},
23+
PkgInfo{Name: "sonar"},
24+
PkgInfo{Name: "gotham"},
2525
},
26-
[]pkgInfo{
27-
pkgInfo{Name: "gotham"},
26+
[]PkgInfo{
27+
PkgInfo{Name: "gotham"},
2828
},
2929
true,
3030
},
3131
{
32-
[]pkgInfo{
33-
pkgInfo{Name: "cu-ddns"},
34-
pkgInfo{Name: "sonar"},
32+
[]PkgInfo{
33+
PkgInfo{Name: "cu-ddns"},
34+
PkgInfo{Name: "sonar"},
3535
},
36-
[]pkgInfo{
37-
pkgInfo{Name: "cu-ddns"},
38-
pkgInfo{Name: "sonar"},
36+
[]PkgInfo{
37+
PkgInfo{Name: "cu-ddns"},
38+
PkgInfo{Name: "sonar"},
3939
},
40-
[]pkgInfo{},
40+
[]PkgInfo{},
4141
true,
4242
},
4343
{
44-
[]pkgInfo{
45-
pkgInfo{Name: "sonar"},
44+
[]PkgInfo{
45+
PkgInfo{Name: "sonar"},
4646
},
47-
[]pkgInfo{
48-
pkgInfo{Name: "Sonar"},
47+
[]PkgInfo{
48+
PkgInfo{Name: "Sonar"},
4949
},
50-
[]pkgInfo{},
50+
[]PkgInfo{},
5151
false,
5252
},
5353
}

pmm/pip.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ type pipManager struct {
1111
commands []string
1212
}
1313

14-
func (this *pipManager) List() []pkgInfo {
14+
func (this *pipManager) List() []PkgInfo {
1515

16-
var packages []pkgInfo
16+
var packages []PkgInfo
1717
var pipJSON []map[string]string
1818

1919
for _, pipCmd := range []string{"pip", "pip3"} {
@@ -33,7 +33,7 @@ func (this *pipManager) List() []pkgInfo {
3333
}
3434

3535
for _, pkg := range pipJSON {
36-
packages = append(packages, pkgInfo{
36+
packages = append(packages, PkgInfo{
3737
Name: pkg["name"],
3838
Version: pkg["version"],
3939
Manager: "pip",

pmm/rpm.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
type rpmManager struct {
1111
}
1212

13-
func (this *rpmManager) List() []pkgInfo {
13+
func (this *rpmManager) List() []PkgInfo {
1414

15-
var packages []pkgInfo
15+
var packages []PkgInfo
1616

1717
output, err := exec.Command("rpm", "-qa", "--qf", "%{NAME}\t%{VERSION}\n").Output()
1818
if err != nil {
@@ -25,7 +25,7 @@ func (this *rpmManager) List() []pkgInfo {
2525
for _, pkg := range lines {
2626

2727
pkgSplit := strings.Split(pkg, "\t")
28-
packages = append(packages, pkgInfo{
28+
packages = append(packages, PkgInfo{
2929
Name: pkgSplit[0],
3030
Version: pkgSplit[1],
3131
Manager: "rpm",

0 commit comments

Comments
 (0)