ceedling 0.30.0 → 0.31.0

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ end
 here = File.dirname(__FILE__)
 
 $: << File.join(here, '../lib')
-$: << File.join(here, '../vendor/deep_merge/lib')
 $: << File.join(here, '../vendor/cmock/lib')
 
 support_files = File.join(File.dirname(__FILE__), "support/**/*.rb")

data/spec/spec_system_helper.rb

@@ -1,10 +1,19 @@
 require 'fileutils'
 require 'tmpdir'
-require 'yaml'
+require 'ceedling/yaml_wrapper'
+require 'spec_helper'
 
-Modulegenerator = Struct.new(:project_root, :source_root, :inc_root, :test_root) do
-  def initialize(project_root: "./", source_root: "src/", inc_root: "src/", test_root: "test/")
-    super(project_root, source_root, inc_root, test_root)
+if Gem.ruby_version >= Gem::Version.new("2.5.0")
+  Modulegenerator = Struct.new(:project_root, :source_root, :inc_root, :test_root, keyword_init: true) do
+    def initialize(project_root: "./", source_root: "src/", inc_root: "src/", test_root: "test/")
+      super
+    end
+  end
+else
+  Modulegenerator = Struct.new(:project_root, :source_root, :inc_root, :test_root) do
+    def initialize(project_root: "./", source_root: "src/", inc_root: "src/", test_root: "test/")
+      super(project_root, source_root, inc_root, test_root)
+    end
   end
 end
 
@@ -20,75 +29,11 @@ def convert_slashes(path)
   end
 end
 
-def _add_path_in_section(project_file_path, path, section)
-  project_file_contents = File.readlines(project_file_path)
-  paths_index = project_file_contents.index(":paths:\n")
-
-  if paths_index.nil?
-    # Something wrong with project.yml file, no paths?
-    return
-  end
-
-  section_index =  paths_index + project_file_contents[paths_index..-1].index("  :#{section}:\n")
-
-  project_file_contents.insert(section_index + 1, "    - #{path}\n")
-
-  File.open(project_file_path, "w+") do |f|
-    f.puts(project_file_contents)
-  end
-end
-
-def _add_define_in_section(project_file_path, define, section)
-  project_file_contents = File.readlines(project_file_path)
-  defines_index = project_file_contents.index(":defines:\n")
-
-  if defines_index.nil?
-    # Something wrong with project.yml file, no defines?
-    return
-  end
-
-  section_index =  defines_index + project_file_contents[defines_index..-1].index("  :#{section}:\n")
-
-  project_file_contents.insert(section_index + 1, "    - #{define}\n")
-
-  File.open(project_file_path, "w+") do |f|
-    f.puts(project_file_contents)
-  end
-end
-
-def add_source_path(path)
-  _add_path_in_section("project.yml", path, "source")
-end
-
-def add_test_path(path)
-  _add_path_in_section("project.yml", path, "test")
-end
-
-def add_test_define(define)
-  _add_define_in_section("project.yml", define, "test")
-end
-
-def add_module_generator_section(project_file_path, mod_gen)
-  project_file_contents = File.readlines(project_file_path)
-  module_gen_index = project_file_contents.index(":module_generator:\n")
-
-  unless module_gen_index.nil?
-    # already a module_generator in project file, delete it
-    module_gen_end_index = project_file_contents[module_gen_index..-1].index("\n")
-    project_file_contents.slice[module_gen_index..module_gen_end_index]
-  end
-
-  project_file_contents.insert(-2, "\n")
-  project_file_contents.insert(-2, ":module_generator:\n")
-  project_file_contents.insert(-2, "  :project_root: #{mod_gen.project_root}\n")
-  project_file_contents.insert(-2, "  :source_root: #{mod_gen.source_root}\n")
-  project_file_contents.insert(-2, "  :inc_root: #{mod_gen.inc_root}\n")
-  project_file_contents.insert(-2, "  :test_root: #{mod_gen.test_root}\n")
-  project_file_contents.insert(-2, "\n")
-
-  File.open(project_file_path, "w+") do |f|
-    f.puts(project_file_contents)
-  end
+def add_project_settings(project_file_path, settings)
+  yaml_wrapper = YamlWrapper.new
+  project_hash = yaml_wrapper.load(project_file_path)
+  project_hash.deep_merge(settings)
+  yaml_wrapper.dump(project_file_path, project_hash)
 end
 
 class GemDirLayout
@@ -133,7 +78,7 @@ class SystemContext
 
     Dir.chdir @dir do
       with_constrained_env do
-        `bundle config set path '#{@gem.install_dir}'`
+        `bundle config set --local path '#{@gem.install_dir}'`
         `bundle install`
         checks = ["bundle exec ruby -S ceedling 2>&1"]
         checks.each do |c|
@@ -324,7 +269,87 @@ module CeedlingTestCases
         FileUtils.cp test_asset_path("example_file.h"), 'src/'
         FileUtils.cp test_asset_path("example_file.c"), 'src/'
         FileUtils.cp test_asset_path("test_example_file_success.c"), 'test/'
-        add_test_define("UNITY_INCLUDE_EXEC_TIME")
+        settings = { :unity => { :defines => [ "UNITY_INCLUDE_EXEC_TIME" ] } }
+        add_project_settings("project.yml", settings)
+
+        output = `bundle exec ruby -S ceedling 2>&1`
+        expect($?.exitstatus).to match(0) # Since a test either pass or are ignored, we return success here
+        expect(output).to match(/TESTED:\s+\d/)
+        expect(output).to match(/PASSED:\s+\d/)
+        expect(output).to match(/FAILED:\s+\d/)
+        expect(output).to match(/IGNORED:\s+\d/)
+      end
+    end
+  end
+
+  def can_test_projects_with_test_and_vendor_defines_with_success
+    @c.with_context do
+      Dir.chdir @proj_name do
+        FileUtils.cp test_asset_path("example_file.h"), 'src/'
+        FileUtils.cp test_asset_path("example_file.c"), 'src/'
+        FileUtils.cp test_asset_path("test_example_file_unity_printf.c"), 'test/'
+        settings = { :unity => { :defines => [ "UNITY_INCLUDE_PRINT_FORMATTED" ] },
+                     :defines => { :test_example_file_unity_printf => [ "TEST" ] }
+                   }
+        add_project_settings("project.yml", settings)
+
+        output = `bundle exec ruby -S ceedling 2>&1`
+        expect($?.exitstatus).to match(0) # Since a test either pass or are ignored, we return success here
+        expect(output).to match(/TESTED:\s+\d/)
+        expect(output).to match(/PASSED:\s+\d/)
+        expect(output).to match(/FAILED:\s+\d/)
+        expect(output).to match(/IGNORED:\s+\d/)
+      end
+    end
+  end
+
+  def can_test_projects_with_enabled_auto_link_deep_deependency_with_success
+    @c.with_context do
+      Dir.chdir @proj_name do
+        FileUtils.copy_entry test_asset_path("auto_link_deep_dependencies/src/"), 'src/'
+        FileUtils.cp_r test_asset_path("auto_link_deep_dependencies/test/."), 'test/'
+        settings = { :project => { :auto_link_deep_dependencies => true } }
+        add_project_settings("project.yml", settings)
+
+        output = `bundle exec ruby -S ceedling 2>&1`
+        expect($?.exitstatus).to match(0) # Since a test either pass or are ignored, we return success here
+        expect(output).to match(/TESTED:\s+\d/)
+        expect(output).to match(/PASSED:\s+\d/)
+        expect(output).to match(/FAILED:\s+\d/)
+        expect(output).to match(/IGNORED:\s+\d/)
+      end
+    end
+  end
+
+  def can_test_projects_with_enabled_preprocessor_directives_with_success
+    @c.with_context do
+      Dir.chdir @proj_name do
+        FileUtils.cp test_asset_path("test_example_with_parameterized_tests.c"), 'test/'
+        settings = { :project => { :use_preprocessor_directives => true },
+                     :unity => { :use_param_tests => true }
+                   }
+        add_project_settings("project.yml", settings)
+
+        output = `bundle exec ruby -S ceedling 2>&1`
+        expect($?.exitstatus).to match(0) # Since a test either pass or are ignored, we return success here
+        expect(output).to match(/TESTED:\s+\d/)
+        expect(output).to match(/PASSED:\s+\d/)
+        expect(output).to match(/FAILED:\s+\d/)
+        expect(output).to match(/IGNORED:\s+\d/)
+      end
+    end
+  end
+
+  def can_test_projects_with_test_name_replaced_defines_with_success
+    @c.with_context do
+      Dir.chdir @proj_name do
+        FileUtils.copy_entry test_asset_path("tests_with_defines/src/"), 'src/'
+        FileUtils.cp_r test_asset_path("tests_with_defines/test/."), 'test/'
+        settings = { :defines => { :test => [ "STANDARD_CONFIG" ],
+                                   :test_adc_hardware_special => [ "TEST", "SPECIFIC_CONFIG" ]
+                                 }
+                   }
+        add_project_settings("project.yml", settings)
 
         output = `bundle exec ruby -S ceedling 2>&1`
         expect($?.exitstatus).to match(0) # Since a test either pass or are ignored, we return success here
@@ -482,8 +507,11 @@ module CeedlingTestCases
         expect(File.exists?("myPonies/test/test_ponies.c")).to eq true
 
         # add module path to project file
-        add_test_path("myPonies/test")
-        add_source_path("myPonies/src")
+        settings = { :paths => { :test => [ "myPonies/test" ],
+                                 :source => [ "myPonies/src" ]
+                               }
+                   }
+        add_project_settings("project.yml", settings)
 
         # See if ceedling finds the test in the subdir
         output = `bundle exec ruby -S ceedling test:all`
@@ -506,7 +534,13 @@ module CeedlingTestCases
       Dir.chdir @proj_name do
         # add include path to module generator
         mod_gen = Modulegenerator.new(inc_root: "inc/")
-        add_module_generator_section("project.yml", mod_gen)
+        settings = { :module_generator => { :project_root => mod_gen.project_root,
+                                            :source_root => mod_gen.source_root,
+                                            :inc_root => mod_gen.inc_root,
+                                            :test_root => mod_gen.test_root
+                                          }
+                   }
+        add_project_settings("project.yml", settings)
 
         # module creation
         output = `bundle exec ruby -S ceedling module:create[myPonies:ponies]`
@@ -532,7 +566,13 @@ module CeedlingTestCases
       Dir.chdir @proj_name do
         # add paths to module generator
         mod_gen = Modulegenerator.new({source_root: "foo/", inc_root: "bar/", test_root: "barz/"})
-        add_module_generator_section("project.yml", mod_gen)
+        settings = { :module_generator => { :project_root => mod_gen.project_root,
+                                            :source_root => mod_gen.source_root,
+                                            :inc_root => mod_gen.inc_root,
+                                            :test_root => mod_gen.test_root
+                                          }
+                   }
+        add_project_settings("project.yml", settings)
 
         # module creation
         output = `bundle exec ruby -S ceedling module:create[ponies]`

data/spec/system/deployment_spec.rb

@@ -29,8 +29,10 @@ describe "Ceedling" do
     it { can_fetch_project_help }
     it { can_test_projects_with_success }
     it { can_test_projects_with_success_test_alias }
+    it { can_test_projects_with_test_name_replaced_defines_with_success }
     it { can_test_projects_with_success_default }
     it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
     it { can_test_projects_with_fail }
     it { can_test_projects_with_fail_alias }
     it { can_test_projects_with_fail_default }
@@ -76,8 +78,10 @@ describe "Ceedling" do
     it { can_fetch_project_help }
     it { can_test_projects_with_success }
     it { can_test_projects_with_success_test_alias }
+    it { can_test_projects_with_test_name_replaced_defines_with_success }
     it { can_test_projects_with_success_default }
     it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
     it { can_test_projects_with_fail }
     it { can_test_projects_with_fail_alias }
     it { can_test_projects_with_fail_default }
@@ -106,6 +110,7 @@ describe "Ceedling" do
     it { can_test_projects_with_success_test_alias }
     it { can_test_projects_with_success_default }
     it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
     it { can_test_projects_with_fail }
     it { can_test_projects_with_fail_alias }
     it { can_test_projects_with_fail_default }
@@ -127,6 +132,7 @@ describe "Ceedling" do
     it { can_test_projects_with_success_test_alias }
     it { can_test_projects_with_success_default }
     it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
     it { can_test_projects_with_fail }
     it { can_test_projects_with_fail_alias }
     it { can_test_projects_with_fail_default }
@@ -153,8 +159,10 @@ describe "Ceedling" do
     it { can_fetch_project_help }
     it { can_test_projects_with_success }
     it { can_test_projects_with_success_test_alias }
+    it { can_test_projects_with_test_name_replaced_defines_with_success }
     it { can_test_projects_with_success_default }
     it { can_test_projects_with_unity_exec_time }
+    it { can_test_projects_with_test_and_vendor_defines_with_success }
     it { can_test_projects_with_fail }
     it { can_test_projects_with_compile_error }
     it { can_use_the_module_plugin }
@@ -166,6 +174,28 @@ describe "Ceedling" do
     it { handles_destroying_a_module_that_does_not_exist_using_the_module_plugin_path_extension }
   end
 
+  describe "deployed with auto link deep denendencies" do
+    before do
+      @c.with_context do
+        `bundle exec ruby -S ceedling new --local #{@proj_name} 2>&1`
+      end
+    end
+
+    it { can_create_projects }
+    it { can_test_projects_with_enabled_auto_link_deep_deependency_with_success }
+  end
+
+  describe "deployed with enabled preprocessor directives" do
+    before do
+      @c.with_context do
+        `bundle exec ruby -S ceedling new --local #{@proj_name} 2>&1`
+      end
+    end
+
+    it { can_create_projects }
+    it { can_test_projects_with_enabled_preprocessor_directives_with_success }
+  end
+
   describe "command: `ceedling examples`" do
     before do
       @c.with_context do

data/vendor/c_exception/README.md

