zeus 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6763099ec0acd75e736c7dac93c0b085096cc62ef64716be3c8503eab4f489e
-  data.tar.gz: 54f4f6d0316bcedebecdb02e45e1d4c6a953db52ef63d776c2d6c581e83cada7
+  metadata.gz: 3a6d45ec7899f6f3608e686da81cd443cffd058aca885759799185d2fc649fee
+  data.tar.gz: e5d033171d13916defb233555f17822611225e962d985b2f366015a9844eb20f
 SHA512:
-  metadata.gz: 4e0cdbd5348ab0dbb3bbf3154a2b9743266d7001ec4688df0516eb48593d7a0366686f6df6bbe2d945d7b7eb0c604985f62a8d5d96622e513a56806cba6890f5
-  data.tar.gz: 98d7c5c3c7f2095238c77ae049a5c94f9bd525cb8e58fb3a2238018a5ac832954a5e32a2b4fa65687feccf8f00b78f1c4ea39592746b7b6646e286014cacf2cd
+  metadata.gz: 60355aaca66db85f170bf4e6191bd1c7313c87bcf8a30722490f905708f40d1c174a3cc381e57310c9da6b177b2c47c4a53d31b6730868508cc30e6606251537
+  data.tar.gz: f6dc19bb8a9f56dd9da996664bb488d481848a4a4178623bfe320bf74871ae9a884bde89eb9277cf8bc31690f291d392125d7ccfb05ca3ce88a47424485790b9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zeus (0.16.0)
+    zeus (0.18.0)
       method_source (>= 0.6.7)
 
 GEM
@@ -29,7 +29,9 @@ GEM
     rspec-support (3.12.1)
 
 PLATFORMS
+  arm64-darwin-24
   x86_64-darwin-22
+  x86_64-darwin-23
 
 DEPENDENCIES
   bundler (~> 2.3)

data/lib/zeus/load_tracking.rb

@@ -53,15 +53,19 @@ module Zeus
       private
 
       def notify_features(features)
-        unless @feature_pipe
-          raise "Attempted to report features to Zeus when not running as part of a Zeus process"
-        end
+        return unless @feature_pipe
 
         @feature_mutex.synchronize do
           features.each do |t|
             @feature_pipe.puts(t)
+          rescue Errno::EPIPE, Errno::EBADF, IOError
+            break
           end
         end
+      rescue Errno::EPIPE, Errno::EBADF, IOError
+        # Feature pipe is broken; skip tracking. This must not raise because
+        # notify_features is called from ensure blocks and an exception here
+        # would replace the original exception being propagated.
       end
     end
   end
@@ -88,9 +92,9 @@ require 'yaml'
 module YAML
   class << self
     alias_method :__load_file_without_zeus, :load_file
-    def load_file(file, *a)
+    def load_file(file, **kwargs)
       Zeus::LoadTracking.add_feature(file)
-      __load_file_without_zeus(file, *a)
+      __load_file_without_zeus(file, **kwargs)
     end
   end
 end

data/lib/zeus/m.rb

@@ -10,7 +10,7 @@ require "zeus/m/test_method"
 # To avoid possible "you've activated X; gemfile specifies Y" errors, we actually scan
 # Gemfile.lock for a specific version, and require exactly that version if present.
 gemfile_lock = ROOT_PATH + "/Gemfile.lock"
-if File.exists?(gemfile_lock)
+if File.exist?(gemfile_lock)
   version = File.read(ROOT_PATH + "/Gemfile.lock").
     scan(/\bmethod_source\s*\(([\d\.]+)\)/).flatten[0]
 

data/lib/zeus/rails.rb

@@ -1,6 +1,6 @@
 def find_rails_path(root_path)
   paths = %w(spec/dummy test/dummy .)
-  paths.find { |path| File.exists?(File.expand_path(path, root_path)) }
+  paths.find { |path| File.exist?(File.expand_path(path, root_path)) }
 end
 
 ROOT_PATH = File.expand_path(Dir.pwd)
@@ -9,6 +9,24 @@ ENV_PATH  = File.expand_path('config/environment',  RAILS_PATH)
 BOOT_PATH = File.expand_path('config/boot',  RAILS_PATH)
 APP_PATH  = File.expand_path('config/application',  RAILS_PATH) unless defined? APP_PATH
 
+# Set up Bundler's gem environment before loading any gems to prevent version
+# conflicts (e.g. default gem versions conflicting with the app's Gemfile).
+# We must do this before `require 'zeus'` so that gems like json/ostruct are
+# activated at the Gemfile-pinned versions from the start.
+#
+# Bundler#setup may strip zeus's own lib path from $LOAD_PATH if zeus isn't
+# listed in the app's Gemfile, so we capture it first and restore it after.
+_zeus_lib_path = File.expand_path('../../', __FILE__)
+begin
+  require 'bundler/setup'
+rescue LoadError
+  # Bundler not installed; continue without it.
+rescue => e
+  # Bundler setup failed (e.g. no Gemfile, gem conflict); continue without it.
+ensure
+  $LOAD_PATH.unshift(_zeus_lib_path) unless $LOAD_PATH.include?(_zeus_lib_path)
+end
+
 require 'zeus'
 
 def gem_is_bundled?(gem)
@@ -76,10 +94,10 @@ module Zeus
     end
 
     def boot
-      _monkeypatch_rake
       $LOAD_PATH.unshift "./lib"
 
       require BOOT_PATH
+      _monkeypatch_rake
       # config/application.rb normally requires 'rails/all'.
       # Some 'alternative' ORMs such as Mongoid give instructions to switch this require
       # out for a list of railties, not including ActiveRecord.
@@ -210,13 +228,13 @@ module Zeus
       if ENV['RAILS_TEST_HELPER']
         require ENV['RAILS_TEST_HELPER']
       else
-        if File.exists?(ROOT_PATH + "/spec/rails_helper.rb")
+        if File.exist?(ROOT_PATH + "/spec/rails_helper.rb")
           # RSpec >= 3.0+
           require 'rails_helper'
-        elsif File.exists?(ROOT_PATH + "/spec/spec_helper.rb")
+        elsif File.exist?(ROOT_PATH + "/spec/spec_helper.rb")
           # RSpec < 3.0
           require 'spec_helper'
-        elsif File.exists?(ROOT_PATH + "/test/minitest_helper.rb")
+        elsif File.exist?(ROOT_PATH + "/test/minitest_helper.rb")
           require 'minitest_helper'
         else
           require 'test_helper'

data/lib/zeus/version.rb

@@ -1,3 +1,3 @@
 module Zeus
-  VERSION = "0.16.0"
+  VERSION = "0.18.0"
 end

data/lib/zeus.rb

@@ -187,12 +187,16 @@ module Zeus
 
     def report_error_to_master(local, error)
       str = "R:"
-      str << "#{error.backtrace[0]}: #{error.message} (#{error.class})\n"
-      error.backtrace[1..-1].each do |line|
+      backtrace = error.backtrace || []
+      str << "#{backtrace[0] || '(no backtrace)'}: #{error.message} (#{error.class})\n"
+      backtrace[1..-1].each do |line|
         str << "\tfrom #{line}\n"
       end
       str << "\0"
       local.write str
+    rescue Exception
+      # If building or writing the error message itself fails, there is nothing
+      # we can do — the master will see EOF and mark the slave as crashed.
     end
 
     def run_action(socket, identifier)
@@ -204,7 +208,7 @@ module Zeus
         end
 
         socket.write "R:OK\0"
-      rescue => err
+      rescue Exception => err
         report_error_to_master(socket, err)
         raise
       end

data/spec/rails_spec.rb

@@ -5,7 +5,7 @@ module Zeus
     subject(:rails) { Rails.new }
 
     def mock_file_existence(file, result)
-      expect(File).to receive(:exists?).with(file).and_return(result)
+      expect(File).to receive(:exist?).with(file).and_return(result)
     end
 
     describe "#test_helper" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Burke Libbey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2026-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -91,6 +91,7 @@ files:
 - spec/m_spec.rb
 - spec/rails_spec.rb
 - spec/zeus_spec.rb
+- zeus-0.17.0.gem
 - zeus.gemspec
 homepage: https://github.com/burke/zeus
 licenses:
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Zeus is an intelligent preloader for ruby applications. It allows normal