vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-06 22:18:28 +00:00
Code Issues Projects Releases Wiki Activity

Introduce regexp query matching.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-07-15 19:00:06 +04:00
parent a632469890
commit 56d777af0a
8 changed files with 66 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deb/list_test.go
+9 -3
View File
@@ -3,6 +3,7 @@ package deb
import (
"errors"
. "launchpad.net/gocheck"
"regexp"
"sort"
"strings"
)
@@ -358,20 +359,25 @@ func (s *PackageListSuite) TestFilter(c *C) {
c.Check(err, IsNil)
c.Check(plString(result), Equals, "app_1.0_s390 app_1.1~bp1_i386 data_1.1~bp1_all")
result, err = s.il.Filter([]PackageQuery{&AndQuery{&FieldQuery{"Version", VersionGreaterOrEqual, "1.0"},
result, err = s.il.Filter([]PackageQuery{&AndQuery{&FieldQuery{Field: "Version", Relation: VersionGreaterOrEqual, Value: "1.0"},
&FieldQuery{Field: "$Architecture", Relation: VersionEqual, Value: "s390"}}}, false, nil, 0, nil)
c.Check(err, IsNil)
c.Check(plString(result), Equals, "app_1.0_s390 data_1.1~bp1_all")
result, err = s.il.Filter([]PackageQuery{&AndQuery{
&FieldQuery{"$Architecture", VersionPatternMatch, "i*6"}, &PkgQuery{"app", "1.1~bp1", "i386"}}}, false, nil, 0, nil)
&FieldQuery{Field: "$Architecture", Relation: VersionPatternMatch, Value: "i*6"}, &PkgQuery{"app", "1.1~bp1", "i386"}}}, false, nil, 0, nil)
c.Check(err, IsNil)
c.Check(plString(result), Equals, "app_1.1~bp1_i386")
result, err = s.il.Filter([]PackageQuery{&NotQuery{
&FieldQuery{"$Architecture", VersionPatternMatch, "i*6"}}}, false, nil, 0, nil)
&FieldQuery{Field: "$Architecture", Relation: VersionPatternMatch, Value: "i*6"}}}, false, nil, 0, nil)
c.Check(err, IsNil)
c.Check(plString(result), Equals, "app_1.0_s390 app_1.1~bp1_amd64 app_1.1~bp1_arm data_1.1~bp1_all dpkg_1.6.1-3_amd64 dpkg_1.6.1-3_arm dpkg_1.6.1-3_source dpkg_1.7_source libx_1.5_arm")
result, err = s.il.Filter([]PackageQuery{&AndQuery{
&FieldQuery{Field: "$Architecture", Relation: VersionRegexp, Value: "i.*6", Regexp: regexp.MustCompile("i.*6")}, &PkgQuery{"app", "1.1~bp1", "i386"}}}, false, nil, 0, nil)
c.Check(err, IsNil)
c.Check(plString(result), Equals, "app_1.1~bp1_i386")
}
func (s *PackageListSuite) TestVerifyDependencies(c *C) {
deb/package.go
+1 -1
View File
@@ -295,7 +295,7 @@ func (p *Package) MatchesDependency(dep Dependency) bool {
matched, err := filepath.Match(dep.Version, p.Version)
return err == nil && matched
case VersionRegexp:
panic("regexp matching not implemented yet")
return dep.Regexp.FindStringIndex(p.Version) != nil
}
panic("unknown relation")
deb/package_test.go
+11 -4
View File
@@ -7,6 +7,7 @@ import (
. "launchpad.net/gocheck"
"os"
"path/filepath"
"regexp"
)
type PackageSuite struct {
@@ -266,10 +267,16 @@ func (s *PackageSuite) TestMatchesDependency(c *C) {
c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionPatternMatch, Version: "7.40-[2"}), Equals, false)
c.Check(p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionPatternMatch, Version: "7.40-[34]"}), Equals, false)
// %
c.Check(func() {
p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionRegexp, Version: "7\\.40-.*"})
}, Panics, "regexp matching not implemented yet")
// ~
c.Check(
p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionRegexp, Version: "7\\.40-.*",
Regexp: regexp.MustCompile("7\\.40-.*")}), Equals, true)
c.Check(
p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionRegexp, Version: "7\\.40-.*",
Regexp: regexp.MustCompile("40")}), Equals, true)
c.Check(
p.MatchesDependency(Dependency{Pkg: "alien-arena-common", Architecture: "i386", Relation: VersionRegexp, Version: "7\\.40-.*",
Regexp: regexp.MustCompile("39-.*")}), Equals, false)
// Provides
c.Check(p.MatchesDependency(Dependency{Pkg: "game", Relation: VersionDontCare}), Equals, false)
deb/query.go
+4 -2
View File
@@ -2,6 +2,7 @@ package deb
import (
"path/filepath"
"regexp"
)
// PackageQuery is interface of predicate on Package
@@ -34,6 +35,7 @@ type FieldQuery struct {
Field string
Relation int
Value string
Regexp *regexp.Regexp
}
// PkgQuery is search request against specific package
@@ -114,7 +116,7 @@ func (q *NotQuery) Query(list *PackageList) (result *PackageList) {
// Matches on generic field
func (q *FieldQuery) Matches(pkg *Package) bool {
if q.Field == "$Version" {
return pkg.MatchesDependency(Dependency{Pkg: pkg.Name, Relation: q.Relation, Version: q.Value})
return pkg.MatchesDependency(Dependency{Pkg: pkg.Name, Relation: q.Relation, Version: q.Value, Regexp: q.Regexp})
}
if q.Field == "$Architecture" && q.Relation == VersionEqual {
return pkg.MatchesArchitecture(q.Value)
@@ -139,7 +141,7 @@ func (q *FieldQuery) Matches(pkg *Package) bool {
matched, err := filepath.Match(q.Value, field)
return err == nil && matched
case VersionRegexp:
panic("regexp matching not implemented yet")
return q.Regexp.FindStringIndex(field) != nil
}
panic("unknown relation")
deb/version.go
+2
View File
@@ -2,6 +2,7 @@ package deb
import (
"fmt"
"regexp"
"strconv"
"strings"
"unicode"
@@ -188,6 +189,7 @@ type Dependency struct {
Relation int
Version string
Architecture string
Regexp *regexp.Regexp
}
// Hash calculates some predefined unique ID of Dependency