openstudio_measure_tester 0.1.4 → 0.1.5

data/lib/openstudio_measure_tester/openstudio_testing_result.rb

@@ -33,11 +33,17 @@ module OpenStudioMeasureTester
     # Pass in the results_dir where all the results are stored
     # @param results_dir [String]: Directory where the results are scattered. Typically the root dir or where rake was executed
     # @param test_results_dir [String]: Where the final results are to be stored
-    def initialize(results_dir, test_results_dir)
+    # @param orig_results_dir [String]: Optional directory where results are sometimes thrown into that need to be moved (coverage and minitest)
+    def initialize(results_dir, test_results_dir, orig_results_dir = nil)
       @results_dir = results_dir
       @test_results_dir = test_results_dir
+      @orig_results_dir = orig_results_dir
       @results = {}
 
+      puts "results_dir is #{@results_dir}"
+      puts "test_results_dir is #{@test_results_dir}"
+      puts "orig_results_dir is #{@orig_results_dir}"
+
       # get the repository info
       repo_name = 'unknown'
       current_branch = 'unknown'
@@ -68,12 +74,32 @@ module OpenStudioMeasureTester
     end
 
     def aggregate_results
-      # TODO: check if we need this check of directories
-      if @test_results_dir != @results_dir
+      # openstudio style is stored in the correct location (the test_results directory)
+      # OpenStudio Style will have already run, so just grab the results out of the directory and jam into
+      # the @results hash
+      filename = "#{@test_results_dir}/openstudio_style/openstudio_style.json"
+      if File.exist? filename
+        puts "Found OpenStudio Style results, parsing"
+        @results['openstudio_style'] = JSON.parse(File.read(filename))
+      end
+
+      filename = "#{@test_results_dir}/rubocop/rubocop.json"
+      if File.exist? filename
+        @results['rubocop'] = JSON.parse(File.read(filename))
+      elsif Dir.exist? "#{@test_results_dir}/rubocop"
+        # Parse the rubocop results if they were not cached
+        rc = OpenStudioMeasureTester::RubocopResult.new("#{@test_results_dir}/rubocop")
+        @results['rubocop'] = rc.summary
+      end
+
+      # don't copy if the directories are the same
+      if @test_results_dir != @orig_results_dir
         # coverage
-        if Dir.exist? "#{@results_dir}/coverage"
+        if Dir.exist? "#{@orig_results_dir}/coverage"
+          puts "Found Coverage results, parsing"
           FileUtils.rm_rf "#{@test_results_dir}/coverage" if Dir.exist? "#{@test_results_dir}/coverage"
-          FileUtils.mv "#{@results_dir}/coverage", "#{@test_results_dir}/."
+          FileUtils.cp_r "#{@orig_results_dir}/coverage/.", "#{@test_results_dir}/coverage"
+          FileUtils.rm_rf "#{@orig_results_dir}/coverage" if Dir.exist? "#{@orig_results_dir}/coverage"
 
           cov = OpenStudioMeasureTester::Coverage.new("#{@test_results_dir}/coverage")
           cov.parse_results
@@ -81,50 +107,29 @@ module OpenStudioMeasureTester
         end
 
         # minitest
-        if Dir.exist?("#{@results_dir}/test/html_reports") || Dir.exist?("#{@results_dir}/test/reports")
+        if Dir.exist?("#{@orig_results_dir}/test/html_reports") || Dir.exist?("#{@orig_results_dir}/test/reports")
+          puts "Found Minitest Results, parsing"
           FileUtils.rm_rf "#{@test_results_dir}/minitest" if Dir.exist? "#{@test_results_dir}/minitest"
           FileUtils.mkdir_p "#{@test_results_dir}/minitest"
 
-          if Dir.exist?("#{@results_dir}/test/html_reports")
-            FileUtils.mv "#{@results_dir}/test/html_reports", "#{@test_results_dir}/minitest/html_reports"
+          # Copy the files over in case the folder is locked.
+          if Dir.exist?("#{@orig_results_dir}/test/html_reports")
+            puts "Moving Minitest HTML results to results directory"
+            FileUtils.cp_r "#{@orig_results_dir}/test/html_reports/.", "#{@test_results_dir}/minitest/html_reports"
           end
 
-          if Dir.exist?("#{@results_dir}/test/reports")
-            FileUtils.mv "#{@results_dir}/test/reports", "#{@test_results_dir}/minitest/reports"
+          if Dir.exist?("#{@orig_results_dir}/test/reports")
+            puts "Moving Minitest XML results to results directory"
+            FileUtils.cp_r "#{@orig_results_dir}/test/reports/.", "#{@test_results_dir}/minitest/reports"
           end
 
           # Delete the test folder if it is empty
-          FileUtils.rm_rf "#{@results_dir}/test" if Dir.entries("#{@results_dir}/test").size == 2
+          FileUtils.rm_rf "#{@orig_results_dir}/test" if Dir.exist?("#{@orig_results_dir}/test") && Dir.entries("#{@orig_results_dir}/test").size == 2
 
           # Load in the data into the minitest object
           mr = OpenStudioMeasureTester::MinitestResult.new("#{@test_results_dir}/minitest")
           @results['minitest'] = mr.summary
         end
-
-        # rubocop
-        if Dir.exist? "#{@results_dir}/rubocop"
-          FileUtils.rm_rf "#{@test_results_dir}/rubocop" if Dir.exist? "#{@test_results_dir}/rubocop"
-          FileUtils.mv "#{@results_dir}/rubocop", "#{@test_results_dir}/rubocop"
-
-          # need to create parser here!
-          # trying!!! &^&%##%@((@*&()))!!
-          rc = OpenStudioMeasureTester::RubocopResult.new("#{@test_results_dir}/rubocop")
-          @results['rubocop'] = rc.summary
-
-        end
-
-        # openstudio style
-        if Dir.exist? "#{@results_dir}/openstudio_style"
-          FileUtils.rm_rf "#{@test_results_dir}/openstudio_style" if Dir.exist? "#{@test_results_dir}/openstudio_style"
-          FileUtils.mv "#{@results_dir}/openstudio_style", "#{@test_results_dir}/openstudio_style"
-
-          # OpenStudio Style will have already run, so just grab the results out of the directory and jam into
-          # the @results hash
-          filename = "#{@test_results_dir}/openstudio_style/openstudio_style.json"
-          if File.exist? filename
-            @results['openstudio_style'] = JSON.parse(File.read(filename))
-          end
-        end
       end
     end
 
@@ -149,37 +154,45 @@ module OpenStudioMeasureTester
       # pp @results
       final_exit_code = 0
       if @results['rubocop']
-        if @results['rubocop']['total_errors'] > 0
-          puts 'RuboCop errors found.'
+        # more than 10 errors per file on average
+        status = @results['rubocop']['total_errors'] / @results['rubocop']['total_files']
+        if status > 10
+          puts "More than 10 RuboCop errors per file found. Found #{status}"
           final_exit_code = 1
         end
       end
 
       if @results['openstudio_style']
-        if @results['openstudio_style']['total_errors'] > 0
-          puts 'OpenStudio Style errors found.'
+        total_files = @results['openstudio_style']['by_measure'].count
+        status = @results['openstudio_style']['total_errors'] / total_files
+        if status > 10
+          puts "More than 10 OpenStudio Style errors found per file. Found #{status}"
           final_exit_code = 1
         end
-        if @results['openstudio_style']['total_warnings'] > 10
-          puts 'More than 10 OpenStudio Style warnings found, reporting as error'
+
+        status = @results['openstudio_style']['total_warnings'] / total_files
+        if status > 25
+          puts "More than 25 OpenStudio Style warnings found per file, reporting as error. Found #{status}"
           final_exit_code = 1
         end
       end
 
       if @results['minitest']
         if @results['minitest']['total_errors'] > 0 || @results['minitest']['total_failures'] > 0
-          puts 'Unit Test (MiniTest) errors/failures found.'
+          puts 'Unit Test (Minitest) errors/failures found.'
           final_exit_code = 1
         end
       end
 
-      if @results['coverage']
-        if @results['coverage']['total_percent_coverage'] < 70
-          puts 'Code coverage is less than 70%, raising error.'
-          final_exit_code = 1
-        end
-      end
+      # if @results['coverage']
+      #   status = @results['coverage']['total_percent_coverage']
+      #   if status < 70
+      #     puts "Code coverage is less than 70%, raising error. Coverage was #{status}"
+      #     final_exit_code = 1
+      #   end
+      # end
 
+      # Since the data are relative to the directory from which it has been run, then just show from current dir (.)
       puts 'Open ./test_results/dashboard/index.html to view measure testing dashboard.'
 
       return final_exit_code

