ceedling 0.0.3 → 0.0.4

data/new_project_template/vendor/ceedling/lib/constants.rb

@@ -24,6 +24,15 @@ class StdErrRedirect
   TCSH = :tcsh
 end
 
+
+class BackgroundExec
+  NONE = :none
+  AUTO = :auto
+  WIN  = :win
+  UNIX = :unix
+end
+
+
 CEXCEPTION_ROOT_PATH = 'c_exception'
 CEXCEPTION_LIB_PATH  = "#{CEXCEPTION_ROOT_PATH}/lib"
 CEXCEPTION_C_FILE    = 'CException.c'
@@ -49,11 +58,15 @@ INPUT_CONFIGURATION_CACHE_FILE     = 'input.yml'   # input configuration file du
 
 TEST_ROOT_NAME    = 'test'
 TEST_TASK_ROOT    = TEST_ROOT_NAME + ':'
-TEST_CONTEXT      = TEST_ROOT_NAME.to_sym
+TEST_SYM          = TEST_ROOT_NAME.to_sym
 
 RELEASE_ROOT_NAME = 'release'
 RELEASE_TASK_ROOT = RELEASE_ROOT_NAME + ':'
-RELEASE_CONTEXT   = RELEASE_ROOT_NAME.to_sym
+RELEASE_SYM       = RELEASE_ROOT_NAME.to_sym
+
+UTILS_ROOT_NAME   = 'utils'
+UTILS_TASK_ROOT   = UTILS_ROOT_NAME + ':'
+UTILS_SYM         = UTILS_ROOT_NAME.to_sym
 
 
 RUBY_STRING_REPLACEMENT_PATTERN = /#\{.+\}/
@@ -62,5 +75,5 @@ TOOL_EXECUTOR_ARGUMENT_REPLACEMENT_PATTERN = /(\$\{(\d+)\})/
 
 NULL_FILE_PATH = '/dev/null'
 
-TESTS_BASE_PATH   = 'tests'
-RELEASE_BASE_PATH = 'release'
+TESTS_BASE_PATH   = TEST_ROOT_NAME
+RELEASE_BASE_PATH = RELEASE_ROOT_NAME

data/new_project_template/vendor/ceedling/lib/defaults.rb

@@ -4,151 +4,165 @@ require 'file_path_utils'
 
 
 DEFAULT_TEST_COMPILER_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc'),
-  :name => 'default_test_compiler',
-  :stderr_redirect => StdErrRedirect::NONE,
+  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
+  :name => 'default_test_compiler'.freeze,
+  :stderr_redirect => StdErrRedirect::NONE.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
   :arguments => [
-    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'},
-    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'},
-    {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'},
-    "-DGNU_COMPILER",
-    {"$" => 'TEST_COMPILER_ARGUMENTS'},
-    "-c \"${1}\"",
-    "-o \"${2}\"",
-    ]
+    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'}.freeze,
+    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
+    {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
+    "-DGNU_COMPILER".freeze,
+    "-c \"${1}\"".freeze,
+    "-o \"${2}\"".freeze,
+    ].freeze
   }
 
 DEFAULT_TEST_LINKER_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc'),
-  :name => 'default_test_linker',
-  :stderr_redirect => StdErrRedirect::NONE,
+  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
+  :name => 'default_test_linker'.freeze,
+  :stderr_redirect => StdErrRedirect::NONE.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
   :arguments => [
-    {"$" => 'TEST_LINKER_ARGUMENTS'},
-    "\"${1}\"",
-    "-o \"${2}\"",
-    ]
+    "\"${1}\"".freeze,
+    "-o \"${2}\"".freeze,
+    ].freeze
   }
   
 DEFAULT_TEST_FIXTURE_TOOL = {
-  :executable => '${1}',
-  :name => 'default_test_fixture',
-  :stderr_redirect => StdErrRedirect::AUTO,
-  :arguments => [
-    {"$" => 'TEST_FIXTURE_ARGUMENTS'},
-    ]
+  :executable => '${1}'.freeze,
+  :name => 'default_test_fixture'.freeze,
+  :stderr_redirect => StdErrRedirect::AUTO.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
+  :arguments => [].freeze
   }
 
 
 
 DEFAULT_TEST_INCLUDES_PREPROCESSOR_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('cpp'),
