ceedling 0.13.0 → 0.15.0

data/lib/{tool_executor_helper.rb → ceedling/tool_executor_helper.rb}

@@ -1,115 +1,115 @@
-require 'constants' # for Verbosity enumeration & $stderr redirect enumeration
-
-class ToolExecutorHelper
-
-  constructor :streaminator, :system_utils, :system_wrapper
-
-  def stderr_redirection(tool_config, logging)
-    # if there's no logging enabled, return :stderr_redirect unmodified
-    return tool_config[:stderr_redirect] if (not logging)
-    
-    # if there is logging enabled but the redirect is a custom value (not enum), return the custom string
-    return tool_config[:stderr_redirect] if (tool_config[:stderr_redirect].class == String)
- 
-    # if logging is enabled but there's no custom string, return the AUTO enumeration so $stderr goes into the log
-    return StdErrRedirect::AUTO
-  end
-
-  def background_exec_cmdline_prepend(tool_config)
-    return nil if (tool_config[:background_exec].nil?)
-    
-    config_exec = tool_config[:background_exec]
-    
-    if ((config_exec == BackgroundExec::AUTO) and (@system_wrapper.windows?))
-      return 'start'
-    end
-
-    if (config_exec == BackgroundExec::WIN)
-      return 'start'
-    end
-
-    return nil
-  end
-
-  def osify_path_separators(executable)
-    return executable.gsub(/\//, '\\') if (@system_wrapper.windows?)
-    return executable
-  end
-  
-  def stderr_redirect_cmdline_append(tool_config)
-    return nil if (tool_config[:stderr_redirect].nil?)
-    
-    config_redirect = tool_config[:stderr_redirect]
-    redirect        = StdErrRedirect::NONE
-    
-    if (config_redirect == StdErrRedirect::AUTO)
-       if (@system_wrapper.windows?)
-         redirect = StdErrRedirect::WIN
-       else
-         if (@system_utils.tcsh_shell?)
-           redirect = StdErrRedirect::TCSH
-         else
-           redirect = StdErrRedirect::UNIX           
-         end
-       end
-    end
-
-    case redirect
-      # we may need more complicated processing after some learning with various environments
-      when StdErrRedirect::NONE then nil
-      when StdErrRedirect::WIN  then '2>&1'
-      when StdErrRedirect::UNIX then '2>&1'
-      when StdErrRedirect::TCSH then '|&'
-      else redirect.to_s
-    end
-  end
-
-  def background_exec_cmdline_append(tool_config)
-    return nil if (tool_config[:background_exec].nil?)
-
-    config_exec = tool_config[:background_exec]
-    
-    # if :auto & windows, then we already prepended 'start' and should append nothing
-    return nil if ((config_exec == BackgroundExec::AUTO) and (@system_wrapper.windows?))
-
-    # if :auto & not windows, then we append standard '&'
-    return '&' if ((config_exec == BackgroundExec::AUTO) and (not @system_wrapper.windows?))
-
-    # if explicitly Unix, then append '&'
-    return '&' if (config_exec == BackgroundExec::UNIX)
-    
-    # all other cases, including :none, :win, & anything unrecognized, append nothing
-    return nil
-  end
-
-  # if command succeeded and we have verbosity cranked up, spill our guts
-  def print_happy_results(command_str, shell_result, boom=true)
-    if ((shell_result[:exit_code] == 0) or ((shell_result[:exit_code] != 0) and not boom))
-      output  = "> Shell executed command:\n"
-      output += "#{command_str}\n"
-      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
-      output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
-      output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != 0)
-      output += "\n"
-  
-      @streaminator.stdout_puts(output, Verbosity::OBNOXIOUS)
-    end
-  end
-
-  # if command failed and we have verbosity set to minimum error level, spill our guts
-  def print_error_results(command_str, shell_result, boom=true)
-    if ((shell_result[:exit_code] != 0) and boom)
-      output  = "ERROR: Shell command failed.\n"
-      output += "> Shell executed command:\n"
-      output += "'#{command_str}'\n"
-      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
-      output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
-      output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != nil)
-      output += "> And then likely crashed.\n"                               if (shell_result[:exit_code] == nil)
-      output += "\n"
-
-      @streaminator.stderr_puts(output, Verbosity::ERRORS)
-    end
-  end
-  
-end
+require 'ceedling/constants' # for Verbosity enumeration & $stderr redirect enumeration
+
+class ToolExecutorHelper
+
+  constructor :streaminator, :system_utils, :system_wrapper
+
+  def stderr_redirection(tool_config, logging)
+    # if there's no logging enabled, return :stderr_redirect unmodified
+    return tool_config[:stderr_redirect] if (not logging)
+    
+    # if there is logging enabled but the redirect is a custom value (not enum), return the custom string
+    return tool_config[:stderr_redirect] if (tool_config[:stderr_redirect].class == String)
+ 
+    # if logging is enabled but there's no custom string, return the AUTO enumeration so $stderr goes into the log
+    return StdErrRedirect::AUTO
+  end
+
+  def background_exec_cmdline_prepend(tool_config)
+    return nil if (tool_config[:background_exec].nil?)
+    
+    config_exec = tool_config[:background_exec]
+    
+    if ((config_exec == BackgroundExec::AUTO) and (@system_wrapper.windows?))
+      return 'start'
+    end
+
+    if (config_exec == BackgroundExec::WIN)
+      return 'start'
+    end
+
+    return nil
+  end
+
+  def osify_path_separators(executable)
+    return executable.gsub(/\//, '\\') if (@system_wrapper.windows?)
+    return executable
+  end
+  
+  def stderr_redirect_cmdline_append(tool_config)
+    return nil if (tool_config[:stderr_redirect].nil?)
+    
+    config_redirect = tool_config[:stderr_redirect]
+    redirect        = StdErrRedirect::NONE
+    
+    if (config_redirect == StdErrRedirect::AUTO)
+       if (@system_wrapper.windows?)
+         redirect = StdErrRedirect::WIN
+       else
+         if (@system_utils.tcsh_shell?)
+           redirect = StdErrRedirect::TCSH
+         else
+           redirect = StdErrRedirect::UNIX           
+         end
+       end
+    end
+
+    case redirect
+      # we may need more complicated processing after some learning with various environments
+      when StdErrRedirect::NONE then nil
+      when StdErrRedirect::WIN  then '2>&1'
+      when StdErrRedirect::UNIX then '2>&1'
+      when StdErrRedirect::TCSH then '|&'
+      else redirect.to_s
+    end
+  end
+
+  def background_exec_cmdline_append(tool_config)
+    return nil if (tool_config[:background_exec].nil?)
+
+    config_exec = tool_config[:background_exec]
+    
+    # if :auto & windows, then we already prepended 'start' and should append nothing
+    return nil if ((config_exec == BackgroundExec::AUTO) and (@system_wrapper.windows?))
+
+    # if :auto & not windows, then we append standard '&'
+    return '&' if ((config_exec == BackgroundExec::AUTO) and (not @system_wrapper.windows?))
+
+    # if explicitly Unix, then append '&'
+    return '&' if (config_exec == BackgroundExec::UNIX)
+    
+    # all other cases, including :none, :win, & anything unrecognized, append nothing
+    return nil
+  end
+
+  # if command succeeded and we have verbosity cranked up, spill our guts
+  def print_happy_results(command_str, shell_result, boom=true)
+    if ((shell_result[:exit_code] == 0) or ((shell_result[:exit_code] != 0) and not boom))
+      output  = "> Shell executed command:\n"
+      output += "#{command_str}\n"
+      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
+      output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
+      output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != 0)
+      output += "\n"
+  
+      @streaminator.stdout_puts(output, Verbosity::OBNOXIOUS)
+    end
+  end
+
+  # if command failed and we have verbosity set to minimum error level, spill our guts
+  def print_error_results(command_str, shell_result, boom=true)
+    if ((shell_result[:exit_code] != 0) and boom)
+      output  = "ERROR: Shell command failed.\n"
+      output += "> Shell executed command:\n"
+      output += "'#{command_str}'\n"
+      output += "> Produced output:\n"             if (not shell_result[:output].empty?)
+      output += "#{shell_result[:output].strip}\n" if (not shell_result[:output].empty?)
+      output += "> And exited with status: [#{shell_result[:exit_code]}].\n" if (shell_result[:exit_code] != nil)
+      output += "> And then likely crashed.\n"                               if (shell_result[:exit_code] == nil)
+      output += "\n"
+
+      @streaminator.stderr_puts(output, Verbosity::ERRORS)
+    end
+  end
+  
+end

