bake-toolkit 2.35.3 → 2.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b8d306c7cd1654955f1d8ad8d37f28cf38b8e40
-  data.tar.gz: 1dbeadb6be8b3454a9ddb5be6adfd376bdc404a0
+  metadata.gz: 405e09a71d1a19b3fc8afd55052713096efc20be
+  data.tar.gz: 9e6f9eb763a0640ad0e7df22f573b6617a027bfd
 SHA512:
-  metadata.gz: a27861ef5642b2db75e782dfd7e24649b697d1230ab9ab1b7b8abb4e81bd3053a3ffc8b6bbed70a3c02302861358249cdfdca5541cfa5bd87ad95fbc806d98f7
-  data.tar.gz: b456e782115014abcdc8873e5f97d2c8baa878c1e9d4e4b6a98987d1d9de2d17af72d3cd3d8f5870e18d325ce053852f9a0c41ad4937ecb4c44afcd859564036
+  metadata.gz: d785d2498ec565930d8661494d20b1d182f93bab7bb140e9b86b8d22ceb04579f461bcb02bdffa23da40f1171262d7588f36019404313819056ec33daa89b075
+  data.tar.gz: 5533af6a837fe9998da11d02fd026d3161a452ea67dc4fc9fb63819efb8482db346bb6b544944392849329813486a73fe721471d408baea2bd759a1657e9b487

data/bin/bakeqac

@@ -5,10 +5,12 @@ require 'fileutils'
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 
 require "bakeqac/options/options"
+require "bakeqac/filter"
 require 'bake/toolchain/colorizing_formatter'
 require 'bake/options/options'
 require 'common/process'
 require 'common/utils'
+require 'common/ext/file'
 
 STDOUT.sync = true
 STDERR.sync = true
@@ -78,6 +80,7 @@ end
   @options = BakeqacOptions.new(ARGV)
   bakeOptions = Options.new([])
   @options.parse_options(bakeOptions)
+  pfilter = ProjectFilter.new(@options)
   success = false
 
 ###### PREREQUISITE 2: BAKE OPTIONS ######
@@ -199,9 +202,7 @@ end
     if @options.qacfilter
       if success
         puts filterOutput
-        File.open("#{@options.qacdata}/filter.txt", "w+") do |f|
-          f.puts(filter.uniq)
-        end
+        ProjectFilter.writeFilter(filter)
       else
         puts consoleOutput # error
       end
@@ -218,16 +219,6 @@ end
 
     puts "bakeqac: printing results..."
 
-    filter = []
-    useFilter = File.exist?("#{@options.qacdata}/filter.txt") && @options.qacfilter
-
-    if useFilter
-      File.open("#{@options.qacdata}/filter.txt", "r") do |f|
-        f.each_line { |line| filter << line.strip }
-      end
-      filter.delete_if { |f| (f.end_with? "/gtest") or (f.end_with? "/gmock") }
-    end
-
     cmd = qaExe + ["view", "-P", @options.qacdata, "-m", "STDOUT"]
     if not @options.qacnoformat
       cmd += ["-f", "%?u==0%(MSG: %:trc: %)%F(%l,%c): (%r:%N)%t%?v%(\n%v%)"]
@@ -235,7 +226,7 @@ end
 
     success, consoleOutput, checkError = executeQacli(cmd)
 
-    if useFilter
+    if ProjectFilter.is_valid?
 
       if !checkError # success # HACK: seems that QAC returns with error if there too much issues
         # 1. filter
@@ -247,12 +238,7 @@ end
           scan_res = line.scan(/\/\/ ======= Results for ([a-zA-Z]{0,1})(:{0,1})(.*)/)
           if scan_res.length > 0
             converted_line = (scan_res[0][0].downcase + scan_res[0][1] + scan_res[0][2].gsub(/\\/,"/"))
-            filter.each do |fil|
-              if converted_line.include?(fil+"/") and not converted_line.include?(fil+"/test/") and not converted_line.include?(fil+"/mock/") and not converted_line.include?(fil+"/.qacdata/")
-                foundFile = true
-                break
-              end
-            end
+            foundFile = ProjectFilter.localFile(converted_line)
           end
           if foundFile && !line.include?("QAC++ Deep Flow Static Analyser")
             filteredLines << line
@@ -383,6 +369,55 @@ end
 
   end
 
