overrides_tracker 0.1.9 → 0.1.13

data/lib/overrides_tracker/comparer.rb

@@ -1,115 +1,353 @@
 class OverridesTracker::Comparer
   DO_BASE_DIR = File.join(Dir.pwd, "/overrides_tracker")
 
-  def self.compare
-    all_methods_collections = {}
-    unified_methods_collections = {}
-    report_files = Dir.entries(DO_BASE_DIR) - [".", ".."]
-    report_files.each do |file_name|
-      if file_name[-4..-1] == '.otf'
-        all_methods_collections[file_name] = {}
-        method_collection = OverridesTracker::MethodsCollector.instance.load_from_file(file_name)
-        all_methods_collections[file_name] = method_collection
-        unified_methods_collections = unified_methods_collections.deep_merge(method_collection)
-      end
-    end
-    
+  def self.compare_builds(unified_methods_collections, all_methods_collections, working_directories, bundle_directories)
     same_source_count = 0
     errored_source_count = 0
     method_not_available_count = 0
     method_not_override_count = 0
     source_changed_count = 0
-
     methods_count = 0
     classes_count = 0
 
-    unified_methods_collections.each do |unified_class_name, unified_class_hash|
+    results = []
+    added_method_results = []
 
-      if unified_class_hash['instance_methods'].any? || unified_class_hash['singleton_methods'].any?
-        classes_count +=1
-        ['instance_methods', 'singleton_methods'].each do |method_type|
-          unified_class_hash[method_type].each do |unified_method_name, unified_method_hash|
+    numbers = {}
+    numbers[:overrides] = {}
+    numbers[:overrides][:source_changed_count] = 0
+    numbers[:overrides][:override_changed_count] = 0
+    numbers[:overrides][:method_not_available_count] = 0
+    numbers[:overrides][:method_not_override_count] = 0
+    numbers[:overrides][:total] = 0
+
+    numbers[:added_methods] = {}
+    numbers[:added_methods][:source_changed_count] = 0
+    numbers[:added_methods][:override_changed_count] = 0
+    numbers[:added_methods][:method_not_available_count] = 0
+    numbers[:added_methods][:method_not_override_count] = 0
+    numbers[:added_methods][:total] = 0
+    numbers[:total] = {}
 
-            methods_count += 1
-            puts ""
-            puts "==========================================================================================="
-            puts ""
+  
+    unified_methods_collections.each do |unified_class_name, unified_class_hash| 
+      if unified_class_hash['instance_methods']&.any? || unified_class_hash['singleton_methods']&.any?
+        ['instance_methods', 'singleton_methods'].each do |method_type|
+          unified_class_hash[method_type]&.each do |unified_method_name, unified_method_hash|
             same_source_every_where = true
             
-    
-            all_methods_collections.each do |file_name, all_methods_hash|
-              if all_methods_hash[unified_class_name].nil? || all_methods_hash[unified_class_name][method_type][unified_method_name].nil? || all_methods_hash[unified_class_name][method_type][unified_method_name]['sha'] != unified_method_hash['sha']
+            all_methods_collections.each do |build_id, all_methods_hash|
+              if all_methods_hash[unified_class_name].nil? || 
+                all_methods_hash[unified_class_name][method_type].nil? || 
+                all_methods_hash[unified_class_name][method_type][unified_method_name].nil? || 
+                all_methods_hash[unified_class_name][method_type][unified_method_name]['sha'] != unified_method_hash['sha'] || 
+                all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_sha'] != unified_method_hash['overriding_sha']
                 same_source_every_where = false
               end
             end
     
+            method_result_hash = {class_name: unified_class_name, method_name: unified_method_name, builds: {}, method_type: method_type, changes_detected: false}
+    
             if same_source_every_where 
-              puts "#{methods_count}) #{unified_class_name}##{unified_method_name}: No Changes".green.bold
-              same_source_count += 1
+              results << method_result_hash
             else
-              errored_output = nil
+              method_result_hash[:changes_detected] = true
+              method_result_hash[:builds] ||= {}
+    
+              is_source_changed_flag = false
+              is_override_changed_flag = false
+              all_methods_collections.each do |build_id, all_methods_hash|
+                
+                method_result_hash[:builds][build_id] ||= {}
+                
+                if all_methods_hash[unified_class_name].nil?
     
-              puts "#{methods_count}) #{unified_class_name}##{unified_method_name}: Changes between files".red.bold
+                  method_result_hash[:builds][build_id] = {result: 'method_not_available'}
+                  numbers[:overrides][:method_not_available_count] +=1
+
+                elsif all_methods_hash[unified_class_name][method_type].nil?
+                  if all_methods_hash[unified_class_name]["added_#{method_type}"]
+                    if all_methods_hash[unified_class_name]["added_#{method_type}"][unified_method_name]
+                      method_result_hash[:builds][build_id] = {result: 'method_not_override', data: all_methods_hash[unified_class_name]["added_#{method_type}"][unified_method_name]}
+                      numbers[:overrides][:method_not_override_count] +=1
+                    end
+                  end
+                elsif !all_methods_hash[unified_class_name][method_type][unified_method_name].nil?
+                  if all_methods_hash[unified_class_name][method_type][unified_method_name]['sha'] != unified_method_hash['sha']
+                    method_result_hash[:builds][build_id] = {result: 'source_has_changed'}
+                    method_result_hash[:builds][build_id][:original_body] = all_methods_hash[unified_class_name][method_type][unified_method_name]['body']
+                    method_result_hash[:builds][build_id][:original_sha] = all_methods_hash[unified_class_name][method_type][unified_method_name]['sha']
+                    method_result_hash[:builds][build_id][:original_location] = all_methods_hash[unified_class_name][method_type][unified_method_name]['location']
+                    method_result_hash[:builds][build_id][:overriding_body] = all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_body']
+                    method_result_hash[:builds][build_id][:overriding_location] = all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_location']
+                    method_result_hash[:builds][build_id][:overriding_sha] = all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_sha']
+                    method_result_hash[:builds][build_id][:is_part_of_app] = all_methods_hash[unified_class_name][method_type][unified_method_name]['is_part_of_app'] ||  all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_is_part_of_app'] 
+                    mask_path(method_result_hash[:builds][build_id], working_directories[build_id], bundle_directories[build_id])
+
+                    numbers[:overrides][:source_changed_count] += 1
+                    is_source_changed_flag = true
+                    is_override_changed_flag = false
+                  else
+                    method_result_hash[:builds][build_id] = {result: 'override_has_changed'}
+                    method_result_hash[:builds][build_id][:original_body] = all_methods_hash[unified_class_name][method_type][unified_method_name]['body']
+                    method_result_hash[:builds][build_id][:original_sha] = all_methods_hash[unified_class_name][method_type][unified_method_name]['sha']
+                    method_result_hash[:builds][build_id][:original_location] = all_methods_hash[unified_class_name][method_type][unified_method_name]['location']
+                    method_result_hash[:builds][build_id][:overriding_body] = all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_body']
+                    method_result_hash[:builds][build_id][:overriding_location] = all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_location']
+                    method_result_hash[:builds][build_id][:overriding_sha] = all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_sha']
+                    method_result_hash[:builds][build_id][:is_part_of_app] = all_methods_hash[unified_class_name][method_type][unified_method_name]['is_part_of_app'] || all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_is_part_of_app'] 
+
+                    mask_path(method_result_hash[:builds][build_id], working_directories[build_id], bundle_directories[build_id])
+
+                    numbers[:overrides][:override_changed_count] += 1
+                    is_override_changed_flag = true
+                  end
+                else   
+                  method_result_hash[:builds][build_id] = {result: 'method_not_available'}
+                  numbers[:overrides][:method_not_available_count] +=1                                  
+                end
+              end
+
+              if is_source_changed_flag
+                line_differerence_array = []
+                all_methods_collections.each do |build_id, all_methods_hash|
+                  begin
+                    line_differerence_array << method_result_hash[:builds][build_id][:original_body].split(/\n/)
+                  rescue 
+
+                  end
+                  if method_result_hash[:builds][build_id][:result] == 'override_has_changed'
+                    numbers[:overrides][:override_changed_count] -= 1
+                    numbers[:overrides][:source_changed_count] += 1
+                  end
+                  method_result_hash[:builds][build_id][:result] = 'source_has_changed'
+                end
+
+                max_length = line_differerence_array.map(&:length).max
+                transposed_array = line_differerence_array.map{|e| e.values_at(0...max_length)}.transpose
+                method_result_hash[:mark_lines] = transposed_array.map.with_index{|val, index| val.uniq.size > 1 ? index : nil}.compact
+                is_override_changed_flag = false
+              end
+
+              if is_override_changed_flag
+                line_differerence_array = []
+                begin
+                  begin
+                    all_methods_collections.each do |build_id, all_methods_hash|
+                      line_differerence_array << method_result_hash[:builds][build_id][:overriding_body].split(/\n/)
+                    end
+                  rescue
+
+                  end
+                  max_length = line_differerence_array.map(&:length).max
+                  transposed_array = line_differerence_array.map{|e| e.values_at(0...max_length)}.transpose
+                  method_result_hash[:overriding_mark_lines] = transposed_array.map.with_index{|val, index| val.uniq.size > 1 ? index : nil}.compact
+                rescue => exception
+                  
+                end
+              
+              end
+
+              method_result_hash[:is_part_of_app] = method_result_hash[:builds].select{|bu, bu_val| bu_val[:is_part_of_app] }.any?
+              
+              results << method_result_hash
+            end
+          end
+        end
+      end 
+      
+      
+      if unified_class_hash['added_instance_methods']&.any? || unified_class_hash['added_singleton_methods']&.any?
+
+        ['added_instance_methods', 'added_singleton_methods'].each do |method_type|
+          unified_class_hash[method_type]&.each do |unified_method_name, unified_method_hash|
+
+            same_source_every_where = true
+            
+            is_added_source_has_changed_flag = false
+
+            all_methods_collections.each do |build_id, all_methods_hash|
+              unless (all_methods_hash[unified_class_name] != nil) && (all_methods_hash[unified_class_name][method_type] != nil) && (all_methods_hash[unified_class_name][method_type][unified_method_name] != nil ) && (all_methods_hash[unified_class_name][method_type][unified_method_name]['sha'] == unified_method_hash['sha'])
+                same_source_every_where = false
+              end
+            end
+    
+            method_result_hash = {class_name: unified_class_name, method_name: unified_method_name, builds: {}, method_type: method_type, changes_detected: false}
+    
+            if same_source_every_where 
+              added_method_results << method_result_hash
+            else
+              method_result_hash[:changes_detected] = true
+              method_result_hash[:builds] ||= {}
     
-              all_methods_collections.each do |file_name, all_methods_hash|
-                puts ""
-                puts ("in: "+file_name).bold
+              all_methods_collections.each do |build_id, all_methods_hash|
+                
+                method_result_hash[:builds][build_id] ||= {}
     
-                if all_methods_hash[unified_class_name].nil? 
-                  puts "#{unified_class_name}##{unified_method_name}: method is not in codebase"
-                  method_not_available_count +=1
+                if all_methods_hash[unified_class_name].nil?
+                  method_result_hash[:builds][build_id] = {result: 'added_method_not_available'}
+                  numbers[:added_methods][:method_not_available_count] +=1
+                elsif all_methods_hash[unified_class_name][method_type].nil?
+                  method_result_hash[:builds][build_id] = {result: 'added_method_not_available'}
+                  numbers[:added_methods][:method_not_available_count] +=1
                 elsif !all_methods_hash[unified_class_name][method_type][unified_method_name].nil?
-                  puts "#{unified_class_name}##{unified_method_name}:"
-                  puts ""
-                  puts "Source:".bold
-                  puts "#{all_methods_hash[unified_class_name][method_type][unified_method_name]['body']}" 
-                  puts ""
-                  puts "#{all_methods_hash[unified_class_name][method_type][unified_method_name]['location'][0]}:#{all_methods_hash[unified_class_name][method_type][unified_method_name]['location'][1]}".italic   
-
-                  puts ""
-                  puts "Override:".bold
-                  puts "#{all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_body']}" 
-                  puts ""
-                  puts "#{all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_location'][0]}:#{all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_location'][1]}".italic 
-
-                  source_changed_count  +=1  
-                elsif !all_methods_hash[unified_class_name]["added_#{method_type}"][unified_method_name].nil?
-                  puts "#{unified_class_name}##{unified_method_name}: method is not an override"
-                  method_not_override_count  +=1
-
-                  puts ""
-                  puts "Code:".bold
-                  puts "#{all_methods_hash[unified_class_name]["added_#{method_type}"][unified_method_name]['body']}" 
-                  puts ""
-                # puts "#{all_methods_hash[unified_class_name]["added_#{method_type}"][unified_method_name]['location'][0]}:#{all_methods_hash[unified_class_name][method_type][unified_method_name]['location'][1]}".italic 
-
-                elsif all_methods_hash[unified_class_name]["added_#{method_type}"][unified_method_name].nil?
-                  puts "#{unified_class_name}##{unified_method_name}: method is not in codebase"
-                  method_not_available_count +=1                
+                  method_result_hash[:builds][build_id] = {result: 'added_source_has_changed'}
+                  method_result_hash[:builds][build_id][:original_body] = all_methods_hash[unified_class_name][method_type][unified_method_name]['body']
+                  method_result_hash[:builds][build_id][:original_location] = all_methods_hash[unified_class_name][method_type][unified_method_name]['location']
+                  method_result_hash[:builds][build_id][:is_part_of_app] = all_methods_hash[unified_class_name][method_type][unified_method_name]['is_part_of_app'] ||  all_methods_hash[unified_class_name][method_type][unified_method_name]['overriding_is_part_of_app'] 
+
+                  mask_path(method_result_hash[:builds][build_id], working_directories[build_id], bundle_directories[build_id])
+
+                  numbers[:added_methods][:source_changed_count] += 1
+                  is_added_source_has_changed_flag = true
+                elsif all_methods_hash[unified_class_name][method_type][unified_method_name].nil?
+                  method_result_hash[:builds][build_id] = {result: 'added_method_not_available'}
+                   numbers[:added_methods][:method_not_available_count] +=1
                 else
-                  puts "#{unified_class_name}##{unified_method_name}: #{all_methods_hash[unified_class_name][method_type][unified_method_name]}"
+                  method_result_hash[:builds][build_id] = {result: 'error'}
                 end
-                puts ""
-                
               end
-              errored_source_count += 1
+
+              if is_added_source_has_changed_flag
+                begin
+
+                  line_differerence_array = []
+                  all_methods_collections.each do |build_id, all_methods_hash|
+                    line_differerence_array << method_result_hash[:builds][build_id][:original_body].split(/\n/)
+                  end
+
+                  max_length = line_differerence_array.map(&:length).max
+                  transposed_array = line_differerence_array.map{|e| e.values_at(0...max_length)}.transpose
+                  method_result_hash[:mark_added_method_lines] = transposed_array.map.with_index{|val, index| val.uniq.size > 1 ? index : nil}.compact
+                rescue
+
+                end
+              end
+   
+              method_result_hash[:is_part_of_app] = method_result_hash[:builds].select{|bu, bu_val| bu_val[:is_part_of_app] }.any?
+              added_method_results << method_result_hash
+
             end
           end
-        end     
+        end
+      end   
+    end
+    
+    numbers[:overrides][:total] = numbers[:overrides][:method_not_override_count] + numbers[:overrides][:method_not_available_count] + numbers[:overrides][:source_changed_count] + numbers[:overrides][:override_changed_count]
+    numbers[:added_methods][:total] = numbers[:added_methods][:method_not_available_count] + numbers[:added_methods][:source_changed_count]
+    numbers[:total] = numbers[:overrides][:total] + numbers[:added_methods][:total]
+
+    {results: {override_results: results, added_method_results: added_method_results}, numbers: numbers}
+  end
+
+  def self.mask_path(build_hash, working_directory, bundle_directory)
+    if build_hash[:original_location]
+      build_hash[:original_location][0].gsub!(working_directory, 'APP_PATH')
+      build_hash[:original_location][0].gsub!(bundle_directory, 'BUNDLE_PATH')
+    end
+
+    if build_hash[:overriding_location]
+      build_hash[:overriding_location][0].gsub!(working_directory, 'APP_PATH')
+      build_hash[:overriding_location][0].gsub!(bundle_directory, 'BUNDLE_PATH')
+    end
+  end
+
+  def self.compare
+    all_methods_collections = {}
+    unified_methods_collections = {}
+    working_directories = {}
+    bundle_directories = {}
+    
+    all_methods_collections = {}
+    unified_methods_collections = {}
+    report_files = Dir.entries(DO_BASE_DIR) - [".", ".."]
+    report_files.each do |file_name|
+      if file_name[-4..-1] == '.otf'
+        all_methods_collections[file_name] = {}
+        result_file_data = OverridesTracker::MethodsCollector.instance.load_from_file(file_name)
+        result_file_data.deep_stringify_keys!
+        methods_collection = result_file_data['methods_collection']
+        all_methods_collections[file_name] = methods_collection
+        working_directories[file_name] = result_file_data['working_directory']
+        bundle_directories[file_name] = result_file_data['bundle_path']
+        unified_methods_collections = unified_methods_collections.deep_merge(methods_collection)
+      end
+    end
+
+    comparison = compare_builds(unified_methods_collections, all_methods_collections, working_directories, bundle_directories)
+    methods_count = 0
+
+    comparison[:results].each do |result_type, result_array|
+      result_array.each do |method_hash|
+        if method_hash[:builds] != {}
+          methods_count += 1
+          puts ""
+          puts "==========================================================================================="
+          puts ""
+          if result_type == :override_results
+            puts "#{methods_count}) Override: #{method_hash[:class_name]}##{method_hash[:method_name]}".bold
+          else 
+            puts "#{methods_count}) Added Method: #{method_hash[:class_name]}##{method_hash[:method_name]}".bold
+          end
+          
+          method_hash[:builds].each do |build_id, build_result|
+            puts ''
+            puts "..........................................................................................."
+            puts ''
+            puts build_id
+            if build_result[:result] == 'source_has_changed'
+              puts ""
+            elsif build_result[:result] == 'method_not_override'
+              puts "Method not override".italic.yellow
+            elsif build_result[:result] == 'method_not_available'
+              puts "Method not available".italic.yellow
+            elsif build_result[:result] == 'added_method_not_available'
+              puts "Added method not available".italic.yellow
+            elsif build_result[:result] == 'added_source_has_changed'
+              puts ''
+            end
+
+            
+            unless build_result[:original_body].nil?
+              puts "-------------------------------------------------------------------------------------------".pink
+              puts ''
+              puts 'Original:'.italic
+              puts ''
+              puts "#{build_result[:original_body]}".pink
+              puts ''
+              puts "in #{build_result[:original_location][0]}:#{build_result[:original_location][1]}".italic
+            end
+            puts ''
+            puts ''
+            unless build_result[:overriding_body].nil?
+              puts "-------------------------------------------------------------------------------------------".blue
+              puts ''
+              puts 'Override:'.italic
+              puts ''
+              puts "#{build_result[:overriding_body]}".blue
+              puts ''
+              puts "in: #{build_result[:overriding_location][0]}:#{build_result[:overriding_location][1]}".italic
+            end
+            
+            puts ''
+            puts ''
+          end
+        end          
       end
     end
 
+
     puts ""
     puts "==========================================================================================="
     puts ""
     puts "Summary:".bold
-    puts "Found #{methods_count} distinct overridden methods in #{classes_count} Files"
-    puts "#{same_source_count} overridden methods have not changed"
-    puts "#{errored_source_count} overridden methods have changed"
-    puts "#{method_not_override_count} where method is not an override"
-    puts "#{method_not_available_count} where method is not in codebase"
-    source_changed_count = errored_source_count - method_not_available_count
-    puts "#{source_changed_count} source method bodies have changed"
+    puts ""
+    puts "Investigated methods: #{comparison[:numbers][:total]/2}"
+    puts "Diffences on overrides: #{comparison[:numbers][:overrides][:total]/2}"
+    puts "Diffences on added methods: #{comparison[:numbers][:added_methods][:total]/2}"
+
+    comparison
   end
+
 end
 

data/lib/overrides_tracker/file_observer.rb

@@ -7,4 +7,4 @@ module OverridesTracker::FileObserver
       end
     end
   end
-end
+end

data/lib/overrides_tracker/hash_decorator.rb

@@ -0,0 +1,41 @@
+# Adding deep merge functionality
+Hash.class_eval do
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  def deep_merge!(other_hash, &block)
+    merge!(other_hash) do |key, this_val, other_val|
+      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+        this_val.deep_merge(other_val, &block)
+      elsif block_given?
+        block.call(key, this_val, other_val)
+      else
+        other_val
+      end
+    end
+  end
+
+  def deep_stringify_keys!
+    deep_transform_keys!(&:to_s)
+  end
+
+  def deep_transform_keys!(&block)
+    _deep_transform_keys_in_object!(self, &block)
+  end
+
+  def _deep_transform_keys_in_object!(object, &block)
+    case object
+    when Hash
+      object.keys.each do |key|
+        value = object.delete(key)
+        object[yield(key)] = _deep_transform_keys_in_object!(value, &block)
+      end
+      object
+    when Array
+      object.map! { |e| _deep_transform_keys_in_object!(e, &block) }
+    else
+      object
+    end
+  end
+end