evilution 0.22.3 → 0.22.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05657264e506e5a6b5041d68b5eb46bfcbbf9a17780caeb3c44feaf5f5d18794
-  data.tar.gz: a7e6333fc26d21799b3807d3fbc2758ae54e00de2c7f1028e5ad30cf8777e8d2
+  metadata.gz: 8dfc39a794faace7567c4539876cb9c331cba15f62420625aafc8adf9d3fb7bf
+  data.tar.gz: e199a8d90e70db722e76fe785968385dc1725297ee6020b31760fdfad5745c70
 SHA512:
-  metadata.gz: 8d791eba8e795dcaa34c6ff3cc82a4b9653cfc282fcff1f7a75911bdfbd192689d21324ad793077700644a497c8320b2fb77e874bff63cd98c1a788390a27309
-  data.tar.gz: 5ee22113b3b0343c60c08ca4c4c4160492617827376c783fbe0052d5a5a59ab37199fc16de349502c6c7d26f2c64814abf7ad31228e325dcdc1be86e1a7930d7
+  metadata.gz: 32d62ef27f34042244512d5d52082c4a53d82b0f6de91e924faebd8317d5d2d8c57a5fa53b8b5f3cc6bee325723e62dcfbd0b32d9bc8c2b17f368cde027a93b1
+  data.tar.gz: c4695099eb10bbdd2f69995fa95f3f9dcb8dbb3497532758b9177594fb9e098021080924276cf582c5b951dc95e6af39d1d7e2d1fae404f2e451bf8622fefa39

data/CHANGELOG.md

@@ -1,10 +1,22 @@
 # Changelog
 
+## [0.22.5] - 2026-04-12
+
+### Fixed
+
+- **`ActiveSupport::Concern` modules: all mutations error with `MultipleIncludedBlocks`** — re-evaluating a mutated concern file triggered Rails' guard because `@_included_block` (and `@_prepended_block`) was already set from the original load with a different `source_location`; now `clear_concern_state` removes these instance variables from affected concern modules before `require`/`load`, matching both original file paths and temp-dir copies via subpath suffix so consecutive mutations of the same concern also succeed (#676, PR #678)
+
+## [0.22.4] - 2026-04-12
+
+### Fixed
+
+- **`LoadError: cannot load such file -- spec_helper` during preload** — `perform_preload` ran before `ensure_framework_loaded`, so `spec/` was not on `$LOAD_PATH` and `rspec/core` was not loaded when `rails_helper.rb` tried to `require 'spec_helper'` and call `RSpec.configure`; now `prepare_load_path_for_preload` adds `spec/` to `$LOAD_PATH` and loads `rspec/core` before the preload file; errors (e.g. missing `rspec-core` gem) propagate as `ConfigError` with clear context (#669, #673)
+
 ## [0.22.3] - 2026-04-12
 
 ### Fixed
 
-- **`LoadError: cannot load such file -- spec_helper`** — projects with `--require spec_helper` in `.rspec` failed on every mutation because `spec/` was not on `$LOAD_PATH`; RSpec's CLI normally adds it, but evilution calls `RSpec::Core::Runner.run` directly, bypassing the CLI; now adds `spec/` to `$LOAD_PATH` in both `ensure_framework_loaded` and `baseline_runner` (#669)
+- **`LoadError: cannot load such file -- spec_helper`** — projects with `--require spec_helper` in `.rspec` failed on every mutation because `spec/` was not on `$LOAD_PATH`; RSpec's CLI normally adds it, but evilution calls `RSpec::Core::Runner.run` directly, bypassing the CLI; now adds `spec/` to `$LOAD_PATH` in `ensure_framework_loaded`, `baseline_runner`, and `perform_preload`; also loads `rspec/core` before preloading so that `spec_helper.rb` can use `RSpec.configure` (#669)
 
 ## [0.22.2] - 2026-04-12
 

data/lib/evilution/integration/base.rb

@@ -87,6 +87,7 @@ class Evilution::Integration::Base
     File.write(dest, mutation.mutated_source)
     $LOAD_PATH.unshift(@temp_dir)
     displace_loaded_feature(mutation.file_path)
+    clear_concern_state(mutation.file_path)
     require(subpath.delete_suffix(".rb"))
   end
 
@@ -95,6 +96,7 @@ class Evilution::Integration::Base
     dest = File.join(@temp_dir, absolute)
     FileUtils.mkdir_p(File.dirname(dest))
     File.write(dest, mutation.mutated_source)
+    clear_concern_state(mutation.file_path)
     load(dest)
   end
 
@@ -110,6 +112,35 @@ class Evilution::Integration::Base
     @temp_dir = nil
   end
 
+  def clear_concern_state(file_path)
+    return unless defined?(ActiveSupport::Concern)
+
+    absolute = File.expand_path(file_path)
+    subpath = resolve_require_subpath(file_path)
+
+    ObjectSpace.each_object(Module) do |mod|
+      next unless mod.singleton_class.ancestors.include?(ActiveSupport::Concern)
+
+      %i[@_included_block @_prepended_block].each do |ivar|
+        next unless mod.instance_variable_defined?(ivar)
+
+        block = mod.instance_variable_get(ivar)
+        block_file = block.source_location&.first
+        next unless block_file
+
+        expanded = File.expand_path(block_file)
+        mod.remove_instance_variable(ivar) if source_matches?(expanded, absolute, subpath)
+      end
+    end
+  end
+
+  def source_matches?(block_path, absolute, subpath)
+    return true if block_path == absolute
+    return true if subpath && block_path.end_with?("/#{subpath}")
+
+    false
+  end
+
   def resolve_require_subpath(file_path)
     absolute = File.expand_path(file_path)
     best_subpath = nil

data/lib/evilution/runner.rb

@@ -528,6 +528,7 @@ class Evilution::Runner
     path = resolve_preload_path
     return unless path
 
+    prepare_load_path_for_preload
     require File.expand_path(path)
   rescue ScriptError, StandardError => e
     raise Evilution::ConfigError.new(
@@ -536,6 +537,23 @@ class Evilution::Runner
     )
   end
 
+  # Preload files (e.g. spec/rails_helper.rb) typically `require 'spec_helper'`
+  # which needs spec/ on $LOAD_PATH, and use `RSpec.configure` which needs
+  # rspec/core loaded. The RSpec CLI normally sets this up, but evilution
+  # calls Runner.run directly.
+  def prepare_load_path_for_preload
+    spec_dir = File.expand_path(resolve_spec_dir)
+    $LOAD_PATH.unshift(spec_dir) unless $LOAD_PATH.include?(spec_dir)
+    require "rspec/core" if config.integration == :rspec
+  end
+
+  def resolve_spec_dir
+    root = detected_rails_root
+    return File.join(root, "spec") if root
+
+    "spec"
+  end
+
   def resolve_preload_path
     if config.preload.is_a?(String)
       unless File.file?(config.preload)

data/lib/evilution/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Evilution
-  VERSION = "0.22.3"
+  VERSION = "0.22.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evilution
 version: !ruby/object:Gem::Version
-  version: 0.22.3
+  version: 0.22.5
 platform: ruby
 authors:
 - Denis Kiselev