flay 2.12.0 → 2.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3477e1943a1382b0b51cbce9a5e4f5b60c34adc2f38e1e4b713b05f6b7476160
-  data.tar.gz: 042ef82c48aec49077113d53cbe425e6157fd61b36e7118af18dc7369561e77e
+  metadata.gz: de2d236dadc0340897219bba93297f0075b425a8ed67bf942ec858652622c188
+  data.tar.gz: 0647f0f3e5f11b90ebd3487c0b8a0fcd90ebfc0251596525f7c06623ce8ab045
 SHA512:
-  metadata.gz: c05914fd7779c957f60e6e8f32d04a4069d427cf6ecb57b7be97fd53cd9d07969c0076bad6978077f09e47d73a5d7c76c5795233f846a20bc22aef2abbb41dad
-  data.tar.gz: bdcc376f6c7651d1fe4d7ace6349a945a221fc89152bba731719ec4083996b98d98358e6b2506fa58ca6d919dd07d99433f3c6942e0639062909f4e1d55e44e6
+  metadata.gz: '0083c27a6b5861262235ae4199cdf85a60c2851d939927fafad7a77714ae660a5a38b783403273dea51b59579438eab41bb95239a48e73587ea2cfb84746b99f'
+  data.tar.gz: 8c7d1e26acc0f02751930d56de8f8972a849b750dcefbea11cfdd873ad1bc7f2f9338bfe1d6e1d487fcd00ed7f7dc6e4b557555fa430777b3e7ceda7c4b70da6

data/History.rdoc

@@ -1,3 +1,31 @@
+=== 2.13.2 / 2024-02-05
+
+* 1 bug fix:
+
+  * Pass dirs to Flay.run in FlayTask. (adam12)
+
+=== 2.13.1 / 2023-07-20
+
+* 1 minor enhancement:
+
+  * Brought in action_view erubi hacks to enable block calls w/ <%= forms.
+
+=== 2.13.0 / 2022-04-09
+
+* 1 minor enhancement:
+
+  * Switched from erubis to erubi for erb processing. (clive-devops)
+
+* 1 bug fix:
+
+  * Minor cleanup and top-level error handling changes.
+
+=== 2.12.1 / 2019-10-08
+
+* 1 bug fix:
+
+  * Fixed some sexp access under STRICT_SEXP=1.
+
 === 2.12.0 / 2018-04-29
 
 * 1 minor enhancement:

data/Rakefile

@@ -21,7 +21,7 @@ Hoe.spec "flay" do
 
   dependency "sexp_processor", "~> 4.0"
   dependency "ruby_parser",    "~> 3.0"
-  dependency "erubis",         "~> 2.7.0"
+  dependency "erubi",          "~> 1.10"
   dependency "path_expander",  "~> 1.0"
 
   dependency "minitest",       "~> 5.8.0", :dev

data/lib/flay.rb

@@ -1,23 +1,14 @@
 #!/usr/bin/env ruby -w
 
 require "optparse"
-require "rubygems"
 require "sexp_processor"
 require "ruby_parser"
 require "path_expander"
 require "timeout"
 require "zlib"
 
-class File
-  RUBY19 = "<3".respond_to? :encoding unless defined? RUBY19 # :nodoc:
-
-  class << self
-    alias :binread :read unless RUBY19
-  end
-end
-
 class Flay
-  VERSION = "2.12.0" # :nodoc:
+  VERSION = "2.13.2" # :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus
@@ -159,8 +150,8 @@ class Flay
       end
     end
     @@plugins
-  rescue
-    # ignore
+  rescue => e
+    warn "Error loading plugins: #{e}" if option[:verbose]
   end
 
   # :stopdoc:
@@ -228,10 +219,11 @@ class Flay
     update_masses
 
     sorted = masses.sort_by { |h,m|
+      exp = hashes[h].first
       [-m,
-       hashes[h].first.file,
-       hashes[h].first.line,
-       hashes[h].first.first.to_s]
+       exp.file,
+       exp.line,
+       exp.sexp_type.to_s]
     }
 
     sorted.map { |hash, mass|
@@ -249,7 +241,7 @@ class Flay
         Location[x.file, x.line, extra]
       }
 
