ceedling 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a11a8292cd1fb5d6278208a7bc687bb98d9079
-  data.tar.gz: 8c729bd71ea4928e6f33d32a62f32b33ac8db1e2
+  metadata.gz: 815958f80bc12e86b6441872fe5822ec2f2f9ddb
+  data.tar.gz: 6a6e083623424fc18b14c582f5b8c749271c2c76
 SHA512:
-  metadata.gz: f1139841553193bf878268f97526a8684f94bd10a3aa5efd81a5c59953aa85a72c7002cb1adce639e561cf9ae5621be4f294247f7086166fc1a942fcffc0391b
-  data.tar.gz: b548f7b16b85aeb75524bce5a51db838888dee2bfe1ae295a8f76b3a02e2ba865393abcbdfe46a837de79fa465bb914f38d6da028a4d2d36ed4f4b5ab07b354a
+  metadata.gz: 830683a53aa10672251438c079224bb00c53aa776c3722ea87b476b68a223440d1677441596244448561a4ff8461e2081ee4df90bd22de4cd85c154b816cefc7
+  data.tar.gz: f7db6b3fc409f5a49e5587d12d6d69870e8cfd1873a4f54e3ab183df64ae4026239f88aba673daabc3b034696cefb874b7a126be912adfb0b2338a37e71c999c

data/Gemfile.lock

@@ -5,21 +5,22 @@ GEM
     diff-lcs (1.2.5)
     diy (1.1.2)
       constructor (>= 1.0.0)
-    rake (10.3.2)
-    require_all (1.3.2)
+    rake (10.5.0)
+    require_all (1.3.3)
     rr (1.1.2)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.2)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     thor (0.19.1)
 
 PLATFORMS
@@ -34,3 +35,6 @@ DEPENDENCIES
   rr
   rspec (~> 3.0)
   thor
+
+BUNDLED WITH
+   1.11.2

data/docs/CeedlingPacket.md

@@ -202,11 +202,13 @@ Alternatively, from scratch:
    (tasks available to tie to `default` are listed in the next 
    section):
    
