ceedling 0.28.3 → 0.29.0

data/plugins/module_generator/config/module_generator.yml

@@ -1,4 +1,4 @@
-:module_generator:
-  :project_root: ./
-  :source_root: src/
+:module_generator:
+  :project_root: ./
+  :source_root: src/
   :test_root: test/

data/plugins/module_generator/lib/module_generator.rb

@@ -1,51 +1,70 @@
-require 'ceedling/plugin'
-require 'ceedling/constants'
-require 'erb'
-require 'fileutils'
-
-class ModuleGenerator < Plugin
-
-  attr_reader :config
-
-  def create(module_name, optz={})
-
-    require "generate_module.rb" #From Unity Scripts
-
-    if ((!optz.nil?) && (optz[:destroy]))
-      UnityModuleGenerator.new( divine_options(optz) ).destroy(module_name)
-    else
-      UnityModuleGenerator.new( divine_options(optz) ).generate(module_name)
-    end
-  end
-
-  private
-
-  def divine_options(optz={})
-    unity_generator_options =
-    {
-      :path_src     => ((defined? MODULE_GENERATOR_SOURCE_ROOT ) ? MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, '') : "src" ),
-      :path_inc     => ((defined? MODULE_GENERATOR_INC_ROOT ) ?
-                                 MODULE_GENERATOR_INC_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, '')
-                                 : (defined? MODULE_GENERATOR_SOURCE_ROOT ) ?
-                                 MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, '')
-                                 : "src" ),
-      :path_tst     => ((defined? MODULE_GENERATOR_TEST_ROOT   ) ? MODULE_GENERATOR_TEST_ROOT.gsub(  '\\', '/').sub(/^\//, '').sub(/\/$/, '') : "test" ),
-      :pattern      => optz[:pattern],
-      :test_prefix  => ((defined? PROJECT_TEST_FILE_PREFIX     ) ? PROJECT_TEST_FILE_PREFIX : "Test" ),
-      :mock_prefix  => ((defined? CMOCK_MOCK_PREFIX            ) ? CMOCK_MOCK_PREFIX : "Mock" ),
-      :includes     => ((defined? MODULE_GENERATOR_INCLUDES    ) ? MODULE_GENERATOR_INCLUDES : {} ),
-      :boilerplates => ((defined? MODULE_GENERATOR_BOILERPLATES) ? MODULE_GENERATOR_BOILERPLATES : {} ),
-      :naming       => ((defined? MODULE_GENERATOR_NAMING      ) ? MODULE_GENERATOR_NAMING : nil ),
-      :update_svn   => ((defined? MODULE_GENERATOR_UPDATE_SVN  ) ? MODULE_GENERATOR_UPDATE_SVN : false ),
-    }
-
-    unless optz[:module_root_path].to_s.empty?
-      unity_generator_options[:path_src]  = File.join(optz[:module_root_path], unity_generator_options[:path_src])
-      unity_generator_options[:path_inc]  = File.join(optz[:module_root_path], unity_generator_options[:path_inc])
-      unity_generator_options[:path_tst]  = File.join(optz[:module_root_path], unity_generator_options[:path_tst])
-    end
-
-    return unity_generator_options
-  end
-
-end
+require 'ceedling/plugin'
+require 'ceedling/constants'
+require 'erb'
+require 'fileutils'
+
+class ModuleGenerator < Plugin
+
+  attr_reader :config
+
+  def create(module_name, optz={})
+
+    require "generate_module.rb" #From Unity Scripts
+
+    if ((!optz.nil?) && (optz[:destroy]))
+      UnityModuleGenerator.new( divine_options(optz) ).destroy(module_name)
+    else
+      UnityModuleGenerator.new( divine_options(optz) ).generate(module_name)
+    end
+  end
+
+  private
+
+  def divine_options(optz={})
+    unity_generator_options =
+    {
+      :path_src     => ((defined? MODULE_GENERATOR_SOURCE_ROOT ) ? MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, '') : "src" ),
+      :path_inc     => ((defined? MODULE_GENERATOR_INC_ROOT ) ?
+                                 MODULE_GENERATOR_INC_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, '')
+                                 : (defined? MODULE_GENERATOR_SOURCE_ROOT ) ?
+                                 MODULE_GENERATOR_SOURCE_ROOT.gsub('\\', '/').sub(/^\//, '').sub(/\/$/, '')
+                                 : "src" ),
+      :path_tst     => ((defined? MODULE_GENERATOR_TEST_ROOT   ) ? MODULE_GENERATOR_TEST_ROOT.gsub(  '\\', '/').sub(/^\//, '').sub(/\/$/, '') : "test" ),
+      :pattern      => optz[:pattern],
+      :test_prefix  => ((defined? PROJECT_TEST_FILE_PREFIX     ) ? PROJECT_TEST_FILE_PREFIX : "Test" ),
+      :mock_prefix  => ((defined? CMOCK_MOCK_PREFIX            ) ? CMOCK_MOCK_PREFIX : "Mock" ),
+      :includes     => ((defined? MODULE_GENERATOR_INCLUDES    ) ? MODULE_GENERATOR_INCLUDES : {} ),
+      :boilerplates => ((defined? MODULE_GENERATOR_BOILERPLATES) ? MODULE_GENERATOR_BOILERPLATES : {} ),
+      :naming       => ((defined? MODULE_GENERATOR_NAMING      ) ? MODULE_GENERATOR_NAMING : nil ),
+      :update_svn   => ((defined? MODULE_GENERATOR_UPDATE_SVN  ) ? MODULE_GENERATOR_UPDATE_SVN : false ),
+    }
+
+    # Read Boilerplate template file.
+    if (defined? MODULE_GENERATOR_BOILERPLATE_FILES)
+
+      bf = MODULE_GENERATOR_BOILERPLATE_FILES
+
+      if !bf[:src].nil? && File.exists?(bf[:src]) 
+        unity_generator_options[:boilerplates][:src] = File.read(bf[:src])
+      end
+
+      if !bf[:inc].nil? && File.exists?(bf[:inc]) 
+        unity_generator_options[:boilerplates][:inc] = File.read(bf[:inc])
+      end
+
+      if !bf[:tst].nil? && File.exists?(bf[:tst]) 
+        unity_generator_options[:boilerplates][:tst] = File.read(bf[:tst])
+      end
+    end
+
+    # If using "create[<module_root>:<module_name>]" option from command line.
+    unless optz[:module_root_path].to_s.empty?
+      unity_generator_options[:path_src] = File.join(optz[:module_root_path], unity_generator_options[:path_src])
+      unity_generator_options[:path_inc] = File.join(optz[:module_root_path], unity_generator_options[:path_inc])
+      unity_generator_options[:path_tst] = File.join(optz[:module_root_path], unity_generator_options[:path_tst])
+    end
+
+    return unity_generator_options
+  end
+
+end

data/plugins/module_generator/module_generator.rake

@@ -1,43 +1,47 @@
-
-namespace :module do
-  module_root_separator = ":"
-
-  desc "Generate module (source, header and test files)"
-  task :create, :module_path do |t, args|
-    files = [args[:module_path]] + (args.extras || [])
-    optz = { :module_root_path => "" }
-    ["dh", "dih", "mch", "mvp", "src", "test"].each do |pat|
-      p = files.delete(pat)
-      optz[:pattern] = p unless p.nil?
-    end
-    files.each {
-      |v|
-      module_root_path, module_name = v.split(module_root_separator, 2)
-      if module_name
-        optz[:module_root_path] = module_root_path
-        v = module_name
-      end
-      @ceedling[:module_generator].create(v, optz)
-    }
-  end
-
-  desc "Destroy module (source, header and test files)"
-  task :destroy, :module_path do |t, args|
-    files = [args[:module_path]] + (args.extras || [])
-    optz = { :destroy => true, :module_root_path => "" }
-    ["dh", "dih", "mch", "mvp", "src", "test"].each do |pat|
-      p = files.delete(pat)
-      optz[:pattern] = p unless p.nil?
-    end
-    files.each {
-      |v|
-      module_root_path, module_name = v.split(module_root_separator, 2)
-      if module_name
-        optz[:module_root_path] = module_root_path
-        v = module_name
-      end
-      @ceedling[:module_generator].create(v, optz)
-    }
-  end
-
-end
+
+namespace :module do
+  module_root_separator = ":"
+
+  desc "Generate module (source, header and test files)"
+  task :create, :module_path do |t, args|
+    files = [args[:module_path]] + (args.extras || [])
+    optz = { :module_root_path => "" }
+    ["dh", "dih", "mch", "mvp", "src", "test"].each do |pat|
+      p = files.delete(pat)
+      optz[:pattern] = p unless p.nil?
+    end
+    files.each do |v|
+      module_root_path, module_name = v.split(module_root_separator, 2)
+      if module_name
+        optz[:module_root_path] = module_root_path
+        v = module_name
+      end
+      if (v =~ /^test_?/i)
+        # If the name of the file starts with test, automatically treat it as one
+        @ceedling[:module_generator].create(v.sub(/^test_?/i,''), optz.merge({:pattern => 'test'}))
+      else
+        # Otherwise, go through the normal procedure
+        @ceedling[:module_generator].create(v, optz)
+      end
+    end
+  end
+
+  desc "Destroy module (source, header and test files)"
+  task :destroy, :module_path do |t, args|
+    files = [args[:module_path]] + (args.extras || [])
+    optz = { :destroy => true, :module_root_path => "" }
+    ["dh", "dih", "mch", "mvp", "src", "test"].each do |pat|
+      p = files.delete(pat)
+      optz[:pattern] = p unless p.nil?
+    end
+    files.each do |v|
+      module_root_path, module_name = v.split(module_root_separator, 2)
+      if module_name
+        optz[:module_root_path] = module_root_path
+        v = module_name
+      end
+      @ceedling[:module_generator].create(v, optz)
+    end
+  end
+
+end

data/plugins/raw_output_report/lib/raw_output_report.rb

@@ -1,41 +1,41 @@
-require 'ceedling/plugin'
-require 'ceedling/constants'
-
-class RawOutputReport < Plugin
-  def setup
-    @log_paths = {}
-  end
-
-  def post_test_fixture_execute(arg_hash)
-    output = strip_output(arg_hash[:shell_result][:output])
-    write_raw_output_log(arg_hash, output)
-  end
-
-  private
-
-  def strip_output(raw_output)
-    output = ""
-    raw_output.each_line do |line|
-      next if line =~ /^\n$/
-      next if line =~ /^.*:\d+:.*:(IGNORE|PASS|FAIL)/
-      return output if line =~/^-----------------------\n$/
-      output << line
-    end
-  end
-  def write_raw_output_log(arg_hash, output)
-    logging = generate_log_path(arg_hash)
-    @ceedling[:file_wrapper].write(logging[:path], output , logging[:flags]) unless logging.nil?
-  end
-
-  def generate_log_path(arg_hash)
-    f_name = File.basename(arg_hash[:result_file], '.pass')
-    base_path = File.join(PROJECT_BUILD_ARTIFACTS_ROOT, arg_hash[:context].to_s)
-    file_path = File.join(base_path, f_name + '.log')
-
-    if @ceedling[:file_wrapper].exist?(base_path)
-      return { path: file_path, flags: 'w' }
-    end
-
-    nil
-  end
-end
+require 'ceedling/plugin'
+require 'ceedling/constants'
+
+class RawOutputReport < Plugin
+  def setup
+    @log_paths = {}
+  end
+
+  def post_test_fixture_execute(arg_hash)
+    output = strip_output(arg_hash[:shell_result][:output])
+    write_raw_output_log(arg_hash, output)
+  end
+
+  private
+
+  def strip_output(raw_output)
+    output = ""
+    raw_output.each_line do |line|
+      next if line =~ /^\n$/
+      next if line =~ /^.*:\d+:.*:(IGNORE|PASS|FAIL)/
+      return output if line =~/^-----------------------\n$/
+      output << line
+    end
+  end
+  def write_raw_output_log(arg_hash, output)
+    logging = generate_log_path(arg_hash)
+    @ceedling[:file_wrapper].write(logging[:path], output , logging[:flags]) unless logging.nil?
+  end
+
+  def generate_log_path(arg_hash)
+    f_name = File.basename(arg_hash[:result_file], '.pass')
+    base_path = File.join(PROJECT_BUILD_ARTIFACTS_ROOT, arg_hash[:context].to_s)
+    file_path = File.join(base_path, f_name + '.log')
+
+    if @ceedling[:file_wrapper].exist?(base_path)
+      return { path: file_path, flags: 'w' }
+    end
+
+    nil
+  end
+end

data/plugins/stdout_gtestlike_tests_report/assets/template.erb

@@ -1,84 +1,84 @@
-% ignored        = hash[:results][:counts][:ignored]
-% failed         = hash[:results][:counts][:failed]
-% stdout_count   = hash[:results][:counts][:stdout]
-% header_prepend = ((hash[:header].length > 0) ? "#{hash[:header]}: " : '')
-% banner_width   = 25 + header_prepend.length # widest message
-% results = {}
-% hash[:results][:successes].each do |testresult|
-%   results[ testresult[:source][:file] ] = testresult[:collection]
-%   results[ testresult[:source][:file] ].length.times do |i|
-%     results[ testresult[:source][:file] ][i][:pass] = true
-%   end
-% end
-% hash[:results][:ignores].each do |testresult|
-%   if (results[ testresult[:source][:file] ].nil?)
-%     results[ testresult[:source][:file] ] = testresult[:collection]
-%   else
-%     results[ testresult[:source][:file] ] += testresult[:collection]
-%   end
-%   results[ testresult[:source][:file] ].length.times do |i|
-%     results[ testresult[:source][:file] ][i][:pass] = true
-%   end
-% end
-% hash[:results][:failures].each do |testresult|
-%   if (results[ testresult[:source][:file] ].nil?)
-%     results[ testresult[:source][:file] ] = testresult[:collection]
-%   else
-%     results[ testresult[:source][:file] ] += testresult[:collection]
-%   end
-% end
-
-
-[==========] Running <%=hash[:results][:counts][:total].to_s%> tests from <%=results.length.to_s%> test cases.
-[----------] Global test environment set-up.
-% results.each_pair do |modulename, moduledetails|
-[----------] <%=moduledetails.length.to_s%> tests from <%=modulename%>
-%   moduledetails.each do |item|
-[ RUN      ] <%=modulename%>.<%=item[:test]%>
-%     if (not item[:pass])
-%       if (not item[:message].empty?)
-<%=modulename%>(<%=item[:line]%>): error: <%=item[:message]%>
-
-%         m = item[:message].match(/Expected\s+(.*)\s+Was\s+([^\.]*)\./)
-%         if m.nil?
- Actual:   FALSE
- Expected: TRUE
-%         else
- Actual:   <%=m[2]%>
- Expected: <%=m[1]%>
-%         end
-%       else
-<%=modulename%>(<%=item[:line]%>): fail: <%=item[:message]%>
- Actual:   FALSE
- Expected: TRUE
-%       end
-[  FAILED  ] <%=modulename%>.<%=item[:test]%> (0 ms)
-%     else
-[       OK ] <%=modulename%>.<%=item[:test]%> (0 ms)
-%     end
-%   end
-[----------] <%=moduledetails.length.to_s%> tests from <%=modulename%> (0 ms total)
-% end
-
-% if (hash[:results][:counts][:total] > 0)
-[----------] Global test environment tear-down.
-[==========] <%=hash[:results][:counts][:total].to_s%> tests from <%=hash[:results][:stdout].length.to_s%> test cases ran.
-[  PASSED  ] <%=hash[:results][:counts][:passed].to_s%> tests.
-%   if (failed == 0)
-[  FAILED  ] 0 tests.
-
- 0 FAILED TESTS
-%   else
-[  FAILED  ] <%=failed.to_s%> tests, listed below:
-%     hash[:results][:failures].each do |failure|
-%       failure[:collection].each do |item|
-[  FAILED  ] <%=failure[:source][:file]%>.<%=item[:test]%>
-%       end
-%     end
-%   end
-
- <%=failed.to_s%> FAILED TESTS
-% else
-
-No tests executed.
-% end
+% ignored        = hash[:results][:counts][:ignored]
+% failed         = hash[:results][:counts][:failed]
+% stdout_count   = hash[:results][:counts][:stdout]
+% header_prepend = ((hash[:header].length > 0) ? "#{hash[:header]}: " : '')
+% banner_width   = 25 + header_prepend.length # widest message
+% results = {}
+% hash[:results][:successes].each do |testresult|
+%   results[ testresult[:source][:file] ] = testresult[:collection]
+%   results[ testresult[:source][:file] ].length.times do |i|
+%     results[ testresult[:source][:file] ][i][:pass] = true
+%   end
+% end
+% hash[:results][:ignores].each do |testresult|
+%   if (results[ testresult[:source][:file] ].nil?)
+%     results[ testresult[:source][:file] ] = testresult[:collection]
+%   else
+%     results[ testresult[:source][:file] ] += testresult[:collection]
+%   end
+%   results[ testresult[:source][:file] ].length.times do |i|
+%     results[ testresult[:source][:file] ][i][:pass] = true
+%   end
+% end
+% hash[:results][:failures].each do |testresult|
+%   if (results[ testresult[:source][:file] ].nil?)
+%     results[ testresult[:source][:file] ] = testresult[:collection]
+%   else
+%     results[ testresult[:source][:file] ] += testresult[:collection]
+%   end
+% end
+
+
+[==========] Running <%=hash[:results][:counts][:total].to_s%> tests from <%=results.length.to_s%> test cases.
+[----------] Global test environment set-up.
+% results.each_pair do |modulename, moduledetails|
+[----------] <%=moduledetails.length.to_s%> tests from <%=modulename%>
+%   moduledetails.each do |item|
+[ RUN      ] <%=modulename%>.<%=item[:test]%>
+%     if (not item[:pass])
+%       if (not item[:message].empty?)
+<%=modulename%>(<%=item[:line]%>): error: <%=item[:message]%>
+
+%         m = item[:message].match(/Expected\s+(.*)\s+Was\s+([^\.]*)\./)
+%         if m.nil?
+ Actual:   FALSE
+ Expected: TRUE
+%         else
+ Actual:   <%=m[2]%>
+ Expected: <%=m[1]%>
+%         end
+%       else
+<%=modulename%>(<%=item[:line]%>): fail: <%=item[:message]%>
+ Actual:   FALSE
+ Expected: TRUE
+%       end
+[  FAILED  ] <%=modulename%>.<%=item[:test]%> (0 ms)
+%     else
+[       OK ] <%=modulename%>.<%=item[:test]%> (0 ms)
+%     end
+%   end
+[----------] <%=moduledetails.length.to_s%> tests from <%=modulename%> (0 ms total)
+% end
+
+% if (hash[:results][:counts][:total] > 0)
+[----------] Global test environment tear-down.
+[==========] <%=hash[:results][:counts][:total].to_s%> tests from <%=hash[:results][:stdout].length.to_s%> test cases ran.
+[  PASSED  ] <%=hash[:results][:counts][:passed].to_s%> tests.
+%   if (failed == 0)
+[  FAILED  ] 0 tests.
+
+ 0 FAILED TESTS
+%   else
+[  FAILED  ] <%=failed.to_s%> tests, listed below:
+%     hash[:results][:failures].each do |failure|
+%       failure[:collection].each do |item|
+[  FAILED  ] <%=failure[:source][:file]%>.<%=item[:test]%>
+%       end
+%     end
+%   end
+
+ <%=failed.to_s%> FAILED TESTS
+% else
+
+No tests executed.
+% end