bumbler 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c424f5491aa2f8ccc79cbf4f5825c477af3e77b74b85f6adcae5e3b522bebf
-  data.tar.gz: 63a03128fe7576578c5aa5a1486f261276c352d863607b687ba683033a950a8d
+  metadata.gz: c89d49c4a06405dfb85e410e301dc1c38b963b8fb3d01516a74c0653262c5ab4
+  data.tar.gz: 5166819a1081467131e185a596c0d3f2d3ed6110cf97bcf24d3c79f9389297e6
 SHA512:
-  metadata.gz: d186ef879c97e124d3cef56d8b0241ab90730da9746ee46560861c973ab48189197f3efb94be5e9093421996401a03aa50df6c001589985960a28c697044868f
-  data.tar.gz: c5decf76369edd662024404e7fa657d59ba3c99fa5918a37af57d3efbd9122d1b8a12c005794bff9ee44407abe3f8395f8fa878a19b668fedd9c95a6e244f98b
+  metadata.gz: 924cde7931d93dedc918501e2a151da50157983e8c9cc7fed393884c7af99ffe811d44274aba939dbc439e3b463ef21cd3b25170ceaf703d31121c529f0c9791
+  data.tar.gz: 2ea0410b258aa50a912979c061735ed08a8f83b800e2ed2eee061d2f488740049b9f8a8126e763e8ce8125c72674291703b67cbc6d2342bdb2560fc92fb1f89a

data/bin/bumbler

@@ -37,7 +37,7 @@ if options[:initializers]
   add_load_path.call # bundler kicks us out
   require 'bumbler/track_initializers'
   require './config/environment'
-elsif File.exist?('./config/environment')
+elsif File.exist?('./config/environment.rb')
   require 'bumbler/go'
   require './config/environment'
   add_load_path.call # bundler kicks us out

data/lib/bumbler/bundler.rb

@@ -22,7 +22,7 @@ module Bumbler
         @require_map = {}
         @gem_state = {}
 
-        ::Bundler.environment.current_dependencies.each do |spec|
+        ::Bundler.load.current_dependencies.each do |spec|
           gem_name = spec.name
           @gem_state[gem_name] = {}
 

data/lib/bumbler/hooks.rb

@@ -5,12 +5,6 @@ module Bumbler
     @started_items = {}
     @slow_requires = {}
 
-    module RequireLogger
-      def require(path, *args)
-        ::Bumbler::Hooks.handle_require(path) { super }
-      end
-    end
-
     # Everything's a class method (we're a singleton)
     class << self
       attr_writer :slow_threshold
@@ -19,13 +13,41 @@ module Bumbler
 
       # Inject our custom handling of require into the Kernel.
       def hook_require!
-        @hooking_require = true
+        hook_instance_require!
+        hook_singleton_require!
+      end
+
+      def hook_instance_require!
+        @hooking_instance_require = true
+
+        ::Kernel.module_eval do
+          orig_instance_require = instance_method(:require)
+          define_method(:require) do |path, *args|
+            ::Bumbler::Hooks.handle_require(path) do
+              orig_instance_require.bind(self).call(path, *args)
+            end
+          end
+          private :require # rubocop:disable Style/AccessModifierDeclarations
+        end
+
+        @hooking_instance_require = nil
+      end
+
+      def hook_singleton_require!
+        @hooking_singleton_require = true
 
-        # There are two independent require methods.  Joy!
-        ::Kernel.prepend RequireLogger
-        (class << ::Kernel; self; end).prepend RequireLogger
+        ::Kernel.module_eval do
+          class << self
+            orig_public_require = Kernel.public_method(:require)
+            define_method(:require) do |path, *args|
+              ::Bumbler::Hooks.handle_require(path) do
+                orig_public_require.call(path, *args)
+              end
+            end
+          end
+        end
 
-        @hooking_require = nil
+        @hooking_singleton_require = nil
       end
 
       # Even better: Other gems hook require as well.  The instance method one at least.
@@ -33,16 +55,25 @@ module Bumbler
         ::Kernel.module_eval do
           # It isn't previously defined in Kernel.  This could be a bit dangerous, though.
           def self.method_added(method_name, *_args)
-            if method_name == :require && !::Bumbler::Hooks.hooking_require?
-              # Fix those hooks.
-              ::Bumbler::Hooks.hook_require!
+            if method_name == :require && !Bumbler::Hooks.hooking_instance_require?
+              ::Bumbler::Hooks.hook_instance_require!
+            end
+          end
+
+          def self.singleton_method_added(method_name, *_args)
+            if method_name == :require && !Bumbler::Hooks.hooking_singleton_require?
+              ::Bumbler::Hooks.hook_singleton_require!
             end
           end
         end
       end
 
-      def hooking_require?
-        @hooking_require
+      def hooking_instance_require?
+        @hooking_instance_require
+      end
+
+      def hooking_singleton_require?
+        @hooking_singleton_require
       end
 
       # Actually do something about a require here.

data/lib/bumbler/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Bumbler
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bumbler
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ian MacLeod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Find slowly loading gems for your Bundler-based projects