flay 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 73416b286d8de1583c4861f2da639893f0012111
-  data.tar.gz: 31671f4f0671c63d9432e3651d850796aacbbce3
+SHA256:
+  metadata.gz: 8ba894eeca0c7966356ccb85f9252f47cf27e2ee34252288502cc70c50aa4d64
+  data.tar.gz: eb4552d71f43350ec698c3ef36a17d0b18b93c65e54666240af786952ed8e512
 SHA512:
-  metadata.gz: a6574f751315f6d8da0857c7b13d0e0ba4becfbece092e86b310c9a393f0f801700a1a4a3904a0afdaca967bb618187569eecad6ec7a8bd01574748dbee7f09e
-  data.tar.gz: 161a7012a55cf51110f7d535f768f8d1e5ab7eba061ec5fce660cb6595ac67751ad58cb15b4200e62a214e0022d550ada00d52352a805fece333bd4061add125
+  metadata.gz: 921301e4deb3c56b8eaf8fa1078ddb20f5bb9a3bf298ecea377df3440b8fc6e17f2475fbc31a1009b66042876289082bf61139bc982293c5530a51975966f793
+  data.tar.gz: 25e52c615125a7d06f59b41d1191dfca7c56a861d1c4a968f188dedd231b9d64fe84ab6c223526af10785e70b488600be4a4840754291b5408056cd9e11f7a82

data/{History.txt → History.rdoc}

@@ -1,3 +1,14 @@
+=== 2.11.0 / 2018-04-05
+
+* 2 minor enhancements:
+
+  * Added `filters` option to skip processing subtrees that match given patterns.
+  * Switched structural_hash to use crc32 to calculate node type values. Thanks to codeclimate.com!
+
+* 1 bug fix:
+
+  * Merge options w/ defaults. Mostly to fix testing.
+
 === 2.10.0 / 2017-07-17
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -1,6 +1,6 @@
-History.txt
+History.rdoc
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 bin/flay
 lib/flay.rb

data/Rakefile

@@ -12,6 +12,7 @@ Hoe::add_include_dirs("../../sexp_processor/dev/lib",
 
 Hoe.plugin :seattlerb
 Hoe.plugin :isolate
+Hoe.plugin :rdoc
 Hoe.plugin :bundler
 
 Hoe.spec "flay" do

data/lib/flay.rb

@@ -6,6 +6,7 @@ require "sexp_processor"
 require "ruby_parser"
 require "path_expander"
 require "timeout"
+require "zlib"
 
 class File
   RUBY19 = "<3".respond_to? :encoding unless defined? RUBY19 # :nodoc:
@@ -16,7 +17,7 @@ class File
 end
 
 class Flay
-  VERSION = "2.10.0" # :nodoc:
+  VERSION = "2.11.0" # :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus
@@ -51,7 +52,8 @@ class Flay
       :timeout => 10,
       :liberal => false,
       :fuzzy   => false,
-      :only   => nil,
+      :only    => nil,
+      :filters => [],
     }
   end
 
@@ -169,8 +171,8 @@ class Flay
   ##
   # Create a new instance of Flay with +option+s.
 
-  def initialize option = nil
-    @option = option || Flay.default_options
+  def initialize option = {}
+    @option = Flay.default_options.merge option
     @hashes = Hash.new { |h,k| h[k] = [] }
 
     self.identical      = {}
@@ -283,8 +285,9 @@ class Flay
 
   def process_sexp pt
     pt.deep_each do |node|
-      next unless node.any? { |sub| Sexp === sub }
-      next if node.mass < self.mass_threshold
+      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
 
@@ -632,26 +635,7 @@ class Sexp
 end
 
 class Sexp # straight from flay-persistent
