Finished updating all Ruby scripts to match our coding standard. Woo!

2026-01-27 18:24:27 +01:00 · 2017-03-28 20:02:53 -04:00
parent 3e0a7121fb
commit 2a5b24f7bf
15 changed files with 546 additions and 1007 deletions
--- a/auto/colour_prompt.rb
+++ b/auto/colour_prompt.rb
@@ -21,12 +21,11 @@ end

 class ColourCommandLine
  def initialize
-    if RUBY_PLATFORM =~ /(win|w)32$/
-      get_std_handle = Win32API.new('kernel32', 'GetStdHandle', ['L'], 'L')
-      @set_console_txt_attrb =
-        Win32API.new('kernel32', 'SetConsoleTextAttribute', %w(L N), 'I')
-      @hout = get_std_handle.call(-11)
-    end
+    return unless RUBY_PLATFORM =~ /(win|w)32$/
+    get_std_handle = Win32API.new('kernel32', 'GetStdHandle', ['L'], 'L')
+    @set_console_txt_attrb =
+      Win32API.new('kernel32', 'SetConsoleTextAttribute', %w(L N), 'I')
+    @hout = get_std_handle.call(-11)
  end

  def change_to(new_colour)
@@ -34,7 +33,7 @@ class ColourCommandLine
      @set_console_txt_attrb.call(@hout, win32_colour(new_colour))
    else
      "\033[30;#{posix_colour(new_colour)};22m"
-     end
+    end
  end

  def win32_colour(colour)
--- a/auto/colour_reporter.rb
+++ b/auto/colour_reporter.rb
@@ -17,7 +17,7 @@ def report(message)
      line.chomp!
      colour = case line
               when /(?:total\s+)?tests:?\s+(\d+)\s+(?:total\s+)?failures:?\s+\d+\s+Ignored:?/i
-                 Regexp.last_match(1).to_i == 0 ? :green : :red
+                 Regexp.last_match(1).to_i.zero? ? :green : :red
               when /PASS/
                 :green
               when /^OK$/
@@ -30,7 +30,7 @@ def report(message)
                 :white
               else
                 :silver
-      end
+               end
      colour_puts(colour, line)
    end
  end
--- a/auto/generate_test_runner.rb
+++ b/auto/generate_test_runner.rb
@@ -9,11 +9,11 @@ File.expand_path(File.join(File.dirname(__FILE__), 'colour_prompt'))
 class UnityTestRunnerGenerator
  def initialize(options = nil)
    @options = UnityTestRunnerGenerator.default_options
-    case (options)
+    case options
    when NilClass then @options
    when String   then @options.merge!(UnityTestRunnerGenerator.grab_config(options))
    when Hash     then @options.merge!(options)
-      else          raise 'If you specify arguments, it should be a filename or a hash of options'
+    else raise 'If you specify arguments, it should be a filename or a hash of options'
    end
    require "#{File.expand_path(File.dirname(__FILE__))}/type_sanitizer"
  end
@@ -43,16 +43,11 @@ class UnityTestRunnerGenerator
      options.merge!(yaml_guts[:unity] || yaml_guts[:cmock])
      raise "No :unity or :cmock section found in #{config_file}" unless options
    end
-    (options)
+    options
  end

  def run(input_file, output_file, options = nil)
-    tests = []
-    testfile_includes = []
-    used_mocks = []
-
    @options.merge!(options) unless options.nil?
-    module_name = File.basename(input_file)

    # pull required data from source file
    source = File.read(input_file)
@@ -80,15 +75,16 @@ class UnityTestRunnerGenerator
      create_header(output, used_mocks, testfile_includes)
      create_externs(output, tests, used_mocks)
      create_mock_management(output, used_mocks)
-      create_suite_setup_and_teardown(output)
+      create_suite_setup(output)
+      create_suite_teardown(output)
      create_reset(output, used_mocks)
      create_main(output, input_file, tests, used_mocks)
    end

-    if @options[:header_file] && !@options[:header_file].empty?
-      File.open(@options[:header_file], 'w') do |output|
-        create_h_file(output, @options[:header_file], tests, testfile_includes, used_mocks)
-      end
+    return unless @options[:header_file] && !@options[:header_file].empty?
+
+    File.open(@options[:header_file], 'w') do |output|
+      create_h_file(output, @options[:header_file], tests, testfile_includes, used_mocks)
    end
  end

@@ -123,7 +119,7 @@ class UnityTestRunnerGenerator
    source_index = 0
    tests_and_line_numbers.size.times do |i|
      source_lines[source_index..-1].each_with_index do |line, index|
