branchcov-xmlruby-sonar 0.0.0 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a9fd78f1218ff3f8abf910d71cc4e6c354abb14a6dd9fe8a0d3d9d82ff43864
-  data.tar.gz: 1faa96cc9976cee8ec14ce9c95284d94f0a0c412e2978dbfe96c473cb5c91956
+  metadata.gz: 45bff990681073cd41d264e719efd2d3eff05ebdd14a9f8b911ccebeaafbe52a
+  data.tar.gz: e487214a7fe689abda69cb384c07c7ab9a5678dcaa90ab2f280f233e921a53fa
 SHA512:
-  metadata.gz: 5d4105c79decb3d4d383d957d46db26e75908d5a1098a3cea43feda019acf44324abf703eb558a8b21a9d21e72b54638e823b2501fb1adce2d51d21d60f32564
-  data.tar.gz: 829ab5c1c0f33f30fff97c93ff5c58f783b5b63b8c78a6c605f838bc02014286791cba4583fc8c111df63c96f9618ec36bcc5336c446f6bbc847fcbbe5f70c94
+  metadata.gz: b39b97633e02de6e16100f754272a98257370e54e759cf1c55808ecc7f5772ce302f406097b3eeb537c02e78e556883eafb789375014719f0eb13fb6b9303486
+  data.tar.gz: f75e4a98e466d4a85eba3be0fceb79c0076cc27b0103fb419d6456ebc784857ad64567b10ef2adf3607dcf77abd709936c065846554f8c9b8874e3d680e7c3f4

data/lib/ruby_branch_cover.rb

@@ -4,36 +4,36 @@ require 'builder'
 class RubyBranchCover
 
     # To check line already present in list of lineToCover element
-    def checkIfLineAlreadyPresent(lineNumber, lineToCoverElementList)
-        lineToCoverElementList.each_with_index do
-            |lineToCoverElement, idx|
-            if lineToCoverElement[:lineNumber] == lineNumber
+    def check_for_duplicate_line(line_number, line_tocover_elements)
+        line_tocover_elements.each_with_index do
+            |element, idx|
+            if element[:lineNumber] == line_number
                 return idx
             end
         end
         return -1
     end
 
-    def findNotCoveredBranches(condtionsMap)
-        notCovered = 0
-        condtionsMap.each do
+    def find_notcovered_branches(condtions_map)
+        not_covered = 0
+        condtions_map.each do
             |condition, hitCount|
             if hitCount == 0
-                notCovered+=1
+                not_covered+=1
             end
         end
-        return notCovered
+        return not_covered
     end
 
-    def prepareXmlBuilder(xml, fileElementArray)
+    def prepare_xml_builder(xml, file_elements)
         xml.coverage("version" => "1") do
-            fileElementArray.each do
+            file_elements.each do
                 |fileElement|
                 xml.file("path" => fileElement[:path]) do
                     fileElement[:lineElements].each do
-                        |lineToCoverElement|
-                        xml.lineToCover("lineNumber"=>lineToCoverElement[:lineNumber], "covered"=>lineToCoverElement[:covered], 
-                        "branchesToCover"=>lineToCoverElement[:branchesToCover], "coveredBranches"=>lineToCoverElement[:coveredBranches])
+                        |element|
+                        xml.lineToCover("lineNumber"=>element[:lineNumber], "covered"=>element[:covered], 
+                        "branchesToCover"=>element[:branchesToCover], "coveredBranches"=>element[:coveredBranches])
                     end
                 end
             end
@@ -41,57 +41,55 @@ class RubyBranchCover
     end
 
 
-    def readJsonAndGetXml
-        dirname = File.basename(Dir.getwd)
-        # puts dirname
-        file = File.read('coverage/.resultset.json')
+    def read_json_and_getxml(filepath)
+        file = File.read(filepath)
         data_hash = JSON.parse(file)
-
-        unless data_hash['RSpec'] == nil && data_hash['RSpec']['coverage'] == nil 
-            puts "Rspec and coverage key found"
+        file_elements = []
+        unless data_hash.empty? || data_hash['RSpec'] == nil || data_hash['RSpec']['coverage'] == nil 
             files_map = data_hash['RSpec']['coverage']
-            filename_key_list = files_map.keys
-            fileElementArray = []
             files_map.each do
                 |filename,value| 
                 branches = value['branches']
-                # if filename == '/Users/mfv-computer-0090/projects/tax_adjustment_web/lib/pa_api/abstract_client.rb'
-                #     puts "branch size: #{branches.keys.size}"
-                # end
-                lineToCoverArray = []
+                line_to_cover_array = []
                 unless branches.keys.size == 0
                     branches.each do 
-                        |branch, condtionsMap| 
-                        lineNumber = branch.split(',')[2]
-                        notCovered = 0
-                        if filename == '/Users/mfv-computer-0090/projects/tax_adjustment_web/lib/pa_api/abstract_client.rb'
-                            puts "branch conditions size: #{condtionsMap.keys.size}"
-                        end
-                        notCovered = findNotCoveredBranches condtionsMap
-                        covered = condtionsMap.keys.size-notCovered
-                        lineToCoverElement = {lineNumber:lineNumber , covered: condtionsMap.keys.size == covered , branchesToCover: condtionsMap.keys.size, coveredBranches:condtionsMap.keys.size-notCovered}
-                        # if filename == '/Users/mfv-computer-0090/projects/tax_adjustment_web/lib/pa_api/abstract_client.rb'
-                        #     puts "LineElement prepared: #{lineToCoverElement}"
-                        # end
-                        index = checkIfLineAlreadyPresent lineNumber, lineToCoverArray
+                        |branch, condtions_map| 
+                        line_number = branch.split(',')[2].strip
+                        not_covered = find_notcovered_branches condtions_map
+                        covered = condtions_map.keys.size-not_covered
+                        line_tocover_element = {lineNumber:line_number , covered: covered > 0 , branchesToCover: condtions_map.keys.size, coveredBranches:covered}
+                        index = check_for_duplicate_line line_number, line_to_cover_array
                         if index != -1
-                            currentLineToCoverElement = lineToCoverArray[index]
-                            currentLineToCoverElement[:branchesToCover] = currentLineToCoverElement[:branchesToCover] + lineToCoverElement[:branchesToCover]
-                            currentLineToCoverElement[:coveredBranches] = currentLineToCoverElement[:coveredBranches] + lineToCoverElement[:coveredBranches]
-                            currentLineToCoverElement[:covered] = currentLineToCoverElement[:covered] && lineToCoverElement[:covered]
-                            lineToCoverArray[index] = currentLineToCoverElement
+                            old_line_tocover_element = line_to_cover_array[index]
+                            old_line_tocover_element[:branchesToCover] = old_line_tocover_element[:branchesToCover] + line_tocover_element[:branchesToCover]
+                            old_line_tocover_element[:coveredBranches] = old_line_tocover_element[:coveredBranches] + line_tocover_element[:coveredBranches]
+                            old_line_tocover_element[:covered] = old_line_tocover_element[:covered] && line_tocover_element[:covered]
+                            line_to_cover_array[index] = old_line_tocover_element
                         else
-                            lineToCoverArray.push(lineToCoverElement)
+                            line_to_cover_array.push(line_tocover_element)
                         end
                     end
-                    fileElement = {path: filename, lineElements: lineToCoverArray}
-                    fileElementArray.push(fileElement)
+                    file_element = {path: filename, lineElements: line_to_cover_array}
+                    file_elements.push(file_element)
                 end
             end
 
             xml = Builder::XmlMarkup.new(:target => @output, :indent => 2)
-            prepareXmlBuilder xml, fileElementArray
-            File.write("coverage/ruby-c1.xml", xml.to_xml)
+            puts "Total Files: #{file_elements.size}"
+            prepare_xml_builder xml, file_elements
+            File.write("coverage/branch-coverage.xml", xml.to_xml)
+            if file_elements.size > 0
+                return true
+            else
+                return false
+            end
+        else
+            xml = Builder::XmlMarkup.new(:target => @output, :indent => 2)
+            puts "Total Files: #{file_elements.size}"
+            prepare_xml_builder xml, file_elements
+            File.write("coverage/branch-coverage.xml", xml.to_xml)
+            return false
         end
+
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: branchcov-xmlruby-sonar
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.2
 platform: ruby
 authors:
 - Suganya
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies: []
 description: A program to convert json to xml test coverage foramt gem
 email: ''