ceedling 0.31.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b31288bb9de3d69e188046013dcbb67be81d806c92c0a5b929a2e371805dc6ef
-  data.tar.gz: 2d9258e4429ff1a98567efa2635d833c89866f1300462951b2f38f4058174ec2
+  metadata.gz: 0da771e9249d10318e68a8c2c5bee09d14f36dc9198ab603ec1ee7dfc95ffe94
+  data.tar.gz: bd9ecb45abb57b47d59277ca0852b3b176d47a81133131ce2c79e5b0f0d07c48
 SHA512:
-  metadata.gz: 00ba79ff0844313de7ffee17a1fa5dbe1f64638be98ee3e4a7f722c7eafd26af641ee1f7f99366fd22ff29e8afe8df763b286d30dd7caafd7535465b19ea8a9e
-  data.tar.gz: beff63833ed09a8c94bf306163d2395433bb1341642bc0ce407fe3d5c034313f8cdba6b134e07a913eae3ca00f97dc87bf55741262142f6d0baba2b22bd9fdb5
+  metadata.gz: 8ec2df3f174cc78eda8b44c3034a42b99b3a5a0e4ff3b3e9db40c6cd72fde0d05ff4ad45e14070bdf88931443a43343f5d996ac15caebb9eb2da90af20bf3dfa
+  data.tar.gz: cac6b185311d6e042f33c9064aa33e2d4b19422c74349e70bc94d00cbe19d72ac47dc79b07727d60a56e205392aabe16ad957b9c4dd323a795167c0683b5781c

data/assets/example_file_call.c

@@ -0,0 +1,6 @@
+#include "example_file_call.h"
+#include "example_file.h"
+
+int call_add_numbers(int a, int b) {
+  return add_numbers(a, b);
+}

data/assets/example_file_call.h

@@ -0,0 +1,6 @@
+#ifndef EXAMPLE_FILE_CALL_H
+#define EXAMPLE_FILE_CALL_H
+
+int call_add_numbers(int a, int b);
+
+#endif /* EXAMPLE_FILE_CALL_H */

data/assets/test_example_file_with_mock.c

@@ -0,0 +1,13 @@
+#include "unity.h"
+#include "example_file_call.h"
+// mock header should have higher priority than real file
+#include "example_file.h"
+#include "mock_example_file.h"
+
+void setUp(void) {}
+void tearDown(void) {}
+
+void test_add_numbers_adds_numbers(void) {
+  add_numbers_ExpectAndReturn(1, 1, 2);
+  TEST_ASSERT_EQUAL(2, call_add_numbers(1, 1));
+}

data/bin/ceedling

@@ -164,7 +164,7 @@ unless (project_found)
 
           # Perform the actual clone of the config file, while updating the version
           File.open(dst_yaml,'w') do |dst|
-            require 'ceedling/version.rb'
+            require File.expand_path(File.join(File.dirname(__FILE__),"..","lib","ceedling","version.rb"))
             dst << File.read(src_yaml).gsub(":ceedling_version: '?'",":ceedling_version: #{Ceedling::Version::CEEDLING}")
             puts "      create  #{dst_yaml}"
           end
@@ -217,7 +217,7 @@ unless (project_found)
 
     desc "version", "return the version of the tools installed"
     def version()
-      require 'ceedling/version.rb'
+      require File.expand_path(File.join(File.dirname(__FILE__),"..","lib","ceedling","version.rb"))
       puts "    Ceedling:: #{Ceedling::Version::CEEDLING}"
       puts "       CMock:: #{Ceedling::Version::CMOCK}"
       puts "       Unity:: #{Ceedling::Version::UNITY}"

data/ceedling.gemspec

@@ -31,7 +31,7 @@ Ceedling projects are created with a YAML configuration file. A variety of conve
   s.required_ruby_version = ">= 2.4.0"
   
   s.add_dependency "thor", "~> 0.14"
