ceedling 0.0.16 → 0.0.17

data/lib/ceedling/version.rb

@@ -2,10 +2,10 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.16"
+    GEM = "0.0.17"
 
     # @private
-    CEEDLING = "0.9.200"
+    CEEDLING = "0.9.212"
     # @private
     CEXCEPTION = "1.2.17"
     # @private

data/lib/ceedling/version.rb.erb

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

data/new_project_template/vendor/ceedling/lib/{build_invoker_helper.rb → build_invoker_utils.rb}

@@ -1,7 +1,7 @@
 require 'constants'
 
 
-class BuildInvokerHelper
+class BuildInvokerUtils
 
   constructor :configurator, :streaminator
   
@@ -13,7 +13,7 @@ class BuildInvokerHelper
       
       @streaminator.stderr_puts( error_header )
 
-      if (@configurator.project_use_auxiliary_dependencies)
+      if (@configurator.project_use_deep_dependencies)
         help_message = "Try fixing #include statements or adding missing file. Then run '#{REFRESH_TASK_ROOT}#{context.to_s}' task and try again."      
         @streaminator.stderr_puts( help_message )
       end

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

@@ -71,11 +71,11 @@ class Configurator
 
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_TEST )
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_TEST_PREPROCESSORS ) if (config[:project][:use_test_preprocessor])
-    @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_TEST_DEPENDENCIES )  if (config[:project][:use_auxiliary_dependencies])
+    @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_TEST_DEPENDENCIES )  if (config[:project][:use_deep_dependencies])
     
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE )              if (config[:project][:release_build])
     @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE_ASSEMBLER )    if (config[:project][:release_build] and config[:release_build][:use_assembly])
-    @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE_DEPENDENCIES ) if (config[:project][:release_build] and config[:project][:use_auxiliary_dependencies])
+    @configurator_builder.populate_defaults( config, DEFAULT_TOOLS_RELEASE_DEPENDENCIES ) if (config[:project][:release_build] and config[:project][:use_deep_dependencies])
   end
   
   
@@ -110,10 +110,12 @@ class Configurator
     @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
   def tools_setup(config)
@@ -134,6 +136,7 @@ class Configurator
     end
   end
   
+  
   def tools_supplement_arguments(config)
     tools_name_prefix = 'tools_'
     config[:tools].each_key do |name|
@@ -150,8 +153,10 @@ class Configurator
     end
   end
 
+
   def find_and_merge_plugins(config)
-    # plugins must be loaded before generic path evaluation & magic that happen later: perform path magic here as discrete step
+    # plugins must be loaded before generic path evaluation & magic that happen later;
+    # 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)
       FilePathUtils::standardize(path)
@@ -188,7 +193,7 @@ class Configurator
       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) }
+      items.each { |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] )
@@ -197,38 +202,47 @@ class Configurator
 
   
   def eval_paths(config)
-    # [:plugins]:load_paths] already handled
-    individual_paths = [
+    # [:plugins]:[load_paths] already handled
+    
+    paths = [ # individual paths that don't follow convention processed below
       config[:project][:build_root],
-      config[:project][:options_paths]]
-      
-    individual_paths.flatten.each do |path|
-      path.replace(@system_wrapper.module_eval(path)) if (path =~ RUBY_STRING_REPLACEMENT_PATTERN)
-    end
-  
-    config[:paths].each_pair do |key, list|
-      list.each { |path_entry| path_entry.replace(@system_wrapper.module_eval(path_entry)) if (path_entry =~ RUBY_STRING_REPLACEMENT_PATTERN) }
-    end    
+      config[:release_build][:artifacts]]
+
+    eval_path_list( paths )
+
+    config[:paths].each_pair { |collection, paths| eval_path_list( paths ) }
+
+    config[:files].each_pair { |collection, files| eval_path_list( paths ) }
+    
+    # all other paths at secondary hash key level processed by convention:
+    # ex. [:toplevel][:foo_path] & [:toplevel][:bar_paths] are evaluated
+    config.each_pair { |parent, child| eval_path_list( collect_path_list( child ) ) }    
   end
   
   
   def standardize_paths(config)
-    # [:plugins]:load_paths] already handled
-    individual_paths = [
+    # [:plugins]:[load_paths] already handled
+    
+    paths = [ # individual paths that don't follow convention processed below
       config[:project][:build_root],
-      config[:project][:options_paths],
-      config[:cmock][:mock_path]] # cmock path in case it was explicitly set in config
+      config[:release_build][:artifacts]]
 
-    individual_paths.flatten.each { |path| FilePathUtils::standardize(path) }
+    paths.flatten.each { |path| FilePathUtils::standardize( path ) }
 
-    config[:paths].each_pair do |key, list|
-      list.each{|path| FilePathUtils::standardize(path)}
+    config[:paths].each_pair do |collection, paths|
+      paths.each{|path| FilePathUtils::standardize( path )}
       # ensure that list is an array (i.e. handle case of list being a single string)
-      config[:paths][key] = [list].flatten
+      config[:paths][collection] = [paths].flatten
     end
 
