fastup 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff7fb62d73261c1f323338c749f82791546ab1b74de3d257e2254f7d19485ef
-  data.tar.gz: fc7578d69d7c3da331cd4515da1f25344b9d30597e744aab26802ec929822e66
+  metadata.gz: ed16ec41e53affe880060f5a68b2be13f40dda18fed6df09b7fef562aeeffe6c
+  data.tar.gz: 53dcd47645e9b560a96c071f3e8445a5cebbdd4bf6083288ccf56a4c721603d8
 SHA512:
-  metadata.gz: 3b320c6cfb22ae4c3e9c8cbd3a55d7c009a3503b4b6bd0e090205c5578ffe4564194047bd6e2336e2759431840d3c45cc7c20320bc92bdfe768872e7ae8d94c1
-  data.tar.gz: 07a1a6f7e9fcc4694a60b9770842bf33e7e8e64fd7b3dd1916c61f8bba4ff2366c78f05875063e118b8dc7e5c6c42a032f2a22027369fe08bac96f622d0baaac
+  metadata.gz: 93f1e6f5ec39d3708850e9b7af7fa4e3dd3eb252845680fb2678855281a04476e99767b8fc4dc1d933918281f6029c08a1d508caa53d06633fefa850e23896d1
+  data.tar.gz: a1ea36d4c1ce7cdb15db3fd72afa64cc5b9ebb1fde8aec5709cecd8a552ecd110620d70d56fd4dd02b536fd75e1d4df5fbbf44e9aa94e913a7ad80ee0e7388c1

data/lib/fastup.rb

@@ -1,35 +1,37 @@
 module Fastup
-  extend self
+  def self.require(name, original_require)
+    path = @suffixes.map{ |s| @sp.lookup(name.to_s + s) rescue nil }.find do |p|
+      p && File.file?(p)
+    end
 
-  def apply!
-    warn "fastup: building load path index"
-    sp = SearchPath.new($LOAD_PATH)
-    suffixes = Gem.suffixes.lazy
+    # require the absolute path if found, otherwise fallback to original name
+    ret = original_require.call(path || name)
 
-    warn "fastup: patching require"
-    mod = Module.new do
-      define_method(:require) do |name|
-        path = suffixes.map{ |s| sp.lookup(name.to_s + s) rescue nil }.find do |p|
-          p && File.file?(p)
-        end
+    if ret && ENV['FASTUP_DEBUG']
+      if path
+        warn "fastup: loaded #{name} => #{path}"
+      else
+        warn "fastup: super #{name}"
+      end
+    end
 
-        # require the absolute path if found, otherwise fallback to original name
-        ret = super(path || name)
+    ret
+  end
 
-        if ret && ENV['FASTUP_DEBUG']
-          if path
-            warn "fastup: loaded #{name} => #{path}"
-          else
-            warn "fastup: super #{name}"
-          end
-        end
+  def self.apply!
+    @sp = SearchPath.new($LOAD_PATH)
+    @suffixes = Gem.suffixes.lazy
 
-        ret
-      end
+    instance_require = Kernel.instance_method(:require)
+    require = Kernel.method(:require)
+
+    Kernel.send(:define_method, :require) do |name|
+      Fastup.require(name, instance_require.bind(self))
     end
 
-    Object.prepend mod # normal "require 'somegem'" invokes this
-    Kernel.singleton_class.prepend mod # explicit "Kernel.require 'somegem'"
+    Kernel.singleton_class.send(:define_method, :require) do |name|
+      Fastup.require(name, require)
+    end
   end
 
   module XFile

data/test/app/boot.rb

@@ -2,4 +2,4 @@ require 'bundler/setup'
 require 'fastup/autoapply' if ENV['USE_FASTUP']
 Bundler.require
 
-puts $LOADED_FEATURES.join("\n")
+puts $LOADED_FEATURES.map{|f| "feature:#{f}" }.join("\n")

data/test/app/counts.rb

@@ -0,0 +1,15 @@
+require 'benchmark'
+
+require 'bundler/setup'
+require 'fastup/autoapply' if ENV['USE_FASTUP']
+
+total = Benchmark.measure{ Bundler.require }.total
+
+puts ['gems_count', 'load_path_size', 'loaded_features_size', 'time'].join("\t") if ENV['PRINT_HEADER']
+
+puts "%d\t%d\t%d\t%.5f" % [
+       ENV['GEMS_COUNT'].to_i,
+       $LOAD_PATH.size,
+       $LOADED_FEATURES.size,
+       total,
+     ]

data/test/fastup_test.rb

@@ -1,35 +1,38 @@
 require 'benchmark'
+require 'open3'
 require 'tmpdir'
 
 require 'test_helper'
 
 module Fastup
   class TestAppBoot < Minitest::Test
+    def capture(*args)
+      out, status = Open3.capture2e(*args)
+      raise "#{args} exited with error:\n#{out}" unless status.success?
+      out
+    end
+
     tag :slow
     def test_app_boot
       results = {}
 
       Bundler.with_original_env do
         Dir.chdir(File.expand_path('../app', __FILE__)) do
-          results[:setup] = `bundle --quiet`
-          raise "bundle exited with error: #{results[:setup]}" unless $?.success?
+          results[:setup] = capture "bundle --quiet"
+
+          filter = ->(line) do
+            line =~ /^feature:/ && line !~ %r{/lib/fastup}
+          end
 
           results[:total_fastup] = Benchmark.measure {
-            out = `USE_FASTUP=1 bundle exec ruby boot.rb 2>/dev/null`
-            raise "fastup exited with error: #{out}" unless $?.success?
-            results[:output_fastup] = out.lines.reject{ |p| p =~ %r{/lib/fastup} }
+            results[:output_fastup] = capture("USE_FASTUP=1 BUNDLE_FROZEN=true bundle exec ruby boot.rb").lines.select(&filter)
           }
           results[:total_nofastup] = Benchmark.measure {
-            out = `bundle exec ruby boot.rb`
-            raise "nofastup exited with error: #{out}" unless $?.success?
-            results[:output_nofastup] = out.lines.reject{ |p| p =~ %r{/lib/fastup} }
+            results[:output_nofastup] = capture("BUNDLE_FROZEN=true bundle exec ruby boot.rb").lines.select(&filter)
           }
         end
       end
 
-      results[:output_fastup].reject!{ |p| p =~ %r{fastup/lib/fastup} }
-      results[:output_nofastup].reject!{ |p| p =~ %r{fastup/lib/fastup} }
-
       warn("\nfastup: %.2f nofastup: %.2f" % [results[:total_fastup].total, results[:total_nofastup].total])
 
       assert results[:total_fastup].total < results[:total_nofastup].total,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastup
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Patrick Mahoney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -94,6 +94,7 @@ files:
 - lib/fastup.rb
 - lib/fastup/autoapply.rb
 - test/app/boot.rb
+- test/app/counts.rb
 - test/fastup_test.rb
 - test/test_helper.rb
 homepage: https://github.com/raisemarketplace/fastup