-        next unless (line =~ /#{tests_and_line_numbers[i][:test]}/)
+        next unless line =~ /#{tests_and_line_numbers[i][:test]}/
        source_index += index
        tests_and_line_numbers[i][:line_number] = source_index + 1
        break
@@ -182,12 +178,13 @@ class UnityTestRunnerGenerator
      output.puts("#include \"#{mock.gsub('.h', '')}.h\"")
    end
    output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
-    if @options[:enforce_strict_ordering]
-      output.puts('')
-      output.puts('int GlobalExpectCount;')
-      output.puts('int GlobalVerifyOrder;')
-      output.puts('char* GlobalOrderError;')
-    end
+
+    return unless @options[:enforce_strict_ordering]
+
+    output.puts('')
+    output.puts('int GlobalExpectCount;')
+    output.puts('int GlobalVerifyOrder;')
+    output.puts('char* GlobalOrderError;')
  end

  def create_externs(output, tests, _mocks)
@@ -201,55 +198,60 @@ class UnityTestRunnerGenerator
  end

  def create_mock_management(output, mock_headers)
-    unless mock_headers.empty?
-      output.puts("\n/*=======Mock Management=====*/")
-      output.puts('static void CMock_Init(void)')
-      output.puts('{')
-      if @options[:enforce_strict_ordering]
-        output.puts('  GlobalExpectCount = 0;')
-        output.puts('  GlobalVerifyOrder = 0;')
-        output.puts('  GlobalOrderError = NULL;')
-      end
-      mocks = mock_headers.map { |mock| File.basename(mock) }
-      mocks.each do |mock|
-        mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
-        output.puts("  #{mock_clean}_Init();")
-      end
-      output.puts("}\n")
+    return if mock_headers.empty?

-      output.puts('static void CMock_Verify(void)')
-      output.puts('{')
-      mocks.each do |mock|
-        mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
-        output.puts("  #{mock_clean}_Verify();")
-      end
-      output.puts("}\n")
+    output.puts("\n/*=======Mock Management=====*/")
+    output.puts('static void CMock_Init(void)')
+    output.puts('{')

-      output.puts('static void CMock_Destroy(void)')
-      output.puts('{')
-      mocks.each do |mock|
-        mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
-        output.puts("  #{mock_clean}_Destroy();")
-      end
-      output.puts("}\n")
+    if @options[:enforce_strict_ordering]
+      output.puts('  GlobalExpectCount = 0;')
+      output.puts('  GlobalVerifyOrder = 0;')
+      output.puts('  GlobalOrderError = NULL;')
    end
+
+    mocks = mock_headers.map { |mock| File.basename(mock) }
+    mocks.each do |mock|
+      mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
+      output.puts("  #{mock_clean}_Init();")
+    end
+    output.puts("}\n")
+
+    output.puts('static void CMock_Verify(void)')
+    output.puts('{')
+    mocks.each do |mock|
+      mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
+      output.puts("  #{mock_clean}_Verify();")
+    end
+    output.puts("}\n")
+
+    output.puts('static void CMock_Destroy(void)')
+    output.puts('{')
+    mocks.each do |mock|
+      mock_clean = TypeSanitizer.sanitize_c_identifier(mock)
+      output.puts("  #{mock_clean}_Destroy();")
+    end
+    output.puts("}\n")
  end

-  def create_suite_setup_and_teardown(output)
-    unless @options[:suite_setup].nil?
-      output.puts("\n/*=======Suite Setup=====*/")
-      output.puts('static void suite_setup(void)')
-      output.puts('{')
-      output.puts(@options[:suite_setup])
-      output.puts('}')
-    end
-    unless @options[:suite_teardown].nil?
-      output.puts("\n/*=======Suite Teardown=====*/")
-      output.puts('static int suite_teardown(int num_failures)')
-      output.puts('{')
-      output.puts(@options[:suite_teardown])
-      output.puts('}')
-    end
+  def create_suite_setup(output)
+    return if @options[:suite_setup].nil?
+
+    output.puts("\n/*=======Suite Setup=====*/")
+    output.puts('static void suite_setup(void)')
+    output.puts('{')
+    output.puts(@options[:suite_setup])
+    output.puts('}')
+  end
+
+  def create_suite_teardown(output)
+    return if @options[:suite_teardown].nil?
+
+    output.puts("\n/*=======Suite Teardown=====*/")
+    output.puts('static int suite_teardown(int num_failures)')
+    output.puts('{')
+    output.puts(@options[:suite_teardown])
+    output.puts('}')
  end

  def create_runtest(output, used_mocks)
@@ -384,22 +386,25 @@ class UnityTestRunnerGenerator
  end
 end

-if $PROGRAM_NAME == __FILE__
+if $0 == __FILE__
  options = { includes: [] }
-  yaml_file = nil

  # parse out all the options first (these will all be removed as we go)
  ARGV.reject! do |arg|
-    case (arg)
+    case arg
    when '-cexception'
-        options[:plugins] = [:cexception]; true
+      options[:plugins] = [:cexception]
+      true
    when /\.*\.ya?ml/
-        options = UnityTestRunnerGenerator.grab_config(arg); true
+      options = UnityTestRunnerGenerator.grab_config(arg)
+      true
    when /--(\w+)=\"?(.*)\"?/
-        options[Regexp.last_match(1).to_sym] = Regexp.last_match(2); true
+      options[Regexp.last_match(1).to_sym] = Regexp.last_match(2)
+      true
    when /\.*\.h/
-        options[:includes] << arg; true
-      else false
+      options[:includes] << arg
+      true
+    else false
    end
  end

--- a/auto/parseOutput.rb
+++ b/auto/parseOutput.rb
@@ -1,218 +0,0 @@
-#============================================================
-#  Author:   John Theofanopoulos
-#  A simple parser.   Takes the output files generated during the build process and
-# extracts information relating to the tests.
-#
-#  Notes:
-#    To capture an output file under VS builds use the following:
-#      devenv [build instructions]  > Output.txt & type Output.txt
-#
-#    To capture an output file under GCC/Linux builds use the following:
-#      make | tee Output.txt
-#
-#    To use this parser use the following command
-#    ruby parseOutput.rb [options] [file]
-#        options:  -xml  : produce a JUnit compatible XML file
-#        file      :  file to scan for results
-#============================================================
-
-class ParseOutput
-  # The following flag is set to true when a test is found or false otherwise.
-  @testFlag
-  @xmlOut
-  @arrayList
-  @totalTests
-  @classIndex
-
-  #   Set the flag to indicate if there will be an XML output file or not
-  def setXmlOutput
-    @xmlOut = true
-  end
-
-  #  if write our output to XML
-  def writeXmlOuput
-    output = File.open('report.xml', 'w')
-    output << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-    @arrayList.each do |item|
-      output << item << "\n"
-    end
-    output << "</testsuite>\n"
-  end
-
-  #  This function will try and determine when the suite is changed.   This is
-  # is the name that gets added to the classname parameter.
-  def testSuiteVerify(testSuiteName)
-    if @testFlag == false
-      @testFlag = true
-      # Split the path name
-      testName = testSuiteName.split('/')
-      # Remove the extension
-      baseName = testName[testName.size - 1].split('.')
-      @testSuite = 'test.' + baseName[0]
-      printf "New Test: %s\n", @testSuite
-    end
-  end
-
-  # Test was flagged as having passed so format the output
-  def testPassed(array)
-    lastItem = array.length - 1
-    testName = array[lastItem - 1]
-    testSuiteVerify(array[@className])
-    printf "%-40s PASS\n", testName
-    if @xmlOut == true
-      @arrayList.push '     <testcase classname="' + @testSuite + '" name="' + testName + '"/>'
-    end
-  end
-
-  # Test was flagged as having passed so format the output.
-  # This is using the Unity fixture output and not the original Unity output.
-  def testPassedUnityFixture(array)
-    testSuite = array[0].sub('TEST(', '')
-    testSuite = testSuite.sub(',', '')
-    testName = array[1].sub(')', '')
-    if @xmlOut == true
-      @arrayList.push '     <testcase classname="' + testSuite + '" name="' + testName + '"/>'
-    end
-  end
-
-  # Test was flagged as being ingored so format the output
-  def testIgnored(array)
-    lastItem = array.length - 1
-    testName = array[lastItem - 2]
-    reason = array[lastItem].chomp
-    testSuiteVerify(array[@className])
-    printf "%-40s IGNORED\n", testName
-
-    if testName.start_with? 'TEST('
-      array2 = testName.split(' ')
-      @testSuite = array2[0].sub('TEST(', '')
-      @testSuite = @testSuite.sub(',', '')
-      testName = array2[1].sub(')', '')
-    end
-
-    if @xmlOut == true
-      @arrayList.push '     <testcase classname="' + @testSuite + '" name="' + testName + '">'
-      @arrayList.push '            <skipped type="TEST IGNORED"> ' + reason + ' </skipped>'
-      @arrayList.push '     </testcase>'
-    end
-  end
-
-  # Test was flagged as having failed  so format the line
-  def testFailed(array)
-    lastItem = array.length - 1
-    testName = array[lastItem - 2]
-    reason = array[lastItem].chomp + ' at line: ' + array[lastItem - 3]
-    testSuiteVerify(array[@className])
-    printf "%-40s FAILED\n", testName
-
-    if testName.start_with? 'TEST('
-      array2 = testName.split(' ')
-      @testSuite = array2[0].sub('TEST(', '')
-      @testSuite = @testSuite.sub(',', '')
-      testName = array2[1].sub(')', '')
-    end
-
-    if @xmlOut == true
-      @arrayList.push '     <testcase classname="' + @testSuite + '" name="' + testName + '">'
-      @arrayList.push '            <failure type="ASSERT FAILED"> ' + reason + ' </failure>'
-      @arrayList.push '     </testcase>'
-    end
-  end
-
-  # Figure out what OS we are running on.   For now we are assuming if it's not Windows it must
-  # be Unix based.
-  def detectOS
-    myOS = RUBY_PLATFORM.split('-')
-    @className = if myOS.size == 2
-                   if myOS[1] == 'mingw32'
-                     1
-                   else
-                     0
-                                  end
-                 else
-                   0
-                 end
-  end
-
-  # Main function used to parse the file that was captured.
-  def process(name)
-    @testFlag = false
-    @arrayList = []
-
-    detectOS
-
-    puts 'Parsing file: ' + name
-
-    testPass = 0
-    testFail = 0
-    testIgnore = 0
-    puts ''
-    puts '=================== RESULTS ====================='
-    puts ''
-    File.open(name).each do |line|
-      # Typical test lines look like this:
-      # <path>/<test_file>.c:36:test_tc1000_opsys:FAIL: Expected 1 Was 0
-      # <path>/<test_file>.c:112:test_tc5004_initCanChannel:IGNORE: Not Yet Implemented
-      # <path>/<test_file>.c:115:test_tc5100_initCanVoidPtrs:PASS
-      #
-      # where path is different on Unix vs Windows devices (Windows leads with a drive letter)
-      lineArray = line.split(':')
-      lineSize = lineArray.size
-      # If we were able to split the line then we can look to see if any of our target words
-      # were found.  Case is important.
-      if (lineSize >= 4) || (line.start_with? 'TEST(')
-        # Determine if this test passed
-        if line.include? ':PASS'
-          testPassed(lineArray)
-          testPass += 1
-        elsif line.include? ':FAIL:'
-          testFailed(lineArray)
-          testFail += 1
-        elsif line.include? ':IGNORE:'
-          testIgnored(lineArray)
-          testIgnore += 1
-        elsif line.start_with? 'TEST('
-          if line.include? ' PASS'
-            lineArray = line.split(' ')
-            testPassedUnityFixture(lineArray)
-            testPass += 1
-          end
-        # If none of the keywords are found there are no more tests for this suite so clear
-        # the test flag
-        else
-          @testFlag = false
-        end
-      else
-        @testFlag = false
-          end
-    end
-    puts ''
-    puts '=================== SUMMARY ====================='
-    puts ''
-    puts 'Tests Passed  : ' + testPass.to_s
-    puts 'Tests Failed  : ' + testFail.to_s
-    puts 'Tests Ignored : ' + testIgnore.to_s
-    @totalTests = testPass + testFail + testIgnore
-    if @xmlOut == true
-      heading = '<testsuite tests="' + @totalTests.to_s + '" failures="' + testFail.to_s + '"' + ' skips="' + testIgnore.to_s + '">'
-      @arrayList.insert(0, heading)
-      writeXmlOuput
-    end
-
-    #  return result
-  end
- end
-
-# If the command line has no values in, used a default value of Output.txt
-parseMyFile = ParseOutput.new
-
-if ARGV.size >= 1
-  ARGV.each do |a|
-    if a == '-xml'
-      parseMyFile.setXmlOutput
-    else
-      parseMyFile.process(a)
-      break
-    end
-  end
-end
--- a/auto/parse_output.rb
+++ b/auto/parse_output.rb
@@ -0,0 +1,220 @@
+#============================================================
+#  Author:   John Theofanopoulos
+#  A simple parser.   Takes the output files generated during the build process and
+# extracts information relating to the tests.
+#
+#  Notes:
+#    To capture an output file under VS builds use the following:
+#      devenv [build instructions]  > Output.txt & type Output.txt
+#
+#    To capture an output file under GCC/Linux builds use the following:
+#      make | tee Output.txt
+#
+#    To use this parser use the following command
+#    ruby parseOutput.rb [options] [file]
+#        options:  -xml  : produce a JUnit compatible XML file
+#        file      :  file to scan for results
+#============================================================
+
+class ParseOutput
+  def initialize
+    @test_flag = false
+    @xml_out = false
+    @array_list = false
+    @total_tests = false
+    @class_index = false
+  end
+
+  #   Set the flag to indicate if there will be an XML output file or not
+  def set_xml_output
+    @xml_out = true
+  end
+
+  #  if write our output to XML
+  def write_xml_output
+    output = File.open('report.xml', 'w')
+    output << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+    @array_list.each do |item|
+      output << item << "\n"
+    end
+    output << "</testsuite>\n"
+  end
+
+  #  This function will try and determine when the suite is changed.   This is
+  # is the name that gets added to the classname parameter.
+  def test_suite_verify(test_suite_name)
+    return if @test_flag
+
+    @test_flag = true
+    # Split the path name
+    test_name = test_suite_name.split('/')
+    # Remove the extension
+    base_name = test_name[test_name.size - 1].split('.')
+    @test_suite = 'test.' + base_name[0]
+    printf "New Test: %s\n", @test_suite
+  end
+
+  # Test was flagged as having passed so format the output
+  def test_passed(array)
+    last_item = array.length - 1
+    test_name = array[last_item - 1]
+    test_suite_verify(array[@class_name])
+    printf "%-40s PASS\n", test_name
+
+    return unless @xml_out
+
+    @array_list.push '     <testcase classname="' + @test_suite + '" name="' + test_name + '"/>'
+  end
+
+  # Test was flagged as having passed so format the output.
+  # This is using the Unity fixture output and not the original Unity output.
+  def test_passed_unity_fixture(array)
+    test_suite = array[0].sub('TEST(', '')
+    test_suite = test_suite.sub(',', '')
+    test_name = array[1].sub(')', '')
+
+    return unless @xml_out
+
+    @array_list.push '     <testcase classname="' + test_suite + '" name="' + test_name + '"/>'
+  end
+
+  # Test was flagged as being ingored so format the output
+  def test_ignored(array)
+    last_item = array.length - 1
+    test_name = array[last_item - 2]
+    reason = array[last_item].chomp
+    test_suite_verify(array[@class_name])
+    printf "%-40s IGNORED\n", test_name
+
+    if test_name.start_with? 'TEST('
+      array2 = test_name.split(' ')
+      @test_suite = array2[0].sub('TEST(', '')
+      @test_suite = @test_suite.sub(',', '')
+      test_name = array2[1].sub(')', '')
+    end
+
+    return unless @xml_out
+
+    @array_list.push '     <testcase classname="' + @test_suite + '" name="' + test_name + '">'
+    @array_list.push '            <skipped type="TEST IGNORED"> ' + reason + ' </skipped>'
+    @array_list.push '     </testcase>'
+  end
+
+  # Test was flagged as having failed  so format the line
+  def test_failed(array)
+    last_item = array.length - 1
+    test_name = array[last_item - 2]
+    reason = array[last_item].chomp + ' at line: ' + array[last_item - 3]
+    test_suite_verify(array[@class_name])
+    printf "%-40s FAILED\n", test_name
+
+    if test_name.start_with? 'TEST('
+      array2 = test_name.split(' ')
+      @test_suite = array2[0].sub('TEST(', '')
+      @test_suite = @test_suite.sub(',', '')
+      test_name = array2[1].sub(')', '')
+    end
+
+    return unless @xml_out
+
+    @array_list.push '     <testcase classname="' + @test_suite + '" name="' + test_name + '">'
+    @array_list.push '            <failure type="ASSERT FAILED"> ' + reason + ' </failure>'
+    @array_list.push '     </testcase>'
+  end
+
+  # Figure out what OS we are running on.   For now we are assuming if it's not Windows it must
+  # be Unix based.
+  def detect_os
+    os = RUBY_PLATFORM.split('-')
+    @class_name = if os.size == 2
+                    if os[1] == 'mingw32'
+                      1
+                    else
+                      0
+                    end
+                  else
+                    0
+                  end
+  end
+
+  # Main function used to parse the file that was captured.
+  def process(name)
+    @test_flag = false
+    @array_list = []
+
+    detect_os
+
+    puts 'Parsing file: ' + name
+
+    test_pass = 0
+    test_fail = 0
+    test_ignore = 0
+    puts ''
+    puts '=================== RESULTS ====================='
+    puts ''
+    File.open(name).each do |line|
+      # Typical test lines look like this:
+      # <path>/<test_file>.c:36:test_tc1000_opsys:FAIL: Expected 1 Was 0
+      # <path>/<test_file>.c:112:test_tc5004_initCanChannel:IGNORE: Not Yet Implemented
+      # <path>/<test_file>.c:115:test_tc5100_initCanVoidPtrs:PASS
+      #
+      # where path is different on Unix vs Windows devices (Windows leads with a drive letter)
+      line_array = line.split(':')
+
+      # If we were able to split the line then we can look to see if any of our target words
+      # were found.  Case is important.
+      if (line_array.size >= 4) || (line.start_with? 'TEST(')
+        # Determine if this test passed
+        if line.include? ':PASS'
+          test_passed(line_array)
+          test_pass += 1
+        elsif line.include? ':FAIL:'
+          test_failed(line_array)
+          test_fail += 1
+        elsif line.include? ':IGNORE:'
+          test_ignored(line_array)
+          test_ignore += 1
+        elsif line.start_with? 'TEST('
+          if line.include? ' PASS'
+            line_array = line.split(' ')
+            test_passed_unity_fixture(line_array)
+            test_pass += 1
+          end
+        # If none of the keywords are found there are no more tests for this suite so clear
+        # the test flag
+        else
+          @test_flag = false
+        end
+      else
+        @test_flag = false
+      end
+    end
+    puts ''
+    puts '=================== SUMMARY ====================='
+    puts ''
+    puts 'Tests Passed  : ' + test_pass.to_s
+    puts 'Tests Failed  : ' + test_fail.to_s
+    puts 'Tests Ignored : ' + test_ignore.to_s
+    @total_tests = test_pass + test_fail + test_ignore
+
+    return unless @xml_out
+
+    heading = '<testsuite tests="' + @total_tests.to_s + '" failures="' + test_fail.to_s + '"' + ' skips="' + test_ignore.to_s + '">'
+    @array_list.insert(0, heading)
+    write_xml_output
+  end
+end
+
+# If the command line has no values in, used a default value of Output.txt
+parse_my_file = ParseOutput.new
+
+if ARGV.size >= 1
+  ARGV.each do |a|
+    if a == '-xml'
+      parse_my_file.set_xml_output
+    else
+      parse_my_file.process(a)
+      break
+    end
+  end
+end
--- a/auto/stylize_as_junit.rb
+++ b/auto/stylize_as_junit.rb
@@ -23,37 +23,37 @@ class ArgvParser
    options.root_path = '.'
    options.out_file = 'results.xml'

-    opts = OptionParser.new do |opts|
-      opts.banner = 'Usage: unity_to_junit.rb [options]'
+    opts = OptionParser.new do |o|
+      o.banner = 'Usage: unity_to_junit.rb [options]'

-      opts.separator ''
-      opts.separator 'Specific options:'
+      o.separator ''
+      o.separator 'Specific options:'

-      opts.on('-r', '--results <dir>', 'Look for Unity Results files here.') do |results|
+      o.on('-r', '--results <dir>', 'Look for Unity Results files here.') do |results|
        # puts "results #{results}"
        options.results_dir = results
      end

-      opts.on('-p', '--root_path <path>', 'Prepend this path to files in results.') do |root_path|
+      o.on('-p', '--root_path <path>', 'Prepend this path to files in results.') do |root_path|
        options.root_path = root_path
      end

-      opts.on('-o', '--output <filename>', 'XML file to generate.') do |out_file|
+      o.on('-o', '--output <filename>', 'XML file to generate.') do |out_file|
        # puts "out_file: #{out_file}"
        options.out_file = out_file
      end

-      opts.separator ''
-      opts.separator 'Common options:'
+      o.separator ''
+      o.separator 'Common options:'

      # No argument, shows at tail.  This will print an options summary.
-      opts.on_tail('-h', '--help', 'Show this message') do
-        puts opts
+      o.on_tail('-h', '--help', 'Show this message') do
+        puts o
        exit
      end

      # Another typical switch to print the version.
-      opts.on_tail('--version', 'Show version') do
+      o.on_tail('--version', 'Show version') do
        puts "unity_to_junit.rb version #{VERSION}"
        exit
      end
@@ -67,6 +67,7 @@ end # class OptparseExample
 class UnityToJUnit
  include FileUtils::Verbose
  attr_reader :report, :total_tests, :failures, :ignored
+  attr_writer :targets, :root, :out_file

  def initialize
    @report = ''
@@ -82,16 +83,16 @@ class UnityToJUnit
    write_suites_header(f)
    results.each do |result_file|
      lines = File.readlines(result_file).map(&:chomp)
-      if lines.empty?
-        raise "Empty test result file: #{result_file}"
-      else
-        result_output = get_details(result_file, lines)
-        tests, failures, ignored = parse_test_summary(lines)
-        result_output[:counts][:total] = tests
-        result_output[:counts][:failed] = failures
-        result_output[:counts][:ignored] = ignored
-        result_output[:counts][:passed] = (result_output[:counts][:total] - result_output[:counts][:failed] - result_output[:counts][:ignored])
-      end
+
+      raise "Empty test result file: #{result_file}" if lines.empty?
+
+      result_output = get_details(result_file, lines)
+      tests, failures, ignored = parse_test_summary(lines)
+      result_output[:counts][:total] = tests
+      result_output[:counts][:failed] = failures
+      result_output[:counts][:ignored] = ignored
+      result_output[:counts][:passed] = (result_output[:counts][:total] - result_output[:counts][:failed] - result_output[:counts][:ignored])
+
      # use line[0] from the test output to get the test_file path and name
      test_file_str = lines[0].tr('\\', '/')
      test_file_str = test_file_str.split(':')
@@ -99,7 +100,7 @@ class UnityToJUnit
                    result_file
                  else
                    test_file_str[0] + ':' + test_file_str[1]
-      end
+                  end
      result_output[:source][:path] = File.dirname(test_file)
      result_output[:source][:file] = File.basename(test_file)

@@ -116,18 +117,6 @@ class UnityToJUnit
    f.close
  end

-  def set_targets(target_array)
-    @targets = target_array
-  end
-
-  def set_root_path(path)
-    @root = path
-  end
-
-  def set_out_file(filename)
-    @out_file = filename
-  end
-
  def usage(err_msg = nil)
    puts "\nERROR: "
    puts err_msg if err_msg
@@ -148,11 +137,10 @@ class UnityToJUnit
  protected

  def get_details(_result_file, lines)
-    results = get_results_structure
+    results = results_structure
    lines.each do |line|
      line = line.tr('\\', '/')
-      src_file, src_line, test_name, status, msg = line.split(/:/)
-      line_out = (@root && (@root != 0) ? "#{@root}#{line}" : line).gsub(/\//, '\\')
+      _src_file, src_line, test_name, status, msg = line.split(/:/)
      case status
      when 'IGNORE' then results[:ignores] << { test: test_name, line: src_line, message: msg }
      when 'FAIL'   then results[:failures] << { test: test_name, line: src_line, message: msg }
@@ -163,11 +151,8 @@ class UnityToJUnit
  end

  def parse_test_summary(summary)
-    if summary.find { |v| v =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ }
-      [Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i]
-    else
-      raise "Couldn't parse test results: #{summary}"
-    end
+    raise "Couldn't parse test results: #{summary}" unless summary.find { |v| v =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ }
+    [Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i]
  end

  def here
@@ -176,7 +161,7 @@ class UnityToJUnit

  private

-  def get_results_structure
+  def results_structure
    {
      source: { path: '', file: '' },
      successes: [],
@@ -213,7 +198,6 @@ class UnityToJUnit
  def write_tests(results, stream)
    result = results[:successes]
    result.each do |item|
-      filename = File.join(results[:source][:path], File.basename(results[:source][:file], '.*'))
      stream.puts "\t\t<testcase classname=\"#{@unit_name}\" name=\"#{item[:test]}\" time=\"0\" />"
    end
  end
@@ -239,7 +223,7 @@ class UnityToJUnit
  end
 end # UnityToJUnit

-if __FILE__ == $PROGRAM_NAME
+if __FILE__ == $0
  # parse out the command options
  options = ArgvParser.parse(ARGV)

@@ -251,18 +235,18 @@ if __FILE__ == $PROGRAM_NAME

    results = Dir[targets]
    raise "No *.testpass, *.testfail, or *.testresults files found in '#{targets}'" if results.empty?
-    utj.set_targets(results)
+    utj.targets = results

    # set the root path
-    utj.set_root_path(options.root_path)
+    utj.root = options.root_path

    # set the output XML file name
    # puts "Output File from options: #{options.out_file}"
-    utj.set_out_file(options.out_file)
+    utj.out_file = options.out_file

    # run the summarizer
    puts utj.run
-  rescue Exception => e
+  rescue StandardError => e
    utj.usage e.message
  end
 end
--- a/auto/test_file_filter.rb
+++ b/auto/test_file_filter.rb
@@ -10,15 +10,16 @@ module RakefileHelpers
  class TestFileFilter
    def initialize(all_files = false)
      @all_files = all_files
-      if @all_files != true
-        if File.exist?('test_file_filter.yml')
-          filters = YAML.load_file('test_file_filter.yml')
-          @all_files = filters[:all_files]
-          @only_files = filters[:only_files]
-          @exclude_files = filters[:exclude_files]
-        end
-      end
+
+      return false unless @all_files
+      return false unless File.exist?('test_file_filter.yml')
+
+      filters = YAML.load_file('test_file_filter.yml')
+      @all_files = filters[:all_files]
+      @only_files = filters[:only_files]
+      @exclude_files = filters[:exclude_files]
    end
+
    attr_accessor :all_files, :only_files, :exclude_files
  end
 end
--- a/auto/unity_test_summary.rb
+++ b/auto/unity_test_summary.rb
@@ -15,6 +15,7 @@ class UnityTestSummary
  include FileUtils::Verbose

  attr_reader :report, :total_tests, :failures, :ignored
+  attr_writer :targets, :root

  def initialize(_opts = {})
    @report = ''
@@ -33,17 +34,16 @@ class UnityTestSummary

    results.each do |result_file|
      lines = File.readlines(result_file).map(&:chomp)
-      if lines.empty?
-        raise "Empty test result file: #{result_file}"
-      else
-        output = get_details(result_file, lines)
-        failure_output << output[:failures] unless output[:failures].empty?
-        ignore_output  << output[:ignores]  unless output[:ignores].empty?
-        tests, failures, ignored = parse_test_summary(lines)
-        @total_tests += tests
-        @failures += failures
-        @ignored += ignored
-      end
+
+      raise "Empty test result file: #{result_file}" if lines.empty?
+
+      output = get_details(result_file, lines)
+      failure_output << output[:failures] unless output[:failures].empty?
+      ignore_output  << output[:ignores]  unless output[:ignores].empty?
+      tests, failures, ignored = parse_test_summary(lines)
+      @total_tests += tests
+      @failures += failures
+      @ignored += ignored
    end

    if @ignored > 0
@@ -70,14 +70,6 @@ class UnityTestSummary
    @report += "\n"
  end

-  def set_targets(target_array)
-    @targets = target_array
-  end
-
-  def set_root_path(path)
-    @root = path
-  end
-
  def usage(err_msg = nil)
    puts "\nERROR: "
    puts err_msg if err_msg
@@ -94,7 +86,7 @@ class UnityTestSummary
  def get_details(_result_file, lines)
    results = { failures: [], ignores: [], successes: [] }
    lines.each do |line|
-      src_file, src_line, test_name, status, msg = line.split(/:/)
+      _src_file, _src_line, _test_name, status, _msg = line.split(/:/)
      line_out = (@root && (@root != 0) ? "#{@root}#{line}" : line).gsub(/\//, '\\')
      case status
      when 'IGNORE' then results[:ignores]   << line_out
@@ -106,11 +98,8 @@ class UnityTestSummary
  end

  def parse_test_summary(summary)
-    if summary.find { |v| v =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ }
-      [Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i]
-    else
-      raise "Couldn't parse test results: #{summary}"
-    end
+    raise "Couldn't parse test results: #{summary}" unless summary.find { |v| v =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ }
+    [Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i]
  end

  def here
@@ -118,7 +107,7 @@ class UnityTestSummary
  end
 end

-if $PROGRAM_NAME == __FILE__
+if $0 == __FILE__

  # parse out the command options
  opts, args = ARGV.partition { |v| v =~ /^--\w+/ }
@@ -133,15 +122,15 @@ if $PROGRAM_NAME == __FILE__
    targets = "#{ARGV[0].tr('\\', '/')}**/*.test*"
    results = Dir[targets]
    raise "No *.testpass, *.testfail, or *.testresults files found in '#{targets}'" if results.empty?
-    uts.set_targets(results)
+    uts.targets = results

    # set the root path
    args[1] ||= Dir.pwd + '/'
-    uts.set_root_path(ARGV[1])
+    uts.root = ARGV[1]

    # run the summarizer
    puts uts.run
-  rescue Exception => e
+  rescue StandardError => e
    uts.usage e.message
  end
 end