ceedling 0.0.5 → 0.0.7

data/Rakefile

@@ -31,6 +31,7 @@ task :update_tools do
     {:src => 'vendor/constructor/lib/',                          :dest => 'vendor/constructor/'},
     {:src => 'vendor/deep_merge/lib/',                           :dest => 'vendor/deep_merge/'},
     {:src => 'vendor/diy/lib',                                   :dest => 'vendor/diy/'},
+    {:src => 'vendor/unity/auto/',                               :dest => 'vendor/unity/'},
     {:src => 'vendor/unity/release/',                            :dest => 'vendor/unity/'},
     {:src => 'vendor/unity/src/',                                :dest => 'vendor/unity/'},
     {:src => 'vendor/c_exception/docs/CExceptionSummary.pdf',    :dest => 'docs/', :is_file => true},

data/bin/ceedling

@@ -37,7 +37,7 @@ class CeedlingTasks < Thor
     end
   end
 
-  desc "example [PROJ_NAME] [DEST]", "create specified example project (in DEST, if specified)"
+  desc "example PROJ_NAME [DEST]", "create specified example project (in DEST, if specified)"
   def example(proj_name, dest=".")
     dest = "." if dest.nil?
     directory Ceedling::NEW_PROJECT_DIR, dest

data/lib/ceedling/version.rb

@@ -2,10 +2,10 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.5"
+    GEM = "0.0.7"
 
     # @private
-    CEEDLING = "0.9.175"
+    CEEDLING = "0.9.185"
     # @private
     CEXCEPTION = "1.2.16"
     # @private

data/lib/ceedling/version.rb.erb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.5"
+    GEM = "0.0.6"
 
     # @private
     CEEDLING = "<%= versions["CEEDLING"] %>"

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

@@ -78,22 +78,6 @@ class Configurator
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE_DEPENDENCIES ) if (config[:project][:release_build] and config[:project][:use_auxiliary_dependencies])
   end
   
-
-  def populate_unity_defines(config)
-    run_test = true
-  
-    config[:unity][:defines].each do |define|
-      if (define =~ /RUN_TEST\s*\(.+\)\s*=/)
-        run_test = false
-        break
-      end
-    end
-  
-    if (run_test)
-      config[:unity][:defines] << "\"RUN_TEST(func, line_num)=TestRun(func, #func, line_num)\""
-    end
-  end
-  
   
   def populate_cmock_defaults(config)
     # cmock has its own internal defaults handling, but we need to set these specific values
@@ -122,9 +106,13 @@ class Configurator
       cmock[:includes].uniq!
     end
 
+    @runner_config = cmock
     @cmock_builder.manufacture(cmock)
   end
-
+  
+  def get_runner_config
+    @runner_config
+  end
 
   # grab tool names from yaml and insert into tool structures so available for error messages
   # set up default values
@@ -192,12 +180,17 @@ class Configurator
   
   def eval_environment_variables(config)
     config[:environment].each do |hash|
-      key = hash.keys[0]
-      value_string = hash[key].to_s
-      if (value_string =~ RUBY_STRING_REPLACEMENT_PATTERN)
-        value_string.replace(@system_wrapper.module_eval(value_string))
-      end
-      @system_wrapper.env_set(key.to_s.upcase, value_string)
+      key   = hash.keys[0]
+      value = hash[key]
+      items = []
+            
+      interstitial = ((key == :path) ? File::PATH_SEPARATOR : '')
+      items = ((value.class == Array) ? hash[key] : [value])
+      
+      items.map { |item| item.replace( @system_wrapper.module_eval( item ) ) if (item =~ RUBY_STRING_REPLACEMENT_PATTERN) }
+      hash[key] = items.join( interstitial )
+      
+      @system_wrapper.env_set( key.to_s.upcase, hash[key] )
     end
   end
 

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

@@ -261,8 +261,8 @@ class ConfiguratorBuilder
     extra_paths = []
     extra_paths << FilePathUtils::form_ceedling_vendor_path(UNITY_LIB_PATH)
     extra_paths << FilePathUtils::form_ceedling_vendor_path(CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
-    extra_paths << FilePathUtils::form_ceedling_vendor_path(CMOCK_LIB_PATH)       if (in_hash[:project_use_mocks])
-    extra_paths << in_hash[:cmock_mock_path]                                   if (in_hash[:project_use_mocks])
+    extra_paths << FilePathUtils::form_ceedling_vendor_path(CMOCK_LIB_PATH)      if (in_hash[:project_use_mocks])
+    extra_paths << in_hash[:cmock_mock_path]                                     if (in_hash[:project_use_mocks])
 
     return {
       :collection_paths_test_support_source_include_vendor => 
@@ -371,7 +371,7 @@ class ConfiguratorBuilder
 
     # no build paths here so plugins can remap if necessary (i.e. path mapping happens at runtime)
     objects << CEXCEPTION_C_FILE.ext( in_hash[:extension_object] ) if (in_hash[:project_use_exceptions])
-    
+
     return {:collection_release_artifact_extra_link_objects => objects}
   end
   

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

@@ -76,6 +76,7 @@ UTILS_SYM         = UTILS_ROOT_NAME.to_sym
 RUBY_STRING_REPLACEMENT_PATTERN = /#\{.+\}/
 RUBY_EVAL_REPLACEMENT_PATTERN   = /^\{(.+)\}$/
 TOOL_EXECUTOR_ARGUMENT_REPLACEMENT_PATTERN = /(\$\{(\d+)\})/
+TEST_STDOUT_STATISTICS_PATTERN  = /-+\s+(\d+)\s+Tests\s+(\d+)\s+Failures\s+(\d+)\s+Ignored\s+(OK|FAIL)\s*/i
 
 NULL_FILE_PATH = '/dev/null'
 

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

@@ -16,6 +16,7 @@ DEFAULT_TEST_COMPILER_TOOL = {
     "-DGNU_COMPILER".freeze,
     "-c \"${1}\"".freeze,
     "-o \"${2}\"".freeze,
+    # gcc's list file output options are complex; no use of ${3} parameter in default config    
     ].freeze
   }
 
@@ -72,7 +73,7 @@ DEFAULT_TEST_FILE_PREPROCESSOR_TOOL = {
   :arguments => [
     '-E'.freeze,
     {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'}.freeze,
-    {"-I\"$\"" => 'PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
+    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
     {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
     {"-D$" => 'DEFINES_TEST_PREPROCESS'}.freeze,
     "-DGNU_PREPROCESSOR".freeze,
@@ -109,7 +110,7 @@ DEFAULT_RELEASE_DEPENDENCIES_GENERATOR_TOOL = {
   :background_exec => BackgroundExec::NONE.freeze,
   :optional => false.freeze,
   :arguments => [
-    {"-I\"$\"" => 'COLLECTION_PATHS_SOURCE_AND_INCLUDE'}.freeze,
+    {"-I\"$\"" => 'COLLECTION_PATHS_SOURCE_INCLUDE_VENDOR'}.freeze,
     {"-I\"$\"" => 'COLLECTION_PATHS_RELEASE_TOOLCHAIN_INCLUDE'}.freeze,
     {"-D$" => 'COLLECTION_DEFINES_RELEASE_AND_VENDOR'}.freeze,
     {"-D$" => 'DEFINES_RELEASE_PREPROCESS'}.freeze,
@@ -137,6 +138,7 @@ DEFAULT_RELEASE_COMPILER_TOOL = {
     "-DGNU_COMPILER".freeze,
     "-c \"${1}\"".freeze,
     "-o \"${2}\"".freeze,
+    # gcc's list file output options are complex; no use of ${3} parameter in default config    
     ].freeze
   }
 
@@ -256,6 +258,7 @@ DEFAULT_CEEDLING_CONFIG = {
       :object => '.o',
       :executable => ( SystemWrapper.windows? ? EXTENSION_WIN_EXE : EXTENSION_NONWIN_EXE ),
       :map => '.map',
+      :list => '.lst',
       :testpass => '.pass',
       :testfail => '.fail',
       :dependencies => '.d',

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

@@ -83,8 +83,8 @@ class FileFinder
   end
   
   
-  def find_compilation_input_file(file_path)
-    found_file = ''
+  def find_compilation_input_file(file_path, complain=:error)
+    found_file = nil
     
     source_file = File.basename(file_path).ext(@configurator.extension_source)
 
@@ -96,21 +96,21 @@ class FileFinder
         @file_finder_helper.find_file_in_collection(
           source_file,
           @file_wrapper.directory_listing( File.join(@configurator.project_test_runners_path, '*') ),
-          :error)
+          complain)
           
     elsif (@configurator.project_use_mocks and (source_file =~ /#{@configurator.cmock_mock_prefix}/))
       found_file = 
         @file_finder_helper.find_file_in_collection(
           source_file,
           @file_wrapper.directory_listing( File.join(@configurator.cmock_mock_path, '*') ),
-          :error)
+          complain)
 
     else
       found_file = 
         @file_finder_helper.find_file_in_collection(
           source_file,
           @configurator.collection_all_existing_compilation_input,
-          :error)
+          complain)
     end
 
     return found_file

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

@@ -107,6 +107,10 @@ class FilePathUtils
   def form_release_build_asm_objects_filelist(files)
     return (@file_wrapper.instantiate_file_list(files)).pathmap("#{@configurator.project_release_build_output_asm_path}/%n#{@configurator.extension_object}")
   end
+
+  def form_release_build_c_list_filepath(filepath)
+    return File.join( @configurator.project_release_build_output_c_path, File.basename(filepath).ext(@configurator.extension_list) )
+  end
   
   def form_release_dependencies_filelist(files)
     return (@file_wrapper.instantiate_file_list(files)).pathmap("#{@configurator.project_release_dependencies_path}/%n#{@configurator.extension_dependencies}")
@@ -149,6 +153,10 @@ class FilePathUtils
     return File.join( @configurator.project_test_build_output_path, File.basename(filepath).ext(@configurator.extension_map) )
   end
 
+  def form_test_build_list_filepath(filepath)
+    return File.join( @configurator.project_test_build_output_path, File.basename(filepath).ext(@configurator.extension_list) )
+  end
+
   def form_preprocessed_file_filepath(filepath)
     return File.join( @configurator.project_test_preprocess_files_path, File.basename(filepath) )    
   end

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

@@ -1,9 +1,9 @@
-require 'constants' # for Verbosity constants class
+require 'constants'
 
 
 class Generator
 
-  constructor :configurator, :preprocessinator, :cmock_builder, :generator_test_runner, :generator_test_results, :test_includes_extractor, :tool_executor, :file_finder, :file_path_utils, :streaminator, :plugin_manager, :file_wrapper
+  constructor :configurator, :generator_helper, :preprocessinator, :cmock_builder, :generator_test_runner, :generator_test_results, :test_includes_extractor, :tool_executor, :file_finder, :file_path_utils, :streaminator, :plugin_manager, :file_wrapper
 
 
   def generate_shallow_includes_list(context, file)
@@ -40,7 +40,6 @@ class Generator
   # test_filepath may be either preprocessed test file or original test file
   def generate_test_runner(context, test_filepath, runner_filepath)
     arg_hash = {:context => context, :test_file => test_filepath, :runner_file => runner_filepath}
-
     @plugin_manager.pre_runner_execute(arg_hash)
     
     # collect info we need
@@ -51,23 +50,17 @@ class Generator
     @streaminator.stdout_puts("Generating runner for #{module_name}...", Verbosity::NORMAL)
     
     # build runner file
-    @file_wrapper.open(runner_filepath, 'w') do |output|
-      @generator_test_runner.create_header(output, mock_list)
-      @generator_test_runner.create_externs(output, test_cases)
-      @generator_test_runner.create_mock_management(output, mock_list)
-      @generator_test_runner.create_runtest(output, mock_list, test_cases)
-      @generator_test_runner.create_main(output, module_name, test_cases)
-    end
+    @generator_test_runner.generate(module_name, runner_filepath, test_cases, mock_list)
 
     @plugin_manager.post_runner_execute(arg_hash)
   end
 
-  def generate_object_file(tool, context, source, object)    
-    arg_hash = {:tool => tool, :context => context, :source => source, :object => object}
+  def generate_object_file(tool, context, source, object, list='')    
+    arg_hash = {:tool => tool, :context => context, :source => source, :object => object, :list => list}
     @plugin_manager.pre_compile_execute(arg_hash)
 
     @streaminator.stdout_puts("Compiling #{File.basename(arg_hash[:source])}...", Verbosity::NORMAL)
-    command      = @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], arg_hash[:list])
     shell_result = @tool_executor.exec( command[:line], command[:options] )
 
     arg_hash[:shell_result] = shell_result
@@ -116,14 +109,7 @@ class Generator
     command[:options][:boom] = false
     shell_result = @tool_executor.exec( command[:line], command[:options] )
     
-    if (shell_result[:output].nil? or shell_result[:output].strip.empty?)
-      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
+    @generator_helper.test_results_error_handler(executable, shell_result)
     
     processed = @generator_test_results.process_and_write_results( shell_result,
                                                                    arg_hash[:result_file],

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

@@ -0,0 +1,40 @@
+require 'constants'
+
+
+class GeneratorHelper
+
+  constructor :streaminator
+
+
+  def test_results_error_handler(executable, shell_result)
+    notice = ''
+    error  = false
+    
+    if (shell_result[:output].nil? or shell_result[:output].strip.empty?)
+      error = true
+      # mirror style of generic tool_executor failure output
+      notice  = "\n" +
+                "ERROR: Test executable \"#{File.basename(executable)}\" failed.\n" +
+                "> Produced no output to $stdout.\n"
+    elsif ((shell_result[:output] =~ TEST_STDOUT_STATISTICS_PATTERN).nil?)
+      error = true
+      # mirror style of generic tool_executor failure output
+      notice  = "\n" +
+                "ERROR: Test executable \"#{File.basename(executable)}\" failed.\n" +
+                "> Produced no test results in $stdout:\n" +
+                "#{shell_result[:output].strip}\n"
+    end
+    
+    if (error)
+      # since we told the tool executor to ignore the exit code, handle it explicitly here
+      notice += "> And exited with status: [#{shell_result[:exit_code]}] (count of failed tests).\n" if (shell_result[:exit_code] != nil)
+      notice += "> And then likely crashed.\n"                                                       if (shell_result[:exit_code] == nil)
+
+      notice += "> This is often a symptom of a bad memory access in source or test code.\n\n"
+
+      @streaminator.stderr_puts(notice, Verbosity::COMPLAIN)
+      raise      
+    end
+  end
+  
+end

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

@@ -4,12 +4,11 @@ require 'constants'
 
  
 class GeneratorTestResults
-  TEST_STATISTICS_REGEX = /-+\s+(\d+)\s+Tests\s+(\d+)\s+Failures\s+(\d+)\s+Ignored\s+(OK|FAIL)\s*/i
 
   constructor :configurator, :generator_test_results_sanity_checker, :yaml_wrapper
  
   def process_and_write_results(unity_shell_result, results_file, test_file)
-    output_file = results_file
+    output_file   = results_file
     
     results = get_results_structure
     
@@ -17,7 +16,7 @@ class GeneratorTestResults
     results[:source][:file] = File.basename(test_file)
     
     # process test statistics
-    if (unity_shell_result[:output] =~ TEST_STATISTICS_REGEX)
+    if (unity_shell_result[:output] =~ TEST_STDOUT_STATISTICS_PATTERN)
       results[:counts][:total]   = $1.to_i
       results[:counts][:failed]  = $2.to_i
       results[:counts][:ignored] = $3.to_i
@@ -25,10 +24,10 @@ class GeneratorTestResults
     end
 
     # remove test statistics lines
-    unity_shell_result[:output].sub!(TEST_STATISTICS_REGEX, '')
+    output_string = unity_shell_result[:output].sub(TEST_STDOUT_STATISTICS_PATTERN, '')
     
     # bust up the output into individual lines
-    raw_unity_lines = unity_shell_result[:output].split(/\n|\r\n/)
+    raw_unity_lines = output_string.split(/\n|\r\n/)
     
     raw_unity_lines.each do |line|
       # process unity output

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

@@ -3,7 +3,6 @@ class GeneratorTestRunner
 
   constructor :configurator, :file_path_utils, :file_wrapper
 
-  
   def find_test_cases(test_file)
     tests = []
     tests_and_line_numbers = []
@@ -53,154 +52,13 @@ class GeneratorTestRunner
     return tests_and_line_numbers
   end
   
-  
-  def create_header(output, mock_list)    
-    output << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n"
-    output << "#include \"unity.h\"\n"
-    
-    @configurator.test_runner_includes.each do |include|
-      output << "#include \"#{include}\"\n"
-    end
-    
-    output << "#include <setjmp.h>\n"
-    output << "#include <stdio.h>\n"
-    
-    if (@configurator.project_use_exceptions == true)
-      output << "#include \"CException.h\"\n"
-    end
-        
-    unless (mock_list.empty?)
-      header_extension = @configurator.extension_header
-      mock_list.each do |mock|
-        output << "#include \"#{mock}#{header_extension}\"\n"
-      end
-      if (@configurator.cmock_enforce_strict_ordering == true)
-        output << "\n"
-        output << "int GlobalExpectCount;\n"
-        output << "int GlobalVerifyOrder;\n"
-        output << "char* GlobalOrderError;\n"
-      end
-    end
-    
-    output << "\n"
-    output << "char MessageBuffer[50];\n"
-  end
-  
-  
-  def create_externs(output, test_cases)
-    output << "\n"
-    output << "extern void setUp(void);\n"
-    output << "extern void tearDown(void);\n"
-    output << "\n" if not test_cases.empty?
-    
-    test_cases.each do |item|
-      output << "extern void #{item[:test]}(void);\n"
-    end    
-  end
-  
-  
-  def create_mock_management(output, mock_list)
-    
-    unless (mock_list.empty?)
-      header_extension = @configurator.extension_header
-
-      output << "\n"      
-      output << "static void CMock_Init(void)\n"
-      output << "{\n"
-      
-      if (@configurator.cmock_enforce_strict_ordering == true)
-        output << "  GlobalExpectCount = 0;\n"
-        output << "  GlobalVerifyOrder = 0;\n"
-        output << "  GlobalOrderError = NULL;\n"
-      end
-      
-      mock_list.each do |mock|
-        output << "  #{mock.sub(/#{'\\'+header_extension}/, '')}_Init();\n"
-      end
-      output << "}\n"
-      output << "\n"
-
-      output << "static void CMock_Verify(void)\n"
-      output << "{\n"
-      mock_list.each do |mock|
-        output << "  #{mock.sub(/#{'\\'+header_extension}/, '')}_Verify();\n"
-      end
-      output << "}\n"
-      output << "\n"
-
-      output << "static void CMock_Destroy(void)\n"
-      output << "{\n"
-      mock_list.each do |mock|
-        output << "  #{mock.sub(/#{'\\'+header_extension}/, '')}_Destroy();\n"
-      end
-      output << "}\n"
-      output << "\n"
-
-      output << "void CMock_VerifyAndReset(void)\n"
-      output << "{\n"
-      output << "  CMock_Verify();\n"
-      output << "  CMock_Destroy();\n"
-      output << "  CMock_Init();\n"
-      output << "}\n"
-      output << "\n"
-    end
-    
-  end
-  
-  
-  def create_runtest(output, mock_list, test_cases)
-    
-    unless(test_cases.empty?)
-      use_exceptions = @configurator.project_use_exceptions
-
-      tab = '    '   # default spacing
-      tab = '      ' if (use_exceptions)
-
-      output << "\n"
-      output << "static void TestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)\n"
-      output << "{\n"
-      output << "  Unity.CurrentTestName = FuncName;\n"
-      output << "  Unity.CurrentTestLineNumber = FuncLineNum;\n"
-      output << "  Unity.NumberOfTests++;\n"
-      output << "  if (TEST_PROTECT())\n"
-      output << "  {\n"
-      output << "    CEXCEPTION_T e;\n"   if use_exceptions
-      output << "    Try {\n"             if use_exceptions
-      output << "#{tab}CMock_Init();\n"   unless (mock_list.empty?) 
-      output << "#{tab}setUp();\n"
-      output << "#{tab}Func();\n"
-      output << "#{tab}CMock_Verify();\n" unless (mock_list.empty?)
-      output << "    } Catch(e) { TEST_FAIL_MESSAGE(\"Unhandled Exception!\"); }\n" if use_exceptions
-      output << "  }\n"
-      output << "  CMock_Destroy();\n"    unless (mock_list.empty?)
-      output << "  if (TEST_PROTECT() && !(Unity.CurrentTestIgnored))\n"
-      output << "  {\n"
-      output << "    tearDown();\n"
-      output << "  }\n"
-      output << "  UnityConcludeTest();\n"
-      output << "}\n"
-    end
-    
-  end
-    
-  
-  def create_main(output, module_name, test_cases)
-    output << "\n"
-    output << "int main(void)\n"
-    output << "{\n"
-    output << "  UnityBegin();\n"
-    output << "  Unity.TestFile = \"#{module_name}\";\n"
-    output << "\n"
-
-    output << "  // RUN_TEST calls runTest\n" unless (test_cases.empty?)
-    test_cases.each do |item|
-      output << "  RUN_TEST(#{item[:test]}, #{item[:line_number]});\n"
-    end
-
-    output << "\n"
-    output << "  return UnityEnd();\n"
-    output << "}\n"
-    output << "\n"
+  def generate(module_name, runner_filepath, test_cases, mock_list)
+    require 'generate_test_runner.rb'
+    @test_runner_generator ||= UnityTestRunnerGenerator.new( @configurator.get_runner_config )
+    @test_runner_generator.generate( module_name, 
+                                     runner_filepath, 
+                                     test_cases, 
+                                     @configurator.test_runner_includes, 
+                                     mock_list)
   end
-  
 end

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

@@ -170,6 +170,7 @@ task_invoker:
 generator:
   compose:
     - configurator
+    - generator_helper
     - preprocessinator
     - cmock_builder
     - generator_test_runner
@@ -182,6 +183,10 @@ generator:
     - plugin_manager
     - file_wrapper
 
+generator_helper:
+  compose:
+    - streaminator
+
 generator_test_results:
   compose:
     - configurator  

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

@@ -7,6 +7,7 @@ CEEDLING_VENDOR  = File.join(CEEDLING_ROOT, 'vendor')
 CEEDLING_RELEASE = File.join(CEEDLING_ROOT, 'release')
 
 $LOAD_PATH.unshift( CEEDLING_LIB )
+$LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'unity/auto') )
 $LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'diy/lib') )
 $LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'constructor/lib') )
 $LOAD_PATH.unshift( File.join(CEEDLING_VENDOR, 'cmock/lib') )

data/new_project_template/vendor/ceedling/lib/rules_release.rake

@@ -9,7 +9,11 @@ rule(/#{PROJECT_RELEASE_BUILD_OUTPUT_ASM_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ =>
       @ceedling[:file_finder].find_assembly_file(task_name)
     end  
   ]) do |object|
-  @ceedling[:generator].generate_object_file(TOOLS_RELEASE_ASSEMBLER, RELEASE_SYM, object.source, object.name)
+  @ceedling[:generator].generate_object_file(
+    TOOLS_RELEASE_ASSEMBLER,
+    RELEASE_SYM,
+    object.source,
+    object.name )
 end
 end
 
@@ -19,7 +23,12 @@ rule(/#{PROJECT_RELEASE_BUILD_OUTPUT_C_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
       @ceedling[:file_finder].find_compilation_input_file(task_name)
     end  
   ]) do |object|
-  @ceedling[:generator].generate_object_file(TOOLS_RELEASE_COMPILER, RELEASE_SYM, object.source, object.name)
+  @ceedling[:generator].generate_object_file(
+    TOOLS_RELEASE_COMPILER,
+    RELEASE_SYM,
+    object.source,
+    object.name,
+    @ceedling[:file_path_utils].form_release_build_c_list_filepath( object.name ) )
 end
 
 

data/new_project_template/vendor/ceedling/lib/rules_tests.rake

@@ -14,7 +14,12 @@ rule(/#{PROJECT_TEST_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
       @ceedling[:file_finder].find_compilation_input_file(task_name)
     end
   ]) do |object|
-  @ceedling[:generator].generate_object_file(TOOLS_TEST_COMPILER, TEST_SYM, object.source, object.name)
+  @ceedling[:generator].generate_object_file(
+    TOOLS_TEST_COMPILER,
+    TEST_SYM,
+    object.source,
+    object.name,
+    @ceedling[:file_path_utils].form_test_build_list_filepath( object.name ) )
 end
 
 
@@ -24,7 +29,7 @@ rule(/#{PROJECT_TEST_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_EXECUTABLE}$/) do |b
     TEST_SYM,
     bin_file.prerequisites,
     bin_file.name,
-    @ceedling[:file_path_utils].form_test_build_map_filepath(bin_file.name))
+    @ceedling[:file_path_utils].form_test_build_map_filepath( bin_file.name ) )
 end
 
 

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

@@ -21,7 +21,6 @@ class Setupinator
     # note: configurator modifies the cmock section of the hash with a couple defaults to tie 
     #       project together - the modified hash is used to build cmock object
     @ceedling[:configurator].populate_defaults( config_hash )
-    @ceedling[:configurator].populate_unity_defines( config_hash )
     @ceedling[:configurator].populate_cmock_defaults( config_hash )
     @ceedling[:configurator].find_and_merge_plugins( config_hash )
     @ceedling[:configurator].tools_setup( config_hash )

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

@@ -42,16 +42,16 @@ class SystemWrapper
 
   def shell_backticks(command)
     return {
-      :output    => `#{command}`,
-      :exit_code => ($?.exitstatus)
+      :output    => `#{command}`.freeze,
+      :exit_code => ($?.exitstatus).freeze
     }
   end
 
   def shell_system(command)
     system( command )
     return {
-      :output    => '',
-      :exit_code => ($?.exitstatus)
+      :output    => ''.freeze,
+      :exit_code => ($?.exitstatus).freeze
     }
   end
   

data/new_project_template/vendor/ceedling/lib/tasks_release.rake

@@ -9,7 +9,7 @@ task RELEASE_SYM => [:directories] do
   
   core_objects  = []
   extra_objects = @ceedling[:file_path_utils].form_release_build_c_objects_filelist( COLLECTION_RELEASE_ARTIFACT_EXTRA_LINK_OBJECTS )
-  
+
   @ceedling[:project_config_manager].process_release_config_change
   core_objects.concat( @ceedling[:release_invoker].setup_and_invoke_c_objects( COLLECTION_ALL_SOURCE ) )
   

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

@@ -23,7 +23,7 @@ class TestInvokerHelper
     sources  = []
     includes = @test_includes_extractor.lookup_includes_list(test)
     
-    includes.each { |include| sources << @file_finder.find_source_file(include, :ignore) }
+    includes.each { |include| sources << @file_finder.find_compilation_input_file(include, :ignore) }
     
     return sources.compact
   end

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

@@ -87,7 +87,7 @@ class ToolExecutorHelper
     if ((shell_result[:exit_code] == 0) or ((shell_result[:exit_code] != 0) and not boom))
       output  = "> Shell executed command:\n"
       output += "#{command_str}\n"
-      output += "> Produced response:\n"           if (not shell_result[:output].empty?)
+      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
       output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
       output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != 0)
       output += "\n"
@@ -102,7 +102,7 @@ class ToolExecutorHelper
       output  = "ERROR: Shell command failed.\n"
       output += "> Shell executed command:\n"
       output += "'#{command_str}'\n"
-      output += "> Produced response:\n"           if (not shell_result[:output].empty?)
+      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
       output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
       output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != nil)
       output += "> And then likely crashed.\n"                               if (shell_result[:exit_code] == nil)

data/new_project_template/vendor/ceedling/plugins/bullseye/bullseye.rake