data/lib/openstudio_measure_tester/rake_task.rb

@@ -45,213 +45,67 @@ module OpenStudioMeasureTester
 
     private
 
-    # Prepare the current directory and the root directory to remove old test results before running
-    # the new tests
-    def pre_process_minitest(base_dir)
-      current_dir = Dir.pwd
-      test_results_dir = "#{base_dir}/test_results"
-
-      puts "Current directory is #{current_dir}"
-      puts "Pre-processing tests run in #{base_dir}"
-      puts "Test results will be stored in: #{test_results_dir}"
-
-      FileUtils.rm_rf "#{test_results_dir}/coverage" if Dir.exist? "#{test_results_dir}/coverage"
-      FileUtils.rm_rf "#{test_results_dir}/test/html_reports" if Dir.exist? "#{test_results_dir}/test/html_reports"
-      FileUtils.rm_rf "#{test_results_dir}/test/reports" if Dir.exist? "#{test_results_dir}/test/reports"
-      # remove the test directory if it is empty (size == 2 for . and ..)
-      if Dir.exist?("#{test_results_dir}/test") && Dir.entries("#{test_results_dir}/test").size == 2
-        FileUtils.rm_rf "#{test_results_dir}/test"
-      end
-      FileUtils.rm_rf "#{test_results_dir}/minitest" if Dir.exist? "#{test_results_dir}/minitest"
-      FileUtils.rm_rf "#{base_dir}/coverage" if Dir.exist? "#{base_dir}/coverage"
-      FileUtils.rm_rf "#{base_dir}/test" if Dir.exist? "#{base_dir}/test"
-      FileUtils.rm_rf "#{base_dir}/minitest" if Dir.exist? "#{base_dir}/minitest"
-      FileUtils.rm_rf "#{current_dir}/coverage" if Dir.exist? "#{current_dir}/coverage"
-      FileUtils.rm_rf "#{current_dir}/test" if Dir.exist? "#{current_dir}/test"
-      FileUtils.rm_rf "#{current_dir}/minitest" if Dir.exist? "#{current_dir}/minitest"
-
-      # Create the test_results directory to store all the results
-      FileUtils.mkdir_p "#{base_dir}/test_results"
-    end
-
-    # Rubocop stores the results (for now) in the test_results directory
-    def pre_process_rubocop(base_dir)
-      current_dir = Dir.pwd
-      test_results_dir = "#{base_dir}/test_results"
-
-      puts "Current directory is #{current_dir}"
-      puts "Pre-processing tests run in #{base_dir}"
-      puts "Test results will be stored in: #{test_results_dir}"
-
-      FileUtils.rm_rf "#{test_results_dir}/rubocop" if Dir.exist? "#{test_results_dir}/rubocop"
-      FileUtils.rm_rf "#{base_dir}/rubocop" if Dir.exist? "#{base_dir}/rubocop"
-      FileUtils.rm_rf "#{current_dir}/rubocop" if Dir.exist? "#{current_dir}/rubocop"
-
-      # Create the test_results directory to store all the results
-      FileUtils.mkdir_p "#{base_dir}/test_results"
-    end
-
-    # OpenStudio style check preparation
-    def pre_process_style(base_dir)
-      current_dir = Dir.pwd
-      test_results_dir = "#{base_dir}/test_results"
-
-      puts "Current directory is #{current_dir}"
-      puts "Pre-processing tests run in #{base_dir}"
-      puts "Test results will be stored in: #{test_results_dir}"
-
-      FileUtils.rm_rf "#{test_results_dir}/openstudio_style" if Dir.exist? "#{test_results_dir}/openstudio_style"
-      FileUtils.rm_rf "#{base_dir}/openstudio_style" if Dir.exist? "#{base_dir}/openstudio_style"
-      FileUtils.rm_rf "#{current_dir}/openstudio_style" if Dir.exist? "#{current_dir}/openstudio_style"
-
-      # Create the test_results directory to store all the results
-      FileUtils.mkdir_p "#{base_dir}/test_results"
-    end
-
-    def run_style(base_dir)
-      style = OpenStudioMeasureTester::OpenStudioStyle.new("#{base_dir}/**/measure.rb")
-      style.save_results
-    end
-
-    # Post process the various results and save them into the base_dir
-    def post_process_results(base_dir)
-      current_dir = Dir.pwd
-      test_results_dir = "#{base_dir}/test_results"
-
-      puts "Current directory: #{current_dir}"
-      puts "Post-processing tests run in: #{base_dir}"
-      puts "Test results will be stored in: #{test_results_dir}"
-
-      FileUtils.mkdir_p test_results_dir
-
-      results = OpenStudioMeasureTester::OpenStudioTestingResult.new(current_dir, test_results_dir)
-      results.save_results # one single file for dashboard
-
-      # call the create dashboard command now that we have results
-      dashboard(base_dir)
-
-      # return the results exit code
-      return results.exit_code
-    end
-
-    # Run ERB to create the dashboard
-    def dashboard(base_dir)
-      template = OpenStudioMeasureTester::Dashboard.new(base_dir)
-      template.render
-    end
-
     def setup_subtasks(name)
       namespace name do
