From 0813f755468c0b997e8fe59528bcf2279a222e03 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sat, 27 Jul 2019 11:29:39 +0200 Subject: [PATCH] Add packageset --- pkg/package/package.go | 23 +++++++++++++++++++++++ pkg/package/package_test.go | 3 +-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pkg/package/package.go b/pkg/package/package.go index d38d0293..ae8512a5 100644 --- a/pkg/package/package.go +++ b/pkg/package/package.go @@ -52,6 +52,29 @@ type Package interface { GetUses() []string } +type PackageSet interface { + GetPackages() []Package + AddPackages(pkgs []Package) +} + +type DefaultPackages struct { + Packages []Package +} + +type Tree interface { + GetPackageSet() PackageSet +} + +func (pkgs *DefaultPackages) GetPackages() []Package { + return pkgs.Packages +} + +func (p *DefaultPackages) AddPackages(pkgs []Package) { + p.Packages = append(p.Packages, pkgs...) +} + +func NewPackages(p []Package) PackageSet { return &DefaultPackages{Packages: p} } + // DefaultPackage represent a standard package definition type DefaultPackage struct { Name string diff --git a/pkg/package/package_test.go b/pkg/package/package_test.go index b8a2c8ff..e5cbf826 100644 --- a/pkg/package/package_test.go +++ b/pkg/package/package_test.go @@ -16,7 +16,6 @@ package pkg_test import ( - "github.com/crillab/gophersat/bf" . "github.com/mudler/luet/pkg/package" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -84,7 +83,7 @@ var _ = Describe("Package", func() { a1 := NewPackage("A", "1.0", []*DefaultPackage{}, []*DefaultPackage{}) f, err := a1.BuildFormula() Expect(err).ToNot(HaveOccurred()) - Expect(f).To(Equal([]bf.Formula(nil))) + Expect(f).To(BeNil()) }) It("builds constraints correctly", func() { a11 := NewPackage("A", "1.1", []*DefaultPackage{}, []*DefaultPackage{})