ceedling 1.2.0 → 1.2.2

data/lib/ceedling/test_invoker/test_source_file_directive_resolver.rb

@@ -7,9 +7,8 @@
 
 require 'ceedling/constants'
 require 'ceedling/exceptions'
-require 'ceedling/file_path_utils'
-require 'ceedling/path_matcher'
-require 'ceedling/test_invoker/test_build_validations'
+require 'ceedling/filesystem/file_path_utils'
+require 'ceedling/filesystem/path_matcher'
 
 # Owns everything about the TEST_SOURCE_FILE() build directive's own path
 # content: collecting a test's raw directive strings, telling additive
@@ -20,8 +19,6 @@ require 'ceedling/test_invoker/test_build_validations'
 # becomes a real filepath.
 class TestSourceFileDirectiveResolver
 
-  include TestBuildValidations
-
   constructor :test_context_extractor, :file_finder, :configurator, :loginator
 
   # Splits a test's TEST_SOURCE_FILE() entries into files to add and files to
@@ -33,31 +30,33 @@ class TestSourceFileDirectiveResolver
   def resolve(test_filepath, context)
     raw = @test_context_extractor.lookup_build_directive_sources_list( test_filepath )
     additive, subtractive = raw.partition { |source| FilePathUtils.add_path?( source ) }
-
-    # A directive's own text is written directly in the test file, so its `..`, if
-    # any, is anchored to that same test file's own directory -- exactly as a
-    # directory-relative #include would be.
     anchor = File.dirname( test_filepath )
 
-    find = -> (source) {
-      stripped = FilePathUtils.no_aggregation_decorators( source )
-      @file_finder.find_build_input_file(
-        filepath: PathMatcher.resolve_relative( stripped, anchor: anchor ),
-        complain: :ignore,
-        context:  context
-      )
-    }
-
-    additive_sources = additive.map(&find).compact
+    additive_sources = additive.filter_map { |source| locate( source, anchor: anchor, context: context ) }
 
     subtractive_sources = subtractive.each_with_object({}) do |source, hash|
-      resolved = find.call( source )
+      resolved = locate( source, anchor: anchor, context: context )
       hash[resolved] = source unless resolved.nil?
     end
 
     return [additive_sources, subtractive_sources]
   end
 
+  # A TEST_SOURCE_FILE() entry must name a real, recognized file whether it adds or removes.
+  # A typo fails loudly on either side of the +:/-: convention, naming the test that holds
+  # it. Entries are found exactly as `resolve` finds them, so any entry a build uses passes.
+  def validate!(test:, test_filepath:, context:)
+    anchor = File.dirname( test_filepath )
+
+    @test_context_extractor.lookup_build_directive_sources_list( test_filepath ).each do |entry|
+      source = FilePathUtils.no_aggregation_decorators( entry )
+      validate_extension!( test, source )
+      next unless locate( entry, anchor: anchor, context: context ).nil?
+
+      raise CeedlingException.new( "File '#{source}' specified with TEST_SOURCE_FILE() in #{test} cannot be found in the source file collection" )
+    end
+  end
+
   # Applies this test's TEST_SOURCE_FILE("-:...") entries against the fully
   # assembled source list, regardless of how each removed file originally got
   # there -- the implicit header/source convention, a positive directive, or
@@ -75,4 +74,25 @@ class TestSourceFileDirectiveResolver
     return sources - subtractive.keys
   end
 
+  private
+
+  # An entry's text is written in its test file, so its `..`, if any, is anchored to that
+  # test file's directory, as a directory-relative #include is
+  def locate(entry, anchor:, context:)
+    stripped = FilePathUtils.no_aggregation_decorators( entry )
+    return @file_finder.find_build_input_file(
+      filepath: PathMatcher.resolve_relative( stripped, anchor: anchor ), complain: :ignore, context: context
+    )
+  end
+
+  def validate_extension!(test, source)
+    assembly = @configurator.test_build_use_assembly
+    return if @configurator.extension_source.match?( source )
+    return if assembly && @configurator.extension_assembly.match?( source )
+
+    extensions  = @configurator.extension_source.to_s
+    extensions += " or #{@configurator.extension_assembly}" if assembly
+    raise CeedlingException.new( "File '#{source}' specified with TEST_SOURCE_FILE() in #{test} is not a #{extensions} source file" )
+  end
+
 end