@@ -1,7 +1,5 @@
-CException - Lightweight exception library for C
-================================================
-
-[![CException Build Status](https://api.travis-ci.org/ThrowTheSwitch/CException.png?branch=master)](https://travis-ci.org/ThrowTheSwitch/CException)
+CException ![CI](https://github.com/ThrowTheSwitch/CException/workflows/CI/badge.svg)
+==========
 
 _This Documentation Is Released Under a Creative Commons 3.0 Attribution Share-Alike License_
 
@@ -127,7 +125,7 @@ location was updated and not just a register unless the variable is marked volat
 ### Memory Management
 
 Memory which is `malloc`'d within a `Try` block is not automatically released when an error is thrown. This 
-will sometimes be desirable, and othertimes may not. It will be the responsibility of the code you put in 
+will sometimes be desirable, and other times may not. It will be the responsibility of the code you put in 
 the `Catch` block to perform this kind of cleanup.
 
 There's just no easy way to track `malloc`'d memory, etc., without replacing or wrapping `malloc` 
@@ -241,7 +239,7 @@ License
 =======
 
 *This software is licensed under the MIT License:
-Copyright (c) 2007-2019 Mark VanderVoord*
+Copyright (c) 2007-2021 Mark VanderVoord*
 
 *Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.*

data/vendor/c_exception/docs/CException.md

@@ -145,7 +145,7 @@ to successfully utilize this library:
 
 3. Memory which is `malloc`'d or `new`'d is not automatically released
    when an error is thrown.  This will sometimes be desirable, and
-   othertimes may not.  It will be the responsibility of the `Catch`
+   other times may not.  It will be the responsibility of the `Catch`
    block to perform this kind of cleanup.
 
    *Why?*
@@ -311,7 +311,7 @@ LICENSE
 
 This software is licensed under the MIT License
 
-Copyright (c) 2007-2020 Mark VanderVoord
+Copyright (c) 2007-2021 Mark VanderVoord
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/vendor/c_exception/lib/CException.h

@@ -11,7 +11,7 @@ extern "C"
 
 #define CEXCEPTION_VERSION_MAJOR    1
 #define CEXCEPTION_VERSION_MINOR    3
-#define CEXCEPTION_VERSION_BUILD    2
+#define CEXCEPTION_VERSION_BUILD    3
 #define CEXCEPTION_VERSION          ((CEXCEPTION_VERSION_MAJOR << 16) | (CEXCEPTION_VERSION_MINOR << 8) | CEXCEPTION_VERSION_BUILD)
 
 //To Use CException, you have a number of options:

data/vendor/c_exception/lib/meson.build

@@ -7,5 +7,5 @@
 cexception_dir = include_directories('.')
 
 cexception_lib = static_library(meson.project_name(), 
-    sources: ['CException.c'],
-    include_directories: cexception_dir)
+    files('CException.c'),
+    include_directories : cexception_dir)

data/vendor/c_exception/meson.build

@@ -4,45 +4,11 @@
 #
 # license: MIT
 #
-project('CException', 'c',
+project('cexception', 'c',
     license: 'MIT',
     meson_version: '>=0.53.0',
-    default_options: ['layout=flat', 'warning_level=3', 'werror=true', 'c_std=c11']
+    default_options: ['werror=true', 'c_std=c11']
 )
-lang = 'c'
-cc = meson.get_compiler(lang)
 
-#
-# Meson: Add compiler flags
-if cc.get_id() == 'clang'
-    add_project_arguments(cc.get_supported_arguments(
-            [
-                '-Wexit-time-destructors',
-                '-Wglobal-constructors',
-                '-Wmissing-prototypes',
-                '-Wmissing-noreturn',
-                '-Wno-missing-braces',
-                '-Wold-style-cast', '-Wpointer-arith', '-Wweak-vtables',
-                '-Wcast-align', '-Wconversion', '-Wcast-qual', '-Wshadow'
-            ]
-        ), language: lang)
-endif
-
-if cc.get_argument_syntax() == 'gcc'
-    add_project_arguments(cc.get_supported_arguments(
-            [
-                '-Wformat', '-Waddress', '-Winit-self', '-Wno-multichar',
-                '-Wpointer-arith'       , '-Wwrite-strings'              ,
-                '-Wno-parentheses'      , '-Wno-type-limits'             ,
-                '-Wformat-security'     , '-Wunreachable-code'           ,
-                '-Waggregate-return'    , '-Wformat-nonliteral'          ,
-                '-Wmissing-declarations', '-Wmissing-include-dirs'       ,
-                '-Wno-unused-parameter'
-            ]
-        ), language: lang)
-endif
-
-#
-# Sub directory to project source code
 subdir('lib')
 cexception_dep = declare_dependency(link_with: cexception_lib, include_directories: cexception_dir)

data/vendor/cmock/README.md

@@ -1,7 +1,12 @@
-CMock - Mock/stub generator for C
-=================================
-
-[![CMock Build Status](https://api.travis-ci.org/ThrowTheSwitch/CMock.png?branch=master)](https://travis-ci.org/ThrowTheSwitch/CMock)
+CMock ![CI](https://github.com/ThrowTheSwitch/CMock/workflows/CI/badge.svg)
+=====
+CMock is a mock and stub generator and runtime for unit testing C. It's been designed
+to work smoothly with Unity Test, another of the embedded-software testing tools 
+developed by ThrowTheSwitch.org. CMock automagically parses your C headers and creates
+useful and usable mock interfaces for unit testing. Give it a try!
+
+If you don't care to manage unit testing builds yourself, consider checking out Ceedling, 
+a test-centered build manager for unit testing C code.
 
 Getting Started
 ================