data/lib/{verbosinator.rb → ceedling/verbosinator.rb}

@@ -1,10 +1,10 @@
-
-class Verbosinator
-
-  constructor :configurator
-
-  def should_output?(level)
-    return (level <= @configurator.project_verbosity)
-  end
-
-end
+
+class Verbosinator
+
+  constructor :configurator
+
+  def should_output?(level)
+    return (level <= @configurator.project_verbosity)
+  end
+
+end

data/lib/ceedling/version.rb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.13.0"
+    GEM = "0.15.0"
 
     # @private
     CEEDLING = GEM

data/lib/{yaml_wrapper.rb → ceedling/yaml_wrapper.rb}

@@ -1,16 +1,17 @@
-require 'yaml'
-
-
-class YamlWrapper
-
-  def load(filepath)
-    return YAML.load(File.read(filepath))
-  end
-
-  def dump(filepath, structure)
-    File.open(filepath, 'w') do |output|
-      YAML.dump(structure, output)
-    end
-  end
-
-end
+require 'yaml'
+require 'erb'
+
+
+class YamlWrapper
+
+  def load(filepath)
+    return YAML.load(ERB.new(File.read(filepath)).result)
+  end
+
+  def dump(filepath, structure)
+    File.open(filepath, 'w') do |output|
+      YAML.dump(structure, output)
+    end
+  end
+
+end

