ceedling 1.0.1 → 1.1.0

data/lib/ceedling/tasks_base.rake

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -32,8 +32,8 @@ end
 if (not PLUGINS_ENABLED.empty?)
 desc "Execute plugin result summaries (no build triggering)."
 task :summary do
-	@ceedling[:plugin_manager].summary
-  puts "\nNOTE: Summaries may be out of date with project sources.\n\n"
+  @ceedling[:loginator].console( "\nSummaries may be out of date with project sources.\n", LogLabels::NOTICE )
+  @ceedling[:plugin_manager].summary
 end
 end
 

data/lib/ceedling/tasks_filesystem.rake

@@ -1,12 +1,12 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
 # rather than require 'rake/clean' & try to override, we replicate for finer control
-CLEAN   = Rake::FileList["**/*~", "**/*.bak"]
+CLEAN   = Rake::FileList.new
 CLOBBER = Rake::FileList.new
 
 CLEAN.clear_exclude.exclude { |fn| fn.pathmap("%f") == 'core' && File.directory?(fn) }
@@ -35,8 +35,12 @@ REMOVE_FILE_PROC = Proc.new { |fn| rm_r fn rescue nil }
 desc "Delete all build artifacts and temporary products."
 task(:clean) do
   # because :clean is a prerequisite for :clobber, intelligently display the progress message
-  if (not @ceedling[:task_invoker].invoked?(/^clobber$/))
-    @ceedling[:loginator].log("\nCleaning build artifacts...\n(For large projects, this task may take a long time to complete)\n\n")
+  if (not @ceedling[:rake_invocation_tracker].invoked?(/^clobber$/))
+    @ceedling[:loginator].console(
+      "\nCleaning build artifacts...\n" +
+      "(For large projects, this task may take a long time to complete)\n\n",
+      LogLabels::NOTICE
+    )
   end
   CLEAN.each { |fn| REMOVE_FILE_PROC.call(fn) }
 end
@@ -44,7 +48,11 @@ end
 # redefine clobber so we can override how it advertises itself
 desc "Delete all generated files (and build artifacts)."
 task(:clobber => [:clean]) do
-  @ceedling[:loginator].log("\nClobbering all generated files...\n(For large projects, this task may take a long time to complete)\n\n")
+  @ceedling[:loginator].console(
+    "\nClobbering all generated files...\n" +
+    "(For large projects, this task may take a long time to complete)\n\n",
+    LogLabels::NOTICE
+  )
   CLOBBER.each { |fn| REMOVE_FILE_PROC.call(fn) }
 end
 
@@ -66,11 +74,12 @@ namespace :paths do
   paths.each do |name|
     desc "List all collected #{name} paths." if standard_paths.include?(name)
     task(name.to_sym) do
+      loginator = @ceedling[:loginator]
       path_list = Object.const_get("COLLECTION_PATHS_#{name.upcase}")
-      puts "#{name.capitalize} paths:#{' None' if path_list.size == 0}"
+      loginator.console( "\n#{name.capitalize} paths:#{' None' if path_list.size == 0}", LogLabels::TITLE )
       if path_list.size > 0
-        path_list.sort.each {|path| puts " - #{path}" }
-        puts "Path count: #{path_list.size}"
+        path_list.sort.each {|path| loginator.console(" • #{path}") }
+        loginator.console("Path count: #{path_list.size}\n\n")
       end
     end
   end
@@ -84,12 +93,13 @@ namespace :files do
   categories.each do |category|
     desc "List all collected #{category.chomp('s')} files."
     task(category.chomp('s').to_sym) do
+      loginator = @ceedling[:loginator]
       files_list = Object.const_get("COLLECTION_ALL_#{category.upcase}")
-      puts "#{category.chomp('s').capitalize} files:#{' None' if files_list.size == 0}"
+      loginator.console( "\n#{category.chomp('s').capitalize} files:#{' None' if files_list.size == 0}", LogLabels::TITLE )
       if files_list.size > 0
-        files_list.sort.each { |filepath| puts " - #{filepath}" }
-        puts "File count: #{files_list.size}"
-        puts "Note: This list sourced only from your project file, not from any build directive macros in test files."
+        files_list.sort.each { |filepath| loginator.console(" • #{filepath}") }
+        loginator.console("File count: #{files_list.size}")
+        loginator.console("\nThis list sourced only from your project file, not from any build directive macros in test files.\n\n", LogLabels::NOTICE)
       end
     end
   end

data/lib/ceedling/tasks_release.rake

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -9,26 +9,19 @@ require 'ceedling/constants'
 require 'ceedling/file_path_utils'
 
 
-desc "Build release target."
-task RELEASE_SYM => [:prepare] do
-  header = "Release build '#{File.basename( PROJECT_RELEASE_BUILD_TARGET )}'"
+desc "Build release target"
+task RELEASE_SYM => [:prepare] do  
+  begin
+    timestamp_s = SystemWrapper.time_stopwatch_s()
+    @ceedling[:plugin_manager].pre_release_build( timestamp_s )
 
-  banner = @ceedling[:reportinator].generate_banner( header )
+    objects = @ceedling[:release_invoker].collect_release_build_objects()
 
-  @ceedling[:loginator].log( banner )
-  
-  begin
-    @ceedling[:plugin_manager].pre_release
+    @ceedling[:release_invoker].setup_and_invoke_objects( objects )
 
-    core_objects  = []
-    extra_objects = @ceedling[:file_path_utils].form_release_build_objects_filelist( COLLECTION_RELEASE_ARTIFACT_EXTRA_LINK_OBJECTS )
+    file( PROJECT_RELEASE_BUILD_TARGET => (objects) )
 
-    core_objects.concat( @ceedling[:release_invoker].setup_and_invoke_objects( COLLECTION_RELEASE_BUILD_INPUT ) )
-  
-    # If we're using libraries, we need to add those to our collection as well
-    library_objects = (defined? LIBRARIES_RELEASE && !LIBRARIES_RELEASE.empty?) ? LIBRARIES_RELEASE.flatten.compact : []
-    file( PROJECT_RELEASE_BUILD_TARGET => (core_objects + extra_objects + library_objects) )
-    Rake::Task[PROJECT_RELEASE_BUILD_TARGET].invoke()
+    @ceedling[:release_invoker].setup_and_invoke_binary( PROJECT_RELEASE_BUILD_TARGET )
 
   rescue StandardError => ex
     @ceedling[:application].register_build_failure
@@ -38,6 +31,6 @@ task RELEASE_SYM => [:prepare] do
     # Debug backtrace (only if debug verbosity)
     @ceedling[:loginator].log_debug_backtrace( ex )
   ensure
-    @ceedling[:plugin_manager].post_release  
+    @ceedling[:plugin_manager].post_release_build( SystemWrapper.time_stopwatch_s() )
   end
 end

data/lib/ceedling/tasks_tests.rake

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 

data/lib/ceedling/test_context_extractor.rb

@@ -1,28 +1,53 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
 require 'ceedling/exceptions'
+require 'ceedling/partials/partials'
 require 'ceedling/file_path_utils'
-require 'ceedling/generator_test_runner' # From lib/ not vendor/unity/auto
+require 'ceedling/generators/generator_test_runner' # From lib/ not vendor/unity/auto
 require 'ceedling/encodinator'
 
 class TestContextExtractor
 
-  constructor :configurator, :file_wrapper, :loginator, :parsing_parcels
+  # Context extraction options
+  module Context
+    BUILD_DIRECTIVE_INCLUDE_PATHS = :build_directive_include_paths unless const_defined?(:BUILD_DIRECTIVE_INCLUDE_PATHS)
+    BUILD_DIRECTIVE_SOURCE_FILES  = :build_directive_source_files  unless const_defined?(:BUILD_DIRECTIVE_SOURCE_FILES)
+    INCLUDES                      = :includes                      unless const_defined?(:INCLUDES)
+    TEST_RUNNER_DETAILS           = :test_runner_details           unless const_defined?(:TEST_RUNNER_DETAILS)
+    PARTIALS_CONFIGURATION        = :partials_configuration        unless const_defined?(:PARTIALS_CONFIGURATION)
+    
+    ALL = [
+      BUILD_DIRECTIVE_INCLUDE_PATHS,
+      BUILD_DIRECTIVE_SOURCE_FILES,
+      INCLUDES,
+      TEST_RUNNER_DETAILS,
+      PARTIALS_CONFIGURATION
+    ].freeze unless const_defined?(:ALL)
+  end
+
+  constructor(
+    :configurator,
+    :parsing_parcels,
+    :include_factory,
+    :partializer_config,
+    :file_path_utils,
+    :file_wrapper,
+    :loginator
+  )
 
   def setup
     # Per test-file lookup hashes
