flay 2.11.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ba894eeca0c7966356ccb85f9252f47cf27e2ee34252288502cc70c50aa4d64
-  data.tar.gz: eb4552d71f43350ec698c3ef36a17d0b18b93c65e54666240af786952ed8e512
+  metadata.gz: ae1c2d1ab38f3aa6a03b5d110f00f5548d661de7380373ae9d61265f682b6976
+  data.tar.gz: bf0dd5d5f85d35c4eb953e634071c5499e622c17ca11e9fa4089d2a7bc9f3964
 SHA512:
-  metadata.gz: 921301e4deb3c56b8eaf8fa1078ddb20f5bb9a3bf298ecea377df3440b8fc6e17f2475fbc31a1009b66042876289082bf61139bc982293c5530a51975966f793
-  data.tar.gz: 25e52c615125a7d06f59b41d1191dfca7c56a861d1c4a968f188dedd231b9d64fe84ab6c223526af10785e70b488600be4a4840754291b5408056cd9e11f7a82
+  metadata.gz: 81c6471ba30b5d57ff3d1698d4920d3b94fa3161e4f36d2ce8ca22c42ab8476bb02a23a9884261e742c2d3e1efa8380c4f3995bd2c216634de695338848f79ef
+  data.tar.gz: 8daaba1c53636b86d1682606750bfd07b27590c34eb19799f267d6c76a0dd8dfff53ecbe14e3211a3b094751e25df44ffb3de4bf518d0970272edd53ad6f97df

data/History.rdoc

@@ -1,3 +1,25 @@
+=== 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:
+
+  * Switched node filtering to happen before processing to avoid subtrees getting processed. Thanks to codeclimate.com for funding this effort!
+
 === 2.11.0 / 2018-04-05
 
 * 2 minor enhancements:

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.11.0" # :nodoc:
+  VERSION = "2.13.0" # :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
 
@@ -280,14 +272,26 @@ class Flay
     end
   end
 
+  ##
+  # Before processing, filter any sexp's that match against filters
+  # specified in +option[:filters]+. This changes the sexp itself.
+
+  def filter_sexp exp
+    exp.delete_if { |sexp|
+      if Sexp === sexp then
+        del = option[:filters].any? { |pattern| pattern.satisfy? sexp }
+        del or (filter_sexp(sexp); false)
+      end
+    }
+  end
+
   ##
   # Process a sexp +pt+.
 
   def process_sexp pt
-    pt.deep_each do |node|
+    filter_sexp(pt).deep_each do |node|
       next :skip if node.none? { |sub| Sexp === sub }
       next :skip if node.mass < self.mass_threshold
-      next :skip if option[:filters].any? { |pattern| pattern.satisfy? node }
 
       self.hashes[node.structural_hash] << node
 
@@ -330,22 +334,6 @@ class Flay
     end
   end
 
-  ##
-  # Given an array of sexp patterns (see sexp_processor), delete any
-  # buckets whose members match any of the patterns.
-
-  def filter *patterns
-    return if patterns.empty?
-
-    self.hashes.delete_if { |_, sexps|
-      sexps.any? { |sexp|
-        patterns.any? { |pattern|
-          pattern =~ sexp
-        }
-      }
-    }
-  end
-
   ##
   # Prunes nodes that aren't relevant to analysis or are already
   # covered by another node. Also deletes nodes based on the
@@ -361,8 +349,6 @@ class Flay
     else
       prune_conservatively
     end
-
-    self.filter(*option[:filters])
   end
 
   ##
@@ -585,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
@@ -642,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,7 @@ class Flay
   def process_erb file
     erb = File.read file
 
-    ruby = Erubis.new(erb).src
+    ruby = Erubi::Engine.new(erb).src
     begin
       RubyParser.new.process(ruby, file)
     rescue => e
@@ -21,24 +18,4 @@ class Flay
       raise e
     end
   end
-
-  class Erubis < ::Erubis::Eruby # :nodoc:
-    BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
-
-    def add_expr_literal(src, code)
-      if code =~ BLOCK_EXPR
-        src << '@output_buffer.append= ' << code
-      else
-        src << '@output_buffer.append=(' << code << ');'
-      end
-    end
-
-    def add_expr_escaped(src, code)
-      if code =~ BLOCK_EXPR
-        src << "@output_buffer.safe_append= " << code
-      else
-        src << "@output_buffer.safe_append=(" << code << ");"
-      end
-    end
-  end
 end

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
@@ -450,13 +450,12 @@ class TestSexp < Minitest::Test
     exp_foo = s(:begin,
                 s(:begin,
                   s(:filter_me,
-                    s(:a, s(:b)))))
+                    s(:a, s(:b, s(:c, s(:d)))))))
 
     exp_bar = s(:begin,
                 s(:begin,
                   s(:filter_me,
-                    s(:a, s(:b)),
-                    s(:c))))
+                    s(:a, s(:b, s(:c, s(:d)))))))
 
     filter = Sexp::Matcher.parse("(filter_me ___)")
     options = Flay.default_options.merge(mass: 0, filters: [filter])
@@ -467,8 +466,6 @@ class TestSexp < Minitest::Test
 
     refute_nodes :filter_me
 
-    flay.prune
-
     assert_empty flay.hashes
   end
 

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   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
+  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
+  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
+  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
+  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
+  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
+  YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2022-04-09 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: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.23'
 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.3.3
+signing_key:
 specification_version: 4
 summary: Flay analyzes code for structural similarities
 test_files: []