data/lib/ceedling/tool_executor.rb

@@ -189,8 +189,8 @@ class ToolExecutor
 
     # Handle array or anything else passed into method to be expanded in place of replacement operators
     case (to_process)
-      when Array then to_process.each {|value| build_string.concat( "#{element.sub(match, value.to_s)} " ) } if (to_process.size > 0)
-      else build_string.concat( element.sub(match, to_process.to_s) )
+      when Array then to_process.each {|value| build_string.concat( "#{substitute( element, match, value )} " ) } if (to_process.size > 0)
+      else build_string.concat( substitute( element, match, to_process ) )
     end
 
     # Handle inline ruby string substitution
@@ -256,7 +256,7 @@ class ToolExecutor
     # expand elements (whether string or array) into substitution string & replace escaped '\$'
     elements.flatten!
     elements.each do |element|
-      build_string.concat( substitution.sub(/([^\\]*)\$/, "\\1#{element}") ) # don't replace escaped '\$' but allow us to replace just a lonesome '$'
+      build_string.concat( substitute( substitution, /(?<!\\)\$/, element ) ) # don't replace escaped '\$' but allow us to replace just a lonesome '$'
       build_string.gsub!(/\\\$/, '$')
       build_string.concat(' ')
     end
@@ -264,6 +264,12 @@ class ToolExecutor
     return build_string.strip
   end
 
+  # Replaces the first match of pattern in template with value, taken literally. A
+  # replacement string would read a path's `\0`, `\1` or `\\` as a back-reference.
+  def substitute(template, pattern, value)
+    return template.sub( pattern ) { value.to_s }
+  end
+
   def pretty_tool_name(command)
     # Titleize command's name -- each word capitalized plus underscores replaced with spaces
     name = "#{command[:name].split(/ |\_/).map(&:capitalize).join(" ")}"

data/lib/ceedling/yaml_wrapper.rb

@@ -82,8 +82,9 @@ class YamlWrapper
   # already picks the right calling convention for the installed Psych, so this should be
   # unreachable in practice; it exists as a last-resort safety net for an unanticipated
   # Psych version/interface mismatch, reported distinctly so it isn't mistaken for a user
-  # YAML-authoring error.
-  rescue ArgumentError => e
+  # YAML-authoring error. `::ArgumentError` names Ruby's own class, which the constructor
+  # gem's same-named class would otherwise shadow here.
+  rescue ::ArgumentError => e
     raise YamlLoadException.new(
       reason: :incompatible, source: source_label, original_error: e,
       message: "Installed Psych YAML library (#{Psych::VERSION}) does not support a safe-loading feature Ceedling requires ⏩️ #{e.message}"

data/lib/version.rb

@@ -21,7 +21,7 @@ module Ceedling
     # Target version for the current release cycle. Maintained by hand, one edit
     # per minor or major cycle. Never edited to match a release tag. The release
     # pipeline rewrites this line from the tag that triggered it.
-    BASE = '1.2.0'
+    BASE = '1.2.2'
 
     # Marker for a build the release pipeline did not produce. That pipeline
     # empties this line, so a published gem reports a bare version while a local

data/plugins/bullseye/bullseye.rake

@@ -38,11 +38,12 @@ namespace BULLSEYE_SYM do
     @ceedling[:bullseye].process_untested_sources( sources:COLLECTION_ALL_SOURCE )
   end
 
-  desc 'Run single test w/ coverage ([*] test or source file name, no path).'
+  desc 'Run single test w/ coverage ([*] test or source file name, with optional path).'
   task :* do
     message = "Oops! '#{BULLSEYE_ROOT_NAME}:*' isn't a real task. " \
-              "Use a real test or source file name (no path) in place of the wildcard.\n" \
-              "Example: `ceedling #{BULLSEYE_ROOT_NAME}:foo.c`"
+              "Use a real test or source file name in place of the wildcard, " \
+              "adding as much of its path as needed to identify one file among any same-named tests.\n" \
+              "Example: `ceedling #{BULLSEYE_ROOT_NAME}:foo.c` or `ceedling #{BULLSEYE_ROOT_NAME}:unit/foo.c`"
 
     @ceedling[:loginator].log( message, Verbosity::ERRORS )
   end
@@ -83,12 +84,8 @@ namespace BULLSEYE_SYM do
   # Use a rule to increase efficiency for large projects
   rule(/^#{BULLSEYE_TASK_ROOT}\S+$/ => [ # bullseye test tasks by regex
      proc do |task_name|
-        # Yield clean test name => Strip the task string, remove Rake test task prefix, and remove any code file extension
-        test = task_name.strip().sub(/^#{BULLSEYE_TASK_ROOT}/, '')
-        EXTENSION_SOURCE.each { |ext| test = test.chomp( ext ) }
-
-        # Ensure the test name begins with a test name prefix
-        test = PROJECT_TEST_FILE_PREFIX + test if not (test.start_with?( PROJECT_TEST_FILE_PREFIX ))
+        # Any directory typed ahead of the name is kept. See TestTaskName.
+        test = TestTaskName.test_name( task_name, root: BULLSEYE_TASK_ROOT )
 
         # Provide the filepath for the target test task back to the Rake task
         @ceedling[:file_finder].find_test_file_from_name( test )

data/plugins/bullseye/config/defaults_bullseye.rb

@@ -51,7 +51,7 @@ DEFAULT_BULLSEYE_LINKER_TOOL = {
   }
 
 DEFAULT_BULLSEYE_FIXTURE_TOOL = {
-  :executable => '${1}'.freeze,
+  :executable => '"${1}"'.freeze, # Test executable, quoted as a path
   :name => 'default_bullseye_fixture'.freeze,
   :optional => false.freeze,
   :arguments => [].freeze

data/plugins/bullseye/lib/bullseye.rb

@@ -220,7 +220,7 @@ class Bullseye < Plugin
       end
 
       header = "Untested source files not in the coverage report (:untested_sources is :list):"
-      @loginator.log_list( untested_sources.sort, header, Verbosity::COMPLAIN, LogLabels::WARNING )
+      @loginator.log_list( untested_sources.sort, header, Verbosity::COMPLAIN )
 
     when BULLSEYE_UNTESTED_SOURCES_COMPILE
       untested_sources = collect_untested_sources( sources )
@@ -236,7 +236,7 @@ class Bullseye < Plugin
       untested_sources.each do |filepath|
         filename     = File.basename(filepath)
         object       = @ceedling[:file_path_utils].form_test_object_filepath( filepath, context: BULLSEYE_SYM )
-        dependencies = @ceedling[:file_path_utils].form_test_dependencies_filepath( filepath, context: BULLSEYE_SYM )
+        dependencies = @ceedling[:file_path_utils].form_test_dependencies_filepath( object, context: BULLSEYE_SYM )
         search_paths = @configurator.collection_paths_include
         # Defines and flags resolve as a tested source's do, against this source's filepath
         flags        = @ceedling[:test_build_setup].flags( context: BULLSEYE_SYM, operation: OPERATION_COMPILE_SYM, filepath: filepath )
@@ -263,6 +263,9 @@ class Bullseye < Plugin
           next
         end
 
+        @file_wrapper.mkdir( File.dirname( object ) )
+        @file_wrapper.mkdir( File.dirname( dependencies ) )
+
         begin
           @ceedling[:generator].generate_object_file_c(
             tool:         TOOLS_BULLSEYE_COMPILER,
@@ -559,11 +562,10 @@ class Bullseye < Plugin
     coverage_sources = []
     @test_invoker.each_test_with_sources { |_, srcs| coverage_sources.concat( srcs ) }
     coverage_sources.uniq!
-    # Every configured source extension is a valid ending for a mock/ignored-source name,
-    # so the two are joined into one regex alternation rather than matching just one.
-    source_extensions = EXTENSION_SOURCE.to_a.map { |ext| Regexp.escape(ext) }.join('|')
-    coverage_sources.delete_if {|item| item =~ /#{@configurator.cmock_mock_prefix}.+(?:#{source_extensions})$/}
-    coverage_sources.delete_if {|item| item =~ /(?:#{BULLSEYE_IGNORE_SOURCES.join('|')})(?:#{source_extensions})$/}
+    # Every configured source extension is a valid ending for a mock/ignored-source name
+    source_extensions = EXTENSION_SOURCE.pattern
+    coverage_sources.delete_if {|item| item =~ /#{@configurator.cmock_mock_prefix}.+#{source_extensions}$/}
+    coverage_sources.delete_if {|item| item =~ /(?:#{BULLSEYE_IGNORE_SOURCES.join('|')})#{source_extensions}$/}
 
     coverage_sources.each do |source|
       command          = @ceedling[:tool_executor].build_command_line(TOOLS_BULLSEYE_REPORT_COVFN, [], source)

data/plugins/cppcheck/config/defaults_cppcheck.rb

@@ -16,7 +16,7 @@ DEFAULT_CPPCHECK_TOOL = {
   :optional => true.freeze,
   :arguments => [
     '-I"${1}"'.freeze,
-    '${2}'.freeze
+    '"${2}"'.freeze
   ].freeze
 }
 

data/plugins/dependencies/config/defaults.yml

@@ -26,9 +26,9 @@
     :name: 'Dependencies archiver'
     :optional: true  # Checked when :build_lib archives, not by every Ceedling command
     :arguments:  
-      - rcs  
-      - ${2}  
-      - ${1}
+      - rcs
+      - '"${2}"'  # Library
+      - '"${1}"'  # Objects
 
   :deps_zip:
     :executable: unzip
@@ -36,7 +36,7 @@
     :optional: true
     :arguments:
       - -o
-      - ${1}  # Filepath
+      - '"${1}"'  # Filepath
 
   :deps_targzip:
     :executable: tar
@@ -57,7 +57,7 @@
       - clone
       - ${1}  # Optional branch with `-b` flag
       - ${2}  # Optional depth with `--depth` flag
-      - ${3}  # Repository source
+      - '"${3}"'  # Repository source
       - .
 
   :deps_git_checkout:
@@ -75,7 +75,7 @@
     :arguments:
       - checkout
       - ${1}  # Optional branch with `--revision` flag
-      - ${2}  # Repository source
+      - '"${2}"'  # Repository source
       - .
 
 ...

data/plugins/dependencies/dependencies.rake

@@ -89,12 +89,15 @@
   task :prepare => all_deps
 end
 
-# Dependency libraries join the library names and paths test and release builds link with
+# Dependency libraries join the library names and paths test and release builds link with,
+# and their files join those the links depend on
 link_libraries = @ceedling[DEPENDENCIES_SYM].link_libraries
 PATHS_LIBRARIES ||= []
 PATHS_LIBRARIES.concat( link_libraries[:paths] ).uniq!
 LIBRARIES_SYSTEM ||= []
 LIBRARIES_SYSTEM.concat( link_libraries[:names] ).uniq!
+LIBRARIES_LINK_FILES ||= []
+LIBRARIES_LINK_FILES.concat( link_libraries[:files] ).uniq!
 
 # Add any artifact:include or :source folders to our release & test includes paths so linking and mocking work.
 @ceedling[DEPENDENCIES_SYM].add_headers_and_sources()

data/plugins/dependencies/lib/dependencies.rb

@@ -8,6 +8,8 @@
 require 'ceedling/plugins/plugin'
 require 'ceedling/constants'
 require 'ceedling/exceptions'
+require 'ceedling/filesystem/project_paths'
+require 'ceedling/filesystem/working_dir'
 require 'dependency_spec'
 require 'dependency_commands'
 require 'dependency_environment'
@@ -121,13 +123,15 @@ class Dependencies < Plugin
     end
   end
 
-  # Library names and their directories, for test and release linking
+  # Library names and their directories, for test and release linking, and the library files
+  # themselves, which those links depend on
   def link_libraries
     libraries = @specs.flat_map { |spec| spec.static_libraries + spec.dynamic_libraries }
 
     return {
       names: libraries.map { |library| File.basename( library, '.*' ).delete_prefix( 'lib' ) }.reject( &:empty? ).uniq,
-      paths: libraries.map { |library| File.dirname( library ) }.reject( &:empty? ).uniq
+      paths: libraries.map { |library| File.dirname( library ) }.reject( &:empty? ).uniq,
+      files: libraries.uniq
     }
   end
 
@@ -173,7 +177,7 @@ class Dependencies < Plugin
 
   # The one place this plugin changes directory, around a dependency's own commands
   def in_directory(path, &block)
-    Dir.chdir( path, &block )
+    WorkingDir.chdir( path, &block )
   end
 
   # A fetch path that already holds files is taken as fetched, so fetching again, or
@@ -273,7 +277,7 @@ class Dependencies < Plugin
   end
 
   def compile(spec, source, search_paths)
-    object = object_for( spec, source )
+    object = prepared_object( spec, source )
     @ceedling[:generator].generate_object_file_c(
       tool:         TOOLS_DEPS_COMPILER,
       module_name:  File.basename( source ).ext,
@@ -283,13 +287,13 @@ class Dependencies < Plugin
       search_paths: search_paths,
       flags:        spec.flags,
       defines:      spec.defines,
-      list:         @ceedling[:file_path_utils].form_release_build_list_filepath( File.basename( source ).ext )
+      list:         @ceedling[:file_path_utils].form_release_build_list_filepath( object )
     )
     return object
   end
 
   def assemble(spec, source)
-    object = object_for( spec, source )
+    object = prepared_object( spec, source )
     @ceedling[:generator].generate_object_file_asm(
       tool: TOOLS_DEPS_ASSEMBLER, module_name: File.basename( source ).ext, context: DEPENDENCIES_SYM,
       source: source, object: object
@@ -297,8 +301,14 @@ class Dependencies < Plugin
     return object
   end
 
-  def object_for(spec, source)
-    return File.join( spec.build_path, File.basename( source ).ext( EXTENSION_OBJECT.primary ) )
+  # A source's object sits at the source's own path below the dependency's source path, so
+  # same-named sources in different directories keep apart. Its directory is made here.
+  def prepared_object(spec, source)
+    subdir = ProjectPaths.subdir_below( spec.source_path, File.dirname( source ) ) || ''
+    object = File.join( spec.build_path, subdir, File.basename( source ).ext( EXTENSION_OBJECT.primary ) )
+
+    @ceedling[:file_wrapper].mkdir( File.dirname( object ) )
+    return object
   end
 
   def copy_library(built, destination)

data/plugins/dependencies/lib/dependency_spec.rb

@@ -6,14 +6,15 @@
 # =========================================================================
 
 require 'ceedling/exceptions'
+require 'ceedling/filesystem/project_paths'
 
 # One configured dependency, validated and normalized.
 #
 # Each dependency names its paths under :paths, and each path falls back to another when
 # left out: :source and :fetch to each other, :build to :source then :fetch, :artifact to
 # :build. With none configured, every path is `dependencies/<task name>`. Artifacts
-# (libraries, executables, includes, sources) live under the artifact path. An optional
-# :deploy path receives deployed copies.
+# (libraries, executables, includes, sources) live under the artifact path, unless named by
+# an absolute path. An optional :deploy path receives deployed copies.
 #
 # The task name is the configured name's word characters, which `dependencies:*` tasks
 # use, so it must be non-empty and unique among dependencies.
@@ -47,7 +48,7 @@ class DependencySpec
     @name      = dep[:name] or raise CeedlingException.new( 'Each dependency must have a :name.' )
     @task_name = task_name_for( @name )
     @fetch     = dep[:fetch] || {}
-    @paths     = dep[:paths] || {}
+    @paths     = standardized( dep[:paths] || {} )
     @artifacts = dep[:artifacts] || {}
 
     problem = fetch_problem
@@ -106,7 +107,7 @@ class DependencySpec
   # glob expands through `collector` against the disk, and anything else is a directory.
   def include_directories(collector)
     return Array( @artifacts[:includes] ).flat_map do |include|
-      path = File.join( artifact_path, include )
+      path = artifact_at( include )
       if include.end_with?( '.h' ) then [File.dirname( path )]
       elsif include.match?( INCLUDE_GLOB ) then collector.call( path )
       else [path]
@@ -128,7 +129,18 @@ class DependencySpec
   end
 
   def artifacts(kind)
-    return Array( @artifacts[kind] ).map { |path| File.join( artifact_path, path ) }
+    return Array( @artifacts[kind] ).map { |path| artifact_at( path ) }
+  end
+
+  # Configured paths, read as every configured path is read
+  def standardized(paths)
+    return paths.transform_values { |path| path.is_a?( String ) ? ProjectPaths.standardize( path ) : path }
+  end
+
+  # An artifact below the artifact path, or one named by an absolute path as written
+  def artifact_at(path)
+    path = ProjectPaths.standardize( path )
+    return ProjectPaths.absolute?( path ) ? path : File.join( artifact_path, path )
   end
 
   # What is wrong with the fetch configuration, or nil

data/plugins/fff/lib/fff.rb

@@ -10,6 +10,7 @@
 #   ⏩️ https://github.com/ElectronVector/fake_function_framework
 # =========================================================================
 
+require 'fileutils'
 require 'ceedling/plugins/plugin'
 require 'fff_mock_generator'
 
@@ -36,16 +37,17 @@ end # class Fff
 
 class FffCMockWrapper
 
-    def initialize(options=nil)
+  def initialize(options=nil)
     @cm_config      = CMockConfig.new(options)
     @cm_parser      = CMockHeaderParser.new(@cm_config)
-    @silent        = (@cm_config.verbosity < 2)
-
-    # These are the additional files to include in the mock files.
-    @includes_h_pre_orig_header  = (@cm_config.includes || @cm_config.includes_h_pre_orig_header || []).map{|h| h.match?(/</) ? h : "\"#{h}\""}
-    @includes_h_post_orig_header = (@cm_config.includes_h_post_orig_header || []).map{|h| h.match?(/</) ? h : "\"#{h}\""}
-    @includes_c_pre_header       = (@cm_config.includes_c_pre_header || []).map{|h| h.match?(/</) ? h : "\"#{h}\""}
-    @includes_c_post_header      = (@cm_config.includes_c_post_header || []).map{|h| h.match?(/</) ? h : "\"#{h}\""}
+    # CMock's levels: 0 errors only, 1 warnings, 2 normal, 3 verbose
+    @verbosity      = @cm_config.verbosity
+
+    # The additional files to include in the fake files, gathered as CMock gathers them
+    @includes_h_pre_orig_header  = quoted( @cm_config.includes, @cm_config.includes_h_pre_orig_header )
+    @includes_h_post_orig_header = quoted( @cm_config.includes_h_post_orig_header )
+    @includes_c_pre_header       = quoted( @cm_config.includes_c_pre_header )
+    @includes_c_post_header      = quoted( @cm_config.includes_c_post_header )
   end
 
   # Matches CMock's own entry point, which Ceedling calls with the folder a mock's
@@ -57,37 +59,14 @@ class FffCMockWrapper
   end
 
   def generate_mock(header_file_to_mock, folder=nil)
-      module_name = File.basename(header_file_to_mock, '.h')
-      puts( "Creating fake functions for #{module_name}..." ) unless @silent
-      mock_name = @cm_config.mock_prefix + module_name + @cm_config.mock_suffix
-      mock_path = folder.nil? ? @cm_config.mock_path : File.join(@cm_config.mock_path, folder)
-      if @cm_config.subdir
-          # If a subdirectory has been configured, append it to the mock path.
-          mock_path = "#{mock_path}/#{@cm_config.subdir}"
-      end
-      full_path_for_mock = "#{mock_path}/#{mock_name}"
-      c_name = c_name_for(mock_name, folder)
-
-      # Parse the header file so we know what to mock.
-      parsed_header = @cm_parser.parse(module_name, File.read(header_file_to_mock))
-
-      # Create the directory if it doesn't exist.
-      mkdir_p full_path_for_mock.pathmap("%d")
-
-      # Generate the fake function header file.
-      puts( "Creating fake functions: #{full_path_for_mock}.h" )
-
-      # Create the mock header.
-      File.open("#{full_path_for_mock}.h", 'w') do |f|
-        f.write(FffMockGenerator.create_mock_header(module_name, mock_name, parsed_header,
-          @includes_h_pre_orig_header, @includes_h_post_orig_header, c_name: c_name))
-      end
-
-      # Create the mock source file.
-      File.open("#{full_path_for_mock}.c", 'w') do |f|
-        f.write(FffMockGenerator.create_mock_source(mock_name, parsed_header,
-          @includes_c_pre_orig_header, @includes_c_post_orig_header, c_name: c_name))
-      end
+    module_name = File.basename(header_file_to_mock, '.h')
+    puts( "Creating fake functions for #{module_name}..." ) unless @verbosity < 2
+    mock_name = @cm_config.mock_prefix + module_name + @cm_config.mock_suffix
+
+    # Parse the header file so we know what to mock.
+    parsed_header = @cm_parser.parse(module_name, File.read(header_file_to_mock))
+
+    write_fake( "#{mock_path_for( folder )}/#{mock_name}", module_name, mock_name, parsed_header, c_name_for( mock_name, folder ) )
   end
 
   # The name for a fake's guard and control functions, as CMock forms it. With
@@ -103,6 +82,33 @@ class FffCMockWrapper
     return identity.gsub( %r{[-/\\.,\s]}, '_' )
   end
 
+  private
+
+  # The directory a fake is written to: the mock root, the folder its #include names,
+  # then any configured :subdir
+  def mock_path_for(folder)
+    mock_path = folder.nil? ? @cm_config.mock_path : File.join( @cm_config.mock_path, folder )
+    return @cm_config.subdir ? "#{mock_path}/#{@cm_config.subdir}" : mock_path
+  end
+
+  # Writes the fake's header and source at `path`, which ends in the mock's name
+  def write_fake(path, module_name, mock_name, parsed_header, c_name)
+    FileUtils.mkdir_p( File.dirname( path ) )
+
+    puts( "Creating fake functions: #{path}.h and #{path}.c" ) unless @verbosity < 3
+    File.write( "#{path}.h", FffMockGenerator.create_mock_header( module_name, mock_name, parsed_header,
+      @includes_h_pre_orig_header, @includes_h_post_orig_header, c_name: c_name ) )
+
+    File.write( "#{path}.c", FffMockGenerator.create_mock_source( mock_name, parsed_header,
+      @includes_c_pre_header, @includes_c_post_header, c_name: c_name ) )
+  end
+
+  # Joins include lists, each named once, as #include operands. A name holding `<` is
+  # kept as written, and any other is quoted, as CMock does.
+  def quoted(*lists)
+    return lists.compact.flatten.uniq.map { |name| name.match?( /</ ) ? name : "\"#{name}\"" }
+  end
+
 end
 
 # Switch out the CMock with FFF Mock Generator