-  s.add_dependency "rake", "~> 12"
+  s.add_dependency "rake", ">= 12", "< 14"
   s.add_dependency "deep_merge", "~> 1.2"
   s.add_dependency "constructor", "~> 2"
 

data/lib/ceedling/configurator.rb

@@ -184,17 +184,22 @@ class Configurator
     @rake_plugins   = @configurator_plugins.find_rake_plugins(config, paths_hash)
     @script_plugins = @configurator_plugins.find_script_plugins(config, paths_hash)
     config_plugins  = @configurator_plugins.find_config_plugins(config, paths_hash)
-    plugin_defaults = @configurator_plugins.find_plugin_defaults(config, paths_hash)
+    plugin_yml_defaults = @configurator_plugins.find_plugin_yml_defaults(config, paths_hash)
+    plugin_hash_defaults = @configurator_plugins.find_plugin_hash_defaults(config, paths_hash)
 
     config_plugins.each do |plugin|
       plugin_config = @yaml_wrapper.load(plugin)
       config.deep_merge(plugin_config)
     end
 
-    plugin_defaults.each do |defaults|
+    plugin_yml_defaults.each do |defaults|
       @configurator_builder.populate_defaults( config, @yaml_wrapper.load(defaults) )
     end
 
+    plugin_hash_defaults.each do |defaults|
+      @configurator_builder.populate_defaults( config, defaults )
+    end
+
     # special plugin setting for results printing
     config[:plugins][:display_raw_test_results] = true if (config[:plugins][:display_raw_test_results].nil?)
 

data/lib/ceedling/configurator_plugins.rb

@@ -26,6 +26,7 @@ class ConfiguratorPlugins
 
           if is_script_plugin
             @system_wrapper.add_load_path( File.join( path, 'lib') )
+            @system_wrapper.add_load_path( File.join( path, 'config') )
           end
           break
         end
@@ -92,7 +93,7 @@ class ConfiguratorPlugins
 
 
   # gather up and return default .yml filepaths that exist on-disk
-  def find_plugin_defaults(config, plugin_paths)
+  def find_plugin_yml_defaults(config, plugin_paths)
     defaults_with_path = []
 
     config[:plugins][:enabled].each do |plugin|
@@ -108,4 +109,23 @@ class ConfiguratorPlugins
     return defaults_with_path
   end
 
+  # gather up and return 
+  def find_plugin_hash_defaults(config, plugin_paths)
+    defaults_hash= []
+
+    config[:plugins][:enabled].each do |plugin|
+      if path = plugin_paths[(plugin + '_path').to_sym]
+        default_path = File.join(path, "config", "defaults_#{plugin}.rb")
+        if @file_wrapper.exist?(default_path)
+          @system_wrapper.require_file( "defaults_#{plugin}.rb")
+
+          object = eval("get_default_config()")
+          defaults_hash << object
+        end
+      end
+    end
+
+    return defaults_hash
+  end
+
 end

data/lib/ceedling/defaults.rb

@@ -294,6 +294,7 @@ DEFAULT_CEEDLING_CONFIG = {
       :use_preprocessor_directives => false,
       :use_deep_dependencies => false,
       :generate_deep_dependencies => true, # only applicable if use_deep_dependencies is true
+      :auto_link_deep_dependencies => false,
       :test_file_prefix => 'test_',
       :options_paths => [],
       :release_build => false,

data/lib/ceedling/preprocessinator_extractor.rb

@@ -16,6 +16,7 @@ class PreprocessinatorExtractor
 
     lines = []
     File.readlines(filepath).each do |line|
+      line.encode!('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
       if found_file and not line =~ not_pragma
         lines << line
       else
@@ -41,6 +42,7 @@ class PreprocessinatorExtractor
 
     lines = []
     File.readlines(filepath).each do |line|
+      line.encode!('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
       lines << line
 
       if line =~ pattern

data/lib/ceedling/preprocessinator_includes_handler.rb

@@ -77,8 +77,7 @@ class PreprocessinatorIncludesHandler
       new_deps, new_to_process, all_mocks = extract_includes_helper(target, include_paths, ignore_list, all_mocks)
       list += new_deps
       to_process += new_to_process
-      if (!@configurator.project_config_hash.has_key?(:project_auto_link_deep_dependencies) or
-          !@configurator.project_config_hash[:project_auto_link_deep_dependencies])
+      if !@configurator.project_config_hash[:project_auto_link_deep_dependencies]
         break
       else
         list = list.uniq()
@@ -94,7 +93,7 @@ class PreprocessinatorIncludesHandler
     make_rule = self.form_shallow_dependencies_rule(filepath)
     target_file = make_rule.split[0].gsub(':', '').gsub('\\','/')
     base = File.basename(target_file, File.extname(target_file))
-    make_rule_dependencies = make_rule.gsub(/.*#{Regexp.escape(base)}\S*/, '').gsub(/\\$/, '')
+    make_rule_dependencies = make_rule.gsub(/.*\b#{Regexp.escape(base)}\S*/, '').gsub(/\\$/, '')
     
     # Extract the headers dependencies from the make rule
     hdr_ext = @configurator.extension_header
@@ -109,15 +108,30 @@ class PreprocessinatorIncludesHandler
     full_path_sources_dependencies = extract_full_path_dependencies(sources_dependencies)
 
     list = full_path_headers_dependencies + full_path_sources_dependencies
-    to_process = []
 
-    if @configurator.project_config_hash.has_key?(:project_auto_link_deep_dependencies) && @configurator.project_config_hash[:project_auto_link_deep_dependencies]
-      mock_prefix = @configurator.project_config_hash[:cmock_mock_prefix]
-      # Creating list of mocks
-      mocks += full_path_headers_dependencies.find_all do |header|
-        File.basename(header) =~ /^#{mock_prefix}.*$/
-      end.compact
+    mock_prefix = @configurator.project_config_hash[:cmock_mock_prefix]
+    # Creating list of mocks
+    mocks += full_path_headers_dependencies.find_all do |header|
+      File.basename(header) =~ /^#{mock_prefix}.*$/
+    end.compact
+
+    # ignore real file when both mock and real file exist
+    mocks.each do |mock|
+      list.each do |filename|
+        if File.basename(filename) == File.basename(mock).sub(mock_prefix, '')
+          ignore_list << filename
+        end
+      end
+    end.compact
+
+    # Filtering list of final includes to only include mocks and anything that is NOT in the ignore_list
+    list = list.select do |item|
+      mocks.include? item or !(ignore_list.any? { |ignore_item| !item.match(/^(.*\/)?#{Regexp.escape(ignore_item)}$/).nil? })
+    end
 
+    to_process = []
+
+    if @configurator.project_config_hash[:project_auto_link_deep_dependencies]
       # Creating list of headers that should be recursively pre-processed
       # Skipping mocks and vendor headers
       headers_to_deep_link = full_path_headers_dependencies.select do |hdr|
@@ -126,20 +140,6 @@ class PreprocessinatorIncludesHandler
       headers_to_deep_link.map! {|hdr| File.expand_path(hdr) }
       headers_to_deep_link.compact!
 
-      # ignore real file when both mock and real file exist
-      mocks.each do |mock|
-        list.each do |filename|
-          if File.basename(filename) == File.basename(mock).sub(mock_prefix, '')
-            ignore_list << filename
-          end
-        end
-      end.compact
-
-      # Filtering list of final includes to only include mocks and anything that is NOT in the ignore_list
-      list = list.select do |item|
-        mocks.include? item or !(ignore_list.any? { |ignore_item| !item.match(/^(.*\/)?#{Regexp.escape(ignore_item)}$/).nil? })
-      end
-
       headers_to_deep_link.each do |hdr|
         if (ignore_list.none? {|ignore_header| hdr.match(/^(.*\/)?#{Regexp.escape(ignore_header)}$/)} and
             include_paths.none? {|include_path| hdr =~ /^#{include_path}\.*/})

data/lib/ceedling/version.rb

@@ -13,7 +13,7 @@ module Ceedling
         path1
       elsif (File.exists?(path2))
         path2
-      elsif exists?(CEEDLING_VENDOR)
+      elsif File.exists?(CEEDLING_VENDOR)
         path3 = File.expand_path( File.join(CEEDLING_VENDOR,path) )
         if (File.exists?(path3))
           path3
@@ -23,7 +23,7 @@ module Ceedling
             [ @ceedling[:file_wrapper].read( File.join(base_path, 'release', 'version.info') ).strip,
               @ceedling[:file_wrapper].read( File.join(base_path, 'release', 'build.info') ).strip ].join('.')
           rescue
-            "unknown"
+            "#{name}"
           end
         end
       else
@@ -33,18 +33,22 @@ module Ceedling
 
       # Actually look up the versions
       a = [0,0,0]
-      File.readlines(filename).each do |line|
-        ["VERSION_MAJOR", "VERSION_MINOR", "VERSION_BUILD"].each_with_index do |field, i|
-          m = line.match(/#{name}_#{field}\s+(\d+)/)
-          a[i] = m[1] unless (m.nil?)
+      begin
+        File.readlines(filename).each do |line|
+          ["VERSION_MAJOR", "VERSION_MINOR", "VERSION_BUILD"].each_with_index do |field, i|
+            m = line.match(/#{name}_#{field}\s+(\d+)/)
+            a[i] = m[1] unless (m.nil?)
+          end
         end
+      rescue
+        abort("Can't collect data for vendor component: \"#{filename}\" . \nPlease check your setup.")
       end
 
       # splat it to return the final value
       eval("#{name} = '#{a.join(".")}'")
     end
 
-    GEM = "0.31.0"
+    GEM = "0.31.1"
     CEEDLING = GEM
   end
 end

data/plugins/gcov/config/defaults_gcov.rb

@@ -0,0 +1,118 @@
+
+DEFAULT_GCOV_COMPILER_TOOL = {
+    :executable => ENV['CC'].nil? ? FilePathUtils.os_executable_ext('gcc').freeze : ENV['CC'].split[0],
+    :name => 'default_gcov_compiler'.freeze,
+    :stderr_redirect => StdErrRedirect::NONE.freeze,
+    :background_exec => BackgroundExec::NONE.freeze,
+    :optional => false.freeze,
+    :arguments => [
+      "-g".freeze,
+      "-fprofile-arcs".freeze,
+      "-ftest-coverage".freeze,
+      ENV['CC'].nil? ? "" : ENV['CC'].split[1..-1],
+      ENV['CPPFLAGS'].nil? ? "" : ENV['CPPFLAGS'].split,
+      {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'}.freeze,
+      {"-I\"$\"" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
+      {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
+      "-DGCOV_COMPILER".freeze,
+      "-DCODE_COVERAGE".freeze,
+      ENV['CFLAGS'].nil? ? "" : ENV['CFLAGS'].split,
+      "-c \"${1}\"".freeze,
+      "-o \"${2}\"".freeze
+      ].freeze
+    }
+
+
+DEFAULT_GCOV_LINKER_TOOL = {
+    :executable => ENV['CCLD'].nil? ? FilePathUtils.os_executable_ext('gcc').freeze : ENV['CCLD'].split[0],
+    :name => 'default_gcov_linker'.freeze,
+    :stderr_redirect => StdErrRedirect::NONE.freeze,
+    :background_exec => BackgroundExec::NONE.freeze,
+    :optional => false.freeze,
+    :arguments => [
+        "-g".freeze,
+        "-fprofile-arcs".freeze,
+        "-ftest-coverage".freeze,
+        ENV['CCLD'].nil? ? "" : ENV['CCLD'].split[1..-1],
+        ENV['CFLAGS'].nil? ? "" : ENV['CFLAGS'].split,
+        ENV['LDFLAGS'].nil? ? "" : ENV['LDFLAGS'].split,
+        "\"${1}\"".freeze,
+        "-o \"${2}\"".freeze,
+        "${4}".freeze,
+        "${5}".freeze,
+        ENV['LDLIBS'].nil? ? "" : ENV['LDLIBS'].split
+        ].freeze
+    }
+
+DEFAULT_GCOV_FIXTURE_TOOL = {
+    :executable => '${1}'.freeze,
+    :name => 'default_gcov_fixture'.freeze,
+    :stderr_redirect => StdErrRedirect::NONE.freeze,
+    :background_exec => BackgroundExec::NONE.freeze,
+    :optional => false.freeze,
+    :arguments => [].freeze
+    }
+
+DEFAULT_GCOV_REPORT_TOOL = {
+    :executable => ENV['GCOV'].nil? ? FilePathUtils.os_executable_ext('gcov').freeze : ENV['GCOV'].split[0],
+    :name => 'default_gcov_report'.freeze,
+    :stderr_redirect => StdErrRedirect::NONE.freeze,
+    :background_exec => BackgroundExec::NONE.freeze,
+    :optional => false.freeze,
+    :arguments => [
+        "-n".freeze,
+        "-p".freeze,
+        "-b".freeze,
+        {"-o \"$\"" => 'GCOV_BUILD_OUTPUT_PATH'}.freeze,
+        "\"${1}\"".freeze
+        ].freeze
+    }
+
+DEFAULT_GCOV_GCOV_POST_REPORT_TOOL = {
+    :executable => ENV['GCOV'].nil? ? FilePathUtils.os_executable_ext('gcov').freeze : ENV['GCOV'].split[0],
+    :name => 'default_gcov_gcov_post_report'.freeze,
+    :stderr_redirect => StdErrRedirect::NONE.freeze,
+    :background_exec => BackgroundExec::NONE.freeze,
+    :optional => true.freeze,
+    :arguments => [
+        "-b".freeze,
+        "-c".freeze,
+        "-r".freeze,
+        "-x".freeze,
+        "${1}".freeze
+        ].freeze
+    }
+
+DEFAULT_GCOV_GCOVR_POST_REPORT_TOOL = {
+    :executable => 'gcovr'.freeze,
+    :name => 'default_gcov_gcovr_post_report'.freeze,
+    :stderr_redirect => StdErrRedirect::NONE.freeze,
+    :background_exec => BackgroundExec::NONE.freeze,
+    :optional => true.freeze,
+    :arguments => [
+        "${1}".freeze
+        ].freeze
+    }
+
+DEFAULT_GCOV_REPORTGENERATOR_POST_REPORT = {
+    :executable => 'reportgenerator'.freeze,
+    :name => 'default_gcov_reportgenerator_post_report'.freeze,
+    :stderr_redirect => StdErrRedirect::NONE.freeze,
+    :background_exec => BackgroundExec::NONE.freeze,
+    :optional => true.freeze,
+    :arguments => [
+        "${1}".freeze
+        ].freeze
+    }
+
+def get_default_config
+    return :tools => {
+        :gcov_compiler => DEFAULT_GCOV_COMPILER_TOOL,
+        :gcov_linker   => DEFAULT_GCOV_LINKER_TOOL,
+        :gcov_fixture  => DEFAULT_GCOV_FIXTURE_TOOL,
+        :gcov_report   => DEFAULT_GCOV_REPORT_TOOL,
+        :gcov_gcov_post_report => DEFAULT_GCOV_GCOV_POST_REPORT_TOOL,
+        :gcov_gcovr_post_report => DEFAULT_GCOV_GCOVR_POST_REPORT_TOOL,
+        :gcov_reportgenerator_post_report => DEFAULT_GCOV_REPORTGENERATOR_POST_REPORT
+    }
+end

data/plugins/gcov/lib/gcovr_reportinator.rb

@@ -16,7 +16,7 @@ class GcovrReportinator
     # Build the common gcovr arguments.
     args_common = args_builder_common(opts)
 
-    if (gcovr_version_info[0] >= 4) && (gcovr_version_info[1] >= 2)
+    if ((gcovr_version_info[0] == 4) && (gcovr_version_info[1] >= 2)) || (gcovr_version_info[0] > 4)
       # gcovr version 4.2 and later supports generating multiple reports with a single call.
       args = args_common
       args += args_builder_cobertura(opts, false)

data/plugins/gcov/lib/reportgenerator_reportinator.rb

@@ -181,7 +181,7 @@ class ReportGeneratorReportinator
 
   # Run ReportGenerator with the given arguments.
   def run(args)
-    command = @ceedling[:tool_executor].build_command_line(TOOLS_GCOV_REPORT_GENERATOR_POST_REPORT, [], args)
+    command = @ceedling[:tool_executor].build_command_line(TOOLS_GCOV_REPORTGENERATOR_POST_REPORT, [], args)
     return @ceedling[:tool_executor].exec(command[:line], command[:options])
   end
 

data/plugins/junit_tests_report/lib/junit_tests_report.rb

@@ -44,7 +44,7 @@ class JunitTestsReport < Plugin
   def write_header( results, stream )
     results[:counts][:time] = @time_result.reduce(0, :+)
     stream.puts '<?xml version="1.0" encoding="utf-8" ?>'
-    stream.puts('<testsuites tests="%<total>d" failures="%<failed>d" skipped="%<ignored>d" time="%<time>f">' % results[:counts])
+    stream.puts('<testsuites tests="%<total>d" failures="%<failed>d" time="%<time>.3f">' % results[:counts])
   end
 
   def write_footer( stream )
@@ -53,7 +53,7 @@ class JunitTestsReport < Plugin
 
   def reorganise_results( results )
     # Reorganise the output by test suite instead of by result
-    suites = Hash.new{ |h,k| h[k] = {collection: [], total: 0, success: 0, failed: 0, ignored: 0, stdout: []} }
+    suites = Hash.new{ |h,k| h[k] = {collection: [], total: 0, success: 0, failed: 0, ignored: 0, errors: 0, stdout: []} }
     results[:successes].each do |result|
       source = result[:source]
       name = source[:file].sub(/\..{1,4}$/, "")
@@ -85,7 +85,7 @@ class JunitTestsReport < Plugin
 
   def write_suite( suite, stream )
     suite[:time] = @time_result.shift
-    stream.puts('  <testsuite name="%<name>s" tests="%<total>d" failures="%<failed>d" skipped="%<ignored>d" time="%<time>f">' % suite)
+    stream.puts('  <testsuite name="%<name>s" tests="%<total>d" failures="%<failed>d" skipped="%<ignored>d" errors="%<errors>d" time="%<time>.3f">' % suite)
 
     suite[:collection].each do |test|
       write_test( test, stream )
@@ -116,9 +116,9 @@ class JunitTestsReport < Plugin
 
     case test[:result]
     when :success
-      stream.puts('    <testcase name="%<test>s" time="%<unity_test_time>f"/>' % test)
+      stream.puts('    <testcase name="%<test>s" time="%<unity_test_time>.3f"/>' % test)
     when :failed
-      stream.puts('    <testcase name="%<test>s" time="%<unity_test_time>f">' % test)
+      stream.puts('    <testcase name="%<test>s" time="%<unity_test_time>.3f">' % test)
       if test[:message].empty?
         stream.puts('      <failure />')
       else
@@ -126,7 +126,7 @@ class JunitTestsReport < Plugin
       end
       stream.puts('    </testcase>')
     when :ignored
-      stream.puts('    <testcase name="%<test>s" time="%<unity_test_time>f">' % test)
+      stream.puts('    <testcase name="%<test>s" time="%<unity_test_time>.3f">' % test)
       stream.puts('      <skipped />')
       stream.puts('    </testcase>')
     end