-        task :prepare_minitest do
-          pre_process_minitest(Rake.application.original_dir)
-        end
-
-        task :prepare_rubocop do
-          # copy over the .rubocop.yml file
-          shared_rubocop_file = File.expand_path('../../.rubocop.yml', File.dirname(__FILE__))
-          dest_file = "#{Dir.pwd}/.rubocop.yml"
-          if shared_rubocop_file != dest_file
-            FileUtils.copy(shared_rubocop_file, dest_file)
-          end
-          pre_process_rubocop(Rake.application.original_dir)
-        end
-
-        task :prepare_style do
-          pre_process_style(Rake.application.original_dir)
-        end
-
-        task style_core: [] do
-          run_style(Rake.application.original_dir)
-        end
-
-        task :post_process_core do
-          post_process_results(Rake.application.original_dir)
-        end
-
-        Rake::TestTask.new(:test_core_command) do |task|
-          task.options = '--ci-reporter'
-          task.description = 'Run measures tests recursively from current directory'
-          task.pattern = [
-            "#{Rake.application.original_dir}/**/*_test.rb",
-            "#{Rake.application.original_dir}/**/*_Test.rb"
-          ]
-          task.verbose = true
-        end
-
-        task :test_core do
-          begin
-            Rake.application['openstudio:test_core_command'].invoke
-          rescue StandardError
-            puts 'Test failures in openstudio:test. Will continue to post-processing.'
-          ensure
-            Rake.application['openstudio:test_core_command'].reenable
-          end
-        end
-
-        # The .rubocop.yml file downloads the RuboCop rules from the OpenStudio-resources repo.
-        # This may cause an issue if the Gem directory does not have write access.
-        RuboCop::RakeTask.new(:rubocop_core) do |task|
-          task.options = ['--no-color', '--out=rubocop/rubocop-results.xml', '--format=simple']
-          task.formatters = ['RuboCop::Formatter::CheckstyleFormatter']
-          task.requires = ['rubocop/formatter/checkstyle_formatter']
-          # Run the rake at the original root directory
-          task.patterns = ["#{Rake.application.original_dir}/**/*.rb"]
-          # don't abort rake on failure
-          task.fail_on_error = false
-        end
-
-        desc 'Run OpenStudio Measure Unit Tests'
-        task test: ['openstudio:prepare_minitest', 'openstudio:test_core'] do
-          exit_status = post_process_results(Rake.application.original_dir)
-          exit exit_status
+        ####################################### Minitest and Coverage #######################################
+        desc 'new test task'
+        task :test do
+          runner = OpenStudioMeasureTester::Runner.new(Rake.application.original_dir)
+          # Need to pass in the current directory because the results of minitest and coverage end up going into
+          # the root directorys
+          exit runner.run_test(false, Dir.pwd, false)
         end
 
+        ####################################### RuboCop #######################################
         # Need to create a namespace so that we can have openstudio:rubocop and openstudio:rubocop:auto_correct.
         namespace :rubocop do
-          task check: ['openstudio:prepare_rubocop', 'openstudio:rubocop_core'] do
-            exit_status = post_process_results(Rake.application.original_dir)
-            exit exit_status
+          task :check do
+            # original_dir is the location where Rakefile exists, Dir.pwd is where the rake task was called.
+            runner = OpenStudioMeasureTester::Runner.new(Rake.application.original_dir)
+
+            exit runner.run_rubocop(false)
           end
 
           desc 'Run RuboCop Auto Correct on Measures'