@@ -18,7 +18,12 @@ rule(/#{BULLSEYE_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
   ]) do |object|
 
   if (File.basename(object.source) =~ /^(#{PROJECT_TEST_FILE_PREFIX}|#{CMOCK_MOCK_PREFIX}|unity|cmock|cexception)/i)
-    @ceedling[:generator].generate_object_file(TOOLS_BULLSEYE_COMPILER, BULLSEYE_CONTEXT, object.source, object.name)
+    @ceedling[:generator].generate_object_file(
+      TOOLS_BULLSEYE_COMPILER,
+      BULLSEYE_CONTEXT,
+      object.source,
+      object.name,
+      @ceedling[:file_path_utils].form_test_build_list_filepath( object.name ) )
   else
     @ceedling[BULLSEYE_CONTEXT].generate_coverage_object_file(object.source, object.name)
   end

data/new_project_template/vendor/ceedling/plugins/bullseye/bullseye.rb

@@ -35,7 +35,12 @@ class Bullseye < Plugin
     @ceedling[:plugin_manager].pre_compile_execute(arg_hash)
 
     @ceedling[:streaminator].stdout_puts("Compiling #{File.basename(source)} with coverage...")
-    compile_command  = @ceedling[:tool_executor].build_command_line(TOOLS_BULLSEYE_COMPILER, source, object)
+    compile_command  = 
+      @ceedling[:tool_executor].build_command_line(
+        TOOLS_BULLSEYE_COMPILER,
+        source,
+        object,
+        @ceedling[:file_path_utils].form_test_build_list_filepath( object ) )
     coverage_command = @ceedling[:tool_executor].build_command_line(TOOLS_BULLSEYE_INSTRUMENTATION, compile_command[:line] )
 
     shell_result     = @ceedling[:tool_executor].exec( coverage_command[:line], coverage_command[:options] )
@@ -124,7 +129,7 @@ class Bullseye < Plugin
     sources.each do |source|
       command          = @ceedling[:tool_executor].build_command_line(TOOLS_BULLSEYE_REPORT_COVFN, source)
       shell_results    = @ceedling[:tool_executor].exec(command[:line], command[:options])
-      coverage_results = shell_results[:output]
+      coverage_results = shell_results[:output].deep_clone
       coverage_results.sub!(/.*\n.*\n/,'') # Remove the Bullseye tool banner
       if (coverage_results =~ /warning cov814: report is empty/)
         coverage_results = "WARNING: #{source} contains no coverage data!\n\n"

data/new_project_template/vendor/ceedling/plugins/gcov/gcov.rake

@@ -18,7 +18,12 @@ rule(/#{GCOV_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
   ]) do |object|
 
   if (File.basename(object.source) =~ /^(#{PROJECT_TEST_FILE_PREFIX}|#{CMOCK_MOCK_PREFIX}|unity|cmock|cexception)/i)
-    @ceedling[:generator].generate_object_file(TOOLS_GCOV_COMPILER, GCOV_CONTEXT, object.source, object.name)
+    @ceedling[:generator].generate_object_file(
+      TOOLS_GCOV_COMPILER,
+      GCOV_CONTEXT,
+      object.source,
+      object.name,
+      @ceedling[:file_path_utils].form_test_build_list_filepath( object.name ) )
   else
     @ceedling[GCOV_CONTEXT].generate_coverage_object_file(object.source, object.name)
   end

data/new_project_template/vendor/ceedling/plugins/gcov/gcov.rb

@@ -29,7 +29,12 @@ class Gcov < Plugin
   end
 
   def generate_coverage_object_file(source, object)
-    compile_command  = @ceedling[:tool_executor].build_command_line(TOOLS_GCOV_COMPILER, source, object)
+    compile_command = 
+      @ceedling[:tool_executor].build_command_line(
+        TOOLS_GCOV_COMPILER,
+        source,
+        object,
+        @ceedling[:file_path_utils].form_test_build_list_filepath( object ) )
     @ceedling[:streaminator].stdout_puts("Compiling #{File.basename(source)} with coverage...")
     @ceedling[:tool_executor].exec( compile_command[:line], compile_command[:options] )
   end
@@ -101,7 +106,7 @@ class Gcov < Plugin
 
       if (coverage_results.strip =~ /(File\s+'#{Regexp.escape(source)}'.+$)/m)
         report = ((($1.lines.to_a)[1..-1])).map{|line| basename + ' ' + line}.join('')
-        @ceedling[:streaminator].stdout_puts (report + "\n\n")
+        @ceedling[:streaminator].stdout_puts(report + "\n\n")
       end
     end
   end

data/new_project_template/vendor/ceedling/plugins/xml_tests_report/xml_tests_report.rb

@@ -10,7 +10,7 @@ class XmlTestsReport < Plugin
   end
 
   def post_test_execute(arg_hash)
-    return if not (arg_hash[:context] == TEST_TASKS_CONTEXT)
+    return if not (arg_hash[:context] == TEST_SYM)
 
     @results_list << arg_hash[:result_file]
   end

data/new_project_template/vendor/ceedling/release/build.info

@@ -1 +1,2 @@
-175
+185
+

data/new_project_template/vendor/ceedling/vendor/unity/auto/generate_test_runner.rb

@@ -0,0 +1,308 @@
+# ==========================================
+#   Unity Project - A Test Framework for C
+#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+#   [Released under MIT License. Please refer to license.txt for details]
+# ========================================== 
+
+File.expand_path(File.join(File.dirname(__FILE__),'colour_prompt'))
+
+class UnityTestRunnerGenerator
+
+  def initialize(options = nil)
+    @options = { :includes => [], :plugins => [], :framework => :unity }
+    case(options)
+      when NilClass then @options
+      when String   then @options.merge!(UnityTestRunnerGenerator.grab_config(options))
+      when Hash     then @options.merge!(options)
+      else          raise "If you specify arguments, it should be a filename or a hash of options"
+    end
+  end
+  
+  def self.grab_config(config_file)
+    options = { :includes => [], :plugins => [], :framework => :unity }
+    unless (config_file.nil? or config_file.empty?)
+      require 'yaml'
+      yaml_guts = YAML.load_file(config_file)
+      options.merge!(yaml_guts[:unity] ? yaml_guts[:unity] : yaml_guts[:cmock])
+      raise "No :unity or :cmock section found in #{config_file}" unless options
+    end
+    return(options)
+  end
+
+  def run(input_file, output_file, options=nil)
+    tests = []
+    includes = []
+    used_mocks = []
+    
+    @options.merge!(options) unless options.nil?
+    module_name = File.basename(input_file)
+    
+    #pull required data from source file
+    File.open(input_file, 'r') do |input|
+      tests      = find_tests(input)
+      includes   = find_includes(input)
+      used_mocks = find_mocks(includes)
+    end
+
+    #build runner file
+    generate(input_file, output_file, tests, includes, used_mocks)
+    
+    #determine which files were used to return them
+    all_files_used = [input_file, output_file]
+    all_files_used += includes.map {|filename| filename + '.c'} unless includes.empty?
+    all_files_used += @options[:includes] unless @options[:includes].empty?
+    return all_files_used.uniq
+  end
+  
+  def generate(input_file, output_file, tests, includes, used_mocks)
+    File.open(output_file, 'w') do |output|
+      create_header(output, used_mocks)
+      create_externs(output, tests, used_mocks)
+      create_mock_management(output, used_mocks)
+      create_suite_setup_and_teardown(output)
+      create_reset(output, used_mocks)
+      create_main(output, input_file, tests)
+    end
+  end
+  
+  def find_tests(input_file)
+    tests_raw = []
+    tests_args = []
+    tests_and_line_numbers = []
+    
+    input_file.rewind
+    source_raw = input_file.read
+    source_scrubbed = source_raw.gsub(/\/\/.*$/, '')           # remove line comments
+    source_scrubbed = source_scrubbed.gsub(/\/\*.*?\*\//m, '') # remove block comments
+    lines = source_scrubbed.split(/(^\s*\#.*$)                 # Treat preprocessor directives as a logical line
+                              | (;|\{|\}) /x)                  # Match ;, {, and } as end of lines
+
+    lines.each_with_index do |line, index|
+      #find tests
+      if line =~ /^((?:\s*TEST_CASE\s*\(.*?\)\s*)*)\s*void\s+(test.*?)\s*\(\s*(.*)\s*\)/
+        arguments = $1
+        name = $2
+        call = $3
+        args = nil
+        if (@options[:use_param_tests] and !arguments.empty?)
+          args = []
+          arguments.scan(/\s*TEST_CASE\s*\((.*)\)\s*$/) {|a| args << a[0]}
+        end
+        tests_and_line_numbers << { :test => name, :args => args, :call => call, :line_number => 0 }
+        tests_args = []
+      end
+    end
+
+    #determine line numbers and create tests to run
+    source_lines = source_raw.split("\n")
+    source_index = 0;
+    tests_and_line_numbers.size.times do |i|
+      source_lines[source_index..-1].each_with_index do |line, index|
+        if (line =~ /#{tests_and_line_numbers[i][:test]}/)
+          source_index += index
+          tests_and_line_numbers[i][:line_number] = source_index + 1
+          break
+        end
+      end
+    end
+    
+    return tests_and_line_numbers
+  end
+
+  def find_includes(input_file)
+    input_file.rewind
+    includes = []
+    input_file.readlines.each do |line|
+      scan_results = line.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/)
+      includes << scan_results[0][0] if (scan_results.size > 0)
+    end
+    return includes
+  end
+  
+  def find_mocks(includes)
+    mock_headers = []
+    includes.each do |include_file|
+      mock_headers << File.basename(include_file) if (include_file =~ /^mock/i)
+    end
+    return mock_headers  
+  end
+  
+  def create_header(output, mocks)
+    output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
+    create_runtest(output, mocks)
+    output.puts("\n//=======Automagically Detected Files To Include=====")
+    output.puts("#include \"#{@options[:framework].to_s}.h\"")
+    output.puts('#include "cmock.h"') unless (mocks.empty?)
+    @options[:includes].flatten.uniq.compact.each do |inc|
+      output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h','')}.h\""}")
+    end
+    output.puts('#include <setjmp.h>')
+    output.puts('#include <stdio.h>')
+    output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
+    mocks.each do |mock|
+      output.puts("#include \"#{mock.gsub('.h','')}.h\"")
+    end
+    if @options[:enforce_strict_ordering]
+      output.puts('')    
+      output.puts('int GlobalExpectCount;') 
+      output.puts('int GlobalVerifyOrder;') 
+      output.puts('char* GlobalOrderError;') 
+    end
+  end
+  
+  def create_externs(output, tests, mocks)
+    output.puts("\n//=======External Functions This Runner Calls=====")
+    output.puts("extern void setUp(void);")
+    output.puts("extern void tearDown(void);")
+    tests.each do |test|
+      output.puts("extern void #{test[:test]}(#{test[:call]});")
+    end
+    output.puts('')
+  end
+  
+  def create_mock_management(output, mocks)
+    unless (mocks.empty?)
+      output.puts("\n//=======Mock Management=====")
+      output.puts("static void CMock_Init(void)")
+      output.puts("{")
+      if @options[:enforce_strict_ordering]
+        output.puts("  GlobalExpectCount = 0;")
+        output.puts("  GlobalVerifyOrder = 0;") 
+        output.puts("  GlobalOrderError = NULL;") 
+      end
+      mocks.each do |mock|
+        output.puts("  #{mock}_Init();")
+      end
+      output.puts("}\n")
+
+      output.puts("static void CMock_Verify(void)")
+      output.puts("{")
+      mocks.each do |mock|
+        output.puts("  #{mock}_Verify();")
+      end
+      output.puts("}\n")
+
+      output.puts("static void CMock_Destroy(void)")
+      output.puts("{")
+      mocks.each do |mock|
+        output.puts("  #{mock}_Destroy();")
+      end
+      output.puts("}\n")
+    end
+  end
+  
+  def create_suite_setup_and_teardown(output)
+    unless (@options[:suite_setup].nil?)
+      output.puts("\n//=======Suite Setup=====")
+      output.puts("static int suite_setup(void)")
+      output.puts("{")
+      output.puts(@options[:suite_setup])
+      output.puts("}")
+    end
+    unless (@options[:suite_teardown].nil?)
+      output.puts("\n//=======Suite Teardown=====")
+      output.puts("static int suite_teardown(int num_failures)")
+      output.puts("{")
+      output.puts(@options[:suite_teardown])
+      output.puts("}")
+    end
+  end
+  
+  def create_runtest(output, used_mocks)
+    cexception = @options[:plugins].include? :cexception
+    va_args1   = @options[:use_param_tests] ? ', ...' : ''
+    va_args2   = @options[:use_param_tests] ? '__VA_ARGS__' : ''
+    output.puts("\n//=======Test Runner Used To Run Each Test Below=====")
+    output.puts("#define RUN_TEST_NO_ARGS") if @options[:use_param_tests] 
+    output.puts("#define RUN_TEST(TestFunc, TestLineNum#{va_args1}) \\")
+    output.puts("{ \\")
+    output.puts("  Unity.CurrentTestName = #TestFunc#{va_args2.empty? ? '' : " \"(\" ##{va_args2} \")\""}; \\")
+    output.puts("  Unity.CurrentTestLineNumber = TestLineNum; \\")
+    output.puts("  Unity.NumberOfTests++; \\")
+    output.puts("  if (TEST_PROTECT()) \\")
+    output.puts("  { \\")
+    output.puts("    CEXCEPTION_T e; \\") if cexception
+    output.puts("    Try { \\") if cexception
+    output.puts("      CMock_Init(); \\") unless (used_mocks.empty?) 
+    output.puts("      setUp(); \\")
+    output.puts("      TestFunc(#{va_args2}); \\")
+    output.puts("      CMock_Verify(); \\") unless (used_mocks.empty?)
+    output.puts("    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, \"Unhandled Exception!\"); } \\") if cexception
+    output.puts("  } \\")
+    output.puts("  CMock_Destroy(); \\") unless (used_mocks.empty?)
+    output.puts("  if (TEST_PROTECT() && !TEST_IS_IGNORED) \\")
+    output.puts("  { \\")
+    output.puts("    tearDown(); \\")
+    output.puts("  } \\")
+    output.puts("  UnityConcludeTest(); \\")
+    output.puts("}\n")
+  end
+  
+  def create_reset(output, used_mocks)
+    output.puts("\n//=======Test Reset Option=====")
+    output.puts("void resetTest()")
+    output.puts("{")
+    output.puts("  CMock_Verify();") unless (used_mocks.empty?)
+    output.puts("  CMock_Destroy();") unless (used_mocks.empty?)
+    output.puts("  tearDown();")
+    output.puts("  CMock_Init();") unless (used_mocks.empty?) 
+    output.puts("  setUp();")
+    output.puts("}")
+  end
+  
+  def create_main(output, filename, tests)
+    output.puts("\n\n//=======MAIN=====")
+    output.puts("int main(void)")
+    output.puts("{")
+    output.puts("  suite_setup();") unless @options[:suite_setup].nil?
+    output.puts("  Unity.TestFile = \"#{filename}\";")
+    output.puts("  UnityBegin();")
+    if (@options[:use_param_tests])
+      tests.each do |test|
+        if ((test[:args].nil?) or (test[:args].empty?))
+          output.puts("  RUN_TEST(#{test[:test]}, #{test[:line_number]}, RUN_TEST_NO_ARGS);")
+        else
+          test[:args].each {|args| output.puts("  RUN_TEST(#{test[:test]}, #{test[:line_number]}, #{args});")}
+        end
+      end
+    else
+        tests.each { |test| output.puts("  RUN_TEST(#{test[:test]}, #{test[:line_number]});") }
+    end
+    output.puts()
+    output.puts("  return #{@options[:suite_teardown].nil? ? "" : "suite_teardown"}(UnityEnd());")
+    output.puts("}")
+  end
+end
+
+
+if ($0 == __FILE__)
+  options = { :includes => [] }
+  yaml_file = nil
+  
+  #parse out all the options first
+  ARGV.reject! do |arg| 
+    case(arg)
+      when '-cexception' 
+        options[:plugins] = [:cexception]; true
+      when /\.*\.yml/
+        options = UnityTestRunnerGenerator.grab_config(arg); true
+      else false
+    end
+  end     
+           
+  #make sure there is at least one parameter left (the input file)
+  if !ARGV[0]
+    puts ["usage: ruby #{__FILE__} (yaml) (options) input_test_file output_test_runner (includes)",
+           "  blah.yml    - will use config options in the yml file (see docs)",
+           "  -cexception - include cexception support"].join("\n")
+    exit 1
+  end
+  
+  #create the default test runner name if not specified
+  ARGV[1] = ARGV[0].gsub(".c","_Runner.c") if (!ARGV[1])
+  
+  #everything else is an include file
+  options[:includes] ||= (ARGV.slice(2..-1).flatten.compact) if (ARGV.size > 2)
+  
+  UnityTestRunnerGenerator.new(options).run(ARGV[0], ARGV[1])
+end

data/new_project_template/vendor/ceedling/vendor/unity/src/unity_internals.h

@@ -296,24 +296,23 @@ void UnityAssertEqualFloatArray(const _UF* expected,
 #define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message)                                       UNITY_TEST_ASSERT(((pointer) != NULL),  (UNITY_LINE_TYPE)line, message)
 
 #define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message)                             UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message)                            UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
+#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message)                            UnityAssertEqualNumber((_U_SINT)(_US8 )(expected), (_U_SINT)(_US8 )(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
+#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_US16)(expected), (_U_SINT)(_US16)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
+#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_US32)(expected), (_U_SINT)(_US32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
 #define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message)                            UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message)                          UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message)                          UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message)                            UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
+#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_US8 )(expected), (_U_SINT)(_US8 )(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
+#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message)                          UnityAssertEqualNumber((_U_SINT)(_US16)(expected), (_U_SINT)(_US16)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
+#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message)                          UnityAssertEqualNumber((_U_SINT)(_US32)(expected), (_U_SINT)(_US32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
+#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message)                            UnityAssertEqualNumber((_U_SINT)(_US8 )(expected), (_U_SINT)(_US8 )(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
+#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_US16)(expected), (_U_SINT)(_US16)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
+#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message)                           UnityAssertEqualNumber((_U_SINT)(_US32)(expected), (_U_SINT)(_US32)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
 #define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message)                            UnityAssertBits((_U_SINT)(mask), (_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line)
 
 #define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message)                     UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT)
 #define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
-#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64)
+#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU8 )(delta), (_U_SINT)(_U_UINT)(_UU8 )(expected), (_U_SINT)(_U_UINT)(_UU8 )(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8)
+#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU16)(delta), (_U_SINT)(_U_UINT)(_UU16)(expected), (_U_SINT)(_U_UINT)(_UU16)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16)
+#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(_U_UINT)(_UU32)(delta), (_U_SINT)(_U_UINT)(_UU32)(expected), (_U_SINT)(_U_UINT)(_UU32)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32)
 
 #define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message)                             UnityAssertEqualNumber((_U_SINT)(_UP)(expected), (_U_SINT)(_UP)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER)
 #define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message)                          UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)line)
@@ -340,6 +339,7 @@ void UnityAssertEqualFloatArray(const _UF* expected,
 #define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64)
 #define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64)
 #define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64)
+#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64)
 #endif
 
 #ifdef UNITY_EXCLUDE_FLOAT

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ceedling
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Mike Karlesky, Mark VanderVoord
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -04:00
+date: 2011-04-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -186,6 +186,7 @@ files:
 - new_project_template/vendor/ceedling/lib/file_system_utils.rb
 - new_project_template/vendor/ceedling/lib/file_wrapper.rb
 - new_project_template/vendor/ceedling/lib/generator.rb
+- new_project_template/vendor/ceedling/lib/generator_helper.rb
 - new_project_template/vendor/ceedling/lib/generator_test_results.rb
 - new_project_template/vendor/ceedling/lib/generator_test_results_sanity_checker.rb
 - new_project_template/vendor/ceedling/lib/generator_test_runner.rb
@@ -238,10 +239,12 @@ files:
 - new_project_template/vendor/ceedling/plugins/bullseye/bullseye.rake
 - new_project_template/vendor/ceedling/plugins/bullseye/bullseye.rb
 - new_project_template/vendor/ceedling/plugins/bullseye/defaults.yml
+- new_project_template/vendor/ceedling/plugins/bullseye/readme.txt
 - new_project_template/vendor/ceedling/plugins/bullseye/template.erb
 - new_project_template/vendor/ceedling/plugins/gcov/defaults.yml
 - new_project_template/vendor/ceedling/plugins/gcov/gcov.rake
 - new_project_template/vendor/ceedling/plugins/gcov/gcov.rb
+- new_project_template/vendor/ceedling/plugins/gcov/readme.txt
 - new_project_template/vendor/ceedling/plugins/gcov/template.erb
 - new_project_template/vendor/ceedling/plugins/stdout_ide_tests_report/stdout_ide_tests_report.rb
 - new_project_template/vendor/ceedling/plugins/stdout_ide_tests_report/stdout_ide_tests_report.yml
@@ -280,6 +283,7 @@ files:
 - new_project_template/vendor/ceedling/vendor/deep_merge/lib/deep_merge.rb
 - new_project_template/vendor/ceedling/vendor/diy/lib/diy.rb
 - new_project_template/vendor/ceedling/vendor/diy/lib/diy/factory.rb
+- new_project_template/vendor/ceedling/vendor/unity/auto/generate_test_runner.rb
 - new_project_template/vendor/ceedling/vendor/unity/release/build.info
 - new_project_template/vendor/ceedling/vendor/unity/release/version.info
 - new_project_template/vendor/ceedling/vendor/unity/src/unity.c
@@ -315,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ceedling
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Gemified version of the Ceedling C testing / build environment