bake-toolkit 2.36.1 → 2.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f14ffc262d93edc0c8c5ad281e93378445b273c9
-  data.tar.gz: 0c1fce72edba474e76d15004f70c619e5d7ab217
+  metadata.gz: 10b5d02b50a49b9fe736175a016c46db97ae6e02
+  data.tar.gz: 32adc905319f5e567b4571fff3e0d22315cdecee
 SHA512:
-  metadata.gz: b4e2aa589001372881833df8a6d1ddb816f61930d0b9106b478e071c98888a322af822b0b2a57c17730a45ab15cc514a4a961f52da510a298079f66af7e4e952
-  data.tar.gz: 6c528387292dd2ea437fb8ffa8067e4d1ad248defb06d12945378ce080e0c95ec59f46bd3754ff70a15e822b39683bf6d3aff979b2ad117de74888aaa66b94be
+  metadata.gz: 16a1135b69cb94a02c4e15f8c3bb31d36f2ae293872ae3834a1d7dc3e6427cad1c1a2106840bf102db4113a305852002be8ef30ca9db62b4d344408a4b4d1946
+  data.tar.gz: ef5156a0c490148bab91dd25d14ef687b1a59c0b0c7ee210602c7c8592a817eb74ae6bb0c16aea01cef94e14e439935f747b7ae0161aa55258ed2bf030831f04

data/bin/bakeqac

@@ -75,6 +75,17 @@ def self.executeQacli(cmd, adminStepAndImmediateOutput = false)
   return [success, consoleOutput, checkError]
 end
 
+def self.getLineNumbersOfFunctions(entities)
+  fileFunctions = []
+  entities.each do |e2|
+    if e2.has_key?("type") && e2["type"] == "function"
+      fileFunctions << e2["line"].to_i
+    end
+  end
+  fileFunctions.sort
+  return fileFunctions
+end
+
 ###### PREREQUISITE 1: BAKEQAC OPTIONS ######
 
   @options = BakeqacOptions.new(ARGV)
@@ -389,12 +400,15 @@ end
       jsons = Dir.glob(@options.qacdata + "/prqa/reports/data/*.json")
 
       maxComplexity = 0
-      numGreater10 = 0
+      numGreaterAllowed = 0
       jsons.each do |file|
         raw = File.read(file)
         data = JSON.parse(raw)
 
         filename = File.normalize(data["file"])
+        filename = @options.qacdata + "/../" + filename unless File.is_absolute?(filename) # only needed for UT
+        fileContent = nil
+        fileFunctions = []
 
         if ProjectFilter.localFile(filename)
           Bake.formatter.printAdditionalInfo(filename)
@@ -404,10 +418,40 @@ end
               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)
+                  line = e["line"].to_i
+                  allowed = 10
+
+                  if complexity > 10 && File.exist?(filename)
+                    if fileContent.nil?
+                      fileContent = File.readlines(filename)
+                      fileFunctions = getLineNumbersOfFunctions(entities)
+                    end
+                    lineOfLastFunction = 0
+                    pos = fileFunctions.find_index(line)
+                    if !pos.nil? and fileContent.length >= line
+                      lineOfLastFunction = fileFunctions[pos-1] if pos > 0
+                      # "line" received from json count from 1...
+                      # ... so adjustment of lineOfLastFunction for array access not needed
+                      # line-2 = index of array for line above the current function
+                      (line-2).downto(lineOfLastFunction) do |i|
+                        res = fileContent[i].scan(/METRIC\s+STCYC\s+(\d+)/)
+                        if (res.length > 0)
+                          allowed = res[0][0].to_i if res[0][0].to_i > 10
+                        end
+                      end
+                    end
+                  end
+
+                  str = "  #{e["name"]}:#{line}: cyclomatic complexity = #{complexity}"
+                  if complexity > allowed
+                    str = str + " (warning: accepted = #{allowed})"
+                  elsif allowed > 10
+                    str = str + " (info: accepted = #{allowed})"
+                  end
+
+                  complexity > allowed ? Bake.formatter.printWarning(str) : puts(str)
                   maxComplexity = complexity if complexity > maxComplexity
-                  numGreater10 +=1 if complexity > 10
+                  numGreaterAllowed +=1 if complexity > allowed
                 end
               end
             end
@@ -415,8 +459,8 @@ 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)
+      resultStr = "**** Number of functions with cyclomatic complexity more than accepted: #{numGreaterAllowed} ****"
+      numGreaterAllowed > 0 ? Bake.formatter.printWarning(resultStr) : Bake.formatter.printSuccess(resultStr)
     else
       Bake.formatter.printError("Failed to generate MDR report.")
     end

data/lib/blocks/block.rb

@@ -416,7 +416,7 @@ module Bake
           SyncOut.mutex.synchronize do
             @outputStep = nil
             SyncOut.startStream() if Bake.options.syncedOutput
-            if Bake.options.verbose >= 2 || isBuildBlock?
+            if Bake.options.verbose >= 2 || (isBuildBlock? && Bake.options.verbose >= 1)
               typeStr = "Building"
               if @prebuild
                 typeStr = "Using"
@@ -467,7 +467,7 @@ module Bake
           Bake.formatter.printAdditionalInfo "**** #{typeStr} #{Block.block_counter} of #{@@num_projects}: #{@projectName} (#{@configName}) ****"
         end
 
-        if Bake.options.verbose >= 2 || isBuildBlock?
+        if Bake.options.verbose >= 2 || (isBuildBlock? && Bake.options.verbose >= 1)
           Block.inc_block_counter()
         end
 

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.36.1"
+      "2.37.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.36.1
+  version: 2.37.0
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext