overrides_tracker 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70dce7004599affb475e97520917e99a53d822334e91a2903a3e7a5f6ade2cdd
-  data.tar.gz: c90fe3480fb060b39a2432e2eec2ec7241b975366fca01642b412183d84154ab
+  metadata.gz: 52e9e378077f48a8e7c3aa3d66c8263b0a382c880d6c9a4138ab43b3aa1258bc
+  data.tar.gz: 9cc7d37a44eb61ef618dd90f1fe623c3e571760d3ace0af4f7f3a496dd79b196
 SHA512:
-  metadata.gz: 401d480227c2b3dce23c37fc769c06c9ae759c94ffbe72cefcb2bf5c6b60d7964ff3a289e69cbc47ebebced807261b5c6a5a3893603adfd0880a79bf90384156
-  data.tar.gz: fd825cfd85fdfb163a0d3ff5bc31268cf290cc83daf6d414e54ea43e9505ef7cdaa9f4dc49f9a299f61e73126070b0a5de9877b831298da73230ca9499b266c7
+  metadata.gz: 0bde076e4319f7a6a7f3abb5f1f2b850e28bbdc2fa99839e7b34dc4670db06d80f5669747da423e97fa62c20d28fe1778f29a0252219edd0a3b44a2a11f43eb4
+  data.tar.gz: cf8043ee35322037a673915b51241a2d7ec6f3ac4dafbeaca97700b8e2c24bcd8dd1a5e148d68eb0e0a7a243f990706cba027643afe01ee49a25960dc5650501

data/bin/overrides_tracker

@@ -5,6 +5,7 @@ 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/api.rb

@@ -3,8 +3,8 @@ require 'net/https'
 
 class OverridesTracker::Api
 
-  API_HOST = ENV['OVERRIDES_TRACKER_DEVELOPMENT'] ? "localhost:3000" : "overrides.io"
-  API_PROTOCOL = ENV['OVERRIDES_TRACKER_DEVELOPMENT'] ? "http" : "https"
+  API_HOST = false ? "localhost:3000" : "overrides.io"
+  API_PROTOCOL = false ? "http" : "https"
   API_DOMAIN = "#{API_PROTOCOL}://#{API_HOST}"
 
   API_BASE = "#{API_DOMAIN}/api/v1"

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,57 @@ 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)
+    else
+      methods = clazz.singleton_methods(false)
+    end
+
+    methods.each do |method_name|
+      if method_name != nil
+        method_hash = class_methods[methods_type][method_name]
+
+        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_to_check_hash[:location][0].include? working_directory)
+            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
+              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
+      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
@@ -76,7 +113,8 @@ class OverridesTracker::MethodsCollector
     data = nil
     begin
       File.open(file_path) do |f|
-        data = JSON.parse(f.read)
+        file_data = JSON.parse(f.read)
+        data = file_data['overridden_methods'] != nil ?  file_data['overridden_methods'] : file_data
       end
     rescue
       puts "Error processing #{file_path}"
@@ -85,8 +123,18 @@ class OverridesTracker::MethodsCollector
   end
 
   def save_to_file
+    
+    file_data = {}
+    file_data[:version] = OverridesTracker::VERSION
+    file_data[:branch_name] = branch_name
+    file_data[:branch_name_to_report] = branch_name_to_report
+    file_data[:last_commit_id] = last_commit_id
+    file_data[:last_commit_name] = last_commit_name
+    file_data[:last_commit_name_to_report] = last_commit_name_to_report
+    file_data[:overridden_methods] = @overridden_methods_collection
+
     File.open(path_to_report_file, "w") do |f|
-      f << @overridden_methods_collection.to_json
+      f << file_data.to_json
     end
     puts '  '
     puts '==========='
@@ -104,6 +152,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.3"
+  VERSION = "0.1.5"
 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)
@@ -90,44 +52,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.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Simon Meyborg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-04 00:00:00.000000000 Z
+date: 2022-12-06 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: []