+###### STEP 5: REPORT MDR (OPTIONAL) ######
+
+  if success and !@options.qacstep.nil? and @options.qacstep.include?("mdr")
+    FileUtils::mkdir_p @options.qacdata
+
+    puts "bakeqac: generating MDR report..."
+
+    cmd = qaExe + ["report", "-P", @options.qacdata, "-t", "MDR"]
+
+    success, consoleOutput = ProcessHelper.run(cmd, false)
+    puts consoleOutput
+
+    if success
+      require "json"
+      jsons = Dir.glob(@options.qacdata + "/prqa/reports/data/*.json")
+
+      maxComplexity = 0
+      numGreater10 = 0
+      jsons.each do |file|
+        raw = File.read(file)
+        data = JSON.parse(raw)
+
+        filename = File.normalize(data["file"])
+
+        if ProjectFilter.localFile(filename)
+          Bake.formatter.printAdditionalInfo(filename)
+          entities = data["entities"]
+          if Array === entities
+            entities.each do |e|
+              if e.has_key?("type") && e["type"] == "function"
+                if e.has_key?("metrics") && e["metrics"].has_key?("STCYC")
+                  complexity = e["metrics"]["STCYC"].to_i
+                  str = "  #{e["name"]}:#{e["line"]}: cyclomatic complexity = #{complexity}"
+                  complexity > 10 ? Bake.formatter.printWarning(str) : puts(str)
+                  maxComplexity = complexity if complexity > maxComplexity
+                  numGreater10 +=1 if complexity > 10
+                end
+              end
+            end
+          end
+        end
+      end
+      Bake.formatter.printInfo("\n**** Maximum cyclomatic complexity: #{maxComplexity} ****")
+      resultStr = "**** Number of functions with cyclomatic complexity > 10: #{numGreater10} ****"
+      numGreater10 > 0 ? Bake.formatter.printWarning(resultStr) : Bake.formatter.printSuccess(resultStr)
+    else
+      Bake.formatter.printError("Failed to generate MDR report.")
+    end
+  end
 
 #### TODO: unittest for report
 

data/lib/bakeqac/filter.rb

@@ -0,0 +1,47 @@
+module Bake
+
+  class ProjectFilter
+
+    def initialize(options)
+      @@filterList = nil
+      @@valid = nil
+      @@options = options
+      @@filter_filename = "#{@@options.qacdata}/filter.txt"
+    end
+
+    def self.projects
+      calcFilter_internal() if @@filterList.nil?
+      return @@filterList
+    end
+
+    def self.is_valid?
+      calcFilter_internal() if @@valid.nil?
+      return @@valid
+    end
+
+    def self.localFile(str)
+      return true if not is_valid?
+      projects.any? { |fil| str.include?(fil+"/") and not str.include?(fil+"/test/") and not str.include?(fil+"/mock/") and not str.include?(fil+"/.qacdata/") }
+    end
+
+    def self.writeFilter(filter)
+      File.open(@@filter_filename, "w+") do |f|
+        filter.uniq!
+        filter.delete_if { |f| (f.end_with? "/gtest") or (f.end_with? "/gmock") }
+        f.puts(filter)
+      end
+    end
+
+    def self.calcFilter_internal
+      @@filterList = []
+      @@valid = File.exist?(@@filter_filename) && @@options.qacfilter
+      if @@valid
+        File.open(@@filter_filename, "r") do |f|
+          f.each_line { |line| @@filterList << line.strip }
+        end
+      end
+    end
+
+  end
+
+end

data/lib/bakeqac/options/options.rb

@@ -63,7 +63,7 @@ module Bake
       puts " --acf <file>     Set a specific analysis config file, otherwise $(QAC_HOME)/config/acf/default.acf will be used."
       puts " --qaccctpatch    If specified, some adaptions to cct are made. Might improve the result - no guarantee."
       puts " --qacdata <dir>  QAC writes data into this folder. Default is <working directory>/.qacdata."
-      puts " --qacstep admin|analyze|view|report   Steps can be ORed. Per default admin|analyze|view will be executed."
+      puts " --qacstep admin|analyze|view|report|mdr   Steps can be ORed. Per default admin|analyze|view will be executed."
       puts " --qacnofilter    Output will be printed immediately and unfiltered. Per default filters are used to reduce noise."
       puts " --qacrawformat   Raw QAC output (with incomplete MISRA rules!)."
       puts " --qacretry <seconds>   If build or result step fail due to refused license, the step will be retried until timeout."
@@ -129,7 +129,7 @@ module Bake
 
       if !@qacstep.nil?
         @qacstep.split("|").each do |s|
-          if not ["admin", "analyze", "view", "report"].include?s
+          if not ["admin", "analyze", "view", "report", "mdr"].include?s
             Bake.formatter.printError("Error: incorrect qacstep name.")
             ExitHelper.exit(1)
           end

data/lib/common/ext/file.rb

@@ -8,6 +8,14 @@ class File
     filename[0] == SLASH or filename[1] == ':'
   end
 
+  def self.normalize(filename)
+    if filename.length > 1
+      toIsWindowsAbs = filename[1] == ':'
+      return filename[0].downcase + filename[1..-1] if toIsWindowsAbs
+    end
+    return filename
+  end
+
   # seems both are rel or both are abs in all cases
   def self.rel_from_to_project(from,to,endWithSlash = true)
 

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.35.3"
+      "2.36.0"
     end
 
     def self.printBakeVersion(ry = "")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.35.3
+  version: 2.36.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext
@@ -190,6 +190,7 @@ files:
 - lib/bake/toolchain/ti.rb
 - lib/bake/util.rb
 - lib/bakeclean/options/options.rb
+- lib/bakeqac/filter.rb
 - lib/bakeqac/options/options.rb
 - lib/bakery/buildPattern.rb
 - lib/bakery/model/language.rb