-    config[:tools].each_pair do |key, tool_config|
-      FilePathUtils::standardize(tool_config[:executable])
+    config[:files].each_pair { |collection, files| files.each{ |path| FilePathUtils::standardize( path ) } }
+
+    config[:tools].each_pair { |tool, config| FilePathUtils::standardize( config[:executable] ) }
+    
+    # all other paths at secondary hash key level processed by convention:
+    # ex. [:toplevel][:foo_path] & [:toplevel][:bar_paths] are standardized
+    config.each_pair do |parent, child|
+      collect_path_list( child ).each { |path| FilePathUtils::standardize( path ) }
     end    
   end
 
@@ -295,4 +309,21 @@ class Configurator
     end
   end
   
+  ### private ###
+  
+  private
+
+  def collect_path_list( container )
+    paths = []
+    container.each_key { |key| paths << container[key] if (key.to_s =~ /_path(s)?$/) } if (container.class == Hash)
+    return paths.flatten
+  end
+  
+  def eval_path_list( paths )
+    paths.flatten.each do |path|
+      path.replace( @system_wrapper.module_eval( path ) ) if (path =~ RUBY_STRING_REPLACEMENT_PATTERN)
+    end
+  end
+  
+  
 end

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

@@ -150,10 +150,12 @@ class ConfiguratorBuilder
 
     out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'rules_cmock.rake') if (in_hash[:project_use_mocks])
     out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'rules_preprocess.rake') if (in_hash[:project_use_test_preprocessor])
-    out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'rules_tests_aux_dependencies.rake') if (in_hash[:project_use_auxiliary_dependencies])
+    out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'rules_tests_deep_dependencies.rake') if (in_hash[:project_use_deep_dependencies])
+    out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'tasks_tests_deep_dependencies.rake') if (in_hash[:project_use_deep_dependencies])
 
-    out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'rules_release_aux_dependencies.rake') if (in_hash[:project_release_build] and in_hash[:project_use_auxiliary_dependencies])
+    out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'rules_release_deep_dependencies.rake') if (in_hash[:project_release_build] and in_hash[:project_use_deep_dependencies])
     out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'rules_release.rake') if (in_hash[:project_release_build])
+    out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'tasks_release_deep_dependencies.rake') if (in_hash[:project_release_build] and in_hash[:project_use_deep_dependencies])
     out_hash[:project_rakefile_component_files] << File.join(CEEDLING_LIB, 'tasks_release.rake') if (in_hash[:project_release_build])
 
     return out_hash
@@ -279,6 +281,8 @@ class ConfiguratorBuilder
       all_tests.include( File.join(path, "#{in_hash[:project_test_file_prefix]}*#{in_hash[:extension_source]}") )
     end
 
+    @file_system_utils.revise_file_list( all_tests, in_hash[:files_test] )
+
     return {:collection_all_tests => all_tests}
   end
 
@@ -292,6 +296,8 @@ class ConfiguratorBuilder
       all_assembly.include( File.join(path, "*#{in_hash[:extension_assembly]}") )
     end
     
+    @file_system_utils.revise_file_list( all_assembly, in_hash[:files_assembly] )
+
     return {:collection_all_assembly => all_assembly}
   end
 
@@ -303,6 +309,8 @@ class ConfiguratorBuilder
       all_source.include( File.join(path, "*#{in_hash[:extension_source]}") )
     end
     
+    @file_system_utils.revise_file_list( all_source, in_hash[:files_source] )
+    
     return {:collection_all_source => all_source}
   end
 
@@ -316,9 +324,11 @@ class ConfiguratorBuilder
       in_hash[:collection_paths_source] + 
       in_hash[:collection_paths_include]
     
-    (paths).each do |path|
+    paths.each do |path|
       all_headers.include( File.join(path, "*#{in_hash[:extension_header]}") )
     end
+
+    @file_system_utils.revise_file_list( all_headers, in_hash[:files_include] )
     
     return {:collection_all_headers => all_headers}
   end
