overrides_tracker 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52e9e378077f48a8e7c3aa3d66c8263b0a382c880d6c9a4138ab43b3aa1258bc
-  data.tar.gz: 9cc7d37a44eb61ef618dd90f1fe623c3e571760d3ace0af4f7f3a496dd79b196
+  metadata.gz: 697c58a5a0c9db02845d9812170b02f2a9dc9415db401db25edab2693476c639
+  data.tar.gz: d8962351ec1438b7d1a550fb0622b66e4d03e9e598cd8e704f25e3614d4f7dcf
 SHA512:
-  metadata.gz: 0bde076e4319f7a6a7f3abb5f1f2b850e28bbdc2fa99839e7b34dc4670db06d80f5669747da423e97fa62c20d28fe1778f29a0252219edd0a3b44a2a11f43eb4
-  data.tar.gz: cf8043ee35322037a673915b51241a2d7ec6f3ac4dafbeaca97700b8e2c24bcd8dd1a5e148d68eb0e0a7a243f990706cba027643afe01ee49a25960dc5650501
+  metadata.gz: f88b7b5eeeb80b6ac306908b5e810d0c17cef5573da16a778c361594e18f7fb6cb2e6c1a7a9121d4279dfc5e9596b6958d297c22b15ef0f83a486718697cc480
+  data.tar.gz: 5b469f55caed226a3deca1fd93a9a7e3b15e8d4a5e0fdf1f6bba128850c40740a1e72a488a7d31868ed8ad92aa0261aaabd19ee4df997fe00cb1c76c8a3e85db

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
 

data/lib/overrides_tracker/api.rb

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

data/lib/overrides_tracker/methods_collector.rb

@@ -36,6 +36,7 @@ class OverridesTracker::MethodsCollector
     @overridden_methods_collection[class_name][method_type][method_name] = @methods_collection[class_name][method_type][method_name]
     @overridden_methods_collection[class_name][method_type][method_name][:overriding_location] = overriding_method.source_location
     @overridden_methods_collection[class_name][method_type][method_name][:overriding_body] = method_hash[:body]
+    @overridden_methods_collection[class_name][method_type][method_name][:overriding_sha] = method_hash[:sha]
   end
 
   def mark_method_as_added_instance(class_name, method_name, overriding_method, method_hash)
@@ -56,34 +57,49 @@ class OverridesTracker::MethodsCollector
     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
+      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
 
-        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)
+          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
-              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
+              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

data/lib/overrides_tracker/version.rb

@@ -1,3 +1,3 @@
 module OverridesTracker
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/lib/overrides_tracker.rb

@@ -42,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overrides_tracker
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Simon Meyborg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source