flay 2.14.2 → 2.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc9ce0202d55742699dc59bcc8793683a7efc68a7f9f395c5f740b97836c0c85
-  data.tar.gz: f389db1f4bae7f7f2535986317a566d355108ffc5e0652cba87b0a6c2f7566c4
+  metadata.gz: be4e30464c63609fc7e169633d341a4479794effbeab1cddae17ec61b7aa99c1
+  data.tar.gz: a5d0d7e99cba3df3c022c8524d215509f2fc7ccbec9c547332ef4a67d7473aaf
 SHA512:
-  metadata.gz: 742fa42cabacbe0cf3d65a5c7083c60b019a014f0f1e9509edd00507809335bf7315f9e254eccda05f347f32c39c034963cddea8bdd3ad8735648380d3ded6b9
-  data.tar.gz: 804293d0ccedb1900e65bd4bcec84246e9d3caf01fd87a411c36e2116affc915b1d0b694d88aaa9d527357e09332e2ae5c1a37def8d47852f925acaf725ea63e
+  metadata.gz: 2686fd16226e533a3c6689025c14839ac7f446c12d572ab74799ad5db0a1c57fdf6d7674eb496e71ed3fbfcad3cc61b656db5bf7dde46fbfbb695babfcdbece5
+  data.tar.gz: 535c3aa7a9db9a4b98d1610e9c26dfea88a2afdc0782c030558e935f13f12442ec886df01c29afe723d70f44840a416b99f059947ee9e43a1a7f534e96c26293

data/History.rdoc

@@ -1,3 +1,17 @@
+=== 2.14.4 / 2026-04-14
+
+* 2 bug fixes:
+
+  * Fix Sexp#[] to return empty sexp if indicies run off the end. (slbug)
+  * Loosened dependency on ruby2ruby to catch up and drop ruby_parser.
+
+=== 2.14.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:

data/Rakefile

@@ -24,7 +24,7 @@ Hoe.spec "flay" do
   dependency "path_expander",  "~> 2.0"
 
   dependency "minitest",       "> 5.8", :dev
-  dependency "ruby2ruby",      "~> 2.2.0", :dev
+  dependency "ruby2ruby",      "~> 2.2", :dev
 
   self.flay_threshold = 250
 end

data/lib/flay.rb

@@ -9,7 +9,7 @@ require "prism"
 require "prism/translation/ruby_parser"
 
 class Flay
-  VERSION = "2.14.2" # :nodoc:
+  VERSION = "2.14.4" # :nodoc:
 
   NotRubyParser = Class.new Prism::Translation::RubyParser # compatibility layer :nodoc:
 
@@ -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

@@ -229,6 +229,93 @@ class TestSexp < Minitest::Test
     assert_equal exp.gsub(/\d+/, "N"), out.gsub(/\d+/, "N")
   end
 
+  def test_sexp_idx
+    # sexp = NotRubyParser.new.parse "def x(n); n + 1; end"
+    sexp = s(:defn, :x, s(:args, :n),
+             s(:call, s(:lvar, :n), :+, s(:lit, 1)))
+
+    assert_equal :defn, sexp[0]
+    assert_equal s(:defn), sexp[0..0]
+    assert_equal s(:defn, :x), sexp[0..1]
+  end
+
+  def test_sexp_idx__off
+    # sexp = NotRubyParser.new.parse "->(something) { something.to_s }"
+    sexp = s(:iter,
+             s(:lambda),
+             s(:args, :something),
+             s(:call, s(:lvar, :something), :to_s))
+
+    # def arguments_element
+    #   call_element.sexp_body(3) || []
+    call_element = sexp[1] # s(:lambda) = this is just wrong
+
+    assert_equal s(), call_element[3..-1]
+    assert_equal s(), call_element.sexp_body(3)
+  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.2
+  version: 2.14.4
 platform: ruby
 authors:
 - Ryan Davis
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -140,18 +140,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        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