ceedling 1.0.1 → 1.1.0

data/lib/ceedling/encodinator.rb

@@ -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/erb_wrapper.rb

@@ -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/exceptions.rb

@@ -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
 # =========================================================================
 
@@ -13,6 +13,22 @@ class CeedlingException < RuntimeError
 end
 
 
+class YamlLoadException < CeedlingException
+
+  attr_reader :reason, :source, :original_error
+
+  # reason: :syntax (malformed YAML), :unsafe (Psych safe_load rejected a disallowed type),
+  #         :incompatible (installed Psych's safe_load interface doesn't support a required
+  #         feature/argument), :not_found (source file doesn't exist)
+  def initialize(reason:, source:, original_error:, message:)
+    @reason         = reason
+    @source         = source
+    @original_error = original_error
+    super( message )
+  end
+end
+
+
 class ShellException < CeedlingException
 
   attr_reader :shell_result
@@ -33,12 +49,16 @@ class ShellException < CeedlingException
       _message = "#{name} terminated with exit code [#{shell_result[:exit_code]}]"
 
       if !shell_result[:output].empty?
-        _message += " and output >>\n#{shell_result[:output].strip()}"
+        _message += " and output ⏩️\n#{shell_result[:output].strip()}"
+      end
+
+      if !message.empty?
+        _message += "\n#{message}"
       end
 
     # Otherwise, just report the exception message
     else
-      _message = "#{name} encountered an error with output >>\n#{message}"
+      _message = "#{name} encountered an error with output ⏩️\n#{message}"
     end
 
     # Hand the message off to parent Exception

data/lib/ceedling/file_finder.rb

@@ -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
 # =========================================================================
 
@@ -14,15 +14,20 @@ class FileFinder
   constructor :configurator, :file_finder_helper, :cacheinator, :file_path_utils, :file_wrapper, :yaml_wrapper
 
 
-  def find_header_input_for_mock(mock_name)
-    # Mock name => <mock prefix><header filename without extension>
-    # Examples: 'Mockfoo' or 'mock_Bar'
+  def find_header_input_for_mock(mock)
+    # Mock name => <mock prefix><header filename (.h)>
+    # Examples: 'Mockfoo.h' or 'mock_Bar.h'
     # Note: In some rare cases, a mock name may include a dot (ex. Sensor.44) because of versioning file naming convention
     #       Be careful about assuming the end of the name has any sort of file extension
 