-  :name => 'default_test_includes_preprocessor',
-  :stderr_redirect => StdErrRedirect::NONE,
+  :executable => FilePathUtils.os_executable_ext('cpp').freeze,
+  :name => 'default_test_includes_preprocessor'.freeze,
+  :stderr_redirect => StdErrRedirect::NONE.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
   :arguments => [
-    '-MM', '-MG',
+    '-MM'.freeze,
+    '-MG'.freeze,
     # avoid some possibility of deep system lib header file complications by omitting vendor paths
     # if cpp is run on *nix system, escape spaces in paths; if cpp on windows just use the paths collection as is
-    {"-I\"$\"" => "{SystemWrapper.is_windows? ? COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE : COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE.map{|path| path.gsub(\/ \/, \'\\\\ \') }}"},
-    {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'},
-    {"-D$" => 'DEFINES_TEST_PREPROCESS'},
-    "-DGNU_PREPROCESSOR",
-    {"$" => 'TEST_INCLUDES_PREPROCESSOR_ARGUMENTS'},
-    '-w',
-    '-nostdinc',
-    "\"${1}\""
-    ]
+    {"-I\"$\"" => "{SystemWrapper.windows? ? COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE : COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE.map{|path| path.gsub(\/ \/, \'\\\\ \') }}"}.freeze,
+    {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
+    {"-D$" => 'DEFINES_TEST_PREPROCESS'}.freeze,
+    "-DGNU_PREPROCESSOR".freeze,
+    '-w'.freeze,
+    '-nostdinc'.freeze,
+    "\"${1}\"".freeze
+    ].freeze
   }
 
 DEFAULT_TEST_FILE_PREPROCESSOR_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc'),
-  :name => 'default_test_file_preprocessor',
-  :stderr_redirect => StdErrRedirect::NONE,
+  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
+  :name => 'default_test_file_preprocessor'.freeze,
+  :stderr_redirect => StdErrRedirect::NONE.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
   :arguments => [
-    '-E',
-    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'},
-    {"-I\"$\"" => 'PATHS_TEST_TOOLCHAIN_INCLUDE'},
-    {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'},
-    {"-D$" => 'DEFINES_TEST_PREPROCESS'},
-    "-DGNU_PREPROCESSOR",
-    {"$" => 'TEST_FILE_PREPROCESSOR_ARGUMENTS'},
-    "\"${1}\"",
-    "-o \"${2}\""
-    ]
+    '-E'.freeze,
+    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'}.freeze,
+    {"-I\"$\"" => 'PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
+    {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
+    {"-D$" => 'DEFINES_TEST_PREPROCESS'}.freeze,
+    "-DGNU_PREPROCESSOR".freeze,
+    "\"${1}\"".freeze,
+    "-o \"${2}\"".freeze
+    ].freeze
   }
 
 DEFAULT_TEST_DEPENDENCIES_GENERATOR_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc'),
-  :name => 'default_test_dependencies_generator',
-  :stderr_redirect => StdErrRedirect::NONE,
+  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
+  :name => 'default_test_dependencies_generator'.freeze,
+  :stderr_redirect => StdErrRedirect::NONE.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
   :arguments => [
-    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'},
-    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'},
-    {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'},   
-    {"-D$" => 'DEFINES_TEST_PREPROCESS'},     
-    "-DGNU_PREPROCESSOR",
-    "-MT \"${3}\"",
-    '-MM', '-MD', '-MG',
-    "-MF \"${2}\"",
-    {"$" => 'TEST_DEPENDENCIES_GENERATOR_ARGUMENTS'},
-    "-c \"${1}\"",
-    ]
+    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'}.freeze,
+    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
+    {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze, 
+    {"-D$" => 'DEFINES_TEST_PREPROCESS'}.freeze,     
+    "-DGNU_PREPROCESSOR".freeze,
+    "-MT \"${3}\"".freeze,
+    '-MM'.freeze,
+    '-MD'.freeze,
+    '-MG'.freeze,
+    "-MF \"${2}\"".freeze,
+    "-c \"${1}\"".freeze,
+    ].freeze
   }
 
 DEFAULT_RELEASE_DEPENDENCIES_GENERATOR_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc'),
-  :name => 'default_release_dependencies_generator',
-  :stderr_redirect => StdErrRedirect::NONE,
+  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
+  :name => 'default_release_dependencies_generator'.freeze,
+  :stderr_redirect => StdErrRedirect::NONE.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
   :arguments => [
-    {"-I\"$\"" => 'COLLECTION_PATHS_SOURCE_AND_INCLUDE'},
-    {"-I\"$\"" => 'COLLECTION_PATHS_RELEASE_TOOLCHAIN_INCLUDE'},
-    {"-D$" => 'COLLECTION_DEFINES_RELEASE_AND_VENDOR'},
-    {"-D$" => 'DEFINES_RELEASE_PREPROCESS'},
-    "-DGNU_PREPROCESSOR",
-    "-MT \"${3}\"",
-    '-MM', '-MD', '-MG',
-    "-MF \"${2}\"",
-    {"$" => 'RELEASE_DEPENDENCIES_GENERATOR_ARGUMENTS'},
-    "-c \"${1}\"",
-    ]
+    {"-I\"$\"" => 'COLLECTION_PATHS_SOURCE_AND_INCLUDE'}.freeze,
+    {"-I\"$\"" => 'COLLECTION_PATHS_RELEASE_TOOLCHAIN_INCLUDE'}.freeze,
+    {"-D$" => 'COLLECTION_DEFINES_RELEASE_AND_VENDOR'}.freeze,
+    {"-D$" => 'DEFINES_RELEASE_PREPROCESS'}.freeze,
+    "-DGNU_PREPROCESSOR".freeze,
+    "-MT \"${3}\"".freeze,
+    '-MM'.freeze,
+    '-MD'.freeze,
+    '-MG'.freeze,
+    "-MF \"${2}\"".freeze,
+    "-c \"${1}\"".freeze,
+    ].freeze
   }
 
 
 DEFAULT_RELEASE_COMPILER_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc'),