-    @all_header_includes = {} # Full list of all headers from test #include statements
-    @header_includes     = {} # List of all headers minus mocks & framework files
-    @source_includes     = {} # List of C files #include'd in a test file
-    @source_extras       = {} # C source files outside of header convention added to test build by TEST_SOURCE_FILE()
+    @header_includes     = {} # Full list of all headers as Include objects from #include statements
+    @source_includes     = {} # List of C files #include'd in a test file as Include objects
+    @source_extras       = {} # List of C source files as strings outside of header convention added to test build by TEST_SOURCE_FILE()
     @test_runner_details = {} # Test case lists & Unity runner generator instances
-    @mocks               = {} # List of mocks by name without header file extension
-    @include_paths       = {} # Additional search paths added to a test build via TEST_INCLUDE_PATH()
+    @partials_config     = {} # Hash of module_name => PartializerConfig::Config structs per test file
+    @include_paths       = {} # List of additional search paths as strings added to a test build via TEST_INCLUDE_PATH()
     
     # Arrays
     @all_include_paths   = [] # List of all search paths added through individual test files using TEST_INCLUDE_PATH()
@@ -30,58 +55,77 @@ class TestContextExtractor
     @lock = Mutex.new
   end
 
-  # `input` must have the interface of IO -- StringIO for testing or File in typical use
-  def collect_simple_context( filepath, input, *args )
-    all_options = [
-      :build_directive_include_paths,
-      :build_directive_source_files,
-      :includes,
-      :test_runner_details
-    ]
+  # Reads through a file's content line by line to extract relevant information by context.
+  # `content_filepath` is the file to be read (could be preprocessed version of test file).
+  # `source_fileapth` is the test filepath to use for results storage and lookup.
+  # `*args` is a list of context symbols.
+  # If `source_filepath` is not provided, then `content_filepath` is used for results storage and lookup.
+  def collect_simple_context_from_file( content_filepath, source_filepath, *args )
+    # Load content_filepath
+    @file_wrapper.open( content_filepath, 'r' ) do |input|
+      collect_context(
+        # Use source_filepath if provided, else use content_filepath
+        (source_filepath.nil? ? content_filepath : source_filepath),
+        input,
+        *args
+      )
+    end
+  end
 
+  # Reads through IO interface line by line to extract relevant information by context.
+  # `*args` is a list of context symbols.
+  # `input` must have the interface of IO -- StringIO for testing or File in typical use.
+  def collect_context( filepath, input, *args )
     # Code error check--bad context symbol argument
     args.each do |context|
-      next if context == :all
       msg = "Unrecognized test context for collection :#{context}"
-      raise CeedlingException.new( msg ) if !all_options.include?( context )
+      raise CeedlingException.new( msg ) if !Context::ALL.include?( context )
     end
 
-    # Handle the :all shortcut to redefine list to include all contexts
-    args = all_options if args.include?( :all )
-
     include_paths = []
     source_extras = []
     includes = []
+    partials_config = {}
 
     @parsing_parcels.code_lines( input ) do |line|
-      if args.include?( :build_directive_include_paths )
+      if args.include?( Context::BUILD_DIRECTIVE_INCLUDE_PATHS )
         # Scan for build directives: TEST_INCLUDE_PATH()
         include_paths += extract_build_directive_include_paths( line )
       end
 
-      if args.include?( :build_directive_source_files )
+      if args.include?( Context::BUILD_DIRECTIVE_SOURCE_FILES )
         # Scan for build directives: TEST_SOURCE_FILE()
         source_extras += extract_build_directive_source_files( line )
       end
 
-      if args.include?( :includes )
+      if args.include?( Context::INCLUDES )
         # Scan for contents of #include directives
         includes += _extract_includes( line )
       end
     end
 
-    collect_build_directive_include_paths( filepath, include_paths ) if args.include?( :build_directive_include_paths )
-    collect_build_directive_source_files( filepath, source_extras ) if args.include?( :build_directive_source_files )
-    collect_includes( filepath, includes ) if args.include?( :includes )
-
+    collect_build_directive_include_paths( filepath, include_paths ) if !include_paths.empty?
+    collect_build_directive_source_files( filepath, source_extras ) if !source_extras.empty?
+  
     # Different code processing pattern for test runner
-    if args.include?( :test_runner_details )
+    if args.include?( Context::TEST_RUNNER_DETAILS )
       # Go back to beginning of IO object for a full string extraction
       input.rewind()
 
       # Ultimately, we rely on Unity's runner generator that processes file contents as a single string
-      _collect_test_runner_details( filepath, input.read() )
+      _collect_test_runner_details( filepath, input.read().clean_encoding )
     end
+  
+    if args.include?( Context::PARTIALS_CONFIGURATION )
+      # Go back to beginning of IO object for a full string extraction
+      input.rewind()
+
+      # Scan for Partials configuration directive macros
+      partials_config = _extract_partials_config( input.read.clean_encoding )
+      collect_partials_configuration( filepath, partials_config ) if !partials_config.empty?
+    end  
+
+    collect_includes( filepath, partials_config, includes ) if (!includes.empty? or !partials_config.empty?)
   end
 
   def collect_test_runner_details(test_filepath, input_filepath=nil)
@@ -93,28 +137,8 @@ class TestContextExtractor
     )
   end
 
-  # Scan for all includes.
-  # Unlike other extract() calls, extract_includes() is public to be called externally.
-  # `input` must have the interface of IO -- StringIO for testing or File in typical use  
-  def extract_includes(input)
-    includes = []
-
-    @parsing_parcels.code_lines( input ) {|line| includes += _extract_includes( line ) }
-
-    return includes.uniq
-  end
-
-  # All header includes .h of test file
-  def lookup_full_header_includes_list(filepath)
-    val = nil
-    @lock.synchronize do
-      val = @all_header_includes[form_file_key( filepath )] || []
-    end
-    return val
-  end
-
-  # Header includes .h (minus mocks & framework headers) in test file
-  def lookup_header_includes_list(filepath)
+  # All header includes .h as list of Include objects of test file
+  def lookup_all_header_includes_list(filepath)
     val = nil
     @lock.synchronize do
       val = @header_includes[form_file_key( filepath )] || []
@@ -131,7 +155,7 @@ class TestContextExtractor
     return val
   end
 
-  # Source C includes within test file
+  # Source C includes as list of Include objects within test file
   def lookup_source_includes_list(filepath)
     val = nil
     @lock.synchronize do
@@ -140,7 +164,7 @@ class TestContextExtractor
     return val
   end
 
-  # Source extras via TEST_SOURCE_FILE() within test file
+  # Source extras as list of string via TEST_SOURCE_FILE() within test file
   def lookup_build_directive_sources_list(filepath)
     val = nil
     @lock.synchronize do
@@ -149,6 +173,7 @@ class TestContextExtractor
     return val
   end
 
+  # Test case names as list of strings
   def lookup_test_cases(filepath)
     val = []
     @lock.synchronize do
@@ -160,6 +185,7 @@ class TestContextExtractor
     return val
   end
 
+  # Fetch Unity runner generator instance for test file
   def lookup_test_runner_generator(filepath)
     val = nil
     @lock.synchronize do
@@ -171,16 +197,30 @@ class TestContextExtractor
     return val
   end
 
-  # Mocks within test file with no file extension
-  def lookup_raw_mock_list(filepath)
+  # Mocks within test file header includes list as list of MockInclude objects
+  def lookup_mock_header_includes_list(filepath)
+    includes = lookup_all_header_includes_list(filepath)
+    return includes.select { |include| include.is_a?( MockInclude ) }
+  end
+
+  # Test file header includes list minus mocks as list of Include objects
+  def lookup_nonmock_header_includes_list(filepath)
+    includes = lookup_all_header_includes_list(filepath)
+    return includes.reject { |include| include.is_a?( MockInclude ) }
+  end
+
+  # List of single item hashes for Partials configuration by test name
+  # { <Partial type symbol> => <Module name string> }
+  def lookup_partials_config(filepath)
     val = nil
     @lock.synchronize do
