overrides_tracker 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22c40f48f04af34f145bc26c68acf9ebc52913bb814f21dd1a98cd687c61237c
-  data.tar.gz: 2b50d662098bdeb7cd06597ff674ee82f9b1e69d2dc181e2e8a782578afe391c
+  metadata.gz: a349cfc8219a5e3c54b7fcf01e4c8bcb826ececedb3fa81e1b0a3217cbdc7cc4
+  data.tar.gz: 6a602b0a8a08c566f461c8246858d2bf2204a672cff70db325bee4984906215a
 SHA512:
-  metadata.gz: 50a5c5811f4511385fc0e564c6bfe0c12d40e764bd1eb7af84ddd3057adfa1ed2b1df17af2e1fc7aa032a17956aafeb76473591312aa366ccca9695c60080d4b
-  data.tar.gz: ebda84d5c5c899deb6fc323e28a3c74e513471839741cf77a64d8656ad56a325e9449cb500b09ed39781f6b3bb760de25fa29a2a2ba94e19209701491d748b8c
+  metadata.gz: d43eb13bca15ad87a32c47183090a70a23d93d33fd6717f78c1c4c668a1a9c3254fec879771ddc15ab33a782ce03f716d949efbfc8dd9245ba92c2bd722ccac8
+  data.tar.gz: db00cf8aed2a4a65b4536be2e7a075488db611b551f877f40682089e6ac13e390f4aeeae276f2ec01b5598974c219b0f09716398c48054ed5d52b26d5e83dae1

data/bin/overrides_tracker

@@ -5,6 +5,8 @@ if ARGV[0] == "track"
     OVERRIDES_TRACKER_TRACKING_ENABLED = true
     require Dir.pwd+'/config/environment.rb'
     require 'overrides_tracker'
+
+    OverridesTracker::MethodsCollector.instance.build_overrides_hash
     OverridesTracker::MethodsCollector.instance.save_to_file
 
     if ENV['OVERRIDES_API_TOKEN']

data/lib/overrides_tracker/methods_collector.rb

@@ -23,20 +23,6 @@ class OverridesTracker::MethodsCollector
     @methods_collection[class_name][method_type][method_name] = method_hash
   end
 
-
-  def method_is_instance_override?(class_name, method_name)
-    method_is_override?(:instance_methods, class_name, method_name)
-  end
-
-  def method_is_singleton_override?(class_name, method_name)
-    method_is_override?(:singleton_methods, class_name, method_name)
-  end
-
-  def method_is_override?(method_type, class_name, method_name)
-    methods_collection(class_name)
-    @methods_collection[class_name][method_type][method_name].present?
-  end
-
   def mark_method_as_instance_override(class_name, method_name, overriding_method, method_hash)
     mark_method_as_override(:instance_methods, class_name, method_name, overriding_method, method_hash)
   end
@@ -66,6 +52,72 @@ class OverridesTracker::MethodsCollector
     @overridden_methods_collection[class_name][method_type][method_name][:overriding_location] = overriding_method.source_location
   end
 
+  def build_overrides_hash_for_method_type(clazz, class_methods, methods_type, working_directory)
+    methods = []
+    if methods_type == :instance_methods
+      methods = clazz.instance_methods(false)
+      clazz.ancestors.each do |ancestor|
+        if ancestor.class == Class
+          break
+        end
+        methods = methods + ancestor.instance_methods(false)
+      end
+    else
+      methods = clazz.singleton_methods(false)
+      clazz.ancestors.each do |ancestor|
+        if ancestor.class == Class
+          break
+        end
+        methods = methods + ancestor.singleton_methods(false)
+      end
+    end
+
+    methods.each do |method_name|
+      if method_name != nil && method_name != :overrides_tracker_finished_file
+        method_hash = class_methods[methods_type][method_name]
+        begin
+          if methods_type == :instance_methods
+            method_to_check = clazz.instance_method(method_name)
+          else
+            method_to_check = clazz.singleton_method(method_name)
+          end
+
+          method_to_check_hash = OverridesTracker::Util.method_hash(method_to_check)
+        
+          if method_to_check_hash[:location] != nil 
+            if method_hash != nil
+              if method_to_check_hash[:location] != method_hash[:location]
+                mark_method_as_override(methods_type, clazz.name, method_name, method_to_check, method_to_check_hash)
+                puts "#{method_name} of class #{clazz.name} was overridden".green
+              end
+            else
+              if (method_to_check_hash[:location][0].include? working_directory)
+                mark_method_as_added("added_#{methods_type}".to_sym, clazz.name, method_name, method_to_check, method_to_check_hash)
+                puts "#{method_name} of class #{clazz.name} was added".green
+              end
+            end
+          end
+        rescue Exception => e
+          #puts "Error processing #{method_name} of class #{clazz.name}".red
+        end
+      end
+    end
+  end
+
+  def build_overrides_hash
+    total_classes = @methods_collection.size
+    count = 0
+    working_directory = Dir.pwd
+    @methods_collection.each do |class_name, class_methods|
+      if class_name != nil
+        clazz = class_name.constantize
+        build_overrides_hash_for_method_type(clazz, class_methods, :instance_methods, working_directory)
+        build_overrides_hash_for_method_type(clazz, class_methods, :singleton_methods, working_directory)
+      end
+      count = count+1
+      puts "Processed #{class_name} #{count} / #{total_classes}"
+    end
+  end
 
   def overridden_methods
     @overridden_methods_collection
@@ -115,6 +167,7 @@ class OverridesTracker::MethodsCollector
     @methods_collection[class_name] ||= {}
     @methods_collection[class_name][:instance_methods] ||= {}
     @methods_collection[class_name][:singleton_methods] ||= {}
+    @methods_collection[class_name][:closed] ||= 'no'
   end
 
   def overridden_methods_collection(class_name)

data/lib/overrides_tracker/string_colorizer.rb

@@ -0,0 +1,41 @@
+module OverridesTracker::StringColorizer
+  def colorize(color_code)
+    "\e[#{color_code}m#{self}\e[0m"
+  end
+
+  def red
+    colorize(31)
+  end
+
+  def green
+    colorize(32)
+  end
+
+  def yellow
+    colorize(33)
+  end
+
+  def blue
+    colorize(34)
+  end
+
+  def pink
+    colorize(35)
+  end
+
+  def light_blue
+    colorize(36)
+  end
+
+  def bold
+    "\e[1m#{self}\e[22m"
+  end
+  
+  def italic
+    "\e[3m#{self}\e[23m" 
+  end
+
+
+end
+
+String.prepend(OverridesTracker::StringColorizer)

data/lib/overrides_tracker/version.rb

@@ -1,3 +1,3 @@
 module OverridesTracker
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/lib/overrides_tracker.rb

@@ -6,6 +6,7 @@ require 'method_source'
 require "overrides_tracker/version"
 require "overrides_tracker/methods_collector"
 require "overrides_tracker/file_observer"
+require "overrides_tracker/string_colorizer"
 require "overrides_tracker/util"
 require "overrides_tracker/comparer"
 require "overrides_tracker/api"
@@ -19,46 +20,6 @@ end
 if defined? OVERRIDES_TRACKER_TRACKING_ENABLED
   Object.class_eval do
     class << self
-
-      def method_added(name)  
-        begin
-          if caller_locations(1)&.first&.absolute_path()&.include? Dir.pwd
-            clazz = ancestors.first
-            if OverridesTracker::MethodsCollector.instance.method_is_instance_override?(clazz.name, name)
-              puts "Method is instance override: #{clazz.name}##{name}".green
-              overriding_method = clazz.instance_method(name)
-              method_hash = OverridesTracker::Util.method_hash(overriding_method)
-              OverridesTracker::MethodsCollector.instance.mark_method_as_instance_override(clazz.name, name, overriding_method, method_hash)
-            elsif OverridesTracker::MethodsCollector.instance.method_is_singleton_override?(clazz.name, name)
-              puts "Method is singleton override: #{clazz.name}##{name}".green
-              overriding_method = clazz.singleton_method(name)
-              method_hash = OverridesTracker::Util.method_hash(overriding_method)
-              OverridesTracker::MethodsCollector.instance.mark_method_as_singleton_override(clazz.name, name, overriding_method, method_hash)
-            else   
-              if clazz.singleton_methods(false).include?(name) 
-                overriding_method = clazz.singleton_method(name)
-                if overriding_method.present?
-                  method_hash = OverridesTracker::Util.method_hash(overriding_method)
-                  puts "Method is a new singleton method: #{clazz.name}##{name}".green
-                  OverridesTracker::MethodsCollector.instance.mark_method_as_added_singleton(clazz.name, name, overriding_method, method_hash)
-                end
-              elsif clazz.instance_methods(false).include?(name) 
-                overriding_method = clazz.instance_method(name)
-                if overriding_method.present?
-                  method_hash = OverridesTracker::Util.method_hash(overriding_method)
-                  puts "Method is a new instance method: #{clazz.name}##{name}".green
-                  OverridesTracker::MethodsCollector.instance.mark_method_as_added_instance(clazz.name, name, overriding_method, method_hash)
-                end
-              end
-            end
-          end
-        rescue
-          puts "Error: Can not process ##{name}".red
-        end
-    
-        super
-      end
-
       def inherited(subclass)
         subclass.class_eval do
           def self.overrides_tracker_finished_file
@@ -70,7 +31,8 @@ if defined? OVERRIDES_TRACKER_TRACKING_ENABLED
       end
 
       def save_methods_of_class(clazz)
-        puts "Checking...#{clazz.name}"
+        puts "Reading...#{clazz.name}"
+
         inst_methods = clazz.instance_methods(false)
         inst_methods.each do |inst_method|
           method = clazz.instance_method(inst_method)
@@ -80,9 +42,11 @@ if defined? OVERRIDES_TRACKER_TRACKING_ENABLED
 
         single_methods = clazz.singleton_methods(false)
         single_methods.each do |single_method|
-          method = clazz.singleton_method(single_method)
-          method_hash = OverridesTracker::Util.method_hash(method)
-          OverridesTracker::MethodsCollector.instance.add_singleton_method_for_class(clazz.name, single_method, method_hash)
+          if single_method != :overrides_tracker_finished_file
+            method = clazz.singleton_method(single_method)
+            method_hash = OverridesTracker::Util.method_hash(method)
+            OverridesTracker::MethodsCollector.instance.add_singleton_method_for_class(clazz.name, single_method, method_hash)
+          end
         end
       end
     end
@@ -90,44 +54,7 @@ if defined? OVERRIDES_TRACKER_TRACKING_ENABLED
 end
 
 
-String.class_eval do
-  # colorization
-  def colorize(color_code)
-    "\e[#{color_code}m#{self}\e[0m"
-  end
-
-  def red
-    colorize(31)
-  end
 
-  def green
-    colorize(32)
-  end
-
-  def yellow
-    colorize(33)
-  end
-
-  def blue
-    colorize(34)
-  end
-
-  def pink
-    colorize(35)
-  end
-
-  def light_blue
-    colorize(36)
-  end
-
-  def bold
-    "\e[1m#{self}\e[22m"
-  end
-  
-  def italic
-    "\e[3m#{self}\e[23m" 
-  end
-end
 
 #Adding deep merge functionality
 Hash.class_eval do

data/overrides_tracker.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Simon Meyborg"]
   spec.email         = ["meyborg@syborgstudios.com"]
 
-  spec.summary       = 'Overrides Tracker keeps track of all overriding methods in your project and allows for comparison across branches.'
-  spec.description   = 'Overrides Tracker keeps track of all overriding methods in your project and allows for comparison across branches.'
+  spec.summary       = 'Overrides Tracker monitors methods you override for changes and allows for comparison across branches.'
+  spec.description   = 'Overrides Tracker monitors methods you override for changes and allows for comparison across branches.'
   spec.homepage      = "https://github.com/SyborgStudios/overrides_tracker"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overrides_tracker
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Simon Meyborg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-04 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -24,8 +24,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Overrides Tracker keeps track of all overriding methods in your project
-  and allows for comparison across branches.
+description: Overrides Tracker monitors methods you override for changes and allows
+  for comparison across branches.
 email:
 - meyborg@syborgstudios.com
 executables:
@@ -51,6 +51,7 @@ files:
 - lib/overrides_tracker/comparer.rb
 - lib/overrides_tracker/file_observer.rb
 - lib/overrides_tracker/methods_collector.rb
+- lib/overrides_tracker/string_colorizer.rb
 - lib/overrides_tracker/util.rb
 - lib/overrides_tracker/version.rb
 - overrides_tracker.gemspec
@@ -82,6 +83,6 @@ requirements: []
 rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
-summary: Overrides Tracker keeps track of all overriding methods in your project and
-  allows for comparison across branches.
+summary: Overrides Tracker monitors methods you override for changes and allows for
+  comparison across branches.
 test_files: []