Merge pull request #13 from cgay/new-catalog-format

New catalog format

deps.dylan

@@ -85,8 +85,8 @@ end function;
 // package will be used during the build process anyway. The returned deps do not include
 // the active releases.
 //
-// Signal <dep-error> if dependencies can't be resolved due to circularities or
-// conflicting constraints.
+// Signal <dep-error> if dependencies can't be resolved due to circularities,
+// conflicting constraints, or if they are simply missing from the catalog.
 //
 // The algorithm used here is based on my understanding of
 // https://research.swtch.com/vgo-principles, which can be very roughly summarized as
@@ -171,7 +171,13 @@ define function resolve-deps
       let deps = as(<list>, value-sequence(maxima));
       trace(depth, deps, "<= %s", deps);
     end method;
-  let deps = resolve-release(release, #(), 0);
+  let deps = block ()
+               resolve-release(release, #(), 0)
+             exception (ex :: <package-missing-error>)
+               dep-error(make(<dep-error>,
+                              format-string: "package %= not in catalog",
+                              format-arguments: list(ex.package-name)));
+             end;
   trace(0, deps, "Resolved %= to %s", release, deps)
 end function;
 

install.dylan

@@ -65,7 +65,7 @@ define method %download
   let command
     = format-to-string("git clone%s --quiet --branch=%s -- %s %s",
                        (update-submodules? & " --recurse-submodules") | "",
-                       branch, release.release-location, dest-dir);
+                       branch, release.release-url, dest-dir);
   let (exit-code, signal-code /* , process, #rest streams */)
     = os/run(command, output: #"null", error: #"null");
   if (exit-code = 0)
@@ -111,9 +111,8 @@ end method;
 // re-install all dependencies.
 define method install-deps
     (release :: <release>, #key force? :: <bool>)
-  let cat = load-catalog();
   // TODO(cgay): pass correct `active:` arg.
-  for (rel in resolve-deps(release, cat))
+  for (rel in resolve-deps(release, catalog()))
     if (force? | ~installed?)
       install(rel, force?: force?, deps?: #t);
     end;

library.dylan

@@ -24,22 +24,20 @@ end library pacman;
 
 define module pacman
   export
+    catalog,
     dylan-directory,            // $DYLAN or $HOME/dylan or /opt/dylan
-    load-catalog,
     <catalog-error>,
 
     <catalog>,
     find-package,
     find-package-release,
-    package-names,
+    validate-catalog,
 
     <package>,
     package-name,
     package-releases,
-    package-summary,
     package-description,
     package-contact,
-    package-license-type,
     package-category,
     package-keywords,
 
@@ -53,11 +51,16 @@ define module pacman
     release-directory,
     source-directory,
     read-package-file,
+    load-all-packages,
+    load-package,
 
     <release>,
-    release-to-string,
     release-deps,
-    release-location,
+    release-license,
+    // TODO:
+    // release-license-url,
+    release-url,
+    release-to-string,
     release-version,
 
     <dep>,
@@ -83,6 +86,8 @@ define module %pacman
     import: { delete-directory,
               directory-contents,
               directory-empty?,
+              do-directory,
+              ensure-directories-exist,
               file-property,
               <file-system-error>,
               <file-does-not-exist-error>,
@@ -98,10 +103,13 @@ define module %pacman
   use json,
     import: { parse-json => json/parse,
               encode-json => json/encode,
+              print-json => json/print,
+              do-print-json => json/do-print,
               <json-error> => json/<error> };
   use locators,
     import: { <directory-locator>,
               <file-locator>,
+              <locator>,
               locator-name,
               merge-locators,
               subdirectory-locator };
@@ -142,15 +150,18 @@ define module %pacman
 
   // For the test suite.
   export
-    all-packages,
-    <dep-error>,
+    $dylan-env-var,
     <dep-conflict>,
+    <dep-error>,
     <latest>,
+    add-release,
+    cache-package,
+    cached-package,
+    catalog-directory,
+    catalog-package-cache,
+    find-release,
     max-release,
     string-parser,                 // #string:...
-
     string-to-version, version-to-string,
-
-    read-json-catalog,
-    validate-catalog;
+    write-package-file;
 end module %pacman;