ceedling 0.28.2 → 0.28.3

data/lib/ceedling/configurator_plugins.rb

@@ -14,15 +14,20 @@ class ConfiguratorPlugins
   def add_load_paths(config)
     plugin_paths = {}
 
-    config[:plugins][:load_paths].each do |root|
-      @system_wrapper.add_load_path( root ) if ( not @file_wrapper.directory_listing( File.join( root, '*.rb' ) ).empty? )
+    config[:plugins][:enabled].each do |plugin|
+      config[:plugins][:load_paths].each do |root|
+        path = File.join(root, plugin)
 
-      config[:plugins][:enabled].each do |plugin|
-        path = File.join(root, plugin, "lib")
+        is_script_plugin = ( not @file_wrapper.directory_listing( File.join( path, 'lib', '*.rb' ) ).empty? )
+        is_rake_plugin = ( not @file_wrapper.directory_listing( File.join( path, '*.rake' ) ).empty? )
 
-        if ( not @file_wrapper.directory_listing( File.join( path, '*.rb' ) ).empty? )
+        if is_script_plugin or is_rake_plugin
           plugin_paths[(plugin + '_path').to_sym] = path
-          @system_wrapper.add_load_path( path )
+
+          if is_script_plugin
+            @system_wrapper.add_load_path( File.join( path, 'lib') )
+          end
+          break
         end
       end
     end
@@ -32,12 +37,13 @@ class ConfiguratorPlugins
 
 
   # gather up and return .rake filepaths that exist on-disk
-  def find_rake_plugins(config)
+  def find_rake_plugins(config, plugin_paths)
+    @rake_plugins = []
     plugins_with_path = []
 
-    config[:plugins][:load_paths].each do |root|
-      config[:plugins][:enabled].each do |plugin|
-        rake_plugin_path = File.join(root, plugin, "#{plugin}.rake")
+    config[:plugins][:enabled].each do |plugin|
+      if path = plugin_paths[(plugin + '_path').to_sym]
+        rake_plugin_path = File.join(path, "#{plugin}.rake")
         if (@file_wrapper.exist?(rake_plugin_path))
           plugins_with_path << rake_plugin_path
           @rake_plugins << plugin
@@ -50,16 +56,16 @@ class ConfiguratorPlugins
 
 
   # gather up and return just names of .rb classes that exist on-disk
-  def find_script_plugins(config)
-    config[:plugins][:load_paths].each do |root|
-      config[:plugins][:enabled].each do |plugin|
-        script_plugin_path = File.join(root, plugin, "lib", "#{plugin}.rb")
+  def find_script_plugins(config, plugin_paths)
+    @script_plugins = []
 
+    config[:plugins][:enabled].each do |plugin|
+      if path = plugin_paths[(plugin + '_path').to_sym]
+        script_plugin_path = File.join(path, "lib", "#{plugin}.rb")
 
         if @file_wrapper.exist?(script_plugin_path)
           @script_plugins << plugin
         end
-
       end
     end
 
@@ -68,13 +74,12 @@ class ConfiguratorPlugins
 
 
   # gather up and return configuration .yml filepaths that exist on-disk
-  def find_config_plugins(config)
+  def find_config_plugins(config, plugin_paths)
     plugins_with_path = []
 
-    config[:plugins][:load_paths].each do |root|
-      config[:plugins][:enabled].each do |plugin|
-        config_plugin_path = File.join(root, plugin, "config", "#{plugin}.yml")
-
+    config[:plugins][:enabled].each do |plugin|
+      if path = plugin_paths[(plugin + '_path').to_sym]
+        config_plugin_path = File.join(path, "config", "#{plugin}.yml")
 
         if @file_wrapper.exist?(config_plugin_path)
           plugins_with_path << config_plugin_path
@@ -87,12 +92,12 @@ class ConfiguratorPlugins
 
 
   # gather up and return default .yml filepaths that exist on-disk
-  def find_plugin_defaults(config)
+  def find_plugin_defaults(config, plugin_paths)
     defaults_with_path = []
 
-    config[:plugins][:load_paths].each do |root|
-      config[:plugins][:enabled].each do |plugin|
-        default_path = File.join(root, plugin, 'config', 'defaults.yml')
+    config[:plugins][:enabled].each do |plugin|
+      if path = plugin_paths[(plugin + '_path').to_sym]
+        default_path = File.join(path, 'config', 'defaults.yml')
 
         if @file_wrapper.exist?(default_path)
           defaults_with_path << default_path

data/lib/ceedling/configurator_setup.rb

@@ -76,7 +76,6 @@ class ConfiguratorSetup
   def validate_paths(config)
     validation = []
 