-      Item[hash, node.first, bonus, mass, locs]
+      Item[hash, node.sexp_type, bonus, mass, locs]
     }.compact
   end
 
@@ -579,7 +571,10 @@ class Sexp
     s
   end
 
+  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
@@ -636,7 +631,7 @@ class Sexp # straight from flay-persistent
   def pure_ruby_hash # :nodoc: see above
     hash = 0
 
-    n = NODE_NAMES[first]
+    n = NODE_NAMES[sexp_type]
 
     raise "Bad lookup: #{first} in #{sexp.inspect}" unless n
 

data/lib/flay_erb.rb

@@ -1,8 +1,5 @@
-#!/usr/bin/ruby
-
-require "rubygems"
 require "flay"
-require "erubis"
+require "erubi"
 
 class Flay
 
@@ -13,7 +10,8 @@ class Flay
   def process_erb file
     erb = File.read file
 
-    ruby = Erubis.new(erb).src
+    ruby = Erubi.new(erb).src
+
     begin
       RubyParser.new.process(ruby, file)
     rescue => e
@@ -22,22 +20,67 @@ class Flay
     end
   end
 
-  class Erubis < ::Erubis::Eruby # :nodoc:
-    BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
+  # stolen (and munged) from lib/action_view/template/handlers/erb/erubi.rb
+  # this is also in the debride-erb gem, update both!
+  class Erubi < ::Erubi::Engine
+    # :nodoc: all
+    def initialize(input, properties = {})
+      @newline_pending = 0
+
+      properties[:postamble]  = "_buf.to_s"
+      properties[:bufvar]     = "_buf"
+      properties[:freeze_template_literals] = false
+
+      super
+    end
+
+    def add_text(text)
+      return if text.empty?
 
-    def add_expr_literal(src, code)
-      if code =~ BLOCK_EXPR
-        src << '@output_buffer.append= ' << code
+      if text == "\n"
+        @newline_pending += 1
       else