-  names = %w(alias and arglist args array attrasgn attrset back_ref
-             begin block block_pass break call case cdecl class colon2
-             colon3 const cvar cvasgn cvdecl defined defn defs dot2
-             dot3 dregx dregx_once dstr dsym dxstr ensure evstr false
-             flip2 flip3 for gasgn gvar hash iasgn if iter ivar lasgn
-             lit lvar masgn match match2 match3 module next nil not
-             nth_ref op_asgn op_asgn1 op_asgn2 op_asgn_and op_asgn_or or
-             postexe redo resbody rescue retry return sclass self
-             splat str super svalue to_ary true undef until valias
-             when while xstr yield zsuper kwarg kwsplat safe_call)
-
-  ##
-  # All ruby_parser nodes in an index hash. Used by jenkins algorithm.
-
-  NODE_NAMES = Hash[names.each_with_index.map {|n, i| [n.to_sym, i] }]
-
-  NODE_NAMES.default_proc = lambda { |h, k|
-    $stderr.puts "ERROR: couldn't find node type #{k} in Sexp::NODE_NAMES."
-    h[k] = NODE_NAMES.size
-  }
+  NODE_NAMES = Hash.new { |h,k| h[k] = Zlib.crc32(k.to_s) }
 
   MAX_INT32 = 2 ** 32 - 1 # :nodoc:
 

data/test/test_flay.rb

@@ -19,7 +19,7 @@ class TestSexp < Minitest::Test
   end
 
   def test_structural_hash
-    hash = 3336573932
+    hash = 3381710114
 
     assert_equal hash, @s.deep_clone.structural_hash
     assert_equal hash, @s.structural_hash
@@ -98,18 +98,7 @@ class TestSexp < Minitest::Test
     end
   RUBY
 
-  def register_node_types
-    # Register these node types to remove warnings in test
-    capture_io do
-      [:a, :b, :c, :d, :e].each do |s|
-        Sexp::NODE_NAMES[s]
-      end
-    end
-  end
-
   def test_prune
-    register_node_types
-
     contained = s(:a, s(:b,s(:c)), s(:d,s(:e)))
     container = s(:d, contained)
 
@@ -146,8 +135,6 @@ class TestSexp < Minitest::Test
   end
 
   def test_prune_liberal
-    register_node_types
-
     contained = s(:a, s(:b,s(:c)), s(:d,s(:e)))
     container = s(:d, contained)
 
@@ -448,4 +435,178 @@ class TestSexp < Minitest::Test
 
     assert_equal exp, flay.n_way_diff(*dog_and_cat).gsub(/^ {3}$/, "")
   end
