Merge pull request #255 from elfchief/enc_escape_fix

fix ENC 'echo' script template to prevent expansion

Author: jhongturney

lib/octocatalog-diff/catalog-util/builddir.rb

@@ -208,7 +208,7 @@ def install_enc(logger)
         enc_path = File.join(@tempdir, 'enc.sh')
         File.open(enc_path, 'w') do |f|
           f.write "#!/bin/sh\n"
-          f.write "cat <<-EOF\n"
+          f.write "cat <<-'EOF'\n"
           f.write enc_obj.content
           f.write "\nEOF\n"
         end

spec/octocatalog-diff/tests/catalog-util/builddir_spec.rb

@@ -796,7 +796,7 @@
         testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
         enc = File.join(testobj.tempdir, 'enc.sh')
         expect(File.file?(enc)).to eq(true)
-        expect(File.read(enc)).to eq("#!/bin/sh\ncat <<-EOF\n---\n\nEOF\n")
+        expect(File.read(enc)).to eq("#!/bin/sh\ncat <<-'EOF'\n---\n\nEOF\n")
       end
     end
 
@@ -807,7 +807,7 @@
         testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
         enc = File.join(testobj.tempdir, 'enc.sh')
         expect(File.file?(enc)).to eq(true)
-        expect(File.read(enc)).to eq("#!/bin/sh\ncat <<-EOF\n---\n\nEOF\n")
+        expect(File.read(enc)).to eq("#!/bin/sh\ncat <<-'EOF'\n---\n\nEOF\n")
       end
     end
 
@@ -818,7 +818,7 @@
         testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
         enc = File.join(testobj.tempdir, 'enc.sh')
         expect(File.file?(enc)).to eq(true)
-        expect(File.read(enc)).to eq("#!/bin/sh\ncat <<-EOF\n---\n\nEOF\n")
+        expect(File.read(enc)).to eq("#!/bin/sh\ncat <<-'EOF'\n---\n\nEOF\n")
       end
     end
 
@@ -838,7 +838,7 @@
         testobj = OctocatalogDiff::CatalogUtil::BuildDir.new(options, logger)
         enc = File.join(testobj.tempdir, 'enc.sh')
         expect(File.file?(enc)).to eq(true)
-        expect(File.read(enc)).to eq("#!/bin/sh\ncat <<-EOF\n---\nclasses:\n  foo: {}\nparameters: {}\n\nEOF\n")
+        expect(File.read(enc)).to eq("#!/bin/sh\ncat <<-'EOF'\n---\nclasses:\n  foo: {}\nparameters: {}\n\nEOF\n")
       end
     end
   end