flay 2.14.0 → 2.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c7f7b9d1cb38c582802edc030bce9090a4f6c5d407ff6f5bead6fda67acdeda
-  data.tar.gz: 3ea1d180981dbdada766c51a9073485f85bcf7847fa43328d32fe1d0fd9b52a5
+  metadata.gz: bc9ce0202d55742699dc59bcc8793683a7efc68a7f9f395c5f740b97836c0c85
+  data.tar.gz: f389db1f4bae7f7f2535986317a566d355108ffc5e0652cba87b0a6c2f7566c4
 SHA512:
-  metadata.gz: 1057f752d2e665129fb259dee3dfc15c151b62fc928f77c1ab417e728a674dc47c6d90bf47ef63dfc7b9c0162d7f1d41ed43c5b30b63d631ded4f457ec9adf1f
-  data.tar.gz: 8d31dd5ae191f6055c36c6c77adeae47bd0309ab71ff3521469a22e4c7ff7cfbae829fcee8b4811dcad5f7d2f901a3a36b5ba1b63425f1cd63b029c69bbc6edd
+  metadata.gz: 742fa42cabacbe0cf3d65a5c7083c60b019a014f0f1e9509edd00507809335bf7315f9e254eccda05f347f32c39c034963cddea8bdd3ad8735648380d3ded6b9
+  data.tar.gz: 804293d0ccedb1900e65bd4bcec84246e9d3caf01fd87a411c36e2116affc915b1d0b694d88aaa9d527357e09332e2ae5c1a37def8d47852f925acaf725ea63e

data/History.rdoc

@@ -1,3 +1,17 @@
+=== 2.14.2 / 2026-01-06
+
+* 1 bug fix:
+
+  * Namespace NotRubyParser to avoid problems with bundler's horrid eager loading. (nateberkopec)
+
+=== 2.14.1 / 2025-12-20
+
+* 3 bug fixes:
+
+  * Bumped dependency to prism to get some upstreamed fixes.
+  * Loosened the minitest dependency to include MT6.
+  * Removed local copy of the upstreamed fixes.
+
 === 2.14.0 / 2025-12-11
 
 * 2 minor enhancements:

data/Rakefile

@@ -4,14 +4,13 @@ require "rubygems"
 require "hoe"
 
 Hoe::add_include_dirs("../../sexp_processor/dev/lib",
-                      "../../ruby_parser/dev/lib",
                       "../../ruby2ruby/dev/lib",
                       "../../ZenTest/dev/lib",
                       "../../path_expander/dev/lib",
                       "lib")
 
 Hoe.plugin :seattlerb
-Hoe.plugin :isolate
+Hoe.plugin :isolate_binaries
 Hoe.plugin :rdoc
 Hoe.plugin :bundler
 
@@ -20,11 +19,11 @@ Hoe.spec "flay" do
   license "MIT"
 
   dependency "sexp_processor", "~> 4.0"
-  dependency "prism",          "~> 1.5"
+  dependency "prism",          "~> 1.7"
   dependency "erubi",          "~> 1.10"
   dependency "path_expander",  "~> 2.0"
 
-  dependency "minitest",       "~> 5.8.0", :dev
+  dependency "minitest",       "> 5.8", :dev
   dependency "ruby2ruby",      "~> 2.2.0", :dev
 
   self.flay_threshold = 250

data/lib/flay.rb

@@ -5,60 +5,13 @@ require "sexp_processor"
 require "path_expander"
 require "timeout"
 require "zlib"
-
 require "prism"
 require "prism/translation/ruby_parser"
 
-unless Prism::Translation::RubyParser.method_defined? :process then
-  module PrismCompilerMonkeyPatches
-    def attach_comments sexp, node
-      return unless node.comments
-      return if node.comments.empty?
-
-      extra = node.location.start_line - node.comments.last.location.start_line
-      comments = node.comments.map(&:slice)
-      comments.concat [nil] * extra
-      sexp.comments = comments.join "\n"
-    end
-
-    def visit_class_node(node)  = super.tap { |sexp| attach_comments sexp, node }
-    def visit_def_node(node)    = super.tap { |sexp| attach_comments sexp, node }
-    def visit_module_node(node) = super.tap { |sexp| attach_comments sexp, node }
-  end
-
-  module PrismRPMonkeyPatches
-    def process ruby, file="(string)", timeout=nil
-      Timeout.timeout timeout do
-        parse ruby, file
-      end
-    end
-
-    def translate(result, filepath)
-      result.attach_comments!
-      super
-    end
-  end
-
-  module Prism
-    module Translation
-      class RubyParser
-        prepend PrismRPMonkeyPatches
-
-        class Compiler
-          prepend PrismCompilerMonkeyPatches
-        end
-      end
-    end
-  end
-else
-  warn "Tell zenspider to remove prism monkeypatches: #{caller.first}"
-end
-
-class NotRubyParser < Prism::Translation::RubyParser # compatibility layer
-end
-
 class Flay
-  VERSION = "2.14.0" # :nodoc:
+  VERSION = "2.14.2" # :nodoc:
+
+  NotRubyParser = Class.new Prism::Translation::RubyParser # compatibility layer :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus

data/test/test_flay.rb

@@ -4,8 +4,6 @@ require "minitest/autorun"
 require "flay"
 require "tmpdir"
 
-$: << "../../sexp_processor/dev/lib"
-
 class TestSexp < Minitest::Test
   OPTS = Flay.parse_options %w[--mass=1 -v]
 
@@ -64,6 +62,8 @@ class TestSexp < Minitest::Test
     assert_equal expected, x.sort.uniq
   end
 
+  NotRubyParser = Flay::NotRubyParser
+
   DOG_AND_CAT = NotRubyParser.new.process <<~RUBY
     ##
     # I am a dog.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.2
 platform: ruby
 authors:
 - Ryan Davis
@@ -9,9 +9,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBCTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTI1MDEwNjIzMjcwMVoXDTI2MDEwNjIzMjcwMVowRTETMBEGA1UE
+  GRYDY29tMB4XDTI2MDEwNzAxMDkxNFoXDTI3MDEwNzAxMDkxNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,12 +21,12 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAC0WQJcPOWPFwkojhzweilRVjTJ19UiLhiBTw3C1wJO3LVdBkWDmnnhAmKuX4D
-  r7vjQvESlABGIPdutI1Yl7mrHQzTkfLfXvNN6MT0nLChPyIYauT6SZZxubwJrUfA
-  7R0c2CJTIboZ0XaGpLsXqHEF1c29H7TV1QvVuqKAN2mCjh4N82QVn+ZKtys28AwT
-  6GfQX2fqLoi4KSc7xIzHKaNzqxeOICmJofk9w5VZ2rRN6yes8jvFYwz9HR41wdj8
-  bwfinv7Yp5fA6AysuZLhCykyfDuZVRrUp0Vb68YCKsLjJly/Theak+euNTxvHsB+
-  al9oSgPPHICMEX65qvLywitx
+  AQA/X8/PKTTc/IkYQEUL6XWtfK8fAfbuLJzmLcz6f2ZWrtBvPsYvqRuwI1bWUtil
+  2ibJEfIuSIHX6BsUTX18+hlaIussf6EWq/YkE7e2BKmgQE42vSOZMce0kCEAPbx0
+  rQtqonfWTHQ8UbQ7GqCL3gDQ0QDD2B+HUlb4uaCZ2icxqa/eOtxMvHC2tj+h0xKY
+  xL84ipM5kr0bHGf9/MRZJWcw51urueNycBXu1Xh+pEN8qBmYsFRR4SIODLClybAO
+  6cbm2PyPQgKNiqE4H+IQrDVHd9bJs1XgLElk3qoaJBWXc/5fy0J1imYb25UqmiHG
+  snGe1hrppvBRdcyEzvhfIPjI
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +90,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 5.8.0
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 5.8.0
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
@@ -120,34 +120,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.5'
 description: |-
   Flay analyzes code for structural similarities. Differences in literal
   values, variable, class, method names, whitespace, programming style,