-        src << '@output_buffer.append=(' << code << ');'
+        src << "_buf.safe_append='"
+        src << "\n" * @newline_pending if @newline_pending > 0
+        src << text.gsub(/['\\]/, '\\\\\&')
+        src << "';"
+
+        @newline_pending = 0
       end
     end
 
-    def add_expr_escaped(src, code)
-      if code =~ BLOCK_EXPR
-        src << "@output_buffer.safe_append= " << code
+    BLOCK_EXPR = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/
+
+    def add_expression(indicator, code)
+      flush_newline_if_pending(src)
+
+      if (indicator == "==") || @escape
+        src << "_buf.safe_expr_append="
       else
-        src << "@output_buffer.safe_append=(" << code << ");"
+        src << "_buf.append="
+      end
+
+      if BLOCK_EXPR.match?(code)
+        src << " " << code
+      else
+        src << "(" << code << ");"
+      end
+    end
+
+    def add_code(code)
+      flush_newline_if_pending(src)
+      super
+    end
+
+    def add_postamble(_)
+      flush_newline_if_pending(src)
+      super
+    end
+
+    def flush_newline_if_pending(src)
+      if @newline_pending > 0
+        src << "_buf.safe_append='#{"\n" * @newline_pending}';"
+        @newline_pending = 0
       end
     end
   end

data/lib/flay_task.rb

@@ -45,7 +45,7 @@ class FlayTask < Rake::TaskLib
     desc "Analyze for code duplication in: #{dirs.join(", ")}"
     task name do
       require "flay"
-      flay = Flay.run
+      flay = Flay.run(dirs)
       flay.report if verbose
 
       raise "Flay total too high! #{flay.total} > #{threshold}" if

data/test/test_flay.rb

@@ -65,7 +65,7 @@ class TestSexp < Minitest::Test
     assert_equal expected, x.sort.uniq
   end
 
-  DOG_AND_CAT = Ruby18Parser.new.process <<-RUBY
+  DOG_AND_CAT = RubyParser.new.process <<-RUBY
     ##
     # I am a dog.
 
@@ -88,7 +88,7 @@ class TestSexp < Minitest::Test
     end
   RUBY
 
-  ROUND = Ruby18Parser.new.process <<-RUBY
+  ROUND = RubyParser.new.process <<-RUBY
     def x(n)
       if n % 2 == 0
         return n
@@ -196,7 +196,7 @@ class TestSexp < Minitest::Test
 
     flay.process_sexp ROUND.deep_clone
 
-    actual = flay.hashes.values.map { |sexps| sexps.map { |sexp| sexp.first } }
+    actual = flay.hashes.values.map { |sexps| sexps.map(&:sexp_type) }
 
     assert_equal expected, actual.sort_by { |a| a.inspect }
   end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.2
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
+  GRYDY29tMB4XDTI0MDEwMjIxMjEyM1oXDTI1MDEwMTIxMjEyM1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,15 +21,15 @@ cert_chain:
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAfAXSQpsW7YSxd1csRtA/M4Zt0AMXFMd76GJ8Lgtg8G0+VFbdChRyDuDb0kPlW
-  h9QQX/YABfCW8vxmssbMGrP+VGBAn7BbdTcfTlgCWrvMX1uL5aRL74nA4urKXqdW
-  a0nP70K4958P3GffBdtE3KGkU5xstFnXGajxuBRnL66E15KU0BNehVxdG258bdPu
-  EKN6MqBPftFiev3tuwqDV11r2GquDpniYcT+Mi8/PgeAgVT/afBeVgbB3KaZeTRR
-  AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
-  V+HB+LYYhXWitInO/eXxDrFB
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQCygvpmncmkiSs9r/Kceo4bBPDszhTv6iBi4LwMReqnFrpNLMOWJw7xi8x+3eL2
+  XS09ZPNOt2zm70KmFouBMgOysnDY4k2dE8uF6B8JbZOO8QfalW+CoNBliefOTcn2
+  bg5IOP7UoGM5lC174/cbDJrJnRG9bzig5FAP0mvsgA8zgTRXQzIUAZEo92D5K7p4
+  B4/O998ho6BSOgYBI9Yk1ttdCtti6Y+8N9+fZESsjtWMykA+WXWeGUScHqiU+gH8
+  S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
+  deKfBjgVAq7EYHu1AczzlUly
   -----END CERTIFICATE-----
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -60,19 +60,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: path_expander
   requirement: !ruby/object:Gem::Requirement
@@ -119,30 +119,36 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '4.2'
 description: |-
   Flay analyzes code for structural similarities. Differences in literal
   values, variable, class, method names, whitespace, programming style,
@@ -170,8 +176,10 @@ files:
 homepage: http://ruby.sadi.st/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: http://ruby.sadi.st/
+  source_code_uri: https://github.com/seattlerb/flay
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -188,9 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Flay analyzes code for structural similarities
 test_files: []

metadata.gz.sig

@@ -1,3 +1,3 @@
-�
-���x�����v����#�\��
��]�}gh�%l�]��/���Z+����R�{'�gm�&j�x����n����G${�~�9�����a4�&�R��Rpf]�b�p�mSC�IQ��k�(-~~<\�Z�_�^(����ט`�!e����"�M�jRW�ry��{e�����wRg%�&cn$�b����
-��V��l�����e��_�ӽ��B=C�ܸ��H�H�� |d�넷���߉_��d
+�������2X��1��Y�L:�@�G�;��f�����Fc \fܟ������.O�4��
+$�{09�Bf�3f,p�K�a��tb42���DSa��
+a::�,/���Y�㟘o'Z�>�i�0���wjF��V������%,��$��e�I镸A�u��'8�yd�$!��
�?2tšS+VR���m�1�l���5Jd�olV�%�����ޙ-�&�������7��(q]ϾV�-y
�G�Z���pw