-    validation << @configurator_validator.validate_filepath(config, :project, :build_root)
     if config[:cmock][:unity_helper]
       config[:cmock][:unity_helper].each do |path|
         validation << @configurator_validator.validate_filepath_simple( path, :cmock, :unity_helper ) 

data/lib/ceedling/defaults.rb

@@ -4,7 +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
+CEEDLING_PLUGINS = [] unless defined? CEEDLING_PLUGINS
 
 DEFAULT_TEST_COMPILER_TOOL = {
   :executable => FilePathUtils.os_executable_ext('gcc').freeze,
@@ -21,6 +21,8 @@ DEFAULT_TEST_COMPILER_TOOL = {
     "-c \"${1}\"".freeze,
     "-o \"${2}\"".freeze,
     # gcc's list file output options are complex; no use of ${3} parameter in default config
+    "-MMD".freeze,
+    "-MF \"${4}\"".freeze,
     ].freeze
   }
 
@@ -158,6 +160,8 @@ DEFAULT_RELEASE_COMPILER_TOOL = {
     "-c \"${1}\"".freeze,
     "-o \"${2}\"".freeze,
     # gcc's list file output options are complex; no use of ${3} parameter in default config
+    "-MMD".freeze,
+    "-MF \"${4}\"".freeze,
     ].freeze
   }
 