+
+  attr_accessor :flay
+
+  def refute_nodes type
+    assert flay.hashes.values.flatten(1).none? { |s| s.sexp_type == type }, "Found #{type} nodes!"
+  end
+
+  def assert_nodes type
+    assert flay.hashes.values.flatten(1).any? { |s| s.sexp_type == type }, "Did not find #{type} nodes!"
+  end
+
+  def test_prune_and_filter_conflict_separate_trees
+    exp_foo = s(:begin,
+                s(:begin,
+                  s(:filter_me,
+                    s(:a, s(:b)))))
+
+    exp_bar = s(:begin,
+                s(:begin,
+                  s(:filter_me,
+                    s(:a, s(:b)),
+                    s(:c))))
+
+    filter = Sexp::Matcher.parse("(filter_me ___)")
+    options = Flay.default_options.merge(mass: 0, filters: [filter])
+    self.flay = Flay.new(options)
+
+    flay.process_sexp exp_foo
+    flay.process_sexp exp_bar
+
+    refute_nodes :filter_me
+
+    flay.prune
+
+    assert_empty flay.hashes
+  end
+
+  def test_prune_and_filter_conflict_different_tree_shapes
+    exp_foo = s(:filter_me,
+                s(:a, s(:b)))
+
+    exp_bar = s(:filter_me,
+                s(:a, s(:b)),
+                s(:c))
+
+    filter = Sexp::Matcher.parse("(filter_me ___)")
+    options = Flay.default_options.merge(mass: 0, filters: [filter])
+    self.flay = Flay.new(options)
+
+    flay.process_sexp s(:begin,
+                        s(:begin,
+                          exp_foo,
+                          exp_bar))
+
+    refute_nodes :filter_me
+
+    flay.prune
+
+    assert_empty flay.hashes
+  end
+
+  def test_prune_and_filter_conflict_different_literals
+    exp_foo = s(:filter_me,
+                s(:a, s(:b, 1)))
+
+    exp_bar = s(:filter_me,
+                s(:a, s(:b, 2)))
+
+    filter = Sexp::Matcher.parse("(filter_me ___)")
+    options = Flay.default_options.merge(mass: 0, filters: [filter])
+    self.flay = Flay.new(options)
+
+    flay.process_sexp s(:begin,
+                        s(:begin,
+                          exp_foo,
+                          exp_bar))
+
+    refute_nodes :filter_me
+
+    flay.prune
+
+    assert_empty flay.hashes
+  end
+
+  def test_prune_and_filter_conflict_shape_and_literals
+    exp_foo = s(:filter_me,
+                s(:a, s(:b, 1)))
+
+    exp_bar = s(:filter_me,
+                s(:a, s(:b, 2)),
+                s(:c))
+
+    filter = Sexp::Matcher.parse("(filter_me ___)")
+    options = Flay.default_options.merge(mass: 0, filters: [filter])
+    self.flay = Flay.new(options)
+
+    flay.process_sexp s(:begin,
+                        s(:begin,
+                          exp_foo,
+                          exp_bar))
+
+    refute_nodes :filter_me
+
+    flay.prune
+
+    assert_empty flay.hashes
+  end
+
+  def test_prune_and_filter_conflict_must_keep_nonfiltered_trees
+    exp_foo = s(:filter_me,
+                s(:a, s(:b, 1)))
+
+    exp_bar = s(:filter_me,
+                s(:a, s(:b, 2)))
+
+    exp_baz = s(:begin,
+                s(:keep,
+                  s(:a, s(:b, 1))),
+                s(:keep,
+                  s(:a, s(:b, 2))))
+
+    filter = Sexp::Matcher.parse("(filter_me ___)")
+    options = Flay.default_options.merge(mass: 0, filters: [filter])
+    self.flay = Flay.new(options)
+
+    flay.process_sexp s(:begin,
+                        s(:begin,
+                          exp_baz,
+                          exp_foo,
+                          exp_bar))
+
+    refute_nodes :filter_me
+    assert_nodes :keep
+
+    flay.prune
+
+    refute_empty flay.hashes
+    refute_nodes :filter_me
+    assert_nodes :keep
+  end
+
+  def test_prune_and_filter_conflict_must_keep_nonfiltered_trees2
+    exp_foo = s(:filter_me,
+                s(:a, s(:b, 1)))
+
+    exp_bar = s(:filter_me,
+                s(:a, s(:b, 2)))
+
+    exp_baz = s(:begin,
+                s(:keep,
+                  s(:a, s(:b, 1))),
+                s(:keep,
+                  s(:a, s(:b, 2))))
+
+    filter = Sexp::Matcher.parse("(filter_me ___)")
+    options = Flay.default_options.merge(mass: 0, filters: [filter])
+    self.flay = Flay.new(options)
+
+    flay.process_sexp s(:begin,
+                        s(:begin,
+                          exp_foo,
+                          exp_bar,
+                          exp_baz))
+
+    refute_nodes :filter_me
+    assert_nodes :keep
+
+    flay.prune
+
+    refute_empty flay.hashes
+    refute_nodes :filter_me
+    assert_nodes :keep
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,17 +20,16 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
-  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
-  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
-  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
-  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
-  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
-  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
-  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
+  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
   -----END CERTIFICATE-----
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -154,13 +153,13 @@ executables:
 - flay
 extensions: []
 extra_rdoc_files:
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 files:
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - bin/flay
 - lib/flay.rb
@@ -175,7 +174,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.txt
+- README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -190,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Flay analyzes code for structural similarities

metadata.gz.sig

@@ -1 +1,3 @@
-�����S���"�C�	�4uC7����l�#���=+5�B���u�ޞAdʏ�&tdL��&�(/v`�`/ooP�[��a�Uح����|��%��>Ǜ���.�pyXUM6I@���c�H�-`�W�DfK�[g���Xi�7F�c_h����]�[���&���
:���+�o�tP�A��kZ
+9�l����J5u���6��tO�
+7���ٞ�g���	��}6��Lf�{���h탸��C�/�o�'V��IwHC6�
+�m@���VxfwQ���M��]2�Ј���4�>?v㤺���fE���$]!��1}-F���`��ܨ���y4q\�5�\��MG�����G�2ޭŔ�����%K���_�z�_�^�8|��U�<p�%�+��:�Wg%h�fΥ7���zB�1���F��![B尗L-%��w���