-  :name => 'default_release_compiler',
-  :stderr_redirect => StdErrRedirect::NONE,
+  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
+  :name => 'default_release_compiler'.freeze,
+  :stderr_redirect => StdErrRedirect::NONE.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
   :arguments => [
-    {"-I\"$\"" => 'COLLECTION_PATHS_SOURCE_INCLUDE_VENDOR'},
-    {"-I\"$\"" => 'COLLECTION_PATHS_RELEASE_TOOLCHAIN_INCLUDE'},
-    {"-D$" => 'COLLECTION_DEFINES_RELEASE_AND_VENDOR'},        
-    "-DGNU_COMPILER",
-    {"$" => 'RELEASE_COMPILER_ARGUMENTS'},
-    "-c \"${1}\"",
-    "-o \"${2}\"",
-    ]
+    {"-I\"$\"" => 'COLLECTION_PATHS_SOURCE_INCLUDE_VENDOR'}.freeze,
+    {"-I\"$\"" => 'COLLECTION_PATHS_RELEASE_TOOLCHAIN_INCLUDE'}.freeze,
+    {"-D$" => 'COLLECTION_DEFINES_RELEASE_AND_VENDOR'}.freeze,
+    "-DGNU_COMPILER".freeze,
+    "-c \"${1}\"".freeze,
+    "-o \"${2}\"".freeze,
+    ].freeze
   }
 
 DEFAULT_RELEASE_ASSEMBLER_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('as'),
-  :name => 'default_release_assembler',
-  :stderr_redirect => StdErrRedirect::NONE,
+  :executable => FilePathUtils.os_executable_ext('as').freeze,
+  :name => 'default_release_assembler'.freeze,
+  :stderr_redirect => StdErrRedirect::NONE.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
   :arguments => [
-    {"-I\"$\"" => 'COLLECTION_PATHS_SOURCE_AND_INCLUDE'},
-    {"$" => 'RELEASE_ASSEMBLER_ARGUMENTS'},
-    "\"${1}\"",
-    "-o \"${2}\"",
-    ]
+    {"-I\"$\"" => 'COLLECTION_PATHS_SOURCE_AND_INCLUDE'}.freeze,
+    "\"${1}\"".freeze,
+    "-o \"${2}\"".freeze,
+    ].freeze
   }
 
 DEFAULT_RELEASE_LINKER_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc'),
-  :name => 'default_release_linker',
-  :stderr_redirect => StdErrRedirect::NONE,
+  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
+  :name => 'default_release_linker'.freeze,
+  :stderr_redirect => StdErrRedirect::NONE.freeze,
+  :background_exec => BackgroundExec::NONE.freeze,
+  :optional => false.freeze,
   :arguments => [
-    {"$" => 'RELEASE_LINKER_ARGUMENTS'},
-    "\"${1}\"",
-    "-o \"${2}\"",
-    ]
+    "\"${1}\"".freeze,
+    "-o \"${2}\"".freeze,
+    ].freeze
   }
 
   
@@ -240,7 +254,7 @@ DEFAULT_CEEDLING_CONFIG = {
       :source => '.c',
       :assembly => '.s',
       :object => '.o',
-      :executable => ( SystemWrapper.is_windows? ? '.exe' : '.out' ),
+      :executable => ( SystemWrapper.windows? ? '.exe' : '.out' ),
       :testpass => '.pass',
       :testfail => '.fail',
       :dependencies => '.d',
@@ -286,7 +300,7 @@ DEFAULT_CEEDLING_CONFIG = {
       :load_paths => [],
       :enabled => [],
     }
-  }
+  }.freeze
 
   
 DEFAULT_TESTS_RESULTS_REPORT_TEMPLATE = %q{

data/new_project_template/vendor/ceedling/lib/file_path_utils.rb

@@ -29,7 +29,7 @@ class FilePathUtils
   end
 
   def self.os_executable_ext(executable)
-    return executable.ext('.exe') if SystemWrapper.is_windows?
+    return executable.ext('.exe') if SystemWrapper.windows?
     return executable
   end
 

data/new_project_template/vendor/ceedling/lib/generator.rb

@@ -18,14 +18,14 @@ class Generator
   def generate_dependencies_file(tool, context, source, object, dependencies)
     @streaminator.stdout_puts("Generating dependencies for #{File.basename(source)}...", Verbosity::NORMAL)
     
-    command_line = 
+    command = 
       @tool_executor.build_command_line(
         tool,
         source,
         dependencies,
         object)
     
-    @tool_executor.exec(command_line)
+    @tool_executor.exec( command[:line], command[:options] )
   end
 
   def generate_mock(context, header_filepath)
@@ -67,7 +67,8 @@ class Generator
     @plugin_manager.pre_compile_execute(arg_hash)
 
     @streaminator.stdout_puts("Compiling #{File.basename(arg_hash[:source])}...", Verbosity::NORMAL)
-    shell_result = @tool_executor.exec( @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:source], arg_hash[:object]) )
+    command      = @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:source], arg_hash[:object])
+    shell_result = @tool_executor.exec( command[:line], command[:options] )
 
     arg_hash[:shell_result] = shell_result
     @plugin_manager.post_compile_execute(arg_hash)
@@ -81,7 +82,8 @@ class Generator
     @streaminator.stdout_puts("Linking #{File.basename(arg_hash[:executable])}...", Verbosity::NORMAL)
     
     begin
-      shell_result = @tool_executor.exec( @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:objects], arg_hash[:executable]) )
+      command = @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:objects], arg_hash[:executable])
+      shell_result = @tool_executor.exec( command[:line], command[:options] )
     rescue
       notice =    "\n" +
                   "NOTICE: If the linker reports missing symbols, the following may be to blame:\n" +
@@ -110,10 +112,16 @@ class Generator
     
     # Unity's exit code is equivalent to the number of failed tests, so we tell @tool_executor not to fail out if there are failures
     # so that we can run all tests and collect all results
-    shell_result = @tool_executor.exec( @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:executable]), [], {:boom => false} )
+    command = @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:executable])
+    command[:options][:boom] = false
+    shell_result = @tool_executor.exec( command[:line], command[:options] )
     
     if (shell_result[:output].nil? or shell_result[:output].strip.empty?)
-      @streaminator.stderr_puts("ERROR: Test executable \"#{File.basename(executable)}\" did not produce any results.", Verbosity::ERRORS)
+      notice = "\n" +
+               "ERROR: Test executable \"#{File.basename(executable)}\" did not produce any results.\n" +
+               "This is most often a symptom of bad memory accesses in source or test code.\n\n"
+      
+      @streaminator.stderr_puts(notice, Verbosity::COMPLAIN)
       raise
     end
     

data/new_project_template/vendor/ceedling/lib/objects.yml

@@ -17,6 +17,10 @@ rake_utils:
   compose:
     - rake_wrapper  
 
+system_utils:
+  compose:
+    - system_wrapper  
+
 file_path_utils:
   compose:
     - configurator
@@ -59,6 +63,7 @@ tool_executor:
 tool_executor_helper:
   compose:
     - streaminator
+    - system_utils
     - system_wrapper
 
 configurator:

data/new_project_template/vendor/ceedling/lib/plugin.rb

@@ -29,9 +29,10 @@ class String
 end
 
 class Plugin
-  attr_reader :name
+  attr_reader :name, :environment
 
   def initialize(system_objects, name)
+    @environment = []
     @ceedling = system_objects
     @name = name
     self.setup

data/new_project_template/vendor/ceedling/lib/plugin_manager.rb

@@ -11,16 +11,21 @@ class PluginManager
   end
   
   def load_plugin_scripts(script_plugins, system_objects)
+    environment = []
+    
     script_plugins.each do |plugin|
-      # protect against instantiating object multiple times due to processing config multiple times (options, etc)
+      # protect against instantiating object multiple times due to processing config multiple times (option files, etc)
 			next if (@plugin_manager_helper.include?(@plugin_objects, plugin))
       @system_wrapper.require_file( "#{plugin}.rb" )
       object = @plugin_manager_helper.instantiate_plugin_script( camelize(plugin), system_objects, plugin )
       @plugin_objects << object
+      environment += object.environment
       
       # add plugins to hash of all system objects
       system_objects[plugin.downcase.to_sym] = object
     end
+    
+    yield( { :environment => environment } ) if (environment.size > 0)
   end
   
   def plugins_failed?