ceedling 0.0.7 → 0.0.8

data/.gitignore

@@ -4,3 +4,11 @@ Gemfile.lock
 pkg/*
 doc
 .yardoc
+
+new_project_template/vendor/ceedling/docs/CeedlingPacket.pdf
+new_project_template/vendor/ceedling/vendor/unity/auto/colour_prompt.rb
+new_project_template/vendor/ceedling/vendor/unity/auto/colour_reporter.rb
+new_project_template/vendor/ceedling/vendor/unity/auto/generate_config.yml
+new_project_template/vendor/ceedling/vendor/unity/auto/generate_module.rb
+new_project_template/vendor/ceedling/vendor/unity/auto/test_file_filter.rb
+new_project_template/vendor/ceedling/vendor/unity/auto/unity_test_summary.rb

data/lib/ceedling/version.rb

@@ -2,14 +2,14 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.7"
+    GEM = "0.0.8"
 
     # @private
-    CEEDLING = "0.9.185"
+    CEEDLING = "0.9.186"
     # @private
     CEXCEPTION = "1.2.16"
     # @private
-    CMOCK = "2.0.209"
+    CMOCK = "2.0.212"
     # @private
     UNITY = "2.0.118"
   end

data/lib/ceedling/version.rb.erb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.6"
+    GEM = "0.0.8"
 
     # @private
     CEEDLING = "<%= versions["CEEDLING"] %>"

data/new_project_template/vendor/ceedling/lib/generator_helper.rb

@@ -21,7 +21,7 @@ class GeneratorHelper
       # mirror style of generic tool_executor failure output
       notice  = "\n" +
                 "ERROR: Test executable \"#{File.basename(executable)}\" failed.\n" +
-                "> Produced no test results in $stdout:\n" +
+                "> Produced no final test result counts in $stdout:\n" +
                 "#{shell_result[:output].strip}\n"
     end
     

data/new_project_template/vendor/ceedling/lib/test_invoker.rb

@@ -63,10 +63,10 @@ class TestInvoker
     end
 
     # post-process collected mock list
-    @mocks.uniq!
+    @mocks.uniq!.freeze
     
     # post-process collected sources list
-    @sources.uniq!
+    @sources.uniq!.freeze
   end
 
 end

data/new_project_template/vendor/ceedling/plugins/bullseye/bullseye.rake

@@ -17,15 +17,15 @@ rule(/#{BULLSEYE_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
     end
   ]) do |object|
 
-  if (File.basename(object.source) =~ /^(#{PROJECT_TEST_FILE_PREFIX}|#{CMOCK_MOCK_PREFIX}|unity|cmock|cexception)/i)
+  if (File.basename(object.source) =~ /^(#{PROJECT_TEST_FILE_PREFIX}|#{CMOCK_MOCK_PREFIX}|#{BULLSEYE_IGNORE_SOURCES.join('|')})/i)
     @ceedling[:generator].generate_object_file(
       TOOLS_BULLSEYE_COMPILER,
-      BULLSEYE_CONTEXT,
+      BULLSEYE_SYM,
       object.source,
       object.name,
       @ceedling[:file_path_utils].form_test_build_list_filepath( object.name ) )
   else
-    @ceedling[BULLSEYE_CONTEXT].generate_coverage_object_file(object.source, object.name)
+    @ceedling[BULLSEYE_SYM].generate_coverage_object_file(object.source, object.name)
   end
 
 end
@@ -33,7 +33,7 @@ end
 rule(/#{BULLSEYE_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_EXECUTABLE}$/) do |bin_file|
   @ceedling[:generator].generate_executable_file(
     TOOLS_BULLSEYE_LINKER,
-    BULLSEYE_CONTEXT,
+    BULLSEYE_SYM,
     bin_file.prerequisites,
     bin_file.name,
     @ceedling[:file_path_utils].form_test_build_map_filepath(bin_file.name))
@@ -44,7 +44,7 @@ rule(/#{BULLSEYE_RESULTS_PATH}\/#{'.+\\'+EXTENSION_TESTPASS}$/ => [
        @ceedling[:file_path_utils].form_test_executable_filepath(task_name)
      end
   ]) do |test_result|
-  @ceedling[:generator].generate_test_results(TOOLS_BULLSEYE_FIXTURE, BULLSEYE_CONTEXT, test_result.source, test_result.name)
+  @ceedling[:generator].generate_test_results(TOOLS_BULLSEYE_FIXTURE, BULLSEYE_SYM, test_result.source, test_result.name)
 end
 
 rule(/#{BULLSEYE_DEPENDENCIES_PATH}\/#{'.+\\'+EXTENSION_DEPENDENCIES}$/ => [
@@ -54,7 +54,7 @@ rule(/#{BULLSEYE_DEPENDENCIES_PATH}\/#{'.+\\'+EXTENSION_DEPENDENCIES}$/ => [
   ]) do |dep|
   @ceedling[:generator].generate_dependencies_file(
     TOOLS_TEST_DEPENDENCIES_GENERATOR,
-    BULLSEYE_CONTEXT,
+    BULLSEYE_SYM,
     dep.source,
     File.join(BULLSEYE_BUILD_OUTPUT_PATH, File.basename(dep.source).ext(EXTENSION_OBJECT) ),
     dep.name)
@@ -62,13 +62,13 @@ end
 
 task :directories => [BULLSEYE_BUILD_OUTPUT_PATH, BULLSEYE_RESULTS_PATH, BULLSEYE_DEPENDENCIES_PATH, BULLSEYE_ARTIFACTS_PATH]
 
-namespace BULLSEYE_CONTEXT do
+namespace BULLSEYE_SYM do
 
   task :source_coverage => COLLECTION_ALL_SOURCE.pathmap("#{BULLSEYE_BUILD_OUTPUT_PATH}/%n#{@ceedling[:configurator].extension_object}")
 
   desc "Run code coverage for all tests"
   task :all => [:directories] do
-    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
     @ceedling[:test_invoker].setup_and_invoke(COLLECTION_ALL_TESTS)
     @ceedling[:configurator].restore_config
   end
@@ -91,7 +91,7 @@ namespace BULLSEYE_CONTEXT do
     end
   
     if (matches.size > 0)
-      @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+      @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
       @ceedling[:test_invoker].setup_and_invoke(matches, {:force_run => false})
       @ceedling[:configurator].restore_config
     else
@@ -108,7 +108,7 @@ namespace BULLSEYE_CONTEXT do
     end
   
     if (matches.size > 0)
-      @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+      @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
       @ceedling[:test_invoker].setup_and_invoke(matches, {:force_run => false})
       @ceedling[:configurator].restore_config
     else
@@ -118,7 +118,7 @@ namespace BULLSEYE_CONTEXT do
 
   desc "Run code coverage for changed files"
   task :delta => [:directories] do
-    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
     @ceedling[:test_invoker].setup_and_invoke(COLLECTION_ALL_TESTS, {:force_run => false})
     @ceedling[:configurator].restore_config
   end
@@ -133,7 +133,7 @@ namespace BULLSEYE_CONTEXT do
       end
   ]) do |test|
     @ceedling[:rake_wrapper][:directories].invoke
-    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
     @ceedling[:test_invoker].setup_and_invoke([test.source])
     @ceedling[:configurator].restore_config
   end
@@ -143,7 +143,7 @@ end
 namespace UTILS_SYM do
   
   desc "Open Bullseye code coverage browser"
-  task BULLSEYE_CONTEXT do
+  task BULLSEYE_SYM do
     command = @ceedling[:tool_executor].build_command_line(TOOLS_BULLSEYE_BROWSER)
     @ceedling[:tool_executor].exec(command[:line], command[:options])
   end

data/new_project_template/vendor/ceedling/plugins/bullseye/bullseye.rb

@@ -3,7 +3,7 @@ require 'constants'
 
 BULLSEYE_ROOT_NAME         = 'bullseye'
 BULLSEYE_TASK_ROOT         = BULLSEYE_ROOT_NAME + ':'
-BULLSEYE_CONTEXT           = BULLSEYE_ROOT_NAME.to_sym
+BULLSEYE_SYM               = BULLSEYE_ROOT_NAME.to_sym
 
 BULLSEYE_BUILD_PATH        = "#{PROJECT_BUILD_ROOT}/#{BULLSEYE_ROOT_NAME}"
 BULLSEYE_BUILD_OUTPUT_PATH = "#{BULLSEYE_BUILD_PATH}/out"
@@ -11,6 +11,8 @@ BULLSEYE_RESULTS_PATH      = "#{BULLSEYE_BUILD_PATH}/results"
 BULLSEYE_DEPENDENCIES_PATH = "#{BULLSEYE_BUILD_PATH}/dependencies"
 BULLSEYE_ARTIFACTS_PATH    = "#{PROJECT_BUILD_ARTIFACTS_ROOT}/#{BULLSEYE_ROOT_NAME}"
 
+BULLSEYE_IGNORE_SOURCES    = ['unity', 'cmock', 'cexception']
+
 
 class Bullseye < Plugin
 
@@ -31,7 +33,7 @@ class Bullseye < Plugin
   end
 
   def generate_coverage_object_file(source, object)
-    arg_hash = {:tool => TOOLS_BULLSEYE_INSTRUMENTATION, :context => BULLSEYE_CONTEXT, :source => source, :object => object}
+    arg_hash = {:tool => TOOLS_BULLSEYE_INSTRUMENTATION, :context => BULLSEYE_SYM, :source => source, :object => object}
     @ceedling[:plugin_manager].pre_compile_execute(arg_hash)
 
     @ceedling[:streaminator].stdout_puts("Compiling #{File.basename(source)} with coverage...")
@@ -126,7 +128,11 @@ class Bullseye < Plugin
     banner = @ceedling[:plugin_reportinator].generate_banner "#{BULLSEYE_ROOT_NAME.upcase}: CODE COVERAGE SUMMARY"
     @ceedling[:streaminator].stdout_puts "\n" + banner
 
-    sources.each do |source|
+    coverage_sources = sources.clone
+    coverage_sources.delete_if {|item| item =~ /#{CMOCK_MOCK_PREFIX}.+#{EXTENSION_SOURCE}$/}
+    coverage_sources.delete_if {|item| item =~ /#{BULLSEYE_IGNORE_SOURCES.join('|')}#{EXTENSION_SOURCE}$/}
+
+    coverage_sources.each do |source|
       command          = @ceedling[:tool_executor].build_command_line(TOOLS_BULLSEYE_REPORT_COVFN, source)
       shell_results    = @ceedling[:tool_executor].exec(command[:line], command[:options])
       coverage_results = shell_results[:output].deep_clone

data/new_project_template/vendor/ceedling/plugins/bullseye/defaults.yml

@@ -5,6 +5,7 @@
     :executable: covc
     :arguments:
       - '--file $': ENVIRONMENT_COVFILE
+      - -q
       - ${1}
   :bullseye_compiler:
     :executable: gcc

data/new_project_template/vendor/ceedling/plugins/gcov/gcov.rake

@@ -17,15 +17,15 @@ rule(/#{GCOV_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
     end
   ]) do |object|
 
-  if (File.basename(object.source) =~ /^(#{PROJECT_TEST_FILE_PREFIX}|#{CMOCK_MOCK_PREFIX}|unity|cmock|cexception)/i)
+  if (File.basename(object.source) =~ /^(#{PROJECT_TEST_FILE_PREFIX}|#{CMOCK_MOCK_PREFIX}|#{GCOV_IGNORE_SOURCES.join('|')})/i)
     @ceedling[:generator].generate_object_file(
       TOOLS_GCOV_COMPILER,
-      GCOV_CONTEXT,
+      GCOV_SYM,
       object.source,
       object.name,
       @ceedling[:file_path_utils].form_test_build_list_filepath( object.name ) )
   else
-    @ceedling[GCOV_CONTEXT].generate_coverage_object_file(object.source, object.name)
+    @ceedling[GCOV_SYM].generate_coverage_object_file(object.source, object.name)
   end
 
 end
@@ -33,7 +33,7 @@ end
 rule(/#{GCOV_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_EXECUTABLE}$/) do |bin_file|
   @ceedling[:generator].generate_executable_file(
     TOOLS_GCOV_LINKER,
-    GCOV_CONTEXT,
+    GCOV_SYM,
     bin_file.prerequisites,
     bin_file.name,
     @ceedling[:file_path_utils].form_test_build_map_filepath(bin_file.name))
@@ -44,7 +44,7 @@ rule(/#{GCOV_RESULTS_PATH}\/#{'.+\\'+EXTENSION_TESTPASS}$/ => [
        @ceedling[:file_path_utils].form_test_executable_filepath(task_name)
      end
   ]) do |test_result|
-  @ceedling[:generator].generate_test_results(TOOLS_GCOV_FIXTURE, GCOV_CONTEXT, test_result.source, test_result.name)
+  @ceedling[:generator].generate_test_results(TOOLS_GCOV_FIXTURE, GCOV_SYM, test_result.source, test_result.name)
 end
 
 rule(/#{GCOV_DEPENDENCIES_PATH}\/#{'.+\\'+EXTENSION_DEPENDENCIES}$/ => [
@@ -54,7 +54,7 @@ rule(/#{GCOV_DEPENDENCIES_PATH}\/#{'.+\\'+EXTENSION_DEPENDENCIES}$/ => [
   ]) do |dep|
   @ceedling[:generator].generate_dependencies_file(
     TOOLS_TEST_DEPENDENCIES_GENERATOR,
-    GCOV_CONTEXT,
+    GCOV_SYM,
     dep.source,
     File.join(GCOV_BUILD_OUTPUT_PATH, File.basename(dep.source).ext(EXTENSION_OBJECT) ),
     dep.name)
@@ -62,13 +62,13 @@ end
 
 task :directories => [GCOV_BUILD_OUTPUT_PATH, GCOV_RESULTS_PATH, GCOV_DEPENDENCIES_PATH, GCOV_ARTIFACTS_PATH]
 
-namespace GCOV_CONTEXT do
+namespace GCOV_SYM do
 
   task :source_coverage => COLLECTION_ALL_SOURCE.pathmap("#{GCOV_BUILD_OUTPUT_PATH}/%n#{@ceedling[:configurator].extension_object}")
 
   desc "Run code coverage for all tests"
   task :all => [:directories] do
-    @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_CONTEXT].config)
+    @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_SYM].config)
     @ceedling[:test_invoker].setup_and_invoke(COLLECTION_ALL_TESTS)
     @ceedling[:configurator].restore_config
   end
@@ -91,7 +91,7 @@ namespace GCOV_CONTEXT do
     end
   
     if (matches.size > 0)
-      @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_CONTEXT].config)
+      @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_SYM].config)
       @ceedling[:test_invoker].setup_and_invoke(matches, {:force_run => false})
       @ceedling[:configurator].restore_config
     else
@@ -108,7 +108,7 @@ namespace GCOV_CONTEXT do
     end
   
     if (matches.size > 0)
-      @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_CONTEXT].config)
+      @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_SYM].config)
       @ceedling[:test_invoker].setup_and_invoke(matches, {:force_run => false})
       @ceedling[:configurator].restore_config
     else
@@ -118,7 +118,7 @@ namespace GCOV_CONTEXT do
 
   desc "Run code coverage for changed files"
   task :delta => [:directories] do
-    @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_CONTEXT].config)
+    @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_SYM].config)
     @ceedling[:test_invoker].setup_and_invoke(COLLECTION_ALL_TESTS, {:force_run => false})
     @ceedling[:configurator].restore_config
   end
@@ -133,7 +133,7 @@ namespace GCOV_CONTEXT do
       end
   ]) do |test|
     @ceedling[:rake_wrapper][:directories].invoke
-    @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_CONTEXT].config)
+    @ceedling[:configurator].replace_flattened_config(@ceedling[GCOV_SYM].config)
     @ceedling[:test_invoker].setup_and_invoke([test.source])
     @ceedling[:configurator].restore_config
   end

data/new_project_template/vendor/ceedling/plugins/gcov/gcov.rb

@@ -3,7 +3,7 @@ require 'constants'
 
 GCOV_ROOT_NAME         = 'gcov'
 GCOV_TASK_ROOT         = GCOV_ROOT_NAME + ':'
-GCOV_CONTEXT           = GCOV_ROOT_NAME.to_sym
+GCOV_SYM               = GCOV_ROOT_NAME.to_sym
 
 GCOV_BUILD_PATH        = "#{PROJECT_BUILD_ROOT}/#{GCOV_ROOT_NAME}"
 GCOV_BUILD_OUTPUT_PATH = "#{GCOV_BUILD_PATH}/out"
@@ -11,6 +11,8 @@ GCOV_RESULTS_PATH      = "#{GCOV_BUILD_PATH}/results"
 GCOV_DEPENDENCIES_PATH = "#{GCOV_BUILD_PATH}/dependencies"
 GCOV_ARTIFACTS_PATH    = "#{PROJECT_BUILD_ARTIFACTS_ROOT}/#{GCOV_ROOT_NAME}"
 
+GCOV_IGNORE_SOURCES    = ['unity', 'cmock', 'cexception']
+
 
 class Gcov < Plugin
 
@@ -98,7 +100,11 @@ class Gcov < Plugin
     banner = @ceedling[:plugin_reportinator].generate_banner "#{GCOV_ROOT_NAME.upcase}: CODE COVERAGE SUMMARY"
     @ceedling[:streaminator].stdout_puts "\n" + banner
 
-    sources.each do |source|
+    coverage_sources = sources.clone
+    coverage_sources.delete_if {|item| item =~ /#{CMOCK_MOCK_PREFIX}.+#{EXTENSION_SOURCE}$/}
+    coverage_sources.delete_if {|item| item =~ /#{GCOV_IGNORE_SOURCES.join('|')}#{EXTENSION_SOURCE}$/}
+
+    coverage_sources.each do |source|
       basename         = File.basename(source)
       command          = @ceedling[:tool_executor].build_command_line(TOOLS_GCOV_REPORT, basename)
       shell_results    = @ceedling[:tool_executor].exec(command[:line], command[:options])

data/new_project_template/vendor/ceedling/release/build.info

@@ -1,2 +1,2 @@
-185
+186
 

data/new_project_template/vendor/ceedling/vendor/cmock/lib/cmock_config.rb

@@ -57,7 +57,11 @@ class CMockConfig
     options[:plugins].compact!
     options[:plugins].map! {|p| p.to_sym}
     @options = options
-    @options[:treat_as].merge!(standard_treat_as_map)
+    
+    treat_as_map = standard_treat_as_map().clone
+    treat_as_map.merge!(@options[:treat_as])
+    @options[:treat_as] = treat_as_map
+    
     @options.each_key { |key| eval("def #{key.to_s}() return @options[:#{key.to_s}] end") }
   end
   

data/new_project_template/vendor/ceedling/vendor/cmock/lib/cmock_generator.rb

@@ -179,9 +179,9 @@ class CMockGenerator
     file << "  cmock_line = cmock_call_instance->LineNumber;\n"
     if (@ordered)
       file << "  if (cmock_call_instance->CallOrder > ++GlobalVerifyOrder)\n"
-      file << "    UNITY_TEST_FAIL(cmock_line, \"Function '#{function[:name]}' called earlier than expected.\");"
+      file << "    UNITY_TEST_FAIL(cmock_line, \"Function '#{function[:name]}' called earlier than expected.\");\n"
       file << "  if (cmock_call_instance->CallOrder < GlobalVerifyOrder)\n"
-      file << "    UNITY_TEST_FAIL(cmock_line, \"Function '#{function[:name]}' called later than expected.\");"
+      file << "    UNITY_TEST_FAIL(cmock_line, \"Function '#{function[:name]}' called later than expected.\");\n"
       # file << "  UNITY_TEST_ASSERT((cmock_call_instance->CallOrder == ++GlobalVerifyOrder), cmock_line, \"Out of order function calls. Function '#{function[:name]}'\");\n"
     end
     file << @plugins.run(:mock_implementation, function)

data/new_project_template/vendor/ceedling/vendor/cmock/release/build.info

@@ -1,2 +1,2 @@
-209
+212
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ceedling
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Mike Karlesky, Mark VanderVoord
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -04:00
+date: 2011-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency