Add support for $ in package manifest dependency constraint

17 files changed, 78 insertions, 3 deletions

diff --git a/tests/common/git/state0/libbar.tar b/tests/common/git/state0/libbar.tar
index 791d8f2..2e1a3ad 100644
--- a/tests/common/git/state0/libbar.tar
+++ b/tests/common/git/state0/libbar.tar
diff --git a/tests/common/git/state0/libfoo.tar b/tests/common/git/state0/libfoo.tar
index e6bb1c2..6a0cc8a 100644
--- a/tests/common/git/state0/libfoo.tar
+++ b/tests/common/git/state0/libfoo.tar
diff --git a/tests/common/git/state0/libfox.tar b/tests/common/git/state0/libfox.tar
index 31dda5a..a73f460 100644
--- a/tests/common/git/state0/libfox.tar
+++ b/tests/common/git/state0/libfox.tar
diff --git a/tests/common/git/state0/style-basic.tar b/tests/common/git/state0/style-basic.tar
index 098e0ff..36d0dcd 100644
--- a/tests/common/git/state0/style-basic.tar
+++ b/tests/common/git/state0/style-basic.tar
diff --git a/tests/common/git/state0/style.tar b/tests/common/git/state0/style.tar
index 5ad84da..7b48a9d 100644
--- a/tests/common/git/state0/style.tar
+++ b/tests/common/git/state0/style.tar
diff --git a/tests/common/git/state1/libbaz.tar b/tests/common/git/state1/libbaz.tar
index cd2d215..1b35ec4 100644
--- a/tests/common/git/state1/libbaz.tar
+++ b/tests/common/git/state1/libbaz.tar
diff --git a/tests/common/git/state1/libfoo.tar b/tests/common/git/state1/libfoo.tar
index 57befb1..ab694f7 100644
--- a/tests/common/git/state1/libfoo.tar
+++ b/tests/common/git/state1/libfoo.tar
diff --git a/tests/common/git/state1/libfox.tar b/tests/common/git/state1/libfox.tar
index 648811f..a6ef40e 100644
--- a/tests/common/git/state1/libfox.tar
+++ b/tests/common/git/state1/libfox.tar
diff --git a/tests/common/git/state1/style-basic.tar b/tests/common/git/state1/style-basic.tar
index ab302de..7b7a6c5 100644
--- a/tests/common/git/state1/style-basic.tar
+++ b/tests/common/git/state1/style-basic.tar
diff --git a/tests/common/git/state1/style.tar b/tests/common/git/state1/style.tar
index 7772b98..e6243f4 100644
--- a/tests/common/git/state1/style.tar
+++ b/tests/common/git/state1/style.tar
diff --git a/tests/common/satisfy/libbar-0.0.1.tar.gz b/tests/common/satisfy/libbar-0.0.1.tar.gz
index 97ad543..a88d874 100644
--- a/tests/common/satisfy/libbar-0.0.1.tar.gz
+++ b/tests/common/satisfy/libbar-0.0.1.tar.gz
diff --git a/tests/common/satisfy/libbar-1.1.0.tar.gz b/tests/common/satisfy/libbar-1.1.0.tar.gz
index 881292e..16a8b47 100644
--- a/tests/common/satisfy/libbar-1.1.0.tar.gz
+++ b/tests/common/satisfy/libbar-1.1.0.tar.gz
diff --git a/tests/pkg-verify.testscript b/tests/pkg-verify.testscript
index 6f12c51..c384eb6 100644
--- a/tests/pkg-verify.testscript
+++ b/tests/pkg-verify.testscript
@@ -90,4 +90,20 @@ $* --deep --ignore-unknown --manifest $src/foo-2.tar.gz >>EOO
   \
   url: http://www.example.org/foo
   email: foo-users@example.org
+  depends: bar == 2
+  EOO
+
+: incomplete-dependency
+:
+$* --ignore-unknown --manifest $src/foo-2.tar.gz >>EOO
+  : 1
+  name: foo
+  version: 2
+  summary: The "Foo" utility
+  license: MIT
+  description-file: README
+  changes-file: NEWS
+  url: http://www.example.org/foo
+  email: foo-users@example.org
+  depends: bar == $
   EOO
