ceedling 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c3adf2da2a78e959d2b4d912cdf3f10732cd48dbe4819733b0feffdec692f70
-  data.tar.gz: 02fa61eeb38f0fa1eaae3db1a0e92582d1f4d429e6040ed877463bfd41d42277
+  metadata.gz: 3bbf250a1b600bd7d3e3e281975f5ee3563e5052d5cd12de6840c717d18243cf
+  data.tar.gz: 62dfcf6c896792802c3405aa4faddc4d406339616dd2ef8e8f0b2fb6a2a147f1
 SHA512:
-  metadata.gz: 62a3ce4d63b60693edd7656654e782571f7ca127b7dbd28c83bea7316bbc7a753c6f22531535bf2b5b46e96d3650c697d8d0bc035f122de7dcffc05225460acb
-  data.tar.gz: 42dbf84f070c4374e5ccac43feeccd84ac9b2aa891b0602a22440034b16109265915eaaecf0949b9c93e0ace8499dcb80614b3ab35733fe877f7d66cfcfc7c0c
+  metadata.gz: 4d8f98451d2369c8a308bd89f7c036b69246c4d14f9124c4e264ffc19d090589de5f81dc94b77179a165e2929a7e826975a92736ddda00ea9508251607f573c8
+  data.tar.gz: 24187bf1b4cdb0fd559fcb705f68bd6c2220801aa7ae814662d196f6caa57b8ab2601fb042daed7db7933998610e1007bb7937a6b92c77e0ddfa7d2e1eb22044

data/GIT_COMMIT_SHA

@@ -0,0 +1 @@
+fb1ce6c

data/README.md

@@ -1,7 +1,7 @@
 Ceedling ![CI](https://github.com/ThrowTheSwitch/Ceedling/workflows/CI/badge.svg)
 ========
 
-Welcome to **Ceedling 1.0.0** 
+Welcome to **Ceedling 1.0.1** 
 
 See the [Release Notes](docs/ReleaseNotes.md) for an overview
 of all that’s new since 0.31.1 plus links to the detailed Changelog and list of 
@@ -505,7 +505,7 @@ Or, use Ceedling’s built-in `examples` & `example` commands to extract a sampl
 
 See the [configuration section][ceedling-packet-config] in _Ceedling Packet_ for way more details on your project configuration options than we can provide here.
 
-[example-config-file]: assets/project_as_gem.yml
+[example-config-file]: assets/project.yml
 [ceedling-packet-config]: docs/CeedlingPacket.md#the-almighty-ceedling-project-configuration-file-in-glorious-yaml
 
 ## Using Ceedling’s command line (and related)

data/assets/{project_as_gem.yml → project.yml}

@@ -269,10 +269,6 @@
     # :html_encoding: UTF-8
 
 # :module_generator:
-#   :project_root: ./
-#   :source_root: source/
-#   :inc_root: includes/
-#   :test_root: tests/
 #   :naming: :snake #options: :bumpy, :camel, :caps, or :snake
 #   :includes:
 #     :tst: []
@@ -383,11 +379,6 @@
 #     :arguments: []
 #     :name: 
 #     :optional: FALSE
-#   :test_dependencies_generator: 
-#     :executable:
-#     :arguments: []
-#     :name: 
-#     :optional: FALSE
 #   :release_compiler: 
 #     :executable:
 #     :arguments: []

data/bin/cli_helper.rb

@@ -35,16 +35,11 @@ class CliHelper
 
   def create_project_file(dest, local, ceedling_tag)
     project_filepath = File.join( dest, DEFAULT_PROJECT_FILENAME )
-    source_filepath = ''
-
-    if local
-      source_filepath = File.join( 'assets', 'project_with_guts.yml' )
-    else
-      source_filepath = File.join( 'assets', 'project_as_gem.yml' )
-    end
+    source_filepath = File.join( 'assets', DEFAULT_PROJECT_FILENAME )
 
     # Clone the project file
     @actions._copy_file( source_filepath, project_filepath, :force => true)
+
     # Silently update internal version
     @actions._gsub_file(
       project_filepath,
@@ -52,6 +47,16 @@ class CliHelper
       ":ceedling_version: #{ceedling_tag}",
       :verbose => false
     )
+
+    # Silently path to point at local install
+    if local
+      @actions._gsub_file(
+        project_filepath,
+        /:which_ceedling:\s+gem/,
+        ":which_ceedling: vendor/ceedling",
+        :verbose => false
+      )
+    end
   end
 
 

data/bin/projectinator.rb

@@ -109,11 +109,11 @@ class Projectinator
 
     # Handle any inline Ruby string expansion
     load_paths.each do |load_path|
-      load_path.replace( @system_wrapper.module_eval( load_path ) ) if (load_path =~ RUBY_STRING_REPLACEMENT_PATTERN)
+      load_path.replace( @system_wrapper.module_eval( load_path ) ) if (load_path =~ PATTERNS::RUBY_STRING_REPLACEMENT)
     end
 
     enabled.each do |mixin|
-      mixin.replace( @system_wrapper.module_eval( mixin ) ) if (mixin =~ RUBY_STRING_REPLACEMENT_PATTERN)
+      mixin.replace( @system_wrapper.module_eval( mixin ) ) if (mixin =~ PATTERNS::RUBY_STRING_REPLACEMENT)
     end
 
     # Remove the :mixins section of the configuration

data/docs/BreakingChanges.md

@@ -7,7 +7,7 @@ These breaking changes are complemented by two other documents:
 
 ---
 
-# [1.0.0 pre-release] — 2024-11-28
+# [1.0.0] — 2025-01-01
 
 ## Explicit `:paths` ↳ `:include` entries in the project file
 
@@ -181,6 +181,16 @@ In addition, a previously undocumented feature for merging a second configuratio
 
 Thorough documentation on Mixins and the new options for loading a project configuration can be found in _[CeedlingPacket](CeedlingPacket.md))_.
 
