Pass logger to ENC object execute method

Author: Kevin Paulisse

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

@@ -195,6 +195,7 @@ def install_directory_symlink(logger, dir, target = 'environments/production')
       def install_enc(logger)
         raise ArgumentError, 'A node must be specified when using an ENC' unless @node.is_a?(String)
         enc_obj = OctocatalogDiff::CatalogUtil::ENC.new(@options.merge(tempdir: @tempdir))
+        enc_obj.execute(logger)
         raise "Failed ENC: #{enc_obj.error_message}" if enc_obj.error_message
 
         enc_path = File.join(@tempdir, 'enc.sh')

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

@@ -33,18 +33,29 @@ def initialize(options = {})
 
       # Retrieve content
       # @return [String] ENC content, or nil if there was an error
-      def content
-        execute
+      def content(logger = nil)
+        execute(logger)
         @content ||= @enc_obj.content
       end
 
       # Retrieve error message
       # @return [String] Error message, or nil if there was no error
-      def error_message
-        execute
+      def error_message(logger = nil)
+        execute(logger)
         @error_message ||= @enc_obj.error_message
       end
 
+      # Execute the 'execute' method of the object, but only once
+      # @param [Logger] Logger (optional) - if not supplied any logger messages will be discarded
+      def execute(logger = nil)
+        return if @executed
+        logger ||= @options[:logger]
+        logger ||= Logger.new(StringIO.new)
+        @enc_obj.execute(logger) if @enc_obj.respond_to?(:execute)
+        @executed = true
+        override_enc_parameters(logger)
+      end
+
       private
 
       # Override of ENC parameters with parameters specified on the command line.
@@ -98,17 +109,6 @@ def backend
         # At this point we do not know what backend to use for the ENC
         raise ArgumentError, 'Unable to determine ENC backend to use'
       end
-
-      # Execute the 'execute' method of the object, but only once
-      # @param [Logger] Logger (optional) - if not supplied any logger messages will be discarded
-      def execute(logger = nil)
-        return if @executed
-        logger ||= @options[:logger]
-        logger ||= Logger.new(StringIO.new)
-        @enc_obj.execute(logger) if @enc_obj.respond_to?(:execute)
-        @executed = true
-        override_enc_parameters(logger)
-      end
     end
   end
 end