diff --git a/tests/pkg-verify/foo-2.tar.gz b/tests/pkg-verify/foo-2.tar.gz
index eb72635..5f5739d 100644
--- a/tests/pkg-verify/foo-2.tar.gz
+++ b/tests/pkg-verify/foo-2.tar.gz
diff --git a/tests/rep-create.testscript b/tests/rep-create.testscript
index 053902d..502a58b 100644
--- a/tests/rep-create.testscript
+++ b/tests/rep-create.testscript
@@ -28,12 +28,23 @@
     $clone_rep;
 
     $* 1/stable/ 2>>/~%EOE% &1/stable/packages.manifest;
+      added bar 1
       added foo 1
-      %1 package\(s\) in .+/stable/%
+      %2 package\(s\) in .+/stable/%
       EOE
 
     $rep_info -p --manifest 1/stable/ >>EOO
       : 1
+      name: bar
+      version: 1
+      summary: The "Bar" utility
+      license: MIT
+      url: http://www.example.org/bar
+      email: bar-users@example.org
+      depends: foo == 1
+      location: bar-1.tar.gz
+      sha256sum: 514a99f5fadb94f946f8abff59caa9c3cc442cd4f30d4383a1cf6d26ca058036
+      :
       name: foo
       version: 1
       summary: The "Foo" utility
@@ -51,15 +62,26 @@
     $clone_rep;
 
     $* --key $key 1/stable/ 2>>/~%EOE% &1/stable/packages.manifest;
+      added bar 1
       added foo 1
       warning: --key option ignored
         info: repository manifest contains no certificate
         info: run 'bpkg help rep-create' for more information
-      %1 package\(s\) in .+/stable/%
+      %2 package\(s\) in .+/stable/%
       EOE
 
     $rep_info -p --manifest 1/stable/ >>EOO
       : 1
+      name: bar
+      version: 1
+      summary: The "Bar" utility
+      license: MIT
+      url: http://www.example.org/bar
+      email: bar-users@example.org
+      depends: foo == 1
+      location: bar-1.tar.gz
+      sha256sum: 514a99f5fadb94f946f8abff59caa9c3cc442cd4f30d4383a1cf6d26ca058036
+      :
       name: foo
       version: 1
       summary: The "Foo" utility
@@ -96,13 +118,24 @@
 
     $* --key $key 1/stable/ 2>>/~%EOE% &1/stable/packages.manifest \
                                        &1/stable/signature.manifest;
+      added bar 1
       added foo 1
-      %1 package\(s\) in .+/stable/%
+      %2 package\(s\) in .+/stable/%
       EOE
 
     $rep_info --cert-fingerprint -p --manifest 1/stable/ >>~"%EOO%"
       $cert_fp
       : 1
+      name: bar
+      version: 1
+      summary: The "Bar" utility
+      license: MIT
+      url: http://www.example.org/bar
+      email: bar-users@example.org
+      depends: foo == 1
+      location: bar-1.tar.gz
+      sha256sum: 514a99f5fadb94f946f8abff59caa9c3cc442cd4f30d4383a1cf6d26ca058036
+      :
       name: foo
       version: 1
       summary: The "Foo" utility
@@ -118,6 +151,7 @@
   :
   $clone_rep;
   $* 1/stable/ 2>>EOE &1/stable/packages.manifest != 0
+    added bar 1
     added foo 1
     error: --key option required
       info: repository manifest contains a certificate
diff --git a/tests/rep-create/stable/bar-1.tar.gz b/tests/rep-create/stable/bar-1.tar.gz
new file mode 100644
index 0000000..66c79a2
--- /dev/null
+++ b/tests/rep-create/stable/bar-1.tar.gz
diff --git a/tests/rep-info.testscript b/tests/rep-info.testscript
index 3ccbeb6..55a29da 100644
--- a/tests/rep-info.testscript
+++ b/tests/rep-info.testscript
@@ -251,4 +251,29 @@ else
   : 1
   email: user@example.com
   EOO
+
+  : complete-dependency
+  :
+  $* -p --manifest "$rep/libbar.git#master" >>~%EOO%d
+    : 1
+    name: libbar
+    version: 1.0.0
+    summary: libbar
+    license: MIT
+    url: http://example.org/libbar
+    email: pkg@example.org
+    depends: style-basic >= 1.0.0
+    location: libbar
+    %fragment: \.+%
+    :
+    name: libmbar
+    version: 1.0.0
+    summary: libmbar
+    license: MIT
+    url: http://example.org/libmbar
+    email: pkg@example.org
+    depends: style-basic >= 1.0.0
+    location: libmbar
+    %fragment: \.+%
+    EOO
 }