+## Replaced `options:` files, environment project specifications, and nested project files with comprehensive `mixins` feature
+
+The following features have all been removed from Ceedling's functionality. No need to worry, though. The new `mixins` feature can handle all the situations these features previously supported, and much more. Check out the [documentation](CeedlingPacket.md) for more detail.
+
+ - `options:blah.yml` command-line options (see `--mixin` command line option)
+ - The corresponding `options_paths:` key in the project.yml file no longer has any effect. (see `:mixins:` ➡️ `:load_paths:` project.yml specification)
+ - The `:import:` section of the `project.yml` has been replaced (see `:mixins:` ➡️ `:enabled:` section)
+ - `CEEDLING_PROJECT_FILE` environment variable (see `CEEDLING_MIXIN_#` specification)
+ - `CEEDLING_SER_FILE` environment variable (see `CEEDLING_MIXIN_#` specification)
+
 ## Tool definition inline Ruby evaluation replacement removed (inline Ruby string expansion remains)
 
 Reaching back to the earliest days of Ceedling, tool definitions supported two slightly different string replacement options that executed at different points in a build’s lifetime. Yeah. It was maybe not great.

data/docs/CONTRIBUTING.md

@@ -54,7 +54,7 @@ In short, since you are most likely a developer, **provide a ticket that you wou
 
 - **Review the documentation** before opening a new issue.
 
-- **Do not open a duplicate issue!** Search through existing issues to see if your issue has previously been reported. If your issue exists, comment with any additional information you have. You may simply note "I have this problem too", which helps prioritize the most common problems and requests. 
+- **Try not to open a duplicate issue** Search through existing issues to see if your issue has previously been reported. If your issue exists, comment with any additional information you have. You may simply note "I have this problem too", which helps prioritize the most common problems and requests. 
 
 - **Prefer using [reactions](https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)**, not comments, if you simply want to "+1" an existing issue.
 
