Merge pull request #58 from wwkimball/development

Release 2.3.6

CHANGES

@@ -1,3 +1,12 @@
+2.3.6:
+Bug Fixes:
+* When using yaml-set with --format=folded and --eyamlcrypt, the encrypted
+  value was being mistakenly appended with a spurious newline character at its
+  end.  Note that this affected only Puppet's Hiera lookup and not EYAML
+  itself; on the command-line, the eyaml command would not show the extra
+  newline character.  The yaml-get command was also not affected, making it
+  very difficult to set up a unit-test for this case.
+
 2.3.5:
 Bug Fixes:
 * Certain YAML constructs trigger AssertionErrors in ruamel.yaml during YAML

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="yamlpath",
-    version="2.3.5",
+    version="2.3.6",
     description="Read and change YAML/Compatible data using powerful, intuitive, command-line friendly syntax",
     long_description=long_description,
     long_description_content_type="text/markdown",

yamlpath/eyaml/eyamlprocessor.py

@@ -141,7 +141,7 @@ def decrypt_eyaml(self, value: str) -> str:
 
         cmd: List[str] = cmdstr.split()
         cleanval: str = str(value).replace("\n", "").replace(" ", "").rstrip()
-        bval: bytes = (cleanval + "\n").encode("ascii")
+        bval: bytes = cleanval.encode("ascii")
         self.logger.debug(
             "EYAMLPath::decrypt_eyaml:  About to execute {} against:\n{}"
             .format(cmdstr, cleanval)
@@ -212,7 +212,7 @@ def encrypt_eyaml(self, value: str,
             "EYAMLPath::encrypt_eyaml:  About to execute:  {}"
             .format(" ".join(cmd))
         )
-        bval: bytes = (value + "\n").encode("ascii")
+        bval: bytes = value.encode("ascii")
 
         try:
             # self.eyaml is untrusted, so shell must always be False and