-          task auto_correct: ['openstudio:prepare_rubocop', 'openstudio:rubocop_core:auto_correct']
+          task :auto_correct do
+            # original_dir is the location where Rakefile exists, Dir.pwd is where the rake task was called.
+            runner = OpenStudioMeasureTester::Runner.new(Rake.application.original_dir, Dir.pwd)
+
+            exit runner.run_rubocop(false, true)
+          end
         end
 
         desc 'Run RuboCop on Measures'
         task rubocop: 'openstudio:rubocop:check'
 
+        ####################################### Style #######################################
         desc 'Run OpenStudio Style Checks'
-        task style: ['openstudio:prepare_style', 'openstudio:style_core'] do
-          exit_status = post_process_results(Rake.application.original_dir)
-          exit exit_status
+        task :style do
+          runner = OpenStudioMeasureTester::Runner.new(Rake.application.original_dir)
+          exit runner.run_style(false)
         end
 
+        ####################################### Post Processing and Dashboarding #######################################
         desc 'Post process results into one directory'
         task :post_process do
-          exit_status = post_process_results(Rake.application.original_dir)
-          exit exit_status
+          runner = OpenStudioMeasureTester::Runner.new(Rake.application.original_dir)
+          exit runner.post_process_results(Dir.pwd)
         end
 
         desc 'Generate dashboard'
         task :dashboard do
-          dashboard(Rake.application.original_dir)
+          runner = OpenStudioMeasureTester::Runner.new(Rake.application.original_dir)
+          runner.dashboard
         end
 
         desc 'Run MiniTest, Coverage, RuboCop, and Style on measures, then dashboard results'
-        task all: ['openstudio:prepare_minitest',
-                   'openstudio:test_core',
-                   'openstudio:prepare_rubocop',
-                   'openstudio:rubocop_core',
-                   'openstudio:prepare_style',
-                   'openstudio:style_core'] do
-          exit_status = post_process_results(Rake.application.original_dir)
-          exit exit_status
+        task :all do
+          runner = OpenStudioMeasureTester::Runner.new(Rake.application.original_dir)
+          exit runner.run_all(Dir.pwd)
         end
 
         # Hide the core tasks from being displayed when calling rake -T
-        Rake::Task['openstudio:rubocop_core'].clear_comments
-        Rake::Task['openstudio:test_core_command'].clear_comments
-        Rake::Task['openstudio:rubocop_core:auto_correct'].clear_comments
+        # Rake::Task['openstudio:test_core_command'].clear_comments
       end
     end
   end

data/lib/openstudio_measure_tester/rubocop_result.rb

@@ -65,34 +65,32 @@ module OpenStudioMeasureTester
     end
 
     def parse_results
-      # needs rescue
       Dir["#{@path_to_results}/rubocop-results.xml"].each do |file|
         puts "Parsing Rubocop report #{file}"
-        hash = Hash.from_xml(File.read(file))
 
-        if hash.nil?
-          puts 'Error reporting Rubocop'
-          return
-        end
-
-        # get measure names
         measure_names = []
-        # cn= ''
-        hash['checkstyle']['file'].each do |key, data|
-          parts = key['name'].split('/')
-          if parts.last == 'measure.rb'
-            name = parts[-2]
-            measure_names << name
+
+        @total_files = 0
+        doc = REXML::Document.new(File.open(file)).root
+
+        puts "Finished reading #{file}"
+
+        # Go through the XML and find all the measure names first
+        doc.elements.each('file') do |rc_file|
+          @total_files += 1
+          measure_name = rc_file.attributes['name']
+          if measure_name
+            parts = measure_name.split('/')
+            if parts.last == 'measure.rb'
+              measure_names << parts[-2]
+            end
           end
         end
 
         @total_measures = measure_names.length
-        @total_files = hash['checkstyle']['file'].length
 
+        # now go find the specific data about the measure
         measure_names.each do |measure_name|
-          cn = ''
-          results = hash['checkstyle']['file'].select { |data| data['name'].include? measure_name }
-
           mhash = {}
           mhash['measure_issues'] = 0
           mhash['measure_info'] = 0
@@ -100,83 +98,75 @@ module OpenStudioMeasureTester
           mhash['measure_errors'] = 0
           mhash['files'] = []
 
-          results.each do |key, data|
+          cn = ''
+          doc.elements.each('file') do |rc_file|
+            next unless rc_file.attributes['name'].include? measure_name
+
+            # Save off the file information
             fhash = {}
