flay 2.14.1 → 2.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f275c561e9ea5560f62973a4dbc4be004a2b00fa3fc8e219e05c5e1a5bb15c2
-  data.tar.gz: 60ab58da19978d367f25415b658fbe50c137934aee7933bcd3e77bb47f75c085
+  metadata.gz: '0796aba130c20f61f7558524c865ae0abc87502218ee9e6bbdb348b9b9f1b80e'
+  data.tar.gz: a3a06b20c0ccd6358c4937cd0cfa267fcd435870f804afc799fe24f70a2bd664
 SHA512:
-  metadata.gz: 3aef7416ffb1852e68ee9b4da66935bdbe1726171b71ea52982e14c752446cdcb52b409856f742f875a954800585199e36dec1e675ed88aed794bca9e2c1ccee
-  data.tar.gz: 330b6986a40592d54a9d318850cbd3ce334578820be31bec868b9e3e4e9112213e495eaca518f4e5c5632a9c0aa91b01ab60d8f97c4a472e1b3f44ff0e1378c7
+  metadata.gz: 62f49813a8d3f8a08a6727330b229f333389ad9394c75a4777d7818a1b7c689d392617c6bd011ceca46eaca8d3009ed88ce0fc9ae3556d2d65f86d9307cb8f32
+  data.tar.gz: d6c5ebdd419d2623989b907cbc3fb89dd07404d702d7860ebebfa0db2d92ecab1e1d10a98ec57536d3b35b8e81f3ee5e5a72c9a50019fabe4df3dac3f21479f2

data/History.rdoc

@@ -1,3 +1,16 @@
+=== 2.4.3 / 2026-03-23
+
+* 2 bug fixes:
+
+  * Fix Sexp#[] to return a Sexp to ensure process_fuzzy can sort sub-sexps.
+  * Make Sexp#[] return a single element if integer is used.
+
+=== 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:

data/Rakefile

@@ -10,7 +10,7 @@ Hoe::add_include_dirs("../../sexp_processor/dev/lib",
                       "lib")
 
 Hoe.plugin :seattlerb
-Hoe.plugin :isolate
+Hoe.plugin :isolate_binaries
 Hoe.plugin :rdoc
 Hoe.plugin :bundler
 

data/lib/flay.rb

@@ -8,10 +8,10 @@ require "zlib"
 require "prism"
 require "prism/translation/ruby_parser"
 
-NotRubyParser = Class.new Prism::Translation::RubyParser # compatibility layer
-
 class Flay
-  VERSION = "2.14.1" # :nodoc:
+  VERSION = "2.14.3" # :nodoc:
+
+  NotRubyParser = Class.new Prism::Translation::RubyParser # compatibility layer :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus
@@ -584,14 +584,8 @@ class Sexp
   alias :[] :[] # needed for STRICT_SEXP
 
   def [] a # :nodoc:
-    # TODO: figure out a way to make this STRICT_SEXP happy
-    s = super
-    if Sexp === s then
-      s.file = self.file
-      s.line = self.line
-      s.modified = self.modified
-    end
-    s
+    return super if Integer === a
+    self.new._concat super
   end
 
   def + o # :nodoc:

data/test/test_flay.rb

@@ -62,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.
@@ -227,6 +229,76 @@ class TestSexp < Minitest::Test
     assert_equal exp.gsub(/\d+/, "N"), out.gsub(/\d+/, "N")
   end
 
+  def test__fuzzy__idx
+    sexp = NotRubyParser.new.parse "def x(n); n + 1; end"
+
+    assert_equal :defn, sexp[0]
+    assert_equal s(:defn), sexp[0..0]
+    assert_equal s(:defn, :x), sexp[0..1]
+  end
+
+  def test__fuzzy__split_at
+    # def x(n); n + 1; end
+    sexp = s(:defn, :x, s(:args, :n), s(:call, s(:lvar, :n), :+, s(:lit, 1)))
+    sexp = NotRubyParser.new.parse "def x(n); n + 1; end"
+
+    a, b = sexp.split_at 2
+
+    assert_equal s(:defn, :x, s(:args, :n)), a
+    assert_equal s(s(:call, s(:lvar, :n), :+, s(:lit, 1))), b
+  end
+
+  def test__fuzzy__split_code
+    # def x(n); n + 1; end
+    sexp = s(:defn, :x, s(:args, :n), s(:call, s(:lvar, :n), :+, s(:lit, 1)))
+    sexp = NotRubyParser.new.parse "def x(n); n + 1; end"
+
+    a, b = sexp.split_code
+
+    assert_equal s(:defn, :x, s(:args, :n)), a
+    assert_equal s(s(:call, s(:lvar, :n), :+, s(:lit, 1))), b
+  end
+
+  FUZZY_CODE = NotRubyParser.new.process <<-RUBY
+    def a
+      f1; f2; f3; f4; f5; f6
+    end
+
+    def b
+          f2; f3; f4; f5; f6
+    end
+
+    def c
+          f2; f3; f4; f5; f6; f7
+    end
+  RUBY
+
+  def test_report__fuzzy
+    flay = Flay.new OPTS.merge(fuzzy: 1, mass: 5)
+
+    flay.process_sexp FUZZY_CODE.deep_clone
+
+    out, err = capture_io do
+      flay.report
+    end
+
+    exp = <<~END
+      Total score (lower is better) = 37
+
+      1) Similar code found in :defn (mass = 21)
+        (string):1 (FUZZY)
+        (string):5
+        (string):9 (FUZZY)
+
+      2) Similar code found in :defn (mass = 16)
+        (string):1
+        (string):9
+    END
+
+    assert_equal "", err
+    assert_equal exp.gsub(/\d+/, "N"), out.gsub(/\d+/, "N")
+  end
+
   def test_report_io
     out = StringIO.new
     flay = Flay.new OPTS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.14.1
+  version: 2.14.3
 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:
@@ -120,38 +120,60 @@ 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.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.6'
 description: |-
   Flay analyzes code for structural similarities. Differences in literal
   values, variable, class, method names, whitespace, programming style,
   braces vs do/end, etc are all ignored. Making this totally rad.
+
+  == Features/Problems:
+
+  * Reports differences at any level of code.
+  * Adds a score multiplier to identical nodes.
+  * Differences in literal values, variable, class, and method names are ignored.
+  * Differences in whitespace, programming style, braces vs do/end, etc are ignored.
+  * Works across files.
+    * Add the flay-persistent plugin to work across large/many projects.
+  * Run --diff to see an N-way diff of the code.
+  * Provides conservative (default) and --liberal pruning options.
+  * Provides --fuzzy duplication detection.
+  * Language independent: Plugin system allows other languages to be flayed.
+    * Ships with .rb and .erb.
+    * javascript and others will be available separately.
+  * Includes FlayTask for Rakefiles.
+  * Uses path_expander, so you can use:
+    * dir_arg -- expand a directory automatically
+    * @file_of_args -- persist arguments in a file
+    * -path_to_subtract -- ignore intersecting subsets of files/directories
+  * Skips files matched via patterns in .flayignore (subset format of .gitignore).
+  * Totally rad.
 email:
 - ryand-ruby@zenspider.com
 executables:
@@ -178,6 +200,7 @@ licenses:
 metadata:
   homepage_uri: http://ruby.sadi.st/
   source_code_uri: https://github.com/seattlerb/flay
+  documentation_uri: http://docs.seattlerb.org/flay/
 rdoc_options:
 - "--main"
 - README.rdoc