-      val = @mocks[form_file_key( filepath )] || []
+      val = @partials_config[form_file_key( filepath )] || {}
     end
     return val
   end
 
-  def lookup_all_include_paths
+  # Full list of all search paths added through individual test files using TEST_INCLUDE_PATH()
+  def lookup_all_include_paths()
     val = nil
     @lock.synchronize do
       val = @all_include_paths.uniq
@@ -188,7 +228,7 @@ class TestContextExtractor
     return val
   end
 
-  def inspect_include_paths
+  def inspect_include_paths()
     @lock.synchronize do
       @include_paths.each { |test, paths| yield test, paths }
     end
@@ -196,54 +236,45 @@ class TestContextExtractor
 
   # Unlike other ingest() calls, ingest_includes() can be called externally.
   def ingest_includes(filepath, includes)
-    mock_prefix = @configurator.cmock_mock_prefix
-    file_key    = form_file_key( filepath )
+    _includes = Includes.sanitize(includes)
+
+    file_key = form_file_key( filepath )
     
-    mocks       = []
-    all_headers = []
-    headers     = []
-    sources     = []
+    headers = []
+    sources = []
 
-    includes.each do |include|
+    # Processing list of UserInclude and/or SystemInclude
+    _includes.each do |include|
       # <*.h>