-            fhash['file_name'] = key['name'].split('/')[-1]
+            fhash['file_name'] = rc_file.attributes['name'].split('/')[-1]
             fhash['violations'] = []
 
-            # get the class name
+            # get the class name out of the measure file! wow, okay... sure why not.
             if fhash['file_name'] == 'measure.rb'
-              File.readlines(key['name']).each do |line|
-                if (line.include? 'class') && line.split(' ')[0] == 'class'
-                  cn = line.split(' ')[1].gsub /_?[tT]est\z/, ''
-                  break
-                end
-              end
-            end
-
-            if key['error']
-              @file_issues = 0
-              @file_info = 0
-              @file_warnings = 0
-              @file_errors = 0
-
-              violations = []
-
-              if key['error'].class == Array
-                @file_issues = key['error'].length
-                key['error'].each do |s|
-                  if s['severity'] === 'info'
-                    @file_info += 1
-                  elsif s['severity'] === 'warning'
-                    @file_warnings += 1
-                  elsif s['severity'] === 'error' # TODO: look up complete list of codes
-                    @file_errors += 1
+              if File.exist? rc_file.attributes['name']
+                File.readlines(rc_file.attributes['name']).each do |line|
+                  if (line.include? 'class') && line.split(' ')[0] == 'class'
+                    cn = line.split(' ')[1].gsub /_?[tT]est\z/, ''
+                    break
                   end
-                  violations << { line: s['line'], column: s['column'], severity: s['severity'], message: s['message'] }
                 end
+              else
+                puts "Could not find measure to parse for extracting class name in Rubocop. PWD: #{Dir.pwd} filename: #{rc_file.attributes['name']}"
               end
+            end
 
-              if key['error'].class == Hash
-                @file_issues = 1
-                if key['error']['severity'] === 'info'
-                  @file_info += 1
-                elsif key['error']['severity'] === 'warning'
-                  @file_warnings += 1
-                elsif key['error']['severity'] === 'error'
-                  @file_errors += 1
-                end
-                violations << { line: key['error']['line'], column: key['error']['column'], severity: key['error']['severity'], message: key['error']['message'] }
+            @file_issues = 0
+            @file_info = 0
+            @file_warnings = 0
+            @file_errors = 0
+
+            violations = []
+            rc_file.elements.each('error') do |rc_error|
+              @file_issues += 1
+              if rc_error.attributes['severity'] == 'info'
+                @file_info += 1
+              elsif rc_error.attributes['severity'] == 'warning'
+                @file_warnings += 1
+              elsif rc_error.attributes['severity'] == 'error'
+                @file_errors += 1
               end
-
-              fhash['issues'] = @file_issues
-              fhash['info'] = @file_info
-              fhash['warning'] = @file_warnings
-              fhash['error'] = @file_errors
-              fhash['violations'] = violations
-
-              mhash['measure_issues'] += @file_issues
-              mhash['measure_info'] += @file_info
-              mhash['measure_warnings'] += @file_warnings
-              mhash['measure_errors'] += @file_errors
-
-              @total_issues += @file_issues
-              @total_info += @file_info
-              @total_warnings += @file_warnings
-              @total_errors += @file_errors
-
+              violations << {
+                line: rc_error.attributes['line'],
+                column: rc_error.attributes['column'],
+                severity: rc_error.attributes['severity'],
+                message: rc_error.attributes['message']
+              }
             end
+            fhash['issues'] = @file_issues
+            fhash['info'] = @file_info
+            fhash['warning'] = @file_warnings
+            fhash['error'] = @file_errors
+            fhash['violations'] = violations
+
+            mhash['measure_issues'] += @file_issues
+            mhash['measure_info'] += @file_info
+            mhash['measure_warnings'] += @file_warnings
+            mhash['measure_errors'] += @file_errors
+
+            @total_issues += @file_issues
+            @total_info += @file_info
+            @total_warnings += @file_warnings
+            @total_errors += @file_errors
 
             mhash['files'] << fhash
           end
-
-          # @summary << mhash
           @by_measure[cn] = mhash
         end
       end
 
-      puts "total files: #{total_files}"
-      puts "total issues: #{@total_issues} (#{@total_info} info, #{@total_warnings} warnings, #{@total_errors} errors)"
+      puts "Total files: #{@total_files}"
+      puts "Total issues: #{@total_issues} (#{@total_info} info, #{@total_warnings} warnings, #{@total_errors} errors)"
 
       @error_status = true if @total_errors > 0
     end