ceedling 0.25.0 → 0.27.0

data/examples/temp_sensor/test/TestTemperatureCalculator.c

@@ -1,8 +1,11 @@
 #include "unity.h"
 #include "Types.h"
-#include "TemperatureCalculator.h"
 #include <math.h>
 
+TEST_FILE("TemperatureCalculator.c")
+
+extern float TemperatureCalculator_Calculate(uint16_t val);
+
 void setUp(void)
 {
 }

data/lib/ceedling/configurator.rb

@@ -180,7 +180,7 @@ class Configurator
     plugin_defaults = @configurator_plugins.find_plugin_defaults(config)
 
     config_plugins.each do |plugin|
-      config.deep_merge( @yaml_wrapper.load(plugin) )
+      config.deep_merge!( @yaml_wrapper.load(plugin) )
     end
 
     plugin_defaults.each do |defaults|
@@ -194,6 +194,18 @@ class Configurator
   end
 
 
+  def merge_imports(config)
+    if config[:import]
+      until config[:import].empty?
+        path = config[:import].shift
+        path = @system_wrapper.module_eval(path) if (path =~ RUBY_STRING_REPLACEMENT_PATTERN)
+        config.deep_merge!(@yaml_wrapper.load(path))
+      end
+    end
+    config.delete(:import)
+  end
+
+
   def eval_environment_variables(config)
     config[:environment].each do |hash|
       key   = hash.keys[0]
@@ -337,3 +349,4 @@ class Configurator
 
 
 end
+

data/lib/ceedling/configurator_builder.rb

@@ -64,7 +64,8 @@ class ConfiguratorBuilder
   def populate_defaults(config, defaults)
     defaults.keys.sort.each do |section|
       defaults[section].keys.sort.each do |entry|
-        config[section][entry] = defaults[section][entry].deep_clone if (config[section].nil? or config[section][entry].nil?)
+        config[section] = {} if config[section].nil?
+        config[section][entry] = defaults[section][entry].deep_clone if (config[section][entry].nil?)
       end
     end
   end

data/lib/ceedling/configurator_validator.rb

@@ -78,9 +78,18 @@ class ConfiguratorValidator
     return true if (filepath =~ TOOL_EXECUTOR_ARGUMENT_REPLACEMENT_PATTERN)
     
     if (not @file_wrapper.exist?(filepath))
-      # no verbosity checking since this is lowest level anyhow & verbosity checking depends on configurator
-      @stream_wrapper.stderr_puts("ERROR: Config filepath #{format_key_sequence(keys, hash[:depth])}['#{filepath}'] does not exist on disk.") 
-      return false
+
+      # See if we can deal with it internally.
+      if GENERATED_DIR_PATH.include?(filepath)      
+        # we already made this directory before let's make it again.
+        FileUtils.mkdir_p File.join(File.dirname(__FILE__), filepath)
+        @stream_wrapper.stderr_puts("WARNING: Generated filepath #{format_key_sequence(keys, hash[:depth])}['#{filepath}'] does not exist on disk. Recreating") 
+ 
+      else
+        # no verbosity checking since this is lowest level anyhow & verbosity checking depends on configurator
+        @stream_wrapper.stderr_puts("ERROR: Config filepath #{format_key_sequence(keys, hash[:depth])}['#{filepath}'] does not exist on disk.")
+        return false
+      end
     end      
 
     return true

data/lib/ceedling/constants.rb

@@ -36,6 +36,8 @@ unless defined?(PROJECT_ROOT)
   PROJECT_ROOT = Dir.pwd()
 end
 
+GENERATED_DIR_PATH = [['vendor', 'ceedling'], 'src', "test", ['test', 'support'], 'build'].each{|p| File.join(*p)}
+
 EXTENSION_WIN_EXE    = '.exe'
 EXTENSION_NONWIN_EXE = '.out'
 
@@ -87,7 +89,7 @@ OPERATION_LINK_SYM     = :link     unless defined?(OPERATION_LINK_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
+TEST_STDOUT_STATISTICS_PATTERN  = /\n-+\s*(\d+)\s+Tests\s+(\d+)\s+Failures\s+(\d+)\s+Ignored\s+(OK|FAIL)\s*/i
 
 NULL_FILE_PATH = '/dev/null'
 

data/lib/ceedling/defaults.rb

@@ -4,6 +4,7 @@ require 'ceedling/file_path_utils'
 
 #this should be defined already, but not always during system specs
 CEEDLING_VENDOR = File.expand_path(File.dirname(__FILE__) + '/../../vendor') unless defined? CEEDLING_VENDOR
+CEEDLING_PLUGINS = [File.expand_path(File.dirname(__FILE__) + '/../../plugins')] unless defined? CEEDLING_PLUGINS
 
 DEFAULT_TEST_COMPILER_TOOL = {
   :executable => FilePathUtils.os_executable_ext('gcc').freeze,
@@ -32,6 +33,8 @@ DEFAULT_TEST_LINKER_TOOL = {
   :arguments => [
     "\"${1}\"".freeze,
     "-o \"${2}\"".freeze,
+    "".freeze,
+    "${4}".freeze
     ].freeze
   }
 
@@ -276,6 +279,14 @@ DEFAULT_CEEDLING_CONFIG = {
       :test_preprocess => [],
       :release => [],
       :release_preprocess => [],
+      :use_test_definition => false,
+    },
+
+    :libraries => {
+      :test => [],
+      :test_preprocess => [],
+      :release => [],
+      :release_preprocess => [],
     },
 
     :flags => {},
@@ -333,7 +344,7 @@ DEFAULT_CEEDLING_CONFIG = {
     :release_dependencies_generator => { :arguments => [] },
 
     :plugins => {
-      :load_paths => [],
+      :load_paths => CEEDLING_PLUGINS,
       :enabled => [],
     }
   }.freeze

data/lib/ceedling/file_finder.rb

@@ -128,5 +128,8 @@ class FileFinder
     return @file_finder_helper.find_file_in_collection(assembly_file, @configurator.collection_all_assembly, :error)
   end
     
+  def find_file_from_list(file_path, file_list, complain)
+    return @file_finder_helper.find_file_in_collection(file_path, file_list, complain)
+  end
 end
 

data/lib/ceedling/file_path_utils.rb

@@ -23,7 +23,7 @@ class FilePathUtils
   def self.standardize(path)
     path.strip!
     path.gsub!(/\\/, '/')
-    path.gsub!(/^((\+|-):)?\.\//, '')
+    path.gsub!(/^((\+|-):)?/, '')
     path.chomp!('/')
     return path
   end

data/lib/ceedling/file_wrapper.rb

@@ -29,7 +29,7 @@ class FileWrapper
   end
 
   def directory_listing(glob)
-    return Dir.glob(glob)
+    return Dir.glob(glob, File::FNM_PATHNAME)
   end
 
   def rm_f(filepath, options={})
@@ -39,7 +39,7 @@ class FileWrapper
   def rm_r(filepath, options={})
     FileUtils.rm_r(filepath, options={})
   end
-  
+
   def cp(source, destination, options={})
     FileUtils.cp(source, destination, options)
   end
@@ -47,7 +47,7 @@ class FileWrapper
   def compare(from, to)
     return FileUtils.compare_file(from, to)
   end
-  
+
   def open(filepath, flags)
     File.open(filepath, flags) do |file|
       yield(file)
@@ -65,7 +65,7 @@ class FileWrapper
   def write(filepath, contents, flags='w')
     File.open(filepath, flags) do |file|
       file.write(contents)
-    end    
+    end
   end
 
   def readlines(filepath)

data/lib/ceedling/generator.rb

@@ -102,9 +102,16 @@ class Generator
     end
   end
 
-  def generate_executable_file(tool, context, objects, executable, map='')
+  def generate_executable_file(tool, context, objects, executable, map='', libraries=[])
     shell_result = {}
-    arg_hash = {:tool => tool, :context => context, :objects => objects, :executable => executable, :map => map}
+    arg_hash = { :tool => tool,
+                 :context => context,
+                 :objects => objects,
+                 :executable => executable,
+                 :map => map,
+                 :libraries => libraries
+               }
+
     @plugin_manager.pre_link_execute(arg_hash)
 
     @streaminator.stdout_puts("Linking #{File.basename(arg_hash[:executable])}...", Verbosity::NORMAL)
@@ -113,7 +120,9 @@ class Generator
                                          @flaginator.flag_down( OPERATION_LINK_SYM, context, executable ),
                                          arg_hash[:objects],
                                          arg_hash[:executable],
-                                         arg_hash[:map])
+                                         arg_hash[:map],
+                                         arg_hash[:libraries]
+                                       )
 
     begin
       shell_result = @tool_executor.exec( command[:line], command[:options] )

data/lib/ceedling/preprocessinator_helper.rb

@@ -1,7 +1,7 @@
 
 
 class PreprocessinatorHelper
-  
+
   constructor :configurator, :test_includes_extractor, :task_invoker, :file_finder, :file_path_utils
 
 
@@ -11,8 +11,8 @@ class PreprocessinatorHelper
       preprocess_includes_proc.call( @file_finder.find_test_from_file_path(preprocessed_includes_list) )
       @test_includes_extractor.parse_includes_list(preprocessed_includes_list)
     else
-      @test_includes_extractor.parse_test_file(test)      
-    end  
+      @test_includes_extractor.parse_test_file(test)
+    end
   end
 
   def assemble_mocks_list(test)
@@ -29,10 +29,10 @@ class PreprocessinatorHelper
 
   def preprocess_test_file(test, preprocess_file_proc)
     return if (!@configurator.project_use_test_preprocessor)
-    
+
     preprocess_file_proc.call(test)
   end
-  
+
   private ############################
 
   def preprocess_files_smartly(file_list, preprocess_file_proc)

data/lib/ceedling/preprocessinator_includes_handler.rb

@@ -31,6 +31,7 @@ class PreprocessinatorIncludesHandler
     # are included directly by the test file.
     contents = @file_wrapper.read(filepath)
     contents.gsub!( /^\s*#include\s+[\"<]\s*(\S+)\s*[\">]/, "#include \"\\1\"\n#include \"@@@@\\1\"" )
+    contents.gsub!( /^\s*TEST_FILE\(\s*\"\s*(\S+)\s*\"\s*\)/, "#include \"\\1\"\n#include \"@@@@\\1\"")
     @file_wrapper.write( temp_filepath, contents )
 
     # extract the make-style dependency rule telling the preprocessor to
@@ -63,7 +64,7 @@ class PreprocessinatorIncludesHandler
     # Find which of our annotated headers are "real" dependencies. This is
     # intended to weed out dependencies that have been removed due to build
     # options defined in the project yaml and/or in the headers themselves.
-    annotated_headers.find_all do |annotated_header|
+    list = annotated_headers.find_all do |annotated_header|
       # find the index of the "real" include that matches the annotated one.
       idx = real_headers.find_index do |real_header|
         real_header =~ /^(.*\/)?#{Regexp.escape(annotated_header)}$/
@@ -74,6 +75,14 @@ class PreprocessinatorIncludesHandler
       # found/deleted
       idx ? real_headers.delete_at(idx) : nil
     end.compact
+
+    # Extract direct dependencies that were also added
+    src_ext = @configurator.extension_source
+    sdependencies = make_rule.split.find_all {|path| path.end_with?(src_ext) }.uniq
+    sdependencies.map! {|hdr| hdr.gsub('\\','/') }
+    list += sdependencies
+
+    list
   end
 
   def write_shallow_includes_list(filepath, list)

data/lib/ceedling/project_config_manager.rb

@@ -18,8 +18,7 @@ class ProjectConfigManager
 
   def merge_options(config_hash, option_filepath)
     @options_files << File.basename( option_filepath )
-    config_hash.deep_merge( @yaml_wrapper.load( option_filepath ) )
-    return config_hash
+    config_hash.deep_merge!( @yaml_wrapper.load( option_filepath ) )
   end 
   
 

data/lib/ceedling/project_file_loader.rb

@@ -10,7 +10,7 @@ class ProjectFileLoader
   def setup
     @main_file = nil
     @user_file = nil
-    
+
     @main_project_filepath = ''
     @user_project_filepath = ''
   end
@@ -19,17 +19,17 @@ class ProjectFileLoader
   def find_project_files
     # first go hunting for optional user project file by looking for environment variable and then default location on disk
     user_filepath = @system_wrapper.env_get('CEEDLING_USER_PROJECT_FILE')
-    
+
     if ( not user_filepath.nil? and @file_wrapper.exist?(user_filepath) )
       @user_project_filepath = user_filepath
     elsif (@file_wrapper.exist?(DEFAULT_CEEDLING_USER_PROJECT_FILE))
       @user_project_filepath = DEFAULT_CEEDLING_USER_PROJECT_FILE
     end
-    
+
     # next check for main project file by looking for environment variable and then default location on disk;
     # blow up if we don't find this guy -- like, he's so totally important
     main_filepath = @system_wrapper.env_get('CEEDLING_MAIN_PROJECT_FILE')
-    
+
     if ( not main_filepath.nil? and @file_wrapper.exist?(main_filepath) )
       @main_project_filepath = main_filepath
     elsif (@file_wrapper.exist?(DEFAULT_CEEDLING_MAIN_PROJECT_FILE))
@@ -40,25 +40,43 @@ class ProjectFileLoader
       @stream_wrapper.stderr_puts('Found no Ceedling project file (*.yml)')
       raise
     end
-    
+
     @main_file = File.basename( @main_project_filepath )
     @user_file = File.basename( @user_project_filepath ) if ( not @user_project_filepath.empty? )
   end
 
+  def yaml_merger(y1, y2)
+    o1 = y1
+    y2.each_pair do |k,v|
+      if o1[k].nil?
+        o1[k] = v
+      else
+        if (o1[k].instance_of? Hash)
+          o1[k] = yaml_merger(o1[k], v)
+        elsif (o1[k].instance_of? Array)
+          o1[k] += v
+        else
+          o1[k] = v
+        end
+      end
+    end
+    return o1
+  end
 
   def load_project_config
     config_hash = {}
-    
     # if there's no user project file, then just provide hash from project file
     if (@user_project_filepath.empty?)
       config_hash = @yaml_wrapper.load(@main_project_filepath)
     # if there is a user project file, load it too and merge it on top of the project file,
     # superseding anything that's common between them
     else
-      config_hash = (@yaml_wrapper.load(@main_project_filepath)).merge(@yaml_wrapper.load(@user_project_filepath))
+      main_hash = @yaml_wrapper.load(@main_project_filepath)
+      user_hash = @yaml_wrapper.load(@user_project_filepath)
+      config_hash = yaml_merger( main_hash, user_hash )
     end
-    
+
     return config_hash
   end
-      
+
 end

data/lib/ceedling/rakefile.rb

@@ -67,12 +67,12 @@ END {
     @ceedling[:file_wrapper].rm_f( @ceedling[:file_wrapper].directory_listing( File.join(@ceedling[:configurator].project_temp_path, '*') ))
   end
 
-	# only perform these final steps if we got here without runtime exceptions or errors
-	if (@ceedling[:system_wrapper].ruby_success)
+  # only perform these final steps if we got here without runtime exceptions or errors
+  if (@ceedling[:system_wrapper].ruby_success)
 
     # tell all our plugins the build is done and process results
-	  @ceedling[:plugin_manager].post_build
-	  @ceedling[:plugin_manager].print_plugin_failures
-	  #exit(1) if (@ceedling[:plugin_manager].plugins_failed?) #do NOT call this. It will keep caller from reporting failures
-	end
+    @ceedling[:plugin_manager].post_build
+    @ceedling[:plugin_manager].print_plugin_failures
+    exit(1) if (@ceedling[:plugin_manager].plugins_failed? && !@ceedling[:setupinator].config_hash[:graceful_fail]) 
+  end
 }

data/lib/ceedling/release_invoker.rb

@@ -31,7 +31,7 @@ class ReleaseInvoker
     rescue => e
       @build_invoker_utils.process_exception( e, RELEASE_SYM, false )
     end
-    
+
     return objects
   end
 
@@ -39,13 +39,13 @@ class ReleaseInvoker
   def refresh_c_deep_dependencies
     return if (not @configurator.project_use_deep_dependencies)
 
-    @file_wrapper.rm_f( 
-      @file_wrapper.directory_listing( 
+    @file_wrapper.rm_f(
+      @file_wrapper.directory_listing(
         File.join( @configurator.project_release_dependencies_path, '*' + @configurator.extension_dependencies ) ) )
 
-    @release_invoker_helper.process_deep_dependencies( 
-      @file_path_utils.form_release_dependencies_filelist( 
-        @configurator.collection_all_source ) )    
+    @release_invoker_helper.process_deep_dependencies(
+      @file_path_utils.form_release_dependencies_filelist(
+        @configurator.collection_all_source ) )
   end
 
 
@@ -55,4 +55,19 @@ class ReleaseInvoker
     end
   end
 
+  def convert_libraries_to_arguments(libraries)
+    args = (libraries || []) + ((defined? LIBRARIES_SYSTEM) ? LIBRARIES_SYSTEM : [])
+    if (defined? LIBRARIES_FLAG)
+      args.map! {|v| LIBRARIES_FLAG.gsub(/\$\{1\}/, v) }
+    end
+    return args
+  end
+
+  def sort_objects_and_libraries(both)
+    extension = "\\" + (EXTENSION_SUBPROJECTS || ".LIBRARY")
+    sorted_objects = both.group_by {|v| v.match(/.+#{extension}$/) ? :libraries : :objects }
+    libraries = sorted_objects[:libraries] || []
+    objects   = sorted_objects[:objects]   || []
+    return objects, libraries
+  end
 end

data/lib/ceedling/rules_release.rake

@@ -1,6 +1,6 @@
 
-RELEASE_COMPILE_TASK_ROOT  = RELEASE_TASK_ROOT + 'compile:'
-RELEASE_ASSEMBLE_TASK_ROOT = RELEASE_TASK_ROOT + 'assemble:'
+RELEASE_COMPILE_TASK_ROOT  = RELEASE_TASK_ROOT + 'compile:'  unless defined?(RELEASE_COMPILE_TASK_ROOT)
+RELEASE_ASSEMBLE_TASK_ROOT = RELEASE_TASK_ROOT + 'assemble:' unless defined?(RELEASE_ASSEMBLE_TASK_ROOT)
 
 
 if (RELEASE_BUILD_USE_ASSEMBLY)
@@ -35,13 +35,17 @@ end
 
 
 rule(/#{PROJECT_RELEASE_BUILD_TARGET}/) do |bin_file|
+  objects, libraries = @ceedling[:release_invoker].sort_objects_and_libraries(bin_file.prerequisites)
+  tool     = TOOLS_RELEASE_LINKER.clone
+  lib_args = @ceedling[:release_invoker].convert_libraries_to_arguments(libraries)
   map_file = @ceedling[:configurator].project_release_build_map
   @ceedling[:generator].generate_executable_file(
-    TOOLS_RELEASE_LINKER,
+    tool,
     RELEASE_SYM,
-    bin_file.prerequisites,
+    objects,
     bin_file.name,
-    map_file )
+    map_file,
+    lib_args )
   @ceedling[:release_invoker].artifactinate( bin_file.name, map_file, @ceedling[:configurator].release_build_artifacts )
 end