-    header = mock_name.sub(/#{@configurator.cmock_mock_prefix}/, '') + @configurator.extension_header
+    header = mock.delete_prefix(@configurator.cmock_mock_prefix)
 
-    found_path = @file_finder_helper.find_file_in_collection(header, @configurator.collection_all_headers, :error, mock_name)
+    found_path = @file_finder_helper.find_file_in_collection(
+      header,
+      @configurator.collection_all_headers,
+      :error,
+      header.ext()
+    )
 
     return found_path
   end
@@ -52,7 +57,7 @@ class FileFinder
 
     found_file = nil
 
-    # Strip off file extension
+    # Extract filename without file extension
     source_file = File.basename(filepath).ext('')
 
     # We only collect files that already exist when we start up.
@@ -65,7 +70,8 @@ class FileFinder
     #       If we use .ext() below we'll clobber the dotted portion of the filename
 
     # Generated test runners
-    if (!release) and (source_file =~ /^#{@configurator.project_test_file_prefix}.+#{@configurator.test_runner_file_suffix}$/)
+    if (!release) and
+       (source_file =~ /^#{Regexp.escape(@configurator.project_test_file_prefix)}.+#{Regexp.escape(@configurator.test_runner_file_suffix)}$/)
       _source_file = source_file + EXTENSION_CORE_SOURCE
       found_file =
         @file_finder_helper.find_file_in_collection(
@@ -75,12 +81,30 @@ class FileFinder
           filepath)
 
     # Generated mocks
-    elsif (!release) and (source_file =~ /^#{@configurator.cmock_mock_prefix}/)
+    elsif (!release) and 
+          (source_file.start_with?( @configurator.cmock_mock_prefix ))
       _source_file = source_file + EXTENSION_CORE_SOURCE
       found_file =
         @file_finder_helper.find_file_in_collection(
           _source_file,
-          @file_wrapper.directory_listing( File.join(@configurator.cmock_mock_path, '**/*') ),
+          @file_wrapper.directory_listing(
+            File.join(@configurator.cmock_mock_path,
+            ('**/*' + EXTENSION_CORE_SOURCE))
+          ),
+          complain,
+          filepath)
+
+    # Generated partials
+    elsif (!release) and 
+          (source_file.start_with?( PARTIAL_FILENAME_PREFIX ))
+      _source_file = source_file + EXTENSION_CORE_SOURCE
+      found_file =
+        @file_finder_helper.find_file_in_collection(
+          _source_file,
+          @file_wrapper.directory_listing(
+            File.join(@configurator.project_test_partials_path,
+            ('**/*' + EXTENSION_CORE_SOURCE))
+          ),
           complain,
           filepath)
 
@@ -165,6 +189,11 @@ class FileFinder
   end
 
 
+  def find_header_file(filepath, complain = :error)
+    header_file = File.basename(filepath).ext(@configurator.extension_header)
+    return @file_finder_helper.find_file_in_collection(header_file, @configurator.collection_all_headers, complain, filepath)
+  end
+
   def find_source_file(filepath, complain = :error)
     source_file = File.basename(filepath).ext(@configurator.extension_source)
     return @file_finder_helper.find_file_in_collection(source_file, @configurator.collection_all_source, complain, filepath)

data/lib/ceedling/file_finder_helper.rb

@@ -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
 # =========================================================================
 
@@ -16,7 +16,7 @@ class FileFinderHelper
   
   def find_file_in_collection(filename, file_list, complain, original_filepath="")
     # Search our collection for the specified base filename
-    matches = file_list.find_all {|v| File.basename(v) == filename }
+    matches = file_list.find_all {|v| File.basename(v) == File.basename(filename) }
     
     case matches.length 
       when 0 

data/lib/ceedling/file_path_collection_utils.rb

@@ -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
 # =========================================================================
 
@@ -23,13 +23,16 @@ class FilePathCollectionUtils
 
   # Build up a directory path list from one or more strings or arrays of (+:/-:) simple paths & globs
   def collect_paths(paths)
+    # Nil input (e.g. unconfigured section) is treated as an empty list
+    return [] if paths.nil?
+
     plus  = Set.new # All real, expanded directory paths to add
     minus = Set.new # All real, expanded paths to exclude
-    
+
     # Iterate each path possibly decorated with aggregation modifiers and/or containing glob characters
     paths.each do |path|
       dirs = [] # Working list for evaluated directory paths
-    
+
       # Get path stripped of any +:/-: aggregation modifier
       _path = FilePathUtils.no_aggregation_decorators( path )
 
@@ -45,12 +48,15 @@ class FilePathCollectionUtils
         # Previous validation has already made warnings about filepaths in the list
         dirs << entry if @file_wrapper.directory?(entry)
       end
-      
+
       # For recursive directory glob at end of a path, collect parent directories too.
       # Ceedling's recursive glob convention includes parent directories (unlike Ruby's glob).
-      if path.end_with?('/**') or path.end_with?('/*')
+      # Use _path (decorator-stripped) so the suffix check is not sensitive to +:/-: prefix format.
+      # path.end_with? also works today (decorators are always prefixes, never suffixes),
+      # but _path expresses the correct intent and removes the implicit coupling.
+      if _path.end_with?('/**') or _path.end_with?('/*')
         parents = []
-        
+
         dirs.each {|dir| parents << File.join(dir, '..')}
 
         # Handle edge case of subdirectory glob but no subdirectories and therefore no parents
@@ -75,11 +81,12 @@ class FilePathCollectionUtils
       end
     end
 
-    # Use Set subtraction operator to remove any excluded paths
-    paths = (plus - minus).to_a
-    paths.map! {|path| shortest_path_from_working(path) }
+    # Collect the final set as an array and convert each absolute path to the shortest
+    # relative form from the working directory.
+    result = (plus - minus).to_a
+    result.map! {|path| shortest_path_from_working(path) }
 
-    return paths
+    return result
   end
 
 
@@ -88,24 +95,28 @@ class FilePathCollectionUtils
   # So, we rebuild the FileList ourselves and return it.
   # TODO: Replace FileList with our own, better version.
   def revise_filelist(list, revisions)
-    plus  = Set.new # All real, expanded directory paths to add
-    minus = Set.new # All real, expanded paths to exclude
-    
-    # Build base plus set for revised path
+    # Nil list produces an empty FileList; nil revisions leaves the list unchanged
+    return FileList.new([]) if list.nil?
+    revisions ||= []
+
+    plus  = Set.new # All real, expanded file paths to add
+    minus = Set.new # All real, expanded file paths to exclude
+
+    # Build base plus set: expand all existing list entries to absolute paths
     list.each do |path|
-      # Start with expanding all list entries to absolute paths
       plus << File.expand_path( path )
     end
 
     revisions.each do |revision|
       # Include or exclude revisions in file list
       path = FilePathUtils.no_aggregation_decorators( revision )
-      
+
       # Working list of revisions
       filepaths = []
 
-      # Expand path by pattern as needed and add only filepaths to working list
-      @file_wrapper.directory_listing( path ).each do |entry|
+      # Expand path by pattern as needed and add only filepaths to working list.
+      # Sort for deterministic ordering — see collect_paths and Github Issue #860
+      @file_wrapper.directory_listing( path ).sort.each do |entry|
         filepaths << File.expand_path( entry ) if !@file_wrapper.directory?( entry )
       end
 
@@ -117,11 +128,14 @@ class FilePathCollectionUtils
       end
     end
 
-    # Use Set subtraction operator to remove any excluded paths
-    paths = (plus - minus).to_a
-    paths.map! {|path| shortest_path_from_working(path) }
+    # Collect the final set as an array and convert each absolute path to the shortest
+    # relative form from the working directory.
+    result_paths = (plus - minus).to_a
+    result_paths.map! {|path| shortest_path_from_working(path) }
 
-    return FileList.new( paths )
+    result = FileList.new( result_paths )
+    result.resolve()  # Force expansion to prevent race conditions in threaded context
+    return result
   end
 
   def shortest_path_from_working(path)
@@ -130,7 +144,7 @@ class FilePathCollectionUtils
       (Pathname.new( path ).relative_path_from( @working_dir_path )).to_s
     rescue StandardError
       # If we can't form a relative path between these paths, use the absolute
-      path 
+      path
     end
   end
 

data/lib/ceedling/file_path_utils.rb

@@ -1,13 +1,14 @@
 # =========================================================================
 #   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 'rubygems'
 require 'rake' # for ext()
 require 'fileutils'
+require 'ceedling/exceptions'
 require 'ceedling/system_wrapper'
 require 'ceedling/constants'
 
@@ -25,9 +26,11 @@ class FilePathUtils
 
   ######### Class methods ##########
 
-  # Standardize path to use '/' path separator & have no trailing path separator
-  def self.standardize(path)
+  # Standardize path to use '/' separator & have no trailing separator. Mutates in place.
+  # Frozen strings are a programming error at the call site — raises CeedlingException.
+  def self.standardize_in_place(path)
     if path.is_a? String
+      raise CeedlingException.new("Attempted to standardize path in frozen string ⏩️ #{path.inspect}") if path.frozen?
       path.strip!
       path.gsub!(/\\/, '/')
       path.chomp!('/')
@@ -36,11 +39,11 @@ class FilePathUtils
   end
 
   def self.os_executable_ext(executable)
-    return executable.ext('.exe') if SystemWrapper.windows?
+    return executable.ext( EXTENSION_WIN_EXE ) if SystemWrapper.windows?
     return executable
   end
 
-  # Extract path from between optional aggregation modifiers 
+  # Extract path from between optional aggregation modifiers
   # and up to last path separator before glob specifiers.
   # Examples:
   #  - '+:foo/bar/baz/'       => 'foo/bar/baz'
@@ -48,7 +51,10 @@ class FilePathUtils
   #  - 'foo/bar/baz/'         => 'foo/bar/baz'
   #  - 'foo/bar/baz/file.x'   => 'foo/bar/baz/file.x'
   #  - 'foo/bar/baz/file*.x'  => 'foo/bar/baz'
+  # NOTE: Input is assumed to use forward slashes; backslash paths must be normalized by caller.
   def self.no_decorators(path)
+    return '' if path.nil?
+
     path = self.no_aggregation_decorators(path)
 
     # Find first occurrence of glob specifier: *, ?, {, }, [, ]
@@ -58,42 +64,82 @@ class FilePathUtils
     return '' if find_index == 0
 
     # If path contains no glob, clean it up and return whole path
-    return path.chomp('/') if (find_index.nil?)
+    return path.chomp('/') if find_index.nil?
 
     # Extract up to first glob specifier
     path = path[0..(find_index-1)]
 
-    # Keep everything from start of path string up to and 
-    # including final path separator before glob character
+    # Keep everything up to and including the final path separator before the glob.
+    # Three cases for the separator position:
+    #   nil  — no separator at all (e.g. 'src*.c'): no usable directory prefix
+    #   0    — separator is at position 0 (e.g. '/*.c'): root directory
+    #   else — separator somewhere in the middle: slice off the trailing segment
     find_index = path.rindex('/')
-    return path[0..(find_index-1)] if (not find_index.nil?)
-
-    # Otherwise, return empty string
-    # (Not enough of a usable path exists free of glob operators)
-    return ''
+    return '' if find_index.nil?
+    return '/' if find_index == 0
+    return path[0..(find_index-1)]
   end
 
-  # Return whether the given path is to be aggregated (no aggregation modifier defaults to same as +:)
+  # Return whether the given path is to be aggregated (no aggregation modifier defaults to same as +:).
+  # nil is treated as an additive (non-excluding) path.
   def self.add_path?(path)
+    return true if path.nil?
     return !path.strip.start_with?('-:')
   end
 
-  # Get path (and glob) lopping off optional +: / -: prefixed aggregation modifiers
+  # Get path (and glob) stripping optional +: / -: prefixed aggregation modifiers.
+  # Strip surrounding whitespace before the regex so a decorator preceded by whitespace
+  # (e.g. '  -:foo') is handled consistently with add_path?, which also strips first.
   def self.no_aggregation_decorators(path)
-    return path.sub(/^(\+|-):/, '').strip()
+    return '' if path.nil?
+    return path.strip.sub(/^(\+|-):/, '').strip()
   end
 
-  # To recurse through all subdirectories, the RUby glob is <dir>/**/**, but our paths use
+  # To recurse through all subdirectories, the Ruby glob is <dir>/**/**, but our paths use
   # convenience convention of only <dir>/** at tail end of a path.
+  # Paths with ** at non-tail positions (e.g. foo/**/bar) are left unchanged by design.
   def self.reform_subdirectory_glob(path)
+    return '' if path.nil?
     return path if path.end_with?( '/**/**' )
     return path + '/**' if path.end_with?( '/**' )
     return path
   end
 
-  ######### instance methods ##########
+  # Reduce a list of directory paths to the minimal ancestor set by removing any path
+  # that is already a descendant of another path in the list. This shortens command
+  # lines when a path list contains both a parent and a child directory.
+  #
+  # Examples:
+  #   ['src', 'src/platform', 'lib']   =>  ['src', 'lib']
+  #   ['a/b', 'a/c', 'a']             =>  ['a']
+  #   ['src', 'lib/core', 'lib/utils'] =>  ['src', 'lib/core', 'lib/utils']  (unchanged)
+  #
+  # Comparison uses forward-slash-normalized copies; returned paths preserve the original
+  # form supplied by the caller.
+  def self.collapse_to_common_parents(paths)
+    return paths if paths.nil? || paths.length <= 1
+
+    # Pair each original path with a normalized form used only for ancestry comparison.
+    # Normalize to forward slashes and strip any trailing separator.
+    pairs = paths.map { |p| [p, p.gsub('\\', '/').chomp('/')] }
+
+    # Sort shallowest-first so ancestors are always encountered before their descendants.
+    pairs.sort_by! { |_, normalized| normalized.count('/') }
+
+    kept = []
+    pairs.each do |original, normalized|
+      # Skip this path if any already-kept path is a proper ancestor of it.
+      next if kept.any? { |_, k| normalized.start_with?(k + '/') }
+      kept << [original, normalized]
+    end
+
+    kept.map { |original, _| original }
+  end
+
 
-  ### release ###
+  ######### Instance methods ##########
+
+  ### Release ###
   def form_release_build_cache_path(filepath)
     return File.join( @configurator.project_release_build_cache_path, File.basename(filepath) )
   end
@@ -116,12 +162,72 @@ class FilePathUtils
 
   ### Tests ###
 
-  def form_test_build_cache_path(filepath)
-    return File.join( @configurator.project_test_build_cache_path, File.basename(filepath) )
+  def form_test_build_path(name, context: nil)
+    form_build_context_path(BUILD_OUT_DIR, name: name, context: context)
+  end
+
+  def form_test_object_filepath(filepath, name: nil, context: nil)
+    File.join(
+      form_build_context_path(BUILD_OUT_DIR, name: name, context: context),
+      File.basename(filepath).ext(@configurator.extension_object)
+    )
+  end
+
+  def form_test_results_path(name = nil, context: nil)
+    form_build_context_path(BUILD_RESULTS_DIR, context: context)
+  end
+
+  # Forms the filepath for the gdb backtrace log for a given test case.
+  # Produces: <project_log_path>/<context>/<test>/<name>.gdb.log
+  def form_test_gdb_log(test, context:, name:)
+    parts = [@configurator.project_log_path]
+    parts << context.to_s
+    parts << test
+    parts << "#{name}.gdb.log"
+    File.join( *parts )
+  end
+
+  def form_test_dependencies_path(name, context: nil)
+    form_build_context_path(BUILD_DEPENDENCIES_DIR, name: name, context: context)
+  end
+
+  def form_test_dependencies_filepath(filepath, name: nil, context: nil)
+    File.join(
+      form_build_context_path(BUILD_DEPENDENCIES_DIR, name: name, context: context),
+      File.basename(filepath).ext(@configurator.extension_dependencies)
+    )
+  end
+
+  def form_test_mocks_path(name, context: nil)
+    form_named_path(@configurator.cmock_mock_path, name)
+  end
+
+  def form_test_partials_path(name, context: nil)
+    form_named_path(@configurator.project_test_partials_path, name)
+  end
+
+  def form_test_preprocess_includes_path(name, context: nil)
+    form_named_path(@configurator.project_test_preprocess_includes_path, name)
+  end
+
+  def form_test_preprocess_files_path(name, context: nil)
+    form_named_path(@configurator.project_test_preprocess_files_path, name)
   end
 
-  def form_test_dependencies_filepath(filepath)
-    return File.join( @configurator.project_test_dependencies_path, File.basename(filepath).ext(@configurator.extension_dependencies) )
+  def form_test_preprocess_files_full_expansion_path(name, context: nil)
+    form_named_path(@configurator.project_test_preprocess_files_path, name, subdir: PREPROCESS_FULL_EXPANSION_DIR)
+  end
+
+  def form_test_preprocess_files_directives_only_path(name, context: nil)
+    form_named_path(@configurator.project_test_preprocess_files_path, name, subdir: PREPROCESS_DIRECTIVES_ONLY_DIR)
+  end
+
+  def form_test_preprocess_files_raw_directives_only_path(name, context: nil)
+    form_named_path(@configurator.project_test_preprocess_files_path, name, subdir: PREPROCESS_RAW_DIRECTIVES_ONLY_DIR)
+  end
+
+  def form_test_build_cache_path(filepath)
+    return File.join( @configurator.project_test_build_cache_path, File.basename(filepath) )
   end
 
   def form_pass_results_filepath(build_output_path, filepath)
@@ -137,7 +243,7 @@ class FilePathUtils
   end
 
   def form_test_filepath_from_runner(filepath)
-    return filepath.sub(/#{TEST_RUNNER_FILE_SUFFIX}/, '')
+    return filepath.sub(/#{Regexp.escape(TEST_RUNNER_FILE_SUFFIX)}/, '')
   end
 
   def form_test_executable_filepath(build_output_path, filepath)
@@ -164,7 +270,11 @@ class FilePathUtils
     return File.join( @configurator.project_test_preprocess_files_path, subdir, PREPROCESS_FULL_EXPANSION_DIR, File.basename(filepath) )
   end
 
-  def form_preprocessed_file_directives_only_filepath(filepath, subdir)
+  def form_preprocessed_file_raw_directives_only_filepath(filepath, subdir)
+    return File.join( @configurator.project_test_preprocess_files_path, subdir, PREPROCESS_RAW_DIRECTIVES_ONLY_DIR, File.basename(filepath) )
+  end
+
+  def form_preprocessed_file_compacted_directives_only_filepath(filepath, subdir)
     return File.join( @configurator.project_test_preprocess_files_path, subdir, PREPROCESS_DIRECTIVES_ONLY_DIR, File.basename(filepath) )
   end
 
@@ -172,9 +282,37 @@ class FilePathUtils
     return (@file_wrapper.instantiate_file_list(sources)).pathmap("#{path}/%n#{@configurator.extension_object}")
   end
 
+  def form_mock_header_filepath(subdir, filename)
+    # @configurator.cmock_mock_path accessor only exists if mocks are enabled
+    raise CeedlingException.new('Mocks are not enabled, but an internal feature dependent on them was accessed.') unless @configurator.project_use_mocks
+    return File.join(@configurator.cmock_mock_path, subdir, filename.ext(EXTENSION_CORE_HEADER))
+  end
+
   def form_mocks_source_filelist(path, mocks)
     list = (@file_wrapper.instantiate_file_list(mocks))
-    return list.map{ |file| File.join(path, File.basename(file).ext(@configurator.extension_source)) }
+    return list.map{ |file| File.join(path, File.basename(file).ext(EXTENSION_CORE_SOURCE)) }
+  end
+
+  def form_partial_header_filepath(subdir, filename)
+    # @configurator.project_test_partials_path accessor only exists if partials are enabled
+    raise CeedlingException.new('Partials are not enabled, but an internal feature dependent on them was accessed.') unless @configurator.project_use_partials
+    return File.join( @configurator.project_test_partials_path, subdir, filename.ext(EXTENSION_CORE_HEADER) )
+  end
+
+  def form_partial_interface_header_filename(_module)
+    return PARTIAL_FILENAME_PREFIX + _module + '_interface' + EXTENSION_CORE_HEADER
+  end
+
+  def form_mock_partial_interface_header_filename(_module)
+    return @configurator.cmock_mock_prefix + PARTIAL_FILENAME_PREFIX + _module + '_interface' + EXTENSION_CORE_HEADER
+  end
+
+  def form_partial_implementation_header_filename(_module)
+    return PARTIAL_FILENAME_PREFIX + _module + '_impl' + EXTENSION_CORE_HEADER
+  end
+
+  def form_partial_implementation_source_filename(_module)
+    return PARTIAL_FILENAME_PREFIX + _module + '_impl' + EXTENSION_CORE_SOURCE
   end
 
   def form_test_dependencies_filelist(files)
@@ -187,4 +325,23 @@ class FilePathUtils
     return list.pathmap("#{path}/%n#{@configurator.extension_testpass}")
   end
 
+  ### Private ###
+
+  private
+
+  # Forms project_build_root/[context/]subdir[/name]; context and name are omitted when nil
+  def form_build_context_path(subdir, name: nil, context: nil)
+    parts = [@configurator.project_build_root]
+    parts << context.to_s if context
+    parts << subdir
+    parts << name if name
+    File.join( *parts )
+  end
+
+  # Forms base/name[/subdir]
+  def form_named_path(base, name, subdir: nil)
+    return File.join( base, name, subdir ) if subdir
+    File.join( base, name )
+  end
+
 end

data/lib/ceedling/file_system_wrapper.rb

@@ -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/file_wrapper.rb

@@ -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
 # =========================================================================
 
@@ -14,6 +14,13 @@ require 'ceedling/constants'
 
 class FileWrapper
 
+  def self.generate_include_guard(name)
+    # abc-XYZ.h --> _ABC_XYZ_H_
+    base = File.basename(name, '.*') # Remove any extension
+    guard = '__' + CEEDLING_GENERATED + '_' + base.gsub(/\W/, '_').upcase + '_H__'
+    return guard
+  end
+
   def get_expanded_path(path)
     return File.expand_path(path)
   end
@@ -101,6 +108,12 @@ class FileWrapper
     FileUtils.touch(filepath, **options)
   end
 
+  def write_blank_file(filepath)
+    File.open(filepath, 'w') do |file|
+      file.write("// Ceedling intentionally blank file\n\n")
+    end
+  end
+
   def write(filepath, contents, flags='w')
     File.open(filepath, flags) do |file|
       file.write(contents)