From f070778ba138bb2bbbcb071a8822b23af9e4d7ba Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Fri, 7 Jun 2019 14:38:36 -0400
Subject: Add comments

---
 source/merge.d | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'source/merge.d')

diff --git a/source/merge.d b/source/merge.d
index 0b55f92..c08222f 100644
--- a/source/merge.d
+++ b/source/merge.d
@@ -34,6 +34,11 @@ struct testable_t {
 }
 
 
+/**
+  Verifies configuration input
+TODO:
+    Change the name of this function
+  */
 string[string][] dmfile(string[] packages) {
     string[string][] results;
     foreach (line; packages) {
@@ -53,6 +58,9 @@ string[string][] dmfile(string[] packages) {
 }
 
 
+/**
+  Generate base delivery environment
+  */
 bool env_combine(ref Session_t session, ref Conda conda) {
     if (indexOf(session.base_spec, "://", 0) < 0 && !session.base_spec.exists) {
         throw new Exception(session.base_spec ~ " does not exist");
@@ -62,13 +70,11 @@ bool env_combine(ref Session_t session, ref Conda conda) {
     string[] specs;
     string opmode = session.base_spec.endsWith(".yml") ? "env " : "";
 
-    if(conda.run(opmode ~ "create -n " ~ session.delivery
+    if (conda.run(opmode ~ "create -n " ~ session.delivery
                  ~ " --file " ~ session.base_spec)) {
         return false;
     }
 
-    //conda.activate(session.delivery);
-
     writeln("Delivery merge specification:");
     foreach (record; dmfile(session.conda_requirements)) {
         writefln("-> package: %-15s :: version: %s",
@@ -85,7 +91,9 @@ bool env_combine(ref Session_t session, ref Conda conda) {
     return true;
 }
 
-
+/**
+  Scan prefix for just-installed packages owned by `orgs`
+  */
 testable_t[] testable_packages(ref Conda conda, string[] inputs, string[] orgs=[]) {
     testable_t[] results;
     foreach (record; dmfile(inputs)) {
@@ -155,6 +163,9 @@ testable_t[] testable_packages(ref Conda conda, string[] inputs, string[] orgs=[
 }
 
 
+/**
+  Perform integration tests (brute force)
+  */
 int integration_test(ref Session_t session,
                       ref Conda conda,
                       string outdir,
-- 
cgit