-      if include =~ /#{Regexp.escape(@configurator.extension_header)}$/
-        # Check if include is a mock with regex match that extracts only mock name (no .h)
-        scan_results = include.scan(/(#{mock_prefix}.+)#{Regexp.escape(@configurator.extension_header)}/)
-        
-        if (scan_results.size > 0)
-          # Collect mock name
-          mocks << scan_results[0][0]
-        else
-          # If not a mock or framework file, collect tailored header filename
-          headers << include unless VENDORS_FILES.include?( include.ext('') )
-        end
-
+      if include.filename =~ /#{Regexp.escape(@configurator.extension_header)}$/
         # Add to .h includes list
-        all_headers << include
-      # <*.c>
-      elsif include =~ /#{Regexp.escape(@configurator.extension_source)}$/
+        headers << include
+      elsif include.filename =~ /#{Regexp.escape(@configurator.extension_source)}$/
         # Add to .c includes list
         sources << include
       end
     end
 
     @lock.synchronize do
-      @mocks[file_key] = mocks
-      @all_header_includes[file_key] = all_headers
       @header_includes[file_key] = headers
       @source_includes[file_key] = sources
     end
+
+    return _includes
   end
 
   private #################################
 
   def collect_build_directive_source_files(filepath, files)
-    ingest_build_directive_source_files( filepath, files.uniq )
+    _files = files.compact
+    _files.uniq!
+
+    ingest_build_directive_source_files( filepath, _files )
 
     debug_log_list(
       "Extra source files found via TEST_SOURCE_FILE()",
       filepath,
-      files
+      _files
     )
   end
 
@@ -257,16 +288,47 @@ class TestContextExtractor
     )
   end
 
-  def collect_includes(filepath, includes)
-    ingest_includes( filepath, includes.uniq )
-    debug_log_list( "#includes found", filepath, includes )
+  def collect_includes(filepath, partials_config, includes)
+    # Squeeze out any nil elements
+    includes.compact!
+
+    # `partials_config` is a hash of module_name => PartializerConfig::Config.
+    partials_config.each do |_module, config|
+      if config.tests.present?
+        filename = @file_path_utils.form_partial_implementation_header_filename( _module )
+        includes << @include_factory.user_include_from_filepath( filename )
+      end
+
+      if config.mocks.present?
+        filename = @file_path_utils.form_mock_partial_interface_header_filename( _module )
+        includes << @include_factory.user_include_from_filepath( filename )
+      end
+    end
+
+    # `ingest_includes()` does some housekeeping on the list
+    _includes = ingest_includes( filepath, includes )
+
+    debug_log_list( "#includes found", filepath, _includes )
+  end
+
+  def collect_partials_configuration(filepath, partials_config)
+    ingest_partials_configuration(filepath, partials_config)
+
+    debug_lines = partials_config.map do |_module, config|
+      t = config.tests
+      m = config.mocks
+      "#{_module}: tests(type=#{t.type} +#{t.additions} -#{t.subtractions}) " \
+      "mocks(type=#{m.type} +#{m.additions} -#{m.subtractions})"
+    end
+    debug_log_list( "Partials configurations found", filepath, debug_lines )
   end
 
   def _collect_test_runner_details(filepath, test_content, input_content=nil)
     unity_test_runner_generator = GeneratorTestRunner.new(
       config: @configurator.get_runner_config,
       test_file_contents: test_content,
-      preprocessed_file_contents: input_content
+      preprocessed_file_contents: input_content,
+      parsing_parcels: @parsing_parcels
     )
 
     ingest_test_runner_details(
@@ -275,9 +337,9 @@ class TestContextExtractor
     )
 
     test_cases = unity_test_runner_generator.test_cases
-    test_cases = test_cases.map {|test_case| "#{test_case[:line_number]}:#{test_case[:test]}()" }
+    test_cases = test_cases.map {|test_case| "#{test_case[:test]}(): #{test_case[:line_number]}" }
 
-    debug_log_list( "Test cases found ", filepath, test_cases )
+    debug_log_list( "Test cases with line numbers found", filepath, test_cases )
   end
 
   def extract_build_directive_source_files(line)
@@ -286,7 +348,7 @@ class TestContextExtractor
     # Look for TEST_SOURCE_FILE("<*>") statement
     results = line.scan(PATTERNS::TEST_SOURCE_FILE)
     results.each do |result|
-      source_extras << FilePathUtils.standardize( result[0] )
+      source_extras << FilePathUtils.standardize_in_place( result[0] )
     end
 
     return source_extras
@@ -298,7 +360,7 @@ class TestContextExtractor
     # Look for TEST_INCLUDE_PATH("<*>") statements
     results = line.scan(PATTERNS::TEST_INCLUDE_PATH)
     results.each do |result|
-      include_paths << FilePathUtils.standardize( result[0] )
+      include_paths << FilePathUtils.standardize_in_place( result[0] )
     end
 
     return include_paths
@@ -307,13 +369,20 @@ class TestContextExtractor
   def _extract_includes(line)
     includes = []
 
-    # Look for #include statements
-    results = line.match(/#\s*include\s+\"\s*((\w|\.)+)\s*\"/)
-    includes << results[1] if !results.nil?
+    _include = @include_factory.system_include_from_directive( line )
+    includes << _include if !_include.nil?
 
+    # All of the UserInclude types
+    _include = @include_factory.user_include_from_directive( line )
+    includes << _include if !_include.nil?
+  
     return includes
   end
 
+  def _extract_partials_config(content)
+    @partializer_config.extract_configs(content)
+  end
+
   ##
   ## Data structure management ingest methods
   ##
@@ -353,6 +422,16 @@ class TestContextExtractor
     end
   end
 
+  def ingest_partials_configuration(filepath, partials_config)
+    return if partials_config.empty?
+    
+    key = form_file_key( filepath )
+
+    @lock.synchronize do
+      @partials_config[key] = partials_config
+    end
+  end 
+
   ##
   ## Utility methods
   ##
@@ -362,18 +441,8 @@ class TestContextExtractor
   end
 
   def debug_log_list(message, filepath, list)
-    msg = "#{message} in #{filepath}:"
-    if list.empty?
-      msg += " <none>"
-    else
-      msg += "\n"
-      list.each do |item|
-        msg += " - #{item}\n"
-      end
-    end
-
-    @loginator.log( msg, Verbosity::DEBUG )
-    @loginator.log( '', Verbosity::DEBUG )
+    header = "#{message} in #{filepath}:"
+    @loginator.log_list( list, header, Verbosity::DEBUG )
   end
 
 end