@@ -242,6 +246,7 @@ DEFAULT_CEEDLING_CONFIG = {
       :test_threads => 1,
       :use_test_preprocessor => false,
       :use_deep_dependencies => false,
+      :generate_deep_dependencies => true, # only applicable if use_deep_dependencies is true
       :test_file_prefix => 'test_',
       :options_paths => [],
       :release_build => false,
@@ -347,7 +352,7 @@ DEFAULT_CEEDLING_CONFIG = {
     :release_dependencies_generator => { :arguments => [] },
 
     :plugins => {
-      :load_paths => [], #XXX this is injected twice as of now so removed til better handling is found CEEDLING_PLUGINS,
+      :load_paths => CEEDLING_PLUGINS,
       :enabled => [],
     }
   }.freeze

data/lib/ceedling/dependinator.rb

@@ -11,7 +11,11 @@ class Dependinator
 
 
   def load_release_object_deep_dependencies(dependencies_list)
-    dependencies_list.each { |dependencies_file| @rake_wrapper.load_dependencies( dependencies_file ) }
+    dependencies_list.each do |dependencies_file|
+      if File.exists?(dependencies_file)
+        @rake_wrapper.load_dependencies( dependencies_file )
+      end
+    end
   end
 
 
@@ -25,7 +29,11 @@ class Dependinator
 
   def load_test_object_deep_dependencies(files_list)
     dependencies_list = @file_path_utils.form_test_dependencies_filelist(files_list)
-    dependencies_list.each { |dependencies_file| @rake_wrapper.load_dependencies(dependencies_file) }
+    dependencies_list.each do |dependencies_file|
+      if File.exists?(dependencies_file)
+        @rake_wrapper.load_dependencies(dependencies_file)
+      end
+    end
   end
 
 

data/lib/ceedling/file_finder.rb

@@ -1,14 +1,17 @@
 require 'rubygems'
 require 'rake' # for adding ext() method to string
+require 'thread'
+
 
 class FileFinder
+  SEMAPHORE = Mutex.new
 
   constructor :configurator, :file_finder_helper, :cacheinator, :file_path_utils, :file_wrapper, :yaml_wrapper
 
   def prepare_search_sources
-    @all_test_source_and_header_file_collection = 
+    @all_test_source_and_header_file_collection =
       @configurator.collection_all_tests +
-      @configurator.collection_all_source + 
+      @configurator.collection_all_source +
       @configurator.collection_all_headers
   end
 
@@ -25,19 +28,19 @@ class FileFinder
   def find_header_input_for_mock_file(mock_file)
     found_path = find_header_file(mock_file)
     mock_input = found_path
-    
+
     if (@configurator.project_use_test_preprocessor)
       mock_input = @cacheinator.diff_cached_test_file( @file_path_utils.form_preprocessed_file_filepath( found_path ) )
     end
-    
+
     return mock_input
   end
-  
+
 
   def find_source_from_test(test, complain)
     test_prefix  = @configurator.project_test_file_prefix
     source_paths = @configurator.collection_all_source
-    
+
     source = File.basename(test).sub(/#{test_prefix}/, '')
 
     # we don't blow up if a test file has no corresponding source file
@@ -49,31 +52,31 @@ class FileFinder
     extension_source = @configurator.extension_source
 
     test_file = File.basename(runner_path).sub(/#{@configurator.test_runner_file_suffix}#{'\\'+extension_source}/, extension_source)
-    
+
     found_path = @file_finder_helper.find_file_in_collection(test_file, @configurator.collection_all_tests, :error)
 
     return found_path
   end
 
-  
+
   def find_test_input_for_runner_file(runner_path)
     found_path   = find_test_from_runner_path(runner_path)
     runner_input = found_path
-    
+
     if (@configurator.project_use_test_preprocessor)
       runner_input = @cacheinator.diff_cached_test_file( @file_path_utils.form_preprocessed_file_filepath( found_path ) )
     end
-    
+
     return runner_input
   end
-  
+
 
   def find_test_from_file_path(file_path)
     test_file = File.basename(file_path).ext(@configurator.extension_source)
-    
+
     found_path = @file_finder_helper.find_file_in_collection(test_file, @configurator.collection_all_tests, :error)
-    
-    return found_path    
+
+    return found_path
   end
 
 
@@ -81,59 +84,64 @@ class FileFinder
     file = File.basename(file_path)
     return @file_finder_helper.find_file_in_collection(file, @all_test_source_and_header_file_collection, :error)
   end
-  
-  
+
+
   def find_compilation_input_file(file_path, complain=:error, release=false)
     found_file = nil
-    
+
     source_file = File.basename(file_path).ext(@configurator.extension_source)
 
     # We only collect files that already exist when we start up.
     # FileLists can produce undesired results for dynamically generated files depending on when they're accessed.
     # So collect mocks and runners separately and right now.
-    if (source_file =~ /#{@configurator.test_runner_file_suffix}/)
-      found_file = 
-        @file_finder_helper.find_file_in_collection(
-          source_file,
-          @file_wrapper.directory_listing( File.join(@configurator.project_test_runners_path, '*') ),
-          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, '*') ),
-          complain)
-
-    elsif release
-      found_file =
-        @file_finder_helper.find_file_in_collection(
-          source_file,
-          @configurator.collection_release_existing_compilation_input,
-          complain)
-    else
-      found_file = 
-        @file_finder_helper.find_file_in_collection(
-          source_file,
-          @configurator.collection_all_existing_compilation_input,
-          complain)
-    end
 
+    SEMAPHORE.synchronize {
+
+      if (source_file =~ /#{@configurator.test_runner_file_suffix}/)
+        found_file =
+          @file_finder_helper.find_file_in_collection(
+            source_file,
+            @file_wrapper.directory_listing( File.join(@configurator.project_test_runners_path, '*') ),
+            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, '*') ),
+            complain)
+
+      elsif release
+        found_file =
+          @file_finder_helper.find_file_in_collection(
+            source_file,
+            @configurator.collection_release_existing_compilation_input,
+            complain)
+      else
+        temp_complain = (defined?(TEST_BUILD_USE_ASSEMBLY) && TEST_BUILD_USE_ASSEMBLY) ? :ignore : complain
+        found_file =
+          @file_finder_helper.find_file_in_collection(
+            source_file,
+            @configurator.collection_all_existing_compilation_input,
+            temp_complain)
+        found_file ||= find_assembly_file(file_path, false) if (defined?(TEST_BUILD_USE_ASSEMBLY) && TEST_BUILD_USE_ASSEMBLY)
+      end
+    }
     return found_file
   end
 
-  
+
   def find_source_file(file_path, complain)
     source_file = File.basename(file_path).ext(@configurator.extension_source)
     return @file_finder_helper.find_file_in_collection(source_file, @configurator.collection_all_source, complain)
   end
 
-  
-  def find_assembly_file(file_path)
+
+  def find_assembly_file(file_path, complain = :error)
     assembly_file = File.basename(file_path).ext(@configurator.extension_assembly)
-    return @file_finder_helper.find_file_in_collection(assembly_file, @configurator.collection_all_assembly, :error)
+    return @file_finder_helper.find_file_in_collection(assembly_file, @configurator.collection_all_assembly, complain)
   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

data/lib/ceedling/file_path_utils.rb

@@ -116,6 +116,10 @@ class FilePathUtils
     return File.join( @configurator.project_test_build_cache_path, File.basename(filepath) )
   end
 
+  def form_test_dependencies_filepath(filepath)
+    return File.join( @configurator.project_test_dependencies_path, File.basename(filepath).ext(@configurator.extension_dependencies) )
+  end
+
   def form_pass_results_filepath(filepath)
     return File.join( @configurator.project_test_results_path, File.basename(filepath).ext(@configurator.extension_testpass) )
   end
@@ -133,11 +137,15 @@ class FilePathUtils
   end
 
   def form_runner_object_filepath_from_test(filepath)
-    return (form_test_build_object_filepath(filepath)).sub(/(#{@configurator.extension_object})$/, "#{@configurator.test_runner_file_suffix}\\1")
+    return (form_test_build_c_object_filepath(filepath)).sub(/(#{@configurator.extension_object})$/, "#{@configurator.test_runner_file_suffix}\\1")
+  end
+
+  def form_test_build_c_object_filepath(filepath)
+    return File.join( @configurator.project_test_build_output_c_path, File.basename(filepath).ext(@configurator.extension_object) )
   end
 
-  def form_test_build_object_filepath(filepath)
-    return File.join( @configurator.project_test_build_output_path, File.basename(filepath).ext(@configurator.extension_object) )
+  def form_test_build_asm_object_filepath(filepath)
+    return File.join( @configurator.project_test_build_output_asm_path, File.basename(filepath).ext(@configurator.extension_object) )
   end
 
   def form_test_executable_filepath(filepath)
@@ -161,7 +169,7 @@ class FilePathUtils
   end
 
   def form_test_build_objects_filelist(sources)
-    return (@file_wrapper.instantiate_file_list(sources)).pathmap("#{@configurator.project_test_build_output_path}/%n#{@configurator.extension_object}")
+    return (@file_wrapper.instantiate_file_list(sources)).pathmap("#{@configurator.project_test_build_output_c_path}/%n#{@configurator.extension_object}")
   end
 
   def form_preprocessed_mockable_headers_filelist(mocks)

data/lib/ceedling/file_wrapper.rb

@@ -76,4 +76,8 @@ class FileWrapper
     return FileList.new(files)
   end
 
+  def mkdir(folder)
+    return FileUtils.mkdir_p(folder)
+  end
+
 end

data/lib/ceedling/generator.rb

@@ -78,9 +78,9 @@ class Generator
     end
   end
 
-  def generate_object_file(tool, operation, context, source, object, list='')
+  def generate_object_file(tool, operation, context, source, object, list='', dependencies='')
     shell_result = {}
-    arg_hash = {:tool => tool, :operation => operation, :context => context, :source => source, :object => object, :list => list}
+    arg_hash = {:tool => tool, :operation => operation, :context => context, :source => source, :object => object, :list => list, :dependencies => dependencies}
     @plugin_manager.pre_compile_execute(arg_hash)
 
     @streaminator.stdout_puts("Compiling #{File.basename(arg_hash[:source])}...", Verbosity::NORMAL)
@@ -89,7 +89,8 @@ class Generator
                                          @flaginator.flag_down( operation, context, source ),
                                          arg_hash[:source],
                                          arg_hash[:object],
-                                         arg_hash[:list])
+                                         arg_hash[:list],
+                                         arg_hash[:dependencies])
 
     begin
       shell_result = @tool_executor.exec( command[:line], command[:options] )

data/lib/ceedling/generator_test_results.rb

@@ -1,19 +1,20 @@
 require 'rubygems'
 require 'rake' # for .ext()
 require 'ceedling/constants'
- 
+
 class GeneratorTestResults
 
   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
-    
+
     results = get_results_structure
-    
+
     results[:source][:path] = File.dirname(test_file)
     results[:source][:file] = File.basename(test_file)
-    
+    results[:time] = unity_shell_result[:time] unless unity_shell_result[:time].nil?
+
     # process test statistics
     if (unity_shell_result[:output] =~ TEST_STDOUT_STATISTICS_PATTERN)
       results[:counts][:total]   = $1.to_i
@@ -24,7 +25,7 @@ class GeneratorTestResults
 
     # remove test statistics lines
     output_string = unity_shell_result[:output].sub(TEST_STDOUT_STATISTICS_PATTERN, '')
-    
+
     output_string.lines do |line|
       # process unity output
       case line
@@ -44,13 +45,13 @@ class GeneratorTestResults
         results[:stdout] << line.chomp
       end
     end
-    
+
     @generator_test_results_sanity_checker.verify(results, unity_shell_result[:exit_code])
-    
+
     output_file = results_file.ext(@configurator.extension_testfail) if (results[:counts][:failed] > 0)
-    
+
     @yaml_wrapper.dump(output_file, results)
-    
+
     return { :result_file => output_file, :result => results }
   end
 
@@ -64,19 +65,20 @@ class GeneratorTestResults
       :ignores   => [],
       :counts    => {:total => 0, :passed => 0, :failed => 0, :ignored  => 0},
       :stdout    => [],
+      :time      => 0.0
       }
   end
-  
+
   def extract_line_elements(line, filename)
     # handle anything preceding filename in line as extra output to be collected
     stdout = nil
     stdout_regex = /(.+)#{Regexp.escape(filename)}.+/i
-    
+
     if (line =~ stdout_regex)
       stdout = $1.clone
       line.sub!(/#{Regexp.escape(stdout)}/, '')
     end
-    
+
     # collect up test results minus and extra output
     elements = (line.strip.split(':'))[1..-1]