Add delimiter option to serialize command. (#32)

* Add delimiter option to serialize command.

* Update delimiter split logic.

* Update version to 0.6.0

Co-authored-by: Ryan A. Tran <[email protected]>

Author: ryanadtran

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to Merlin Spellbook will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.0]
+
+## Added
+- Delimiter option in serialization command.
+
+## Changed
+- In serialize command, grab the first entry as the key and everything else as the value.
+
 ## [0.5.3]
 
 ## Fixed

setup.py

@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin-Spellbook, Version: 0.5.3.
+# This file is part of Merlin-Spellbook, Version: 0.6.0.
 #
 # For details, see https://github.com/LLNL/merlin-spellbook.
 #

spellbook/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.5.3"
+__version__ = "0.6.0"
 
 VERSION = __version__

spellbook/commands/serialize.py

@@ -28,6 +28,13 @@
     type=str,
     help="key to indicate a nested value, default: /",
 )
+@click.option(
+    "--delimiter",
+    required=False,
+    default="=",
+    type=str,
+    help="key to indicate delimiter value, default: =",
+)
 @click.option(
     "--verbose",
     is_flag=True,
@@ -44,7 +51,7 @@
     type=bool,
     help="indent with new lines, default False",
 )
-def cli(output, vars, splitter, verbose, indent):
+def cli(output, vars, splitter, delimiter, verbose, indent):
     """
     write a serialized file from cli arguments.
     """
@@ -55,6 +62,7 @@ def cli(output, vars, splitter, verbose, indent):
             "output": output,
             "vars": vars,
             "splitter": splitter,
+            "delimiter": delimiter,
             "verbose": verbose,
             "indent": indent,
         }

spellbook/data_formatting/conduit/python/conduit_bundler.py

@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-<PENDING>
 # All rights reserved.
-# This file is part of merlin-spellbook, Version: 0.5.3.
+# This file is part of merlin-spellbook, Version: 0.6.0.
 #
 # For details, see https://github.com/LLNL/merlin-spellbook.
 #

spellbook/data_formatting/serialize.py

@@ -27,18 +27,18 @@ def convert_string(string):
         return string
 
 
-def nested_dict(var_list, splitter="/"):
+def nested_dict(var_list, splitter="/", delimiter="="):
     output = {}
     for v in var_list:
-        keys, val = v.split("=")
+        keys, val = v.split(delimiter, 1)
         keylist = keys.split(splitter)
         value = convert_string(val)
         nested_set(output, keylist, value)
     return output
 
 
 def parse_args(args):
-    output = nested_dict(args.vars, splitter=args.splitter)
+    output = nested_dict(args.vars, splitter=args.splitter, delimiter=args.delimiter)
     dumpargs = {"sort_keys": True}
     if args.indent:
         dumpargs["indent"] = 4

spellbook/log_formatter.py

@@ -6,7 +6,7 @@
 #
 # LLNL-CODE-797170
 # All rights reserved.
-# This file is part of Merlin Spellbook, Version: 0.5.3.
+# This file is part of Merlin Spellbook, Version: 0.6.0.
 #
 # For details, see https://github.com/LLNL/merlin.
 #