-    `load '<path>/ceedling/lib/rakefile.rb' 
-    # ex. run all tests & build release artifact
-    task :default => ['test:all', :release]
-         # namespaced tasks must be quoted 
-         # top-level tasks are Ruby symbols denoted by a leading ':'` 
+    ```ruby
+        load '<path>/ceedling/lib/rakefile.rb' 
+        # ex. run all tests & build release artifact
+        task :default => ['test:all', :release]
+            # namespaced tasks must be quoted 
+            # top-level tasks are Ruby symbols denoted by a leading ':'` 
+    ```
 
 6. Create your project YAML file (more on this later in this document). 
    `project.yml` is the default file name Ceedling recognizes 

data/lib/ceedling/configurator_builder.rb

@@ -162,19 +162,6 @@ class ConfiguratorBuilder
   end
 
 
-  def set_library_build_info_filepaths(hash)
-    # Notes:
-    #  - Dependency on a change to our input configuration hash is handled elsewhere as it is
-    #    dynamically formed during ceedling's execution
-    #  - Compiled vendor dependencies like cmock.o, unity.o, cexception.o are handled below;
-    #    here we're interested only in ceedling-based code generation dependencies
-    out_hash = {
-      :cmock_build_info_filepath => FilePathUtils::form_ceedling_vendor_path('cmock/release', 'build.info')
-    }
-    return out_hash
-  end
-
-
   def set_release_target(in_hash)
     return {} if (not in_hash[:project_release_build])
 
@@ -231,7 +218,7 @@ class ConfiguratorBuilder
 
   def collect_source_include_vendor_paths(in_hash)
     extra_paths = []
-    extra_paths << FilePathUtils::form_ceedling_vendor_path(CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
+    extra_paths << File.join(in_hash[:cexception_path], CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
 
     return {
       :collection_paths_source_include_vendor =>
@@ -336,10 +323,10 @@ class ConfiguratorBuilder
       in_hash[:collection_paths_support] +
       in_hash[:collection_paths_source] +
       in_hash[:collection_paths_include] +
-      [FilePathUtils::form_ceedling_vendor_path(UNITY_LIB_PATH)]
+      [File.join(in_hash[:unity_vendor_path], UNITY_LIB_PATH)]
 
-    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 << File.join(in_hash[:cexception_vendor_path], CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
+    paths << File.join(in_hash[:cmock_vendor_path],      CMOCK_LIB_PATH)      if (in_hash[:project_use_mocks])
 
     paths.each do |path|
       all_input.include( File.join(path, "*#{in_hash[:extension_header]}") )
@@ -396,6 +383,8 @@ class ConfiguratorBuilder
 
     objects = [UNITY_C_FILE]
 
+    in_hash[:files_support].each { |file| objects << File.basename(file) }
+
     # we don't include paths here because use of plugins or mixing different compilers may require different build paths
     objects << CEXCEPTION_C_FILE if (in_hash[:project_use_exceptions])
     objects << CMOCK_C_FILE      if (in_hash[:project_use_mocks])
@@ -419,10 +408,10 @@ class ConfiguratorBuilder
 
   def get_vendor_paths(in_hash)
     vendor_paths = []
-    vendor_paths << FilePathUtils::form_ceedling_vendor_path(UNITY_LIB_PATH)
-    vendor_paths << FilePathUtils::form_ceedling_vendor_path(CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
-    vendor_paths << FilePathUtils::form_ceedling_vendor_path(CMOCK_LIB_PATH)      if (in_hash[:project_use_mocks])
-    vendor_paths << in_hash[:cmock_mock_path]                                     if (in_hash[:project_use_mocks])
+    vendor_paths << File.join(in_hash[:unity_vendor_path],      UNITY_LIB_PATH)
+    vendor_paths << File.join(in_hash[:cexception_vendor_path], CEXCEPTION_LIB_PATH) if (in_hash[:project_use_exceptions])
+    vendor_paths << File.join(in_hash[:cmock_vendor_path],      CMOCK_LIB_PATH)      if (in_hash[:project_use_mocks])
+    vendor_paths << in_hash[:cmock_mock_path]                                        if (in_hash[:project_use_mocks])
 
     return vendor_paths
   end

data/lib/ceedling/configurator_setup.rb

@@ -1,5 +1,5 @@
 
-# add sort-ability to symbol so we can order keys array in hash for test-ability 
+# add sort-ability to symbol so we can order keys array in hash for test-ability
 class Symbol
   include Comparable
 
@@ -10,25 +10,24 @@ end
 
 
 class ConfiguratorSetup
-  
+
   constructor :configurator_builder, :configurator_validator, :configurator_plugins, :stream_wrapper
-  
-  
+
+
   def build_project_config(config, flattened_config)
     ### flesh out config
     @configurator_builder.clean(flattened_config)
-    
+
     ### add to hash values we build up from configuration & file system contents
     flattened_config.merge!(@configurator_builder.set_build_paths(flattened_config))
     flattened_config.merge!(@configurator_builder.set_force_build_filepaths(flattened_config))
     flattened_config.merge!(@configurator_builder.set_rakefile_components(flattened_config))
-    flattened_config.merge!(@configurator_builder.set_library_build_info_filepaths(flattened_config))
     flattened_config.merge!(@configurator_builder.set_release_target(flattened_config))
     flattened_config.merge!(@configurator_builder.collect_project_options(flattened_config))
-    
+
     ### iterate through all entries in paths section and expand any & all globs to actual paths
     flattened_config.merge!(@configurator_builder.expand_all_path_globs(flattened_config))
-    
+
     flattened_config.merge!(@configurator_builder.collect_vendor_paths(flattened_config))
     flattened_config.merge!(@configurator_builder.collect_source_and_include_paths(flattened_config))
     flattened_config.merge!(@configurator_builder.collect_source_include_vendor_paths(flattened_config))
@@ -47,13 +46,13 @@ class ConfiguratorSetup
     return flattened_config
   end
 
-  
+
   def build_constants_and_accessors(config, context)
     @configurator_builder.build_global_constants(config)
     @configurator_builder.build_accessor_methods(config, context)
   end
-  
-  
+
+
   def validate_required_sections(config)
     validation = []
     validation << @configurator_validator.exists?(config, :project)
@@ -94,7 +93,7 @@ class ConfiguratorSetup
     return false if (validation.include?(false))
     return true
   end
-  
+
   def validate_tools(config)
     validation = []
 
@@ -109,15 +108,15 @@ class ConfiguratorSetup
   end
 
   def validate_plugins(config)
-    missing_plugins = 
-      Set.new( config[:plugins][:enabled] ) - 
-      Set.new( @configurator_plugins.rake_plugins ) - 
+    missing_plugins =
+      Set.new( config[:plugins][:enabled] ) -
+      Set.new( @configurator_plugins.rake_plugins ) -
       Set.new( @configurator_plugins.script_plugins )
-    
+
     missing_plugins.each do |plugin|
       @stream_wrapper.stderr_puts("ERROR: Ceedling plugin '#{plugin}' contains no rake or ruby class entry point. (Misspelled or missing files?)")
     end
-    
+
     return ( (missing_plugins.size > 0) ? false : true )
   end
 

data/lib/ceedling/constants.rb

@@ -79,14 +79,15 @@ UTILS_ROOT_NAME   = 'utils'                unless defined?(UTILS_ROOT_NAME)
 UTILS_TASK_ROOT   = UTILS_ROOT_NAME + ':'  unless defined?(UTILS_TASK_ROOT)
 UTILS_SYM         = UTILS_ROOT_NAME.to_sym unless defined?(UTILS_SYM)
 
-OPERATION_COMPILE_SYM = :compile unless defined?(OPERATION_COMPILE_SYM)
-OPERATION_LINK_SYM    = :link    unless defined?(OPERATION_LINK_SYM)
+OPERATION_COMPILE_SYM  = :compile  unless defined?(OPERATION_COMPILE_SYM)
+OPERATION_ASSEMBLE_SYM = :assemble unless defined?(OPERATION_ASSEMBLE_SYM)
+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  = /-+\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

@@ -2,6 +2,8 @@ require 'ceedling/constants'
 require 'ceedling/system_wrapper'
 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
 
 DEFAULT_TEST_COMPILER_TOOL = {
   :executable => FilePathUtils.os_executable_ext('gcc').freeze,
@@ -55,8 +57,8 @@ DEFAULT_TEST_INCLUDES_PREPROCESSOR_TOOL = {
     # avoid some possibility of deep system lib header file complications by omitting vendor paths
     # if cpp is run on *nix system, escape spaces in paths; if cpp on windows just use the paths collection as is
     # {"-I\"$\"" => "{SystemWrapper.windows? ? COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE : COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE.map{|path| path.gsub(\/ \/, \'\\\\ \') }}"}.freeze,
-    {"-I$" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'}.freeze,
-    {"-I$" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
+    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE_VENDOR'}.freeze,
+    {"-I\"$\"" => 'COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'}.freeze,
     {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
     {"-D$" => 'DEFINES_TEST_PREPROCESS'}.freeze,
     "-DGNU_COMPILER".freeze, # OSX clang
@@ -107,7 +109,7 @@ DEFAULT_TEST_DEPENDENCIES_GENERATOR_TOOL = {
     "-DGNU_COMPILER".freeze,
     "-MT \"${3}\"".freeze,
     '-MM'.freeze,
-    MD_FLAG.freeze, 
+    MD_FLAG.freeze,
     '-MG'.freeze,
     "-MF \"${2}\"".freeze,
     "-c \"${1}\"".freeze,
@@ -130,7 +132,7 @@ DEFAULT_RELEASE_DEPENDENCIES_GENERATOR_TOOL = {
     "-DGNU_COMPILER".freeze,
     "-MT \"${3}\"".freeze,
     '-MM'.freeze,
-    MD_FLAG.freeze, 
+    MD_FLAG.freeze,
     '-MG'.freeze,
     "-MF \"${2}\"".freeze,
     "-c \"${1}\"".freeze,
@@ -292,14 +294,17 @@ DEFAULT_CEEDLING_CONFIG = {
     },
 
     :unity => {
+      :vendor_path => CEEDLING_VENDOR,
       :defines => []
     },
 
     :cmock => {
+      :vendor_path => CEEDLING_VENDOR,
       :defines => []
     },
 
     :cexception => {
+      :vendor_path => CEEDLING_VENDOR,
       :defines => []
     },
 

data/lib/ceedling/dependinator.rb

@@ -53,7 +53,6 @@ class Dependinator
     mocks_list.each do |mock_filepath|
       @rake_wrapper[mock_filepath].enhance( [@configurator.project_test_force_rebuild_filepath] ) if (@project_config_manager.test_config_changed)
       @rake_wrapper[mock_filepath].enhance( [@configurator.cmock_unity_helper] )                  if (@configurator.cmock_unity_helper)
-      @rake_wrapper[mock_filepath].enhance( [@configurator.cmock_build_info_filepath] )
     end
   end
 

data/lib/ceedling/file_path_utils.rb

@@ -37,20 +37,20 @@ class FilePathUtils
   # note: slightly different than File.dirname in that /files/foo remains /files/foo and does not become /files
   def self.extract_path(path)
     path = path.sub(/^(\+|-):/, '')
-    
+
     # find first occurrence of path separator followed by directory glob specifier: *, ?, {, }, [, ]
     find_index = (path =~ GLOB_MATCHER)
-    
+
     # no changes needed (lop off final path separator)
     return path.chomp('/') if (find_index.nil?)
-    
+
     # extract up to first glob specifier
     path = path[0..(find_index-1)]
-    
+
     # lop off everything up to and including final path separator
     find_index = path.rindex('/')
     return path[0..(find_index-1)] if (not find_index.nil?)
-    
+
     # return string up to first glob specifier if no path separator found
     return path
   end
@@ -59,12 +59,12 @@ class FilePathUtils
   def self.add_path?(path)
     return (path =~ /^-:/).nil?
   end
-  
+
   # get path (and glob) lopping off optional +: / -: prefixed aggregation modifiers
   def self.extract_path_no_aggregation_operators(path)
     return path.sub(/^(\+|-):/, '')
   end
-  
+
   # all the globs that may be in a path string work fine with one exception;
   # to recurse through all subdirectories, the glob is dir/**/** but our paths use
   # convention of only dir/**
@@ -73,25 +73,21 @@ class FilePathUtils
     return path + '/**'
   end
 
-  def self.form_ceedling_vendor_path(*filepaths)
-    return File.join( CEEDLING_VENDOR, filepaths )
-  end
-
   ######### instance methods ##########
 
   def form_temp_path(filepath, prefix='')
-    return File.join( @configurator.project_temp_path, prefix + File.basename(filepath) )    
+    return File.join( @configurator.project_temp_path, prefix + File.basename(filepath) )
   end
-  
+
   ### release ###
   def form_release_build_cache_path(filepath)
-    return File.join( @configurator.project_release_build_cache_path, File.basename(filepath) )    
+    return File.join( @configurator.project_release_build_cache_path, File.basename(filepath) )
   end
-  
+
   def form_release_dependencies_filepath(filepath)
     return File.join( @configurator.project_release_dependencies_path, File.basename(filepath).ext(@configurator.extension_dependencies) )
   end
-  
+
   def form_release_build_c_object_filepath(filepath)
     return File.join( @configurator.project_release_build_output_c_path, File.basename(filepath).ext(@configurator.extension_object) )
   end
@@ -111,16 +107,16 @@ class FilePathUtils
   def form_release_build_c_list_filepath(filepath)
     return File.join( @configurator.project_release_build_output_c_path, File.basename(filepath).ext(@configurator.extension_list) )
   end
-  
+
   def form_release_dependencies_filelist(files)
     return (@file_wrapper.instantiate_file_list(files)).pathmap("#{@configurator.project_release_dependencies_path}/%n#{@configurator.extension_dependencies}")
   end
-  
+
   ### tests ###
   def form_test_build_cache_path(filepath)
-    return File.join( @configurator.project_test_build_cache_path, File.basename(filepath) )    
+    return File.join( @configurator.project_test_build_cache_path, File.basename(filepath) )
   end
-  
+
   def form_pass_results_filepath(filepath)
     return File.join( @configurator.project_test_results_path, File.basename(filepath).ext(@configurator.extension_testpass) )
   end
@@ -146,7 +142,7 @@ class FilePathUtils
   end
 
   def form_test_executable_filepath(filepath)
-    return File.join( @configurator.project_test_build_output_path, File.basename(filepath).ext(@configurator.extension_executable) )    
+    return File.join( @configurator.project_test_build_output_path, File.basename(filepath).ext(@configurator.extension_executable) )
   end
 
   def form_test_build_map_filepath(filepath)
@@ -158,17 +154,17 @@ class FilePathUtils
   end
 
   def form_preprocessed_file_filepath(filepath)
-    return File.join( @configurator.project_test_preprocess_files_path, File.basename(filepath) )    
+    return File.join( @configurator.project_test_preprocess_files_path, File.basename(filepath) )
   end
 
   def form_preprocessed_includes_list_filepath(filepath)
-    return File.join( @configurator.project_test_preprocess_includes_path, File.basename(filepath) )    
+    return File.join( @configurator.project_test_preprocess_includes_path, File.basename(filepath) )
   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}")
   end
-  
+
   def form_preprocessed_mockable_headers_filelist(mocks)
     list = @file_wrapper.instantiate_file_list(mocks)
     headers = list.map do |file|
@@ -186,12 +182,12 @@ class FilePathUtils
 
   def form_test_dependencies_filelist(files)
     list = @file_wrapper.instantiate_file_list(files)
-    return list.pathmap("#{@configurator.project_test_dependencies_path}/%n#{@configurator.extension_dependencies}")    
+    return list.pathmap("#{@configurator.project_test_dependencies_path}/%n#{@configurator.extension_dependencies}")
   end
 
   def form_pass_results_filelist(path, files)
     list = @file_wrapper.instantiate_file_list(files)
-    return list.pathmap("#{path}/%n#{@configurator.extension_testpass}")    
+    return list.pathmap("#{path}/%n#{@configurator.extension_testpass}")
   end
 
 end

data/lib/ceedling/flaginator.rb

@@ -25,22 +25,22 @@ class Flaginator
   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