ceedling 0.0.13 → 0.0.14

data/bin/ceedling

@@ -12,9 +12,15 @@ class CeedlingTasks < Thor
   end
 
   desc "new PROJECT_NAME", "create a new ceedling project"
+  method_option :nodocs, :type => :boolean, :default => false, :desc => "No docs in vendor directory"
   def new(name)
     directory Ceedling::NEW_PROJECT_DIR, name
-    puts "Execute 'rake test:delta' to run your tests"
+    remove_dir "#{name}/vendor/ceedling/docs" if options[:nodocs]
+    puts "\n"
+    puts "Project '#{name}' created!"
+    puts " - Tool documentation is located in vendor/ceedling/docs" if not options[:nodocs]
+    puts " - Execute 'rake -T' to view available test & build tasks"
+    puts ''
   end
 
   desc "update DIRECTORY", "update the vendor/ceedling directory under the given project root"
@@ -45,8 +51,10 @@ class CeedlingTasks < Thor
     remove_file "#{dest}/rakefile.rb"
     directory "examples/#{proj_name}", dest
     puts "\n"
-    puts "Example project creation successful"
-    puts "Execute 'rake test:delta' to run your tests"
+    puts "Example project '#{proj_name}' created!"
+    puts " - Tool documentation is located in vendor/ceedling/docs"
+    puts " - Execute 'rake -T' to view available test & build tasks"
+    puts ''
   end
 
   desc "version", "print all ceedling gem and library versions"

data/lib/ceedling/version.rb

@@ -2,10 +2,10 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.0.13"
+    GEM = "0.0.14"
 
     # @private
-    CEEDLING = "0.9.196"
+    CEEDLING = "0.9.200"
     # @private
     CEXCEPTION = "1.2.17"
     # @private

data/lib/ceedling/version.rb.erb

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

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

@@ -188,8 +188,8 @@ class ConfiguratorBuilder
     
     return {
       # tempted to make a helper method in file_path_utils? stop right there, pal. you'll introduce a cyclical dependency
-      :project_release_build_target => File.join(in_hash[:project_release_artifacts_path], release_target_file),
-      :project_release_build_map    => File.join(in_hash[:project_release_artifacts_path], release_map_file)
+      :project_release_build_target => File.join(in_hash[:project_build_release_root], release_target_file),
+      :project_release_build_map    => File.join(in_hash[:project_build_release_root], release_map_file)
       }
   end
   

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

@@ -32,9 +32,13 @@ class Generator
     arg_hash = {:header_file => header_filepath, :context => context}
     @plugin_manager.pre_mock_execute(arg_hash)
     
-    @cmock_builder.cmock.setup_mocks( arg_hash[:header_file] )
-
-    @plugin_manager.post_mock_execute(arg_hash)
+    begin
+      @cmock_builder.cmock.setup_mocks( arg_hash[:header_file] )
+    rescue
+      raise
+    ensure
+      @plugin_manager.post_mock_execute(arg_hash)
+    end
   end
 
   # test_filepath may be either preprocessed test file or original test file
@@ -50,21 +54,32 @@ class Generator
     @streaminator.stdout_puts("Generating runner for #{module_name}...", Verbosity::NORMAL)
     
     # build runner file
-    @generator_test_runner.generate(module_name, runner_filepath, test_cases, mock_list)
-
-    @plugin_manager.post_runner_execute(arg_hash)
+    begin
+      @generator_test_runner.generate(module_name, runner_filepath, test_cases, mock_list)
+    rescue
+      raise
+    ensure
+      @plugin_manager.post_runner_execute(arg_hash)    
+    end
   end
 
   def generate_object_file(tool, context, source, object, list='')    
+    shell_result = {}
     arg_hash = {:tool => tool, :context => context, :source => source, :object => object, :list => list}
     @plugin_manager.pre_compile_execute(arg_hash)
 
     @streaminator.stdout_puts("Compiling #{File.basename(arg_hash[:source])}...", Verbosity::NORMAL)
-    command      = @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:source], arg_hash[:object], arg_hash[:list])
-    shell_result = @tool_executor.exec( command[:line], command[:options] )
+    command = @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:source], arg_hash[:object], arg_hash[:list])
 
-    arg_hash[:shell_result] = shell_result
-    @plugin_manager.post_compile_execute(arg_hash)
+    begin
+      shell_result = @tool_executor.exec( command[:line], command[:options] )
+    rescue ShellExecutionException => ex
+      shell_result = ex.shell_result
+      raise ''
+    ensure
+      arg_hash[:shell_result] = shell_result
+      @plugin_manager.post_compile_execute(arg_hash)
+    end
   end
 
   def generate_executable_file(tool, context, objects, executable, map='')
@@ -73,11 +88,11 @@ class Generator
     @plugin_manager.pre_link_execute(arg_hash)
     
     @streaminator.stdout_puts("Linking #{File.basename(arg_hash[:executable])}...", Verbosity::NORMAL)
+    command = @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:objects], arg_hash[:executable], arg_hash[:map])
     
     begin
-      command = @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:objects], arg_hash[:executable], arg_hash[:map])
       shell_result = @tool_executor.exec( command[:line], command[:options] )
-    rescue
+    rescue ShellExecutionException => ex
       notice =    "\n" +
                   "NOTICE: If the linker reports missing symbols, the following may be to blame:\n" +
                   "  1. Test lacks #include statements corresponding to needed source files.\n" +
@@ -88,13 +103,14 @@ class Generator
       else
         notice += "\n"
       end
-               
+      
       @streaminator.stderr_puts(notice, Verbosity::COMPLAIN)
-      raise
+      shell_result = ex.shell_result
+      raise ''
+    ensure
+      arg_hash[:shell_result] = shell_result
+      @plugin_manager.post_link_execute(arg_hash)
     end
-    
-    arg_hash[:shell_result] = shell_result
-    @plugin_manager.post_link_execute(arg_hash)
   end
 
   def generate_test_results(tool, context, executable, result)

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

@@ -6,7 +6,7 @@ class ReleaseInvoker
   constructor :configurator, :release_invoker_helper, :build_invoker_helper, :dependinator, :task_invoker, :file_path_utils, :file_wrapper
 
 
-  def setup_and_invoke_c_objects(c_files)
+  def setup_and_invoke_c_objects( c_files )
     objects = @file_path_utils.form_release_build_c_objects_filelist( c_files )
 
     begin
@@ -22,7 +22,7 @@ class ReleaseInvoker
   end
 
 
-  def setup_and_invoke_asm_objects(asm_files)
+  def setup_and_invoke_asm_objects( asm_files )
     objects = @file_path_utils.form_release_build_asm_objects_filelist( asm_files )
 
     begin
@@ -48,4 +48,11 @@ class ReleaseInvoker
         @configurator.collection_all_source ) )    
   end
 
+
+  def artifactinate( *files )
+    files.each do |file|
+      @file_wrapper.cp( file, @configurator.project_release_artifacts_path ) if @file_wrapper.exist?( file)
+    end
+  end
+
 end

data/new_project_template/vendor/ceedling/lib/rules_release.rake

@@ -33,12 +33,14 @@ end
 
 
 rule(/#{PROJECT_RELEASE_BUILD_TARGET}/) do |bin_file|
+  map_file = @ceedling[:configurator].project_release_build_map
   @ceedling[:generator].generate_executable_file(
     TOOLS_RELEASE_LINKER,
     RELEASE_SYM,
     bin_file.prerequisites,
     bin_file.name,
-    @ceedling[:configurator].project_release_build_map)
+    map_file )
+  @ceedling[:release_invoker].artifactinate( bin_file.name, map_file )
 end
 
 

data/new_project_template/vendor/ceedling/lib/tasks_filesystem.rake

@@ -8,6 +8,7 @@ CLEAN.clear_exclude.exclude { |fn| fn.pathmap("%f") == 'core' && File.directory?
 CLEAN.include(File.join(PROJECT_TEST_BUILD_OUTPUT_PATH, '*'))
 CLEAN.include(File.join(PROJECT_TEST_RESULTS_PATH, '*'))
 CLEAN.include(File.join(PROJECT_TEST_DEPENDENCIES_PATH, '*'))
+CLEAN.include(File.join(PROJECT_BUILD_RELEASE_ROOT, '*.*'))
 CLEAN.include(File.join(PROJECT_RELEASE_BUILD_OUTPUT_PATH, '*'))
 CLEAN.include(File.join(PROJECT_RELEASE_DEPENDENCIES_PATH, '*'))
 

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

@@ -1,5 +1,11 @@
 require 'constants'
 
+class ShellExecutionException < RuntimeError
+  attr_reader :shell_result
+  def initialize(shell_result)
+    @shell_result = shell_result
+  end
+end
 
 class ToolExecutor
 
@@ -62,7 +68,7 @@ class ToolExecutor
     @tool_executor_helper.print_error_results( command_line, shell_result, options[:boom] )
     
     # go boom if exit code isn't 0 (but in some cases we don't want a non-0 exit code to raise)
-    raise if ((shell_result[:exit_code] != 0) and options[:boom])
+    raise ShellExecutionException.new(shell_result) if ((shell_result[:exit_code] != 0) and options[:boom])
     
     return shell_result
   end

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

@@ -78,6 +78,7 @@ class Bullseye < Plugin
     end
     
     # coverage results
+    return if (verify_coverage_file() == false)
     if (@ceedling[:task_invoker].invoked?(/^#{BULLSEYE_TASK_ROOT}(all|delta)/))
       command      = @ceedling[:tool_executor].build_command_line(TOOLS_BULLSEYE_REPORT_COVSRC)
       shell_result = @ceedling[:tool_executor].exec(command[:line], command[:options])
@@ -88,6 +89,7 @@ class Bullseye < Plugin
   end
 
   def summary
+    return if (verify_coverage_file() == false)
     result_list = @ceedling[:file_path_utils].form_pass_results_filelist( BULLSEYE_RESULTS_PATH, COLLECTION_ALL_TESTS )
 
     # test results
@@ -149,8 +151,20 @@ class Bullseye < Plugin
     end
   end
 
+  def verify_coverage_file
+    exist = @ceedling[:file_wrapper].exist?( ENVIRONMENT_COVFILE )
+  
+    if (!exist)
+      banner = @ceedling[:plugin_reportinator].generate_banner "#{BULLSEYE_ROOT_NAME.upcase}: CODE COVERAGE SUMMARY"
+      @ceedling[:streaminator].stdout_puts "\n" + banner + "\nNo coverage file.\n\n"
+    end
+    
+    return exist
+  end
+  
 end
 
+
 # end blocks always executed following rake run
 END {
   # cache our input configurations to use in comparison upon next execution

data/new_project_template/vendor/ceedling/plugins/bullseye/template.erb

@@ -1,7 +1,7 @@
 % function_string = hash[:coverage][:functions].to_s
 % branch_string   = hash[:coverage][:branches].to_s
 % format_string   = "%#{[function_string.length, branch_string.length].max}i"
-<%=@ceedling[:plugin_reportinator].generate_banner("#{BULLSEYE_ROOT_NAME.upcase}: CODE COVERAGE SUMMARY")%>
+<%=@ceedling[:plugin_reportinator].generate_banner("#{hash[:header]}: CODE COVERAGE SUMMARY")%>
 % if (!hash[:coverage][:functions].nil?)
 FUNCTIONS: <%=sprintf(format_string, hash[:coverage][:functions])%>%
 % else

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

@@ -4,24 +4,28 @@ require 'constants'
 class XmlTestsReport < Plugin
 
   def setup
-    @file_path    = File.join( PROJECT_TEST_ARTIFACTS_PATH, 'report.xml' )
-    @results_list = []
-    @test_counter = 1
+    @results_list = {}
+    @test_counter = 0
   end
 
   def post_test_execute(arg_hash)
-    return if not (arg_hash[:context] == TEST_SYM)
+    context = arg_hash[:context]
 
-    @results_list << arg_hash[:result_file]
+    @results_list[context] = [] if (@results_list[context].nil?)
+
+    @results_list[context] << arg_hash[:result_file]
   end
   
   def post_build
-    return if (not @ceedling[:task_invoker].test_invoked?)
-    
-    results = @ceedling[:plugin_reportinator].assemble_test_results(@results_list)
+    @results_list.each_key do |context|
+      results = @ceedling[:plugin_reportinator].assemble_test_results(@results_list[context])
+
+      file_path = File.join( PROJECT_BUILD_ARTIFACTS_ROOT, context.to_s, 'report.xml' )
   
-    @ceedling[:file_wrapper].open( @file_path, 'w' ) do |f|
-      write_results( results, f )
+      @ceedling[:file_wrapper].open( file_path, 'w' ) do |f|
+        @test_counter = 1
+        write_results( results, f )
+      end
     end
   end
   

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

@@ -1 +1 @@
-196
+200

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ceedling
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Mike Karlesky, Mark VanderVoord
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 -04:00
+date: 2011-05-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency