flay 2.13.3 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f398ea8e7f796a1871faedb32dbee7d7377d30abcc91edd075f2015a6be95c74
-  data.tar.gz: cdb49c908285be2c5c40118a33e7d0227e4a32a4b31736b374aaf31a43e58ac6
+  metadata.gz: 5c7f7b9d1cb38c582802edc030bce9090a4f6c5d407ff6f5bead6fda67acdeda
+  data.tar.gz: 3ea1d180981dbdada766c51a9073485f85bcf7847fa43328d32fe1d0fd9b52a5
 SHA512:
-  metadata.gz: 9c7f5b54202e563702d21ee8006d24124dd7810bb3518ae307a1eba17966a042864af2c0b772df9deab11517a8a6268159e5503d6fe70845722ef3544b7b84a9
-  data.tar.gz: 301d1e56ecfd1c12e8d41e826e56c44899598712aec55daac4ba55f74df547e5421250c3ea8dace955edaeacacd0a513c4a3e888f83aa47fddcfe340fb49c9b2
+  metadata.gz: 1057f752d2e665129fb259dee3dfc15c151b62fc928f77c1ab417e728a674dc47c6d90bf47ef63dfc7b9c0162d7f1d41ed43c5b30b63d631ded4f457ec9adf1f
+  data.tar.gz: 8d31dd5ae191f6055c36c6c77adeae47bd0309ab71ff3521469a22e4c7ff7cfbae829fcee8b4811dcad5f7d2f901a3a36b5ba1b63425f1cd63b029c69bbc6edd

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 2.14.0 / 2025-12-11
+
+* 2 minor enhancements:
+
+  * Bumped path_expander to 2.0.0.
+  * Switched to prism for ruby parsing. Use --legacy for RubyParser.
+
 === 2.13.3 / 2024-05-21
 
 * 2 bug fixes:

data/Rakefile

@@ -20,9 +20,9 @@ Hoe.spec "flay" do
   license "MIT"
 
   dependency "sexp_processor", "~> 4.0"
-  dependency "ruby_parser",    "~> 3.0"
+  dependency "prism",          "~> 1.5"
   dependency "erubi",          "~> 1.10"
-  dependency "path_expander",  "~> 1.0"
+  dependency "path_expander",  "~> 2.0"
 
   dependency "minitest",       "~> 5.8.0", :dev
   dependency "ruby2ruby",      "~> 2.2.0", :dev

data/lib/flay.rb

@@ -2,13 +2,63 @@
 
 require "optparse"
 require "sexp_processor"
-require "ruby_parser"
 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.13.3" # :nodoc:
+  VERSION = "2.14.0" # :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus
@@ -45,6 +95,7 @@ class Flay
       :fuzzy   => false,
       :only    => nil,
       :filters => [],
+      :parser  => NotRubyParser,
     }
   end
 
@@ -106,6 +157,11 @@ class Flay
         options[:timeout] = t.to_i
       end
 
+      opts.on("-t", "--legacy", "Use RubyParser to parse.") do
+        require "ruby_parser"
+        options[:parser] = RubyParser
+      end
+
       extensions = ["rb"] + Flay.load_plugins
 
       opts.separator ""
@@ -266,7 +322,8 @@ class Flay
 
   def process_rb file
     begin
-      RubyParser.new.process(File.binread(file), file, option[:timeout])
+      parser = option[:parser].new
+      parser.process(File.binread(file), file, option[:timeout])
     rescue Timeout::Error
       warn "TIMEOUT parsing #{file}. Skipping."
     end
@@ -445,7 +502,7 @@ class Flay
   end
 
   def collapse_and_label ary # :nodoc:
-    ary[0].zip(*ary[1..-1]).map { |lines|
+    ary.first.zip(*ary.drop(1)).map { |lines|
       if lines.uniq.size == 1 then
         "   #{lines.first}"
       else

data/lib/flay_erb.rb

@@ -13,7 +13,8 @@ class Flay
     ruby = Erubi.new(erb).src
 
     begin
-      RubyParser.new.process(ruby, file)
+      parser = option[:parser].new
+      parser.process(ruby, file, option[:timeout])
     rescue => e
       warn ruby if option[:verbose]
       raise e

data/test/test_flay.rb

@@ -8,7 +8,6 @@ $: << "../../sexp_processor/dev/lib"
 
 class TestSexp < Minitest::Test
   OPTS = Flay.parse_options %w[--mass=1 -v]
-  DEF_OPTS = {:diff=>false, :mass=>16, :summary=>false, :verbose=>false, :number=>true, :timeout=>10, :liberal=>false, :fuzzy=>false, :only=>nil}
 
   def setup
     # a(1) { |c| d }
@@ -65,7 +64,7 @@ class TestSexp < Minitest::Test
     assert_equal expected, x.sort.uniq
   end
 
-  DOG_AND_CAT = RubyParser.new.process <<-RUBY
+  DOG_AND_CAT = NotRubyParser.new.process <<~RUBY
     ##
     # I am a dog.
 
@@ -88,7 +87,7 @@ class TestSexp < Minitest::Test
     end
   RUBY
 
-  ROUND = RubyParser.new.process <<-RUBY
+  ROUND = NotRubyParser.new.process <<~RUBY
     def x(n)
       if n % 2 == 0
         return n
@@ -106,7 +105,7 @@ class TestSexp < Minitest::Test
     flay.process_sexp s(:outer,contained)
     2.times { flay.process_sexp s(:outer,container) }
 
-    exp = eval <<-EOM # just to prevent emacs from reindenting it
+    exp = eval <<~EOM # just to prevent emacs from reindenting it
           [
            [      s(:a, s(:b, s(:c)), s(:d, s(:e))),
                   s(:a, s(:b, s(:c)), s(:d, s(:e))),
@@ -142,7 +141,7 @@ class TestSexp < Minitest::Test
     flay.process_sexp s(:outer,contained)
     2.times { flay.process_sexp s(:outer,container) }
 
-    exp = eval <<-EOM # just to prevent emacs from reindenting it
+    exp = eval <<~EOM # just to prevent emacs from reindenting it
           [
            [      s(:a, s(:b, s(:c)), s(:d, s(:e))),
                   s(:a, s(:b, s(:c)), s(:d, s(:e))),
@@ -218,7 +217,7 @@ class TestSexp < Minitest::Test
       flay.report
     end
 
-    exp = <<-END.gsub(/\d+/, "N").gsub(/^ {6}/, "")
+    exp = <<~END
       Total score (lower is better) = 16
 
       1) Similar code found in :class (mass = 16)
@@ -227,7 +226,7 @@ class TestSexp < Minitest::Test
     END
 
     assert_equal "", err
-    assert_equal exp, out.gsub(/\d+/, "N")
+    assert_equal exp.gsub(/\d+/, "N"), out.gsub(/\d+/, "N")
   end
 
   def test_report_io
@@ -238,7 +237,7 @@ class TestSexp < Minitest::Test
     flay.analyze
     flay.report out
 
-    exp = <<-END.gsub(/\d+/, "N").gsub(/^ {6}/, "")
+    exp = <<~END
       Total score (lower is better) = 16
 
       1) Similar code found in :class (mass = 16)
@@ -246,7 +245,7 @@ class TestSexp < Minitest::Test
         (string):6
     END
 
-    assert_equal exp, out.string.gsub(/\d+/, "N")
+    assert_equal exp.gsub(/\d+/, "N"), out.string.gsub(/\d+/, "N")
   end
 
   def test_report_diff
@@ -259,7 +258,7 @@ class TestSexp < Minitest::Test
       flay.report
     end
 
-    exp = <<-END.gsub(/\d+/, "N").gsub(/^ {6}/, "")
+    exp = <<~END.gsub(/_NL_/, "")
       Total score (lower is better) = 16
 
       1) Similar code found in :class (mass = 16)
@@ -272,7 +271,7 @@ class TestSexp < Minitest::Test
       B: # am
       B: # a
       B: # cat.
-
+         _NL_
       A: class Dog
       B: class Cat
       A:   def x
@@ -283,7 +282,7 @@ class TestSexp < Minitest::Test
     END
 
     assert_equal "", err
-    assert_equal exp, out.gsub(/\d+/, "N").gsub(/^ {3}$/, "")
+    assert_equal exp.gsub(/\d+/, "N"), out.gsub(/\d+/, "N")
   end
 
   def test_report_diff_plugin_converter
@@ -301,7 +300,7 @@ class TestSexp < Minitest::Test
 
     Flay.send(:remove_method, :sexp_to_)
 
-    exp = <<-END.gsub(/\d+/, "N").gsub(/^ {6}/, "")
+    exp = <<~END
       Total score (lower is better) = 16
 
       1) Similar code found in :class (mass = 16)
@@ -313,7 +312,7 @@ class TestSexp < Minitest::Test
     END
 
     assert_equal "", err
-    assert_equal exp, out.gsub(/\d+/, "N").gsub(/^ {3}$/, "")
+    assert_equal exp.gsub(/\d+/, "N"), out.gsub(/\d+/, "N")
   end
 
   def test_n_way_diff
@@ -322,7 +321,7 @@ class TestSexp < Minitest::Test
 
     flay = Flay.new
 
-    exp = <<-EOM.gsub(/\d+/, "N").gsub(/^ {6}/, "").chomp
+    exp = <<~EOM.chomp
          ##
       A: # I am a dog.
       B: # I
@@ -349,7 +348,7 @@ class TestSexp < Minitest::Test
 
     flay = Flay.new
 
-    exp = <<-EOM.gsub(/\d+/, "N").gsub(/^ {6}/, "").chomp
+    exp = <<~EOM.gsub(/\d+/, "N").chomp
       A: class Dog
       B: class Cat
       A:   def x
@@ -359,7 +358,7 @@ class TestSexp < Minitest::Test
          end
     EOM
 
-    assert_equal exp, flay.n_way_diff(*dog_and_cat).gsub(/^ {3}$/, "")
+    assert_equal exp, flay.n_way_diff(*dog_and_cat)
   end
 
   def test_split_and_group
@@ -393,10 +392,12 @@ class TestSexp < Minitest::Test
   def test_collapse_and_label
     flay = Flay.new
 
-    a = %w(a b c).map { |s| s.group = "A"; s }
-    b = %w(d b f).map { |s| s.group = "B"; s }
+    a = %w(a b c).map(&:dup).map { |s| s.group = "A"; s }
+    b = %w(d b f).map(&:dup).map { |s| s.group = "B"; s }
 
-    exp = [["A: a", "B: d"], "   b", ["A: c", "B: f"]]
+    exp = [["A: a", "B: d"],
+           "   b",
+           ["A: c", "B: f"]]
 
     assert_equal exp, flay.collapse_and_label([a, b])
   end
@@ -404,8 +405,8 @@ class TestSexp < Minitest::Test
   def test_collapse_and_label_same
     flay = Flay.new
 
-    a = %w(a b c).map { |s| s.group = "A"; s }
-    b = %w(a b c).map { |s| s.group = "B"; s }
+    a = %w(a b c).map(&:dup).map { |s| s.group = "A"; s }
+    b = %w(a b c).map(&:dup).map { |s| s.group = "B"; s }
 
     exp = ["   a", "   b", "   c"]
 
@@ -416,9 +417,9 @@ class TestSexp < Minitest::Test
     dog_and_cat = ["##\n# I am a dog.\n\ndef x\n  return \"Hello\"\nend",
                    "##\n# I\n#\n# am\n# a\n# cat.\n\ndef y\n  return \"Hello\"\nend"]
 
-    flay = Flay.new DEF_OPTS
+    flay = Flay.new Flay.default_options
 
-    exp = <<-EOM.gsub(/\d+/, "N").gsub(/^ {6}/, "").chomp
+    exp = <<~EOM.gsub(/\d+/, "N").gsub(/_NL_/, "").chomp
          ##
       A: # I am a dog.
       B: # I
@@ -426,14 +427,14 @@ class TestSexp < Minitest::Test
       B: # am
       B: # a
       B: # cat.
-
+         _NL_
       A: def x
       B: def y
            return \"Hello\"
          end
     EOM
 
-    assert_equal exp, flay.n_way_diff(*dog_and_cat).gsub(/^ {3}$/, "")
+    assert_equal exp, flay.n_way_diff(*dog_and_cat)
   end
 
   attr_accessor :flay

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.13.3
+  version: 2.14.0
 platform: ruby
 authors:
 - Ryan Davis
-autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBCDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTI0MDEwMjIxMjEyM1oXDTI1MDEwMTIxMjEyM1owRTETMBEGA1UE
+  GRYDY29tMB4XDTI1MDEwNjIzMjcwMVoXDTI2MDEwNjIzMjcwMVowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +21,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCygvpmncmkiSs9r/Kceo4bBPDszhTv6iBi4LwMReqnFrpNLMOWJw7xi8x+3eL2
-  XS09ZPNOt2zm70KmFouBMgOysnDY4k2dE8uF6B8JbZOO8QfalW+CoNBliefOTcn2
-  bg5IOP7UoGM5lC174/cbDJrJnRG9bzig5FAP0mvsgA8zgTRXQzIUAZEo92D5K7p4
-  B4/O998ho6BSOgYBI9Yk1ttdCtti6Y+8N9+fZESsjtWMykA+WXWeGUScHqiU+gH8
-  S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
-  deKfBjgVAq7EYHu1AczzlUly
+  AQAC0WQJcPOWPFwkojhzweilRVjTJ19UiLhiBTw3C1wJO3LVdBkWDmnnhAmKuX4D
+  r7vjQvESlABGIPdutI1Yl7mrHQzTkfLfXvNN6MT0nLChPyIYauT6SZZxubwJrUfA
+  7R0c2CJTIboZ0XaGpLsXqHEF1c29H7TV1QvVuqKAN2mCjh4N82QVn+ZKtys28AwT
+  6GfQX2fqLoi4KSc7xIzHKaNzqxeOICmJofk9w5VZ2rRN6yes8jvFYwz9HR41wdj8
+  bwfinv7Yp5fA6AysuZLhCykyfDuZVRrUp0Vb68YCKsLjJly/Theak+euNTxvHsB+
+  al9oSgPPHICMEX65qvLywitx
   -----END CERTIFICATE-----
-date: 2024-05-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -46,19 +45,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: ruby_parser
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 description: |-
   Flay analyzes code for structural similarities. Differences in literal
   values, variable, class, method names, whitespace, programming style,
@@ -179,7 +178,6 @@ licenses:
 metadata:
   homepage_uri: http://ruby.sadi.st/
   source_code_uri: https://github.com/seattlerb/flay
-post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -196,8 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Flay analyzes code for structural similarities
 test_files: []