@@ -337,11 +347,17 @@ class ConfiguratorBuilder
     paths << FilePathUtils::form_ceedling_vendor_path(CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
     paths << FilePathUtils::form_ceedling_vendor_path(CMOCK_LIB_PATH) if (in_hash[:project_use_mocks])
 
-    (paths).each do |path|
+    paths.each do |path|
       all_input.include( File.join(path, "*#{in_hash[:extension_header]}") )
       all_input.include( File.join(path, "*#{in_hash[:extension_source]}") )
     end
     
+    @file_system_utils.revise_file_list( all_input, in_hash[:files_test] )
+    @file_system_utils.revise_file_list( all_input, in_hash[:files_support] )
+    @file_system_utils.revise_file_list( all_input, in_hash[:files_source] )
+    @file_system_utils.revise_file_list( all_input, in_hash[:files_include] )
+    # finding assembly files handled explicitly through other means
+
     return {:collection_all_existing_compilation_input => all_input}    
   end
 

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

@@ -76,6 +76,9 @@ UTILS_ROOT_NAME   = 'utils'
 UTILS_TASK_ROOT   = UTILS_ROOT_NAME + ':'
 UTILS_SYM         = UTILS_ROOT_NAME.to_sym
 
+OPERATION_COMPILE_SYM = :compile
+OPERATION_LINK_SYM    = :link
+
 
 RUBY_STRING_REPLACEMENT_PATTERN = /#\{.+\}/
 RUBY_EVAL_REPLACEMENT_PATTERN   = /^\{(.+)\}$/

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

@@ -218,7 +218,7 @@ DEFAULT_CEEDLING_CONFIG = {
       :use_exceptions => true,
       :use_mocks => true,
       :use_test_preprocessor => false,
-      :use_auxiliary_dependencies => false,
+      :use_deep_dependencies => false,
       :test_file_prefix => 'test_',
       :options_paths => [],
       :release_build => false,
@@ -226,7 +226,8 @@ DEFAULT_CEEDLING_CONFIG = {
 
     :release_build => {
       # :output is set while building configuration -- allows smart default system-dependent file extension handling
-      :use_assembly => false,      
+      :use_assembly => false,
+      :artifacts => [],
     },
 
     :paths => {
@@ -238,6 +239,14 @@ DEFAULT_CEEDLING_CONFIG = {
       :release_toolchain_include => [],
     },
     
+    :files => {
+      :test => [],
+      :source => [],
+      :assembly => [],
+      :support => [],
+      :include => [],
+    },
+    
     # unlike other top-level entries, environment's value is an array to preserve order
     :environment => [
       # when evaluated, this provides wider text field for rake task comments
@@ -251,6 +260,8 @@ DEFAULT_CEEDLING_CONFIG = {
       :release_preprocess => [],
     },
     
+    :flags => {},
+    
     :extension => {
       :header => '.h',
       :source => '.c',

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

@@ -56,4 +56,14 @@ class FileSystemUtils
     return (plus - minus).to_a.uniq
   end
 
+
+  # given a file list, add to it or remove from it
+  def revise_file_list(list, revisions)
+    revisions.each do |revision|
+      # include or exclude file or glob to file list
+      file = FilePathUtils.extract_path_no_aggregation_operators( revision )
+      FilePathUtils.add_path?(revision) ? list.include(file) : list.exclude(file)
+    end
+  end
+
 end

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

@@ -0,0 +1,54 @@
+require 'rubygems'
+require 'rake' # for ext()
+require 'fileutils'
+require 'constants'
+
+
+# :flags:
+#   :release:
+#     :compile:
+#       :*:          # add '-foo' to compilation of all files not main.c
+#         - -foo
+#       :main:       # add '-Wall' to compilation of main.c
+#         - -Wall
+#   :test:
+#     :link:
+#       :test_main:  # add '--bar --baz' to linking of test_main.exe
+#         - --bar
+#         - --baz
+
+
+class Flaginator
+
+  constructor :configurator
+
+  def flag_down( operation, context, file )
+    # create configurator accessor method
+    accessor = ('flags_' + context.to_s).to_sym
+    
+    # create simple filename key from whatever filename provided
+    file_key = File.basename( file ).ext('').to_sym
+    
+    # if no entry in configuration for flags for this context, bail out
+    return [] if not @configurator.respond_to?( accessor )
+    
+    # get flags sub hash associated with this context
+    flags = @configurator.send( accessor )
+
+    # if operation not represented in flags hash, bail out
+    return [] if not flags.include?( operation )
+    
+    # redefine flags to sub hash associated with the operation
+    flags = flags[operation]
+    
+    # if our file is in the flags hash, extract the array of flags
+    if (flags.include?( file_key )) then return flags[file_key]
+    # if our file isn't in the flags hash, but there is default for all other files, extract array of flags
+    elsif (flags.include?( :* )) then return flags[:*]
+    end
+
+    # fall through: flags were specified but none applying to present file
+    return []
+  end
+
+end

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

@@ -3,7 +3,18 @@ require 'constants'
 
 class Generator
 
-  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
+  constructor :configurator, 
+              :generator_helper,
+              :preprocessinator,
+              :cmock_builder,
+              :generator_test_runner,
+              :generator_test_results,
+              :flaginator,
+              :test_includes_extractor,
+              :tool_executor,
+              :file_finder,
+              :streaminator,
+              :plugin_manager
 
 
   def generate_shallow_includes_list(context, file)
@@ -30,21 +41,21 @@ class Generator
 
   def generate_mock(context, header_filepath)
     arg_hash = {:header_file => header_filepath, :context => context}
-    @plugin_manager.pre_mock_execute(arg_hash)
+    @plugin_manager.pre_mock_generate( arg_hash )
     
     begin
       @cmock_builder.cmock.setup_mocks( arg_hash[:header_file] )
     rescue
       raise
     ensure
-      @plugin_manager.post_mock_execute(arg_hash)
+      @plugin_manager.post_mock_generate( arg_hash )
     end
   end
 
   # 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)
+    @plugin_manager.pre_runner_generate(arg_hash)
     
     # collect info we need
     module_name = File.basename(arg_hash[:test_file])
@@ -59,7 +70,7 @@ class Generator
     rescue
       raise
     ensure
-      @plugin_manager.post_runner_execute(arg_hash)    
+      @plugin_manager.post_runner_generate(arg_hash)    
     end
   end
 
@@ -69,7 +80,12 @@ class Generator
     @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], arg_hash[:list])
+    command = 
+      @tool_executor.build_command_line( arg_hash[:tool],
+                                         arg_hash[:source],
+                                         arg_hash[:object],
+                                         arg_hash[:list],
+                                         @flaginator.flag_down( OPERATION_COMPILE_SYM, context, source ) )
 
     begin
       shell_result = @tool_executor.exec( command[:line], command[:options] )
@@ -88,7 +104,12 @@ class Generator
     @plugin_manager.pre_link_execute(arg_hash)
     
     @streaminator.stdout_puts("Linking #{File.basename(arg_hash[:executable])}...", Verbosity::NORMAL)
-    command = @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:objects], arg_hash[:executable], arg_hash[:map])
+    command = 
+      @tool_executor.build_command_line( arg_hash[:tool],
+                                         arg_hash[:objects],
+                                         arg_hash[:executable],
+                                         arg_hash[:map],
+                                         @flaginator.flag_down( OPERATION_LINK_SYM, context, executable ) )
     
     begin
       shell_result = @tool_executor.exec( command[:line], command[:options] )
@@ -115,7 +136,7 @@ class Generator
 
   def generate_test_results(tool, context, executable, result)
     arg_hash = {:tool => tool, :context => context, :executable => executable, :result_file => result}
-    @plugin_manager.pre_test_execute(arg_hash)
+    @plugin_manager.pre_test_fixture_execute(arg_hash)
     
     @streaminator.stdout_puts("Running #{File.basename(arg_hash[:executable])}...", Verbosity::NORMAL)
     
@@ -135,7 +156,7 @@ class Generator
     arg_hash[:results]      = processed[:results]
     arg_hash[:shell_result] = shell_result # for raw output display if no plugins for formatted display
     
-    @plugin_manager.post_test_execute(arg_hash)
+    @plugin_manager.post_test_fixture_execute(arg_hash)
   end
   
 end

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

@@ -169,6 +169,10 @@ task_invoker:
     - rake_utils
     - rake_wrapper
 
+flaginator:
+  compose:
+    - configurator
+
 generator:
   compose:
     - configurator
@@ -177,13 +181,12 @@ generator:
     - cmock_builder
     - generator_test_runner
     - generator_test_results
+    - flaginator
     - test_includes_extractor
     - tool_executor
     - file_finder
-    - file_path_utils
     - streaminator
     - plugin_manager
-    - file_wrapper
 
 generator_helper:
   compose:
@@ -257,12 +260,13 @@ test_invoker:
   compose:
     - configurator
     - test_invoker_helper
-    - build_invoker_helper
+    - plugin_manager
     - streaminator
     - preprocessinator
     - task_invoker
     - dependinator
     - project_config_manager
+    - build_invoker_utils
     - file_path_utils
     - file_wrapper
 
@@ -279,7 +283,7 @@ release_invoker:
   compose:
     - configurator
     - release_invoker_helper
-    - build_invoker_helper
+    - build_invoker_utils
     - dependinator
     - task_invoker
     - file_path_utils
@@ -291,7 +295,7 @@ release_invoker_helper:
     - dependinator
     - task_invoker
 
-build_invoker_helper:
+build_invoker_utils:
   compose:
     - configurator
     - streaminator

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

@@ -1,5 +1,7 @@
 
 class String
+  # reformat a multiline string to have given number of whitespace columns;
+  # helpful for formatting heredocs
   def left_margin(margin=0)
     non_whitespace_column = 0
     new_lines = []
@@ -40,23 +42,36 @@ class Plugin
 
   def setup; end
 
-  def pre_build; end
-
-  def pre_mock_execute(arg_hash); end
-  def post_mock_execute(arg_hash); end
+  # mock generation
+  def pre_mock_generate(arg_hash); end
+  def post_mock_generate(arg_hash); end
 
-  def pre_runner_execute(arg_hash); end
-  def post_runner_execute(arg_hash); end
+  # test runner generation
+  def pre_runner_generate(arg_hash); end
+  def post_runner_generate(arg_hash); end
 
+  # compilation (test or source)
   def pre_compile_execute(arg_hash); end
   def post_compile_execute(arg_hash); end
 
+  # linking (test or source)
   def pre_link_execute(arg_hash); end
   def post_link_execute(arg_hash); end
 
-  def pre_test_execute(arg_hash); end
-  def post_test_execute(arg_hash); end
+  # test fixture execution
+  def pre_test_fixture_execute(arg_hash); end
+  def post_test_fixture_execute(arg_hash); end
+
+  # test task
+  def pre_test; end
+  def post_test; end
 
+  # release task
+  def pre_release; end
+  def post_release; end
+
+  # whole shebang (any use of Ceedling)
+  def pre_build; end
   def post_build; end
   
   def summary; end

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

@@ -52,13 +52,11 @@ class PluginManager
 
   #### execute all plugin methods ####
 
-  def pre_build; execute_plugins(:pre_build); end
-
-  def pre_mock_execute(arg_hash); execute_plugins(:pre_mock_execute, arg_hash); end
-  def post_mock_execute(arg_hash); execute_plugins(:post_mock_execute, arg_hash); end
+  def pre_mock_generate(arg_hash); execute_plugins(:pre_mock_generate, arg_hash); end
+  def post_mock_generate(arg_hash); execute_plugins(:post_mock_generate, arg_hash); end
 
-  def pre_runner_execute(arg_hash); execute_plugins(:pre_runner_execute, arg_hash); end
-  def post_runner_execute(arg_hash); execute_plugins(:post_runner_execute, arg_hash); end
+  def pre_runner_generate(arg_hash); execute_plugins(:pre_runner_generate, arg_hash); end
+  def post_runner_generate(arg_hash); execute_plugins(:post_runner_generate, arg_hash); end
 
   def pre_compile_execute(arg_hash); execute_plugins(:pre_compile_execute, arg_hash); end
   def post_compile_execute(arg_hash); execute_plugins(:post_compile_execute, arg_hash); end
@@ -66,13 +64,20 @@ class PluginManager
   def pre_link_execute(arg_hash); execute_plugins(:pre_link_execute, arg_hash); end
   def post_link_execute(arg_hash); execute_plugins(:post_link_execute, arg_hash); end
 
-  def pre_test_execute(arg_hash); execute_plugins(:pre_test_execute, arg_hash); end
-  def post_test_execute(arg_hash)
+  def pre_test_fixture_execute(arg_hash); execute_plugins(:pre_test_fixture_execute, arg_hash); end
+  def post_test_fixture_execute(arg_hash)
     # special arbitration: raw test results are printed or taken over by plugins handling the job
     @streaminator.stdout_puts(arg_hash[:shell_result][:output]) if (@configurator.plugins_display_raw_test_results)
-    execute_plugins(:post_test_execute, arg_hash)
+    execute_plugins(:post_test_fixture_execute, arg_hash)
   end
+
+  def pre_test; execute_plugins(:pre_test); end
+  def post_test; execute_plugins(:post_test); end
+
+  def pre_release; execute_plugins(:pre_release); end
+  def post_release; execute_plugins(:post_release); end
   
+  def pre_build; execute_plugins(:pre_build); end
   def post_build; execute_plugins(:post_build); end
   
   def summary; execute_plugins(:summary); end

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

@@ -36,7 +36,7 @@ class PreprocessinatorHelper
   private ############################
 
   def preprocess_files_smartly(file_list, preprocess_file_proc)
-    if (@configurator.project_use_auxiliary_dependencies)
+    if (@configurator.project_use_deep_dependencies)
       @task_invoker.invoke_test_preprocessed_files(file_list)
     else
       file_list.each { |file| preprocess_file_proc.call( yield(file) ) }

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

@@ -3,19 +3,19 @@ require 'constants'
 
 class ReleaseInvoker
 
-  constructor :configurator, :release_invoker_helper, :build_invoker_helper, :dependinator, :task_invoker, :file_path_utils, :file_wrapper
+  constructor :configurator, :release_invoker_helper, :build_invoker_utils, :dependinator, :task_invoker, :file_path_utils, :file_wrapper
 
 
   def setup_and_invoke_c_objects( c_files )
     objects = @file_path_utils.form_release_build_c_objects_filelist( c_files )
 
     begin
-      @release_invoker_helper.process_auxiliary_dependencies( @file_path_utils.form_release_dependencies_filelist( c_files ) )
+      @release_invoker_helper.process_deep_dependencies( @file_path_utils.form_release_dependencies_filelist( c_files ) )
 
       @dependinator.enhance_release_file_dependencies( objects )
       @task_invoker.invoke_release_objects( objects )
     rescue => e
-      @build_invoker_helper.process_exception( e, RELEASE_SYM, false )
+      @build_invoker_utils.process_exception( e, RELEASE_SYM, false )
     end
 
     return objects
@@ -29,29 +29,29 @@ class ReleaseInvoker
       @dependinator.enhance_release_file_dependencies( objects )
       @task_invoker.invoke_release_objects( objects )
     rescue => e
-      @build_invoker_helper.process_exception( e, RELEASE_SYM, false )
+      @build_invoker_utils.process_exception( e, RELEASE_SYM, false )
     end
     
     return objects
   end
 
 
-  def refresh_c_auxiliary_dependencies
-    return if (not @configurator.project_use_auxiliary_dependencies)
+  def refresh_c_deep_dependencies
+    return if (not @configurator.project_use_deep_dependencies)
 
     @file_wrapper.rm_f( 
       @file_wrapper.directory_listing( 
         File.join( @configurator.project_release_dependencies_path, '*' + @configurator.extension_dependencies ) ) )
 
-    @release_invoker_helper.process_auxiliary_dependencies( 
+    @release_invoker_helper.process_deep_dependencies( 
       @file_path_utils.form_release_dependencies_filelist( 
         @configurator.collection_all_source ) )    
   end
 
 
   def artifactinate( *files )
-    files.each do |file|
-      @file_wrapper.cp( file, @configurator.project_release_artifacts_path ) if @file_wrapper.exist?( file)
+    files.flatten.each do |file|
+      @file_wrapper.cp( file, @configurator.project_release_artifacts_path ) if @file_wrapper.exist?( file )
     end
   end
 

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

@@ -5,8 +5,8 @@ class ReleaseInvokerHelper
   constructor :configurator, :dependinator, :task_invoker
 
 
-  def process_auxiliary_dependencies(dependencies_list)
-    return if (not @configurator.project_use_auxiliary_dependencies)
+  def process_deep_dependencies(dependencies_list)
+    return if (not @configurator.project_use_deep_dependencies)
 
     @dependinator.enhance_release_file_dependencies( dependencies_list )
     @task_invoker.invoke_release_dependencies_files( dependencies_list )

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

@@ -8,7 +8,7 @@ rule(/#{PROJECT_TEST_PREPROCESS_FILES_PATH}\/.+/ => [
       @ceedling[:file_finder].find_test_or_source_or_header_file(task_name)
     end  
   ]) do |file|
-  if (not @ceedling[:configurator].project_use_auxiliary_dependencies)
+  if (not @ceedling[:configurator].project_use_deep_dependencies)
     raise 'ERROR: Ceedling preprocessing rule invoked though neccessary auxiliary dependency support not enabled.'
   end
   @ceedling[:generator].generate_preprocessed_file(TEST_SYM, file.source)

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

@@ -40,7 +40,7 @@ rule(/#{PROJECT_RELEASE_BUILD_TARGET}/) do |bin_file|
     bin_file.prerequisites,
     bin_file.name,
     map_file )
-  @ceedling[:release_invoker].artifactinate( bin_file.name, map_file )
+  @ceedling[:release_invoker].artifactinate( bin_file.name, map_file, @ceedling[:configurator].release_build_artifacts )
 end
 
 

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

@@ -7,24 +7,22 @@ task RELEASE_SYM => [:directories] do
   header = "Release build '#{File.basename(PROJECT_RELEASE_BUILD_TARGET)}'"
   @ceedling[:streaminator].stdout_puts("\n\n#{header}\n#{'-' * header.length}")  
   
-  core_objects  = []
-  extra_objects = @ceedling[:file_path_utils].form_release_build_c_objects_filelist( COLLECTION_RELEASE_ARTIFACT_EXTRA_LINK_OBJECTS )
+  begin
+    @ceedling[:plugin_manager].pre_release
 
-  @ceedling[:project_config_manager].process_release_config_change
-  core_objects.concat( @ceedling[:release_invoker].setup_and_invoke_c_objects( COLLECTION_ALL_SOURCE ) )
+    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 ) )
   
-  # if assembler use isn't enabled, COLLECTION_ALL_ASSEMBLY is empty array & nothing happens
-  core_objects.concat( @ceedling[:release_invoker].setup_and_invoke_asm_objects( COLLECTION_ALL_ASSEMBLY ) )
+    # if assembler use isn't enabled, COLLECTION_ALL_ASSEMBLY is empty array & nothing happens
+    core_objects.concat( @ceedling[:release_invoker].setup_and_invoke_asm_objects( COLLECTION_ALL_ASSEMBLY ) )
   
-  file( PROJECT_RELEASE_BUILD_TARGET => (core_objects + extra_objects) )
-  Rake::Task[PROJECT_RELEASE_BUILD_TARGET].invoke
-end
-
-
-if PROJECT_USE_AUXILIARY_DEPENDENCIES
-namespace REFRESH_SYM do
-  task RELEASE_SYM do
-    @ceedling[:release_invoker].refresh_c_auxiliary_dependencies
+    file( PROJECT_RELEASE_BUILD_TARGET => (core_objects + extra_objects) )
+    Rake::Task[PROJECT_RELEASE_BUILD_TARGET].invoke
+  ensure
+    @ceedling[:plugin_manager].post_release  
   end
 end
-end
+

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

@@ -0,0 +1,9 @@
+require 'constants'
+
+namespace REFRESH_SYM do
+
+  task RELEASE_SYM do
+    @ceedling[:release_invoker].refresh_c_deep_dependencies
+  end
+
+end

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

@@ -1,3 +1,5 @@
+require 'constants'
+
 
 namespace TEST_SYM do
   
@@ -48,10 +50,3 @@ namespace TEST_SYM do
 
 end
 
-if PROJECT_USE_AUXILIARY_DEPENDENCIES
-namespace REFRESH_SYM do
-  task TEST_SYM do
-    @ceedling[:test_invoker].refresh_auxiliary_dependencies
-  end
-end
-end

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

@@ -0,0 +1,9 @@
+require 'constants'
+
+namespace REFRESH_SYM do
+
+  task TEST_SYM do
+    @ceedling[:test_invoker].refresh_deep_dependencies
+  end
+
+end

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

@@ -5,7 +5,17 @@ class TestInvoker
 
   attr_reader :sources, :tests, :mocks
 
-  constructor :configurator, :test_invoker_helper, :build_invoker_helper, :streaminator, :preprocessinator, :task_invoker, :dependinator, :project_config_manager, :file_path_utils, :file_wrapper
+  constructor :configurator,
+              :test_invoker_helper,
+              :plugin_manager,
+              :streaminator,
+              :preprocessinator,
+              :task_invoker,
+              :dependinator,
+              :project_config_manager,
+              :build_invoker_utils,
+              :file_path_utils,
+              :file_wrapper
 
   def setup
     @sources = []
@@ -24,7 +34,9 @@ class TestInvoker
       header = "Test '#{File.basename(test)}'"
       @streaminator.stdout_puts("\n\n#{header}\n#{'-' * header.length}")
 
-      begin      
+      begin
+        @plugin_manager.pre_test
+        
         # collect up test fixture pieces & parts
         runner       = @file_path_utils.form_runner_filepath_from_test( test )
         mock_list    = @preprocessinator.preprocess_test_and_invoke_test_mocks( test )
@@ -39,7 +51,7 @@ class TestInvoker
         @test_invoker_helper.clean_results( {:pass => results_pass, :fail => results_fail}, options )
 
         # load up auxiliary dependencies so deep changes cause rebuilding appropriately
-        @test_invoker_helper.process_auxiliary_dependencies( core ) do |dependencies_list| 
+        @test_invoker_helper.process_deep_dependencies( core ) do |dependencies_list| 
           @dependinator.load_test_object_deep_dependencies( dependencies_list )
         end
 
@@ -55,7 +67,9 @@ class TestInvoker
         # 3, 2, 1... launch
         @task_invoker.invoke_test_results( results_pass )        
       rescue => e
-        @build_invoker_helper.process_exception( e, context )
+        @build_invoker_utils.process_exception( e, context )
+      ensure
+        @plugin_manager.post_test        
       end
       
       # store away what's been processed
@@ -71,12 +85,12 @@ class TestInvoker
   end
 
 
-  def refresh_auxiliary_dependencies
+  def refresh_deep_dependencies
     @file_wrapper.rm_f( 
       @file_wrapper.directory_listing( 
         File.join( @configurator.project_test_dependencies_path, '*' + @configurator.extension_dependencies ) ) )
 
-    @test_invoker_helper.process_auxiliary_dependencies( 
+    @test_invoker_helper.process_deep_dependencies( 
       @configurator.collection_all_tests + @configurator.collection_all_source )
   end
 

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

@@ -8,8 +8,8 @@ class TestInvokerHelper
     @file_wrapper.rm_f( results[:pass] ) if (options[:force_run])
   end
 
-  def process_auxiliary_dependencies(files)
-    return if (not @configurator.project_use_auxiliary_dependencies)
+  def process_deep_dependencies(files)
+    return if (not @configurator.project_use_deep_dependencies)
 
     dependencies_list = @file_path_utils.form_test_dependencies_filelist( files )
     @task_invoker.invoke_test_dependencies_files( dependencies_list )

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

@@ -140,11 +140,11 @@ namespace BULLSEYE_SYM do
 
 end
 
-if PROJECT_USE_AUXILIARY_DEPENDENCIES
+if PROJECT_USE_DEEP_DEPENDENCIES
 namespace REFRESH_SYM do
   task BULLSEYE_SYM do
     @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
-    @ceedling[:test_invoker].refresh_auxiliary_dependencies
+    @ceedling[:test_invoker].refresh_deep_dependencies
     @ceedling[:configurator].restore_config
   end
 end

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

@@ -53,7 +53,7 @@ class Bullseye < Plugin
     @ceedling[:plugin_manager].post_compile_execute(arg_hash)
   end
 
-  def post_test_execute(arg_hash)
+  def post_test_fixture_execute(arg_hash)
     result_file = arg_hash[:result_file]
   
     if ((result_file =~ /#{BULLSEYE_RESULTS_PATH}/) and (not @result_list.include?(result_file)))
@@ -111,6 +111,7 @@ class Bullseye < Plugin
 
   def report_coverage_results_all(coverage)
     results = {
+      :header => BULLSEYE_ROOT_NAME.upcase,
       :coverage => {
         :functions => nil,
         :branches  => nil
@@ -129,7 +130,7 @@ class Bullseye < Plugin
   end
 
   def report_per_function_coverage_results(sources)
-    banner = @ceedling[:plugin_reportinator].generate_banner "#{BULLSEYE_ROOT_NAME.upcase}: CODE COVERAGE SUMMARY"
+    banner = @ceedling[:plugin_reportinator].generate_banner( "#{BULLSEYE_ROOT_NAME.upcase}: CODE COVERAGE SUMMARY" )
     @ceedling[:streaminator].stdout_puts "\n" + banner
 
     coverage_sources = sources.clone
@@ -153,9 +154,9 @@ class Bullseye < Plugin
 
   def verify_coverage_file
     exist = @ceedling[:file_wrapper].exist?( ENVIRONMENT_COVFILE )
-  
+
     if (!exist)
-      banner = @ceedling[:plugin_reportinator].generate_banner "#{BULLSEYE_ROOT_NAME.upcase}: CODE COVERAGE SUMMARY"
+      banner = @ceedling[:plugin_reportinator].generate_banner( "#{BULLSEYE_ROOT_NAME.upcase}: CODE COVERAGE SUMMARY" )
       @ceedling[:streaminator].stdout_puts "\n" + banner + "\nNo coverage file.\n\n"
     end
     

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

@@ -140,11 +140,11 @@ namespace GCOV_SYM do
   
 end
 
-if PROJECT_USE_AUXILIARY_DEPENDENCIES
+if PROJECT_USE_DEEP_DEPENDENCIES
 namespace REFRESH_SYM do
   task GCOV_SYM do
     @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_SYM].config)
-    @ceedling[:test_invoker].refresh_auxiliary_dependencies
+    @ceedling[:test_invoker].refresh_deep_dependencies
     @ceedling[:configurator].restore_config
   end
 end

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

@@ -7,7 +7,7 @@ class StdoutIdeTestsReport < Plugin
     @result_list = []
   end
     
-  def post_test_execute(arg_hash)
+  def post_test_fixture_execute(arg_hash)
     return if not (arg_hash[:context] == TEST_SYM)
 
     @result_list << arg_hash[:result_file]

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

@@ -11,7 +11,7 @@ class StdoutPrettyTestsReport < Plugin
     @ceedling[:plugin_reportinator].register_test_results_template( template )
   end
   
-  def post_test_execute(arg_hash)
+  def post_test_fixture_execute(arg_hash)
     return if not (arg_hash[:context] == TEST_SYM)
   
     @result_list << arg_hash[:result_file]

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

@@ -8,7 +8,7 @@ class XmlTestsReport < Plugin
     @test_counter = 0
   end
 
-  def post_test_execute(arg_hash)
+  def post_test_fixture_execute(arg_hash)
     context = arg_hash[:context]
 
     @results_list[context] = [] if (@results_list[context].nil?)

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

@@ -1 +1 @@
-200
+212

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ceedling
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Mike Karlesky, Mark VanderVoord
@@ -17,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-11 00:00:00 Z
+date: 2011-07-06 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -168,7 +169,7 @@ files:
 - new_project_template/vendor/ceedling/docs/CMock Summary.pdf
 - new_project_template/vendor/ceedling/docs/Ceedling Packet.pdf
 - new_project_template/vendor/ceedling/docs/Unity Summary.pdf
-- new_project_template/vendor/ceedling/lib/build_invoker_helper.rb
+- new_project_template/vendor/ceedling/lib/build_invoker_utils.rb
 - new_project_template/vendor/ceedling/lib/cacheinator.rb
 - new_project_template/vendor/ceedling/lib/cacheinator_helper.rb
 - new_project_template/vendor/ceedling/lib/cmock_builder.rb
@@ -185,6 +186,7 @@ files:
 - new_project_template/vendor/ceedling/lib/file_path_utils.rb
 - 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/flaginator.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
@@ -214,9 +216,9 @@ files:
 - new_project_template/vendor/ceedling/lib/rules_cmock.rake
 - new_project_template/vendor/ceedling/lib/rules_preprocess.rake
 - new_project_template/vendor/ceedling/lib/rules_release.rake
-- new_project_template/vendor/ceedling/lib/rules_release_aux_dependencies.rake
+- new_project_template/vendor/ceedling/lib/rules_release_deep_dependencies.rake
 - new_project_template/vendor/ceedling/lib/rules_tests.rake
-- new_project_template/vendor/ceedling/lib/rules_tests_aux_dependencies.rake
+- new_project_template/vendor/ceedling/lib/rules_tests_deep_dependencies.rake
 - new_project_template/vendor/ceedling/lib/setupinator.rb
 - new_project_template/vendor/ceedling/lib/stream_wrapper.rb
 - new_project_template/vendor/ceedling/lib/streaminator.rb
@@ -227,7 +229,9 @@ files:
 - new_project_template/vendor/ceedling/lib/tasks_base.rake
 - new_project_template/vendor/ceedling/lib/tasks_filesystem.rake
 - new_project_template/vendor/ceedling/lib/tasks_release.rake
+- new_project_template/vendor/ceedling/lib/tasks_release_deep_dependencies.rake
 - new_project_template/vendor/ceedling/lib/tasks_tests.rake
+- new_project_template/vendor/ceedling/lib/tasks_tests_deep_dependencies.rake
 - new_project_template/vendor/ceedling/lib/tasks_vendor.rake
 - new_project_template/vendor/ceedling/lib/test_includes_extractor.rb
 - new_project_template/vendor/ceedling/lib/test_invoker.rb
@@ -289,6 +293,7 @@ files:
 - new_project_template/vendor/ceedling/vendor/unity/src/unity.c
 - new_project_template/vendor/ceedling/vendor/unity/src/unity.h
 - new_project_template/vendor/ceedling/vendor/unity/src/unity_internals.h
+has_rdoc: true
 homepage: http://throwtheswitch.org/
 licenses: []
 
@@ -318,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ceedling
-rubygems_version: 1.8.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Gemified version of the Ceedling C testing / build environment