-o

WDL/Bundle.py

@@ -15,7 +15,11 @@
 from . import Tree, Error
 
 
-def build(doc: Tree.Document, input: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
+def build(
+    doc: Tree.Document,
+    input: Optional[Dict[str, Any]] = None,
+    meta: Optional[Dict[str, Any]] = None,
+) -> Dict[str, Any]:
     """
     Bundle the WDL document and all its imports, along with optional input JSON
     """
@@ -40,7 +44,11 @@ def build_layout(doc, ref=None):
             layout["imports"] = imports
         return layout
 
-    ans: Dict[str, Any] = {} if not input else {"input": input}
+    ans: Dict[str, Any] = {}
+    if meta:
+        ans["meta"] = meta
+    if input:
+        ans["input"] = input
     ans["layout"] = build_layout(doc)
 
     # strip common prefix from all abspaths, making bundle reproducible across machines

WDL/CLI.py

@@ -1955,13 +1955,20 @@ def fill_bundle_subparser(subparsers):
     )
     bundle_parser.add_argument(
         "wdlfile",
-        metavar="JSON_OR_FILE",
+        metavar="FILE",
         help="top-level WDL to bundle",
     )
+    bundle_parser.add_argument(
+        "-o",
+        "--output",
+        metavar="FILE",
+        default="-",
+        help="write bundle to file instead of standard output",
+    )
     bundle_parser.add_argument(
         "--input",
         "-i",
-        metavar="FILE",
+        metavar="JSON_OR_FILE",
         help="input JSON to include as defaults",
     )
     bundle_parser.add_argument(
@@ -1974,6 +1981,7 @@ def fill_bundle_subparser(subparsers):
 
 def bundle(
     wdlfile,
+    output="-",
     input=None,
     compress=False,
     check_quant=True,
@@ -2009,10 +2017,20 @@ def bundle(
     else:
         input = sync_await(read_source(Bundle.READ_BUNDLE_INPUT, [], None))
 
+    meta = None
+    miniwdl_version = pkg_version()
+    if miniwdl_version:
+        meta = {"miniwdl": {"version": "v" + miniwdl_version}}
+
     # build bundle
-    bundle = Bundle.build(doc, input=input)
+    bundle = Bundle.build(doc, input=input, meta=meta)
     bundle = Bundle.encode(bundle, compress=compress)
-    print(bundle)
+
+    if not output or output == "-":
+        print(bundle)
+    else:
+        with open(output, "w") as outfile:
+            print(bundle, file=outfile)
 
 
 def pkg_version(pkg="miniwdl"):

tests/bundle.t

@@ -52,7 +52,7 @@ plan tests 11
 
 $miniwdl bundle wdl/wf/outer.wdl --input ' {"w.who": "Alice"}' > my_bundle
 is "$?" "0" "build bundle"
-$miniwdl bundle wdl/wf/outer.wdl --input ' {"w.who": "Alice"}' --compress > compressed_bundle
+$miniwdl bundle wdl/wf/outer.wdl --input ' {"w.who": "Alice"}' --compress -o compressed_bundle
 is "$?" "0" "compress bundle"
 $miniwdl check my_bundle
 is "$?" "0" "check bundle"