data/license.txt

@@ -0,0 +1,31 @@
+ Copyright (c) 2007-2014 Mike Karlesky, Mark VanderVoord, Greg Williams
+
+ 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.
+
+ The end-user documentation included with the redistribution, if
+ any, must include the following acknowledgment: "This product
+ includes software developed for the Unity Project, by Mike Karlesky,
+ Mark VanderVoord, and Greg Williams and other contributors", in
+ the same place and form as other third-party acknowledgments.
+ Alternately, this acknowledgment may appear in the software
+ itself, in the same form and location as other such third-party
+ acknowledgments.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.

data/plugins/bullseye/lib/bullseye.rb

@@ -1,5 +1,5 @@
-require 'plugin'
-require 'constants'
+require 'ceedling/plugin'
+require 'ceedling/constants'
 
 BULLSEYE_ROOT_NAME         = 'bullseye'
 BULLSEYE_TASK_ROOT         = BULLSEYE_ROOT_NAME + ':'

data/plugins/gcov/gcov.rb

@@ -1,5 +1,5 @@
-require 'plugin'
-require 'constants'
+require 'ceedling/plugin'
+require 'ceedling/constants'
 
 GCOV_ROOT_NAME         = 'gcov'
 GCOV_TASK_ROOT         = GCOV_ROOT_NAME + ':'

data/plugins/module_generator/lib/module_generator.rb

@@ -1,5 +1,5 @@
-require 'plugin'
-require 'constants'
+require 'ceedling/plugin'
+require 'ceedling/constants'
 require 'erb'
 require 'fileutils'
 
@@ -65,6 +65,7 @@ class ModuleGenerator < Plugin
       @ceedling[:streaminator].stdout_puts "Destroying '#{path}'..."
       @files.each do |file|
         if File.exist?(file[:path])
+          File.delete(file[:path])
           @ceedling[:streaminator].stdout_puts "File #{file[:path]} deleted"
         else
           @ceedling[:streaminator].stdout_puts "File #{file[:path]} does not exist!"
@@ -141,4 +142,4 @@ class ModuleGenerator < Plugin
     # p @files
   end
   
-end
+end

data/plugins/stdout_ide_tests_report/lib/stdout_ide_tests_report.rb