@@ -80,8 +80,6 @@ You can triage issues which may include reproducing bug reports or asking for ad
 
 We **love** pull requests! Before [forking the repo](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) and [creating a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests) for non-trivial changes, it is usually best to first open an issue to discuss the changes, or discuss your intended approach for solving the problem in the comments for an existing issue.
 
-For most contributions, after your first pull request is accepted and merged, you will be [invited to the project](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository) and given **push access**. :tada:
-
 *Note: All contributions will be licensed under the project's license.*
 
 - **Smaller is better.** Submit **one** pull request per bug fix or feature. A pull request should contain isolated changes pertaining to a single bug fix or feature implementation. **Do not** refactor or reformat code that is unrelated to your change. It is better to **submit many small pull requests** rather than a single large one. Enormous pull requests will take enormous amounts of time to review, or may be rejected altogether. 
@@ -157,15 +155,7 @@ See also: #456, #789
 
 ## :white_check_mark: Pull Request Checklist
 
-Not all Pull Requests require these things, but here's a great list of things to check to see if it makes sense for your situation:
-
- - [ ] Are the changes complete?
- - [ ] Are there tests for the new functionality?
- - [ ] Are the changes passing the style checks?
- - [ ] Is there documentation for the new functionality?
- - [ ] Has the change been added to `Changelog.md`?
- - [ ] Has the change been added to `ReleaseNotes.md`?
- - [ ] Have new config options been added as defaults to the `project.yml` files?
+Not all Pull Requests require these things, but [here's a great list](CeedlingPullRequestChecklist.md) of things to check to see if it makes sense for your situation:
 
 ## :heart: Who Loves Emoji?
 

data/docs/CeedlingPacket.md

@@ -256,7 +256,7 @@ extend Ceedling’s capabilities for needs such as custom code metrics
 reporting, build artifact packaging, and much more. A variety of 
 built-in plugins come with Ceedling.
 
-[example-config-file]: ../assets/project_as_gem.yml
+[example-config-file]: ../assets/project.yml
 [project-configuration]: #the-almighty-ceedling-project-configuration-file-in-glorious-yaml
 
 ## What’s with This Name?
@@ -3010,9 +3010,6 @@ and migrated to the `:test_build` and `:release_build` sections.
   :build_root: project_awesome/build
   :use_exceptions: FALSE
   :use_test_preprocessor: :all
-  :options_paths:
-    - project/options
-    - external/shared/options
   :release_build: TRUE
   :compile_threads: :auto
 ```

data/docs/CeedlingPullRequestChecklist.md

@@ -0,0 +1,24 @@
+# 🌱 Ceedling Pull-Request Checklist
+
+Hello lovely developers! We hear you're interested in submitting some work to our project. Thanks! We really appreciate it! 
+
+Below is a quick checklist of the things that need to be done before a full PR is merged to our project. Don't worry. You're not responsible for ALL of it. We'll accept your contribution however you are able to make it, with our thanks. But if you have some extra time and would like to maximize your contribution, here's a handy reference!
+
+### Documentation
+
+ - [ ] Has `README.md` been updated? (if it provides a huge feature or change... or maybe version bump)
+ - [ ] Has `CeedlingPacket.md` been updated? (if it provides a new or changed feature)
+ - [ ] Has `ReleaseNotes.md` been updated? (if it provides a new or changed feature)
+ - [ ] Has `Changelog.md` been updated? (if it fixes something or provides something new)
+ - [ ] Has `BreakingChanges.md` been updated? (if it changes compatibility with something that has existed before)
+
+ ### Software
+
+ - [ ] Does it follow our coding standards?
+ - [ ] Are all existing tests passing?
+ - [ ] Are there new tests added and passing?
+ - [ ] Have new config options been added as defaults to the `project.yml` file?
+ - [ ] Should new config options be added to example projects' `project.yml` files?
+ - [ ] Does the feature follow our "Logical Defaults" philosophy where possible?
+ - [ ] Has it passed a peer review?
+ - [ ] Does it pass CI (continuous integration) tests?

data/docs/Changelog.md

@@ -9,7 +9,26 @@ This changelog is complemented by two other documents:
 
 ---
 
-# [1.0.0 pre-release] — 2024-11-28
+# [1.0.1] - 2025-01-30
+
+## 💪 Fixed
+
+- `#978` -- Ceedling attempts to link source files that are commented out and/or removed by preprocessor directives
+- `#979` -- FFF plugin generates "warning: already initialized constant CMock" on some platforms
+- `#980` -- FFF original plugin should not be part of release build (le sigh)
+- `#981` -- Ceedling could not find header file to mock when using preprocessor
+- `#982` -- Ceedling did not inject required header file into mock when using preprocessor
+- `#985` -- Macros not being properly hidden from CMock's parser when using preprocessor
+- `#988` -- Parsing of `TEST_SOURCE_FILE` did not support special characters (like `.`) in filenames
+- `#888` & `#977` -- Unicode characters produce crashes in various places
+- `#996` -- Improved handling and documentation of module generator path options
+- `#998` -- FFF plugin missing required stringio
+- `#1005` -- Additional handling of preprocessing extraction improvements
+- Restored `:use_mocks` default to `true` in Ceedling defaults to match documentation and other mocking defaults in template projects.
+- Resolved a preprocessing issue that could cause the content of a file having a similar filename to that of the file `#include`ing it to become mixed with that file.
+- additional documentation improvements
+
+# [1.0.0] — 2025-01-01
 
 ## 🌟 Added
 

data/docs/ReleaseNotes.md

@@ -7,7 +7,15 @@ These release notes are complemented by two other documents:
 
 ---
 
-# 1.0.0 pre-release — November 28, 2024
+# 1.0.1 - January 30, 2025
+
+This is a collection of bugfixes found after the 1.0.0 release. If you are upgrading from a pre-1.0 release of Ceedling, we highly recommend reading the `1.0.0` release notes as well!
+
+See [Changelog](Changelog.md) for a full list of bugfixes and improvements.
+
+The most significant issues addressed with this release are problems with preprocessor handling, particularly when discovering which header files are required for each test. If you were running into similar problems with `1.0.0`, we highly recommend this upgrade.
+
+# 1.0.0 — January 01, 2025
 
 **This Ceedling release is probably the most significant since the project was first [posted to SourceForge in 2009][sourceforge].**
 

data/docs/SECURITY.md

@@ -0,0 +1,41 @@
+# Security Policies and Procedures
+
+This document outlines security procedures and general policies for all `ThrowTheSwitch.org`
+projects, including `Unity`, `CMock`, and `Ceedling`.
+
+  * [Reporting a Bug](#reporting-a-bug)
+  * [Disclosure Policy](#disclosure-policy)
+  * [Comments on this Policy](#comments-on-this-policy)
+
+## Reporting a Bug
+
+The tools from `ThrowTheSwitch.org` are made to collaborate with other tools like compilers, 
+simulators, and such, and therefore have very low-level access to the world they live in. 
+However, they are typically used in controlled development-centered environments. As such, 
+they are typically not directly exposed to security concerns. 
+
+The `ThrowTheSwitch.org` community takes security bugs seriously. Where possible, we will
+make every effort to improve our tools safe use. Thank you for improving the security of 
+our tools. We appreciate your efforts and responsible disclosure and will make every effort 
+to acknowledge your contributions.
+
+Report security bugs by opening a Github Issue on the corresponding project or (when this
+itself would pose a risk) by emailing security@thingamabyte.com.
+
+Report security bugs in third-party modules to the person or team maintaining
+the module.
+
+## Disclosure Policy
+
+Each issue will be assigned to a primary handler. This person will coordinate the fix and 
+release process, involving the following steps:
+
+  * Confirm the problem and determine the affected versions.
+  * Audit code to find any potential similar problems.
+  * Prepare fixes for all releases still under maintenance. These fixes will be
+    released as fast as possible.
+
+## Comments on this Policy
+
+If you have suggestions on how this process could be improved please submit a
+pull request.

data/examples/temp_sensor/project.yml

@@ -221,10 +221,6 @@
     # :html_encoding: UTF-8
 
 # :module_generator:
-#   :project_root: ./
-#   :source_root: source/
-#   :inc_root: includes/
-#   :test_root: tests/
 #   :naming: :snake #options: :bumpy, :camel, :caps, or :snake
 #   :includes:
 #     :tst: []
@@ -336,11 +332,6 @@
 #     :arguments: []
 #     :name: 
 #     :optional: FALSE
-#   :test_dependencies_generator: 
-#     :executable:
-#     :arguments: []
-#     :name: 
-#     :optional: FALSE
 #   :release_compiler: 
 #     :executable:
 #     :arguments: []

data/lib/ceedling/configurator.rb

@@ -132,7 +132,7 @@ class Configurator
     # Plugins must be loaded before generic path evaluation & magic that happen later.
     # So, perform path magic here as discrete step.
     config[:plugins][:load_paths].each do |path|
-      path.replace( @system_wrapper.module_eval( path ) ) if (path =~ RUBY_STRING_REPLACEMENT_PATTERN)
+      path.replace( @system_wrapper.module_eval( path ) ) if (path =~ PATTERNS::RUBY_STRING_REPLACEMENT)
       FilePathUtils::standardize( path )
     end
 
@@ -460,7 +460,7 @@ class Configurator
       # Process value array
       items.each do |item|
         # Process each item for Ruby string replacement
-        if item.is_a? String and item =~ RUBY_STRING_REPLACEMENT_PATTERN
+        if item.is_a? String and item =~ PATTERNS::RUBY_STRING_REPLACEMENT
           item.replace( @system_wrapper.module_eval( item ) )
         end
       end
@@ -706,7 +706,7 @@ class Configurator
     end
 
     paths.each do |path|
-      path.replace( @system_wrapper.module_eval( path ) ) if (path =~ RUBY_STRING_REPLACEMENT_PATTERN)
+      path.replace( @system_wrapper.module_eval( path ) ) if (path =~ PATTERNS::RUBY_STRING_REPLACEMENT)
     end
   end
 
@@ -721,7 +721,7 @@ class Configurator
       if config.all? { |item| item.is_a?( String ) }
         # Expand in place each string item in the array
         config.each do |item|
-          item.replace( @system_wrapper.module_eval( item ) ) if (item =~ RUBY_STRING_REPLACEMENT_PATTERN)
+          item.replace( @system_wrapper.module_eval( item ) ) if (item =~ PATTERNS::RUBY_STRING_REPLACEMENT)
         end
       end
 

data/lib/ceedling/constants.rb

@@ -65,6 +65,15 @@ class StdErrRedirect
   TCSH = :tcsh
 end
 
+class PATTERNS
+  GLOB = /[\*\?\{\}\[\]]/
+  RUBY_STRING_REPLACEMENT = /#\{.+\}/
+  TOOL_EXECUTOR_ARGUMENT_REPLACEMENT = /(\$\{(\d+)\})/
+  TEST_STDOUT_STATISTICS  = /\n-+\s*(\d+)\s+Tests\s+(\d+)\s+Failures\s+(\d+)\s+Ignored\s+(OK|FAIL)\s*/i
+  TEST_SOURCE_FILE  = /TEST_SOURCE_FILE\s*\(\s*\"\s*([^"]+)\s*\"\s*\)/
+  TEST_INCLUDE_PATH = /TEST_INCLUDE_PATH\s*\(\s*\"\s*([^"]+)\s*\"\s*\)/
+end
+
 GIT_COMMIT_SHA_FILENAME = 'GIT_COMMIT_SHA'
 
 # Escaped newline literal (literally double-slash-n) for "encoding" multiline strings as single string
@@ -95,10 +104,6 @@ UNITY_C_FILE           = 'unity.c'
 UNITY_H_FILE           = 'unity.h'
 UNITY_INTERNALS_H_FILE = 'unity_internals.h'
 
-# Do-nothing macros defined in unity.h for extra build context to be used by build tools like Ceedling
-UNITY_TEST_SOURCE_FILE  = 'TEST_SOURCE_FILE'
-UNITY_TEST_INCLUDE_PATH = 'TEST_INCLUDE_PATH'
-
 RUNNER_BUILD_CMDLINE_ARGS_DEFINE = 'UNITY_USE_COMMAND_LINE_ARGS'
 
 CMOCK_SYM       = :cmock
@@ -134,12 +139,6 @@ OPERATION_LINK_SYM        = :link       unless defined?(OPERATION_LINK_SYM)
 PREPROCESS_FULL_EXPANSION_DIR  = 'full_expansion'
 PREPROCESS_DIRECTIVES_ONLY_DIR = 'directives_only'
 
-# Match presence of any glob pattern characters
-GLOB_PATTERN = /[\*\?\{\}\[\]]/
-RUBY_STRING_REPLACEMENT_PATTERN = /#\{.+\}/
-TOOL_EXECUTOR_ARGUMENT_REPLACEMENT_PATTERN = /(\$\{(\d+)\})/
-TEST_STDOUT_STATISTICS_PATTERN  = /\n-+\s*(\d+)\s+Tests\s+(\d+)\s+Failures\s+(\d+)\s+Ignored\s+(OK|FAIL)\s*/i
-
 NULL_FILE_PATH = '/dev/null'
 
 TESTS_BASE_PATH   = TEST_ROOT_NAME

data/lib/ceedling/defaults.rb

@@ -148,26 +148,6 @@ else
   MD_FLAG = '-MD'
 end
 
-DEFAULT_TEST_DEPENDENCIES_GENERATOR_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
-  :name => 'default_test_dependencies_generator'.freeze,
-  :optional => false.freeze,
-  :arguments => [
-    '-E'.freeze,
-    "-I\"${5}\"".freeze, # Per-test executable search paths
-    "-D\"${4}\"".freeze, # Per-test executable defines
-    "-DGNU_COMPILER".freeze,
-    "-MT \"${3}\"".freeze,
-    '-MM'.freeze,
-    MD_FLAG.freeze,
-    '-MG'.freeze,
-    "-MF \"${2}\"".freeze,
-    "-x c".freeze, # Force C language
-    "-c \"${1}\"".freeze,
-    # '-nostdinc'.freeze,
-    ].freeze
-  }
-
 DEFAULT_RELEASE_DEPENDENCIES_GENERATOR_TOOL = {
   :executable => FilePathUtils.os_executable_ext('gcc').freeze,
   :name => 'default_release_dependencies_generator'.freeze,
@@ -276,12 +256,6 @@ DEFAULT_TOOLS_TEST_PREPROCESSORS = {
     }
   }
 
-DEFAULT_TOOLS_TEST_DEPENDENCIES = {
-  :tools => {
-    :test_dependencies_generator => DEFAULT_TEST_DEPENDENCIES_GENERATOR_TOOL,
-    }
-  }
-
 DEFAULT_TOOLS_RELEASE = {
   :tools => {
     :release_compiler => DEFAULT_RELEASE_COMPILER_TOOL,
@@ -307,7 +281,7 @@ DEFAULT_RELEASE_TARGET_NAME = 'project'
 DEFAULT_CEEDLING_PROJECT_CONFIG = {
   :project => {
     # :build_root must be set by user
-    :use_mocks => false,
+    :use_mocks => true,
     :use_exceptions => false,
     :compile_threads => 1,
     :test_threads => 1,

data/lib/ceedling/defineinator.rb

@@ -22,6 +22,8 @@
 #     - TEST
 #     - PLATFORM_B
 
+require 'ceedling/encodinator'
+
 class Defineinator
 
   constructor :configurator, :loginator, :config_matchinator
@@ -66,7 +68,7 @@ class Defineinator
       test_def = File.basename(filepath, '.*').strip
 
       # Replace any non-ASCII characters with underscores
-      test_def = test_def.encode("ASCII", "UTF-8", invalid: :replace, undef: :replace, replace: "_")
+      test_def = test_def.clean_enoding('_')
 
       # Replace all non-alphanumeric characters (including spaces/punctuation but excluding underscores) with underscores
       test_def.gsub!(/[^0-9a-z_]/i, '_')

data/lib/ceedling/encodinator.rb

@@ -0,0 +1,26 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+# Patch the string class so that we have a nice shortcut for cleaning string encodings
+class String
+  def clean_encoding(safe_char = '')
+    begin
+      # Clean up any oddball characters in an otherwise ASCII document
+      encoding_options = {
+        :invalid           => :replace,  # Replace invalid byte sequences
+        :undef             => :replace,  # Replace anything not defined in ASCII
+        :replace           => safe_char, # Use a safe character for those replacements
+        :universal_newline => true       # Always break lines with \n
+      }
+    
+      return self.encode("ASCII", **encoding_options).encode('UTF-8', **encoding_options)
+    rescue 
+      raise "String contains characters that can't be represented in standard ASCII / UTF-8."
+    end 
+    self 
+  end
+end

data/lib/ceedling/file_finder_helper.rb

@@ -49,9 +49,9 @@ class FileFinderHelper
     return nil
   end
 
-  def find_best_path_in_collection(pathname, path_list, complain)
+  def find_best_path_in_collection(pathname, path_list, complain, description)
     # search our collection for the specified exact path
-    raise "No path list provided for search" if path_list.nil?
+    raise "No path list provided for #{description} search" if path_list.nil?
     return pathname if path_list.include?(pathname)
 
     # Determine the closest match by looking for matching path segments, especially paths ENDING the same
@@ -68,6 +68,20 @@ class FileFinderHelper
         best_match_value = num 
       end
     end
+
+    # If none of the options were a good match, handle to the best of our ability
+    if (best_match_value == 0) && (reverse_original_pieces.length > 0)
+      case (complain)
+        when :error
+          raise CeedlingException.new( "Found no path `#{pathname}` in #{description} search paths." ) 
+        when :warn
+          warning = "Found no path `#{pathname}` in #{description} search paths."
+          @loginator.log( warning, Verbosity::COMPLAIN )
+        when :ignore 
+          # nothing further to do
+      end
+    end
+
     return path_list[best_match_index]
   end
 
@@ -94,7 +108,7 @@ class FileFinderHelper
     
   def gripe(filename, extra_message="")
     warning = ["Found no file `#{filename}` in search paths.", extra_message].join(' ').strip
-    @loginator.log( warning + extra_message, Verbosity::COMPLAIN )
+    @loginator.log( warning, Verbosity::COMPLAIN )
   end
 
 end

data/lib/ceedling/file_path_collection_utils.rb

@@ -39,7 +39,7 @@ class FilePathCollectionUtils
       # Expand paths using Ruby's Dir.glob()
       #  - A simple path will yield that path
       #  - A path glob will expand to one or more paths
-      # Note: `sort()` becuase of Github Issue #860
+      # Note: `sort()` because of Github Issue #860
       @file_wrapper.directory_listing( _reformed ).sort.each do |entry|
         # For each result, add it to the working list *only* if it's a directory
         # Previous validation has already made warnings about filepaths in the list
@@ -57,7 +57,7 @@ class FilePathCollectionUtils
         # (Containing parent directory still exists)
         parents << FilePathUtils.no_decorators( _path ) if dirs.empty?
 
-        dirs += parents
+        dirs = parents + dirs
       end
 
       # Based on aggregation modifiers, add entries to plus and minus sets.

data/lib/ceedling/file_path_utils.rb

@@ -52,7 +52,7 @@ class FilePathUtils
     path = self.no_aggregation_decorators(path)
 
     # Find first occurrence of glob specifier: *, ?, {, }, [, ]
-    find_index = (path =~ GLOB_PATTERN)
+    find_index = (path =~ PATTERNS::GLOB)
 
     # Return empty path if first character is part of a glob
     return '' if find_index == 0

data/lib/ceedling/generator_helper.rb

@@ -26,7 +26,7 @@ class GeneratorHelper
     end
 
     # No test results found in test executable output
-    if (shell_result[:output] =~ TEST_STDOUT_STATISTICS_PATTERN).nil?
+    if (shell_result[:output] =~ PATTERNS::TEST_STDOUT_STATISTICS).nil?
       # No debug logging here because we log this condition in the error log handling below
       crash = true
     end
@@ -57,7 +57,7 @@ class GeneratorHelper
       notice += "> Produced no output (including no final test result counts).\n"
 
     # Check for no test results
-    elsif ((shell_result[:output] =~ TEST_STDOUT_STATISTICS_PATTERN).nil?)
+    elsif ((shell_result[:output] =~ PATTERNS::TEST_STDOUT_STATISTICS).nil?)
       # Mirror style of generic tool_executor failure output
       notice += "> Produced some output but contains no final test result counts.\n"
     end

data/lib/ceedling/generator_test_results.rb

@@ -105,7 +105,7 @@ class GeneratorTestResults
     results[:time] = unity_shell_result[:time] unless unity_shell_result[:time].nil?
 
     # Process test statistics
-    if (unity_shell_result[:output] =~ TEST_STDOUT_STATISTICS_PATTERN)
+    if (unity_shell_result[:output] =~ PATTERNS::TEST_STDOUT_STATISTICS)
       results[:counts][:total] =   $1.to_i
       results[:counts][:failed] =  $2.to_i
       results[:counts][:ignored] = $3.to_i
@@ -115,7 +115,7 @@ class GeneratorTestResults
     end
 
     # Remove test statistics lines
-    output_string = unity_shell_result[:output].sub( TEST_STDOUT_STATISTICS_PATTERN, '' )
+    output_string = unity_shell_result[:output].sub( PATTERNS::TEST_STDOUT_STATISTICS, '' )
 
     # Process test executable results line-by-line
     output_string.lines do |line|

data/lib/ceedling/include_pathinator.rb

@@ -28,7 +28,7 @@ class IncludePathinator
         # TODO: When Ceedling's base project path handling is resolved, enable this path redefinition
         # path = File.join( @base_path, path )
         unless @file_wrapper.exist?(path)
-          error = "'#{path}' specified by #{UNITY_TEST_INCLUDE_PATH}() within #{test_filepath} not found"
+          error = "'#{path}' specified by TEST_INCLUDE_PATH() within #{test_filepath} not found"
           raise CeedlingException.new( error )
         end
       end
@@ -51,7 +51,7 @@ class IncludePathinator
 
     if headers.length == 0
       error = "No header files found in project.\n" +
-              "Add search paths to :paths ↳ :include in your project file and/or use #{UNITY_TEST_INCLUDE_PATH}() in your test files.\n" +
+              "Add search paths to :paths ↳ :include in your project file and/or use TEST_INCLUDE_PATH() in your test files.\n" +
               "Verify header files with `ceedling paths:include` and\\or `ceedling files:include`."
       @loginator.log( error, Verbosity::COMPLAIN )
     end

data/lib/ceedling/objects.yml

@@ -162,11 +162,14 @@ file_finder:
 file_finder_helper:
   compose: loginator
 
+parsing_parcels:
+
 test_context_extractor:
   compose:
     - configurator
     - file_wrapper
     - loginator
+    - parsing_parcels
 
 include_pathinator:
   compose:
@@ -272,6 +275,7 @@ preprocessinator_includes_handler:
     - configurator
     - tool_executor
     - test_context_extractor
+    - file_wrapper
     - yaml_wrapper
     - loginator
     - reportinator
@@ -286,6 +290,8 @@ preprocessinator_file_handler:
     - loginator
 
 preprocessinator_extractor:
+  compose:
+    - parsing_parcels
 
 build_batchinator:
   compose: