bumbler 0.6.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a60e2a6c84fbfe256e680819c7e7782fbe1b02c8719967d98debdf89dcb85ca
-  data.tar.gz: 2c94bb726e5f97523fff0c80674f60119e5b247d62d3d5e047594aa2bacd7835
+  metadata.gz: 7ad7fe2ebf27b55813bffb1ba59a966c14f9c3eda4b9df33d568754072549e1e
+  data.tar.gz: e64f75c85c1b996dd5cdfc2ddc1fc2d318e3809464788758578a2799864e6f7f
 SHA512:
-  metadata.gz: f7644c6cdb5b218d01fa3b9c47835a3be6e1a9260dc94d15d9628b021b4653f1330963c7084cba7947e9569858f92174fadd7510a088a0407dfeefde413b7860
-  data.tar.gz: 4f5019ba1b21b83ef31a40be91fe911ad915d0d1030527206476485d81c8342e8db3f7e2c47582d71ffdbedbf4fe5439244f5e8bc774274971b06b2da44b5f95
+  metadata.gz: 75412e45f8d0764be03b8a7c657d477cc51be29b25ff74b614dfacac3440b2e3d0d2ed8442af3de0da0288cc7cb982a883889e2571edb284a281ced58408c9dd
+  data.tar.gz: d1c438a7d9f168ab285c16c53a10ffbe505a6b312d6667b2a201d8e6d4049a25576809cc781991593656380bfa6df75aaa305343c1cd3ca1d9b7c5e92d7b2cf3

data/README.md

@@ -6,7 +6,7 @@ Find slow loading gems in your [Bundler](http://gembundler.com/)-based projects!
 Bumbler tracks how long the main require of each gem takes,
 for example with `gem 'bar'` it tracks `require 'bar'`. If the gem name and the require name are different,
 add `require:` manually for correct time tracking, for example `gem 'bar-foo', require: 'bar_foo'`.
-This reuquire tracking can sometimes lead to false positives, because of dependencies,
+This require tracking can sometimes lead to false positives, because of dependencies,
 for example `foo` requires `rails` which leads to `foo` being marked as slow.
 
 For rails projects it loads `config/environment.rb`, for all others it runs `Bundler.require *Bundler.groups`.

data/bin/bumbler

@@ -21,7 +21,9 @@ OptionParser.new do |parser|
 
     Options:
   BANNER
-  parser.on("-t", "--threshold MILLISECONDS", Integer, "Threshold in ms to be listed as slow") { |t| options[:threshold] = t }
+  parser.on("-t", "--threshold MILLISECONDS", Integer, "Threshold in ms to be listed as slow") do |t|
+    options[:threshold] = t
+  end
   parser.on("--initializers", "Show load time of initializers") { options[:initializers] = true }
   parser.on("--all", "Show all load times") { options[:all] = true }
   parser.on("-h", "--help", "Show this.") { puts parser; exit }
@@ -37,7 +39,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

@@ -13,9 +13,29 @@ 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
+        end
+
+        @hooking_instance_require = nil
+      end
+
+      def hook_singleton_require!
+        @hooking_singleton_require = true
 
-        # There are two independent require methods.  Joy!
         ::Kernel.module_eval do
           class << self
             orig_public_require = Kernel.public_method(:require)
@@ -25,33 +45,35 @@ module Bumbler
               end
             end
           end
-
-          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
         end
 
-        @hooking_require = nil
+        @hooking_singleton_require = nil
       end
 
       # Even better: Other gems hook require as well.  The instance method one at least.
       def watch_require!
         ::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!
+          def self.method_added(method_name, *_args) # rubocop:disable Lint/MissingSuper
+            if method_name == :require && !Bumbler::Hooks.hooking_instance_require?
+              ::Bumbler::Hooks.hook_instance_require!
+            end
+          end
+
+          def self.singleton_method_added(method_name, *_args) # rubocop:disable Lint/MissingSuper
+            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/progress.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 # TODO: replace with ruby-progressbar dependency
+require 'io/console'
+
 module Bumbler
   module Progress
     @item_count   = 0
@@ -36,7 +38,8 @@ module Bumbler
       end
 
       def tty_width
-        `tput cols`.to_i || 80
+        # console_winsize: https://github.com/ruby/ruby/blob/f27eb8148f5a72bbacfebfecc7de9305471bb5c9/ext/io/console/console.c#L796
+        IO.console.winsize[1]
       end
 
       def bar(width)

data/lib/bumbler/track_initializers.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
-Rails::Engine.prepend(Module.new do
-  def load(file, *)
-    initializer = file.sub(Rails.root.to_s, ".")
-    Bumbler::Hooks.benchmark(initializer) { super }.last
+Rails::Engine.prepend(
+  Module.new do
+    def load(file, *)
+      initializer = file.sub(Rails.root.to_s, ".")
+      Bumbler::Hooks.benchmark(initializer) { super }.last
+    end
   end
-end)
+)
 
-Rails::Initializable::Initializer.prepend(Module.new do
-  def run(*)
-    name = (@name.is_a?(Symbol) ? @name.inspect : @name)
-    Bumbler::Hooks.benchmark(name) { super }.last
+Rails::Initializable::Initializer.prepend(
+  Module.new do
+    def run(*)
+      name = (@name.is_a?(Symbol) ? @name.inspect : @name)
+      Bumbler::Hooks.benchmark(name) { super }.last
+    end
   end
-end)
+)

data/lib/bumbler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bumbler
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Ian MacLeod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-26 00:00:00.000000000 Z
+date: 2022-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -97,14 +97,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Find slowly loading gems for your Bundler-based projects