@@ -1,27 +1,27 @@
-require 'plugin'
-require 'defaults'
+require 'ceedling/plugin'
+require 'ceedling/defaults'
 
 class StdoutIdeTestsReport < Plugin
-  
+
   def setup
     @result_list = []
   end
-    
+
   def post_test_fixture_execute(arg_hash)
     return if not (arg_hash[:context] == TEST_SYM)
 
     @result_list << arg_hash[:result_file]
   end
-  
+
   def post_build
     return if (not @ceedling[:task_invoker].test_invoked?)
-    
+
     results = @ceedling[:plugin_reportinator].assemble_test_results(@result_list)
     hash = {
       :header => '',
       :results => results
     }
-    
+
     @ceedling[:plugin_reportinator].run_test_results_report(hash) do
       message = ''
       message = 'Unit test failures.' if (hash[:results][:counts][:failed] > 0)
@@ -41,4 +41,4 @@ class StdoutIdeTestsReport < Plugin
     @ceedling[:plugin_reportinator].run_test_results_report(hash)
   end
 
-end
+end

data/plugins/stdout_pretty_tests_report/lib/stdout_pretty_tests_report.rb

@@ -1,5 +1,5 @@
-require 'plugin'
-require 'defaults'
+require 'ceedling/plugin'
+require 'ceedling/defaults'
 
 class StdoutPrettyTestsReport < Plugin
   
@@ -44,4 +44,4 @@ class StdoutPrettyTestsReport < Plugin
     @ceedling[:plugin_reportinator].run_test_results_report(hash)
   end
 
-end
+end

data/plugins/teamcity_tests_report/config/teamcity_tests_report.yml

@@ -0,0 +1,4 @@
+---
+:plugins:
+  # tell Ceedling we got results display taken care of
+  :display_raw_test_results: FALSE

data/plugins/teamcity_tests_report/lib/teamcity_tests_report.rb

@@ -0,0 +1,57 @@
+require 'ceedling/plugin'
+require 'ceedling/defaults'
+
+class TeamcityTestsReport < Plugin
+
+  def setup
+    @suite_started = nil
+    @output_enabled = !defined?(TEAMCITY_BUILD) || TEAMCITY_BUILD
+  end
+
+  def escape(string)
+    string.gsub(/['|\[\]]/, '|\0').gsub('\r', '|r').gsub('\n', '|n')
+  end
+
+  def pre_test(test)
+    teamcity_message "testSuiteStarted name='#{File.basename(test, '.c')}'"
+    @suite_started = Time.now
+  end
+
+  def post_test(test)
+    teamcity_message "testSuiteFinished name='#{File.basename(test, '.c')}'"
+  end
+
+  def post_test_fixture_execute(arg_hash)
+    duration = (Time.now - @suite_started) * 1000
+    results = @ceedling[:plugin_reportinator].assemble_test_results([arg_hash[:result_file]])
+    avg_duration = (duration / [1, results[:counts][:passed] + results[:counts][:failed]].max).round
+
+    results[:successes].each do |success|
+      success[:collection].each do |test|
+        teamcity_message "testStarted name='#{test[:test]}'"
+        teamcity_message "testFinished name='#{test[:test]}' duration='#{avg_duration}'"
+      end
+    end
+
+    results[:failures].each do |failure|
+      failure[:collection].each do |test|
+        teamcity_message "testStarted name='#{test[:test]}'"
+        teamcity_message "testFailed name='#{test[:test]}' message='#{escape(test[:message])}' details='File: #{failure[:source][:path]}/#{failure[:source][:file]} Line: #{test[:line]}'"
+        teamcity_message "testFinished name='#{test[:test]}' duration='#{avg_duration}'"
+      end
+    end
+
+    results[:ignores].each do |failure|
+      failure[:collection].each do |test|
+        teamcity_message "testIgnored name='#{test[:test]}' message='#{escape(test[:message])}'"
+      end
+    end
+
+    # We ignore stdout
+  end
+
+  def teamcity_message(content)
+    puts "##teamcity[#{content}]" unless !@output_enabled
+  end
+
+end