flay 2.8.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c61c66f88624f0e383065c27b8ef862a267be48
-  data.tar.gz: 27e83ad70de97992734eaa17b2127cdc9633e42d
+  metadata.gz: 28083167bd112a4147a69347db6f5c042a84239d
+  data.tar.gz: 4accae6b53cba132a340a5a73b7a6f6af6432e59
 SHA512:
-  metadata.gz: 502d131e62a3fc06fda5834b3fbf2e546fbe6bf7de6fa4d5ece51dc878f35878b60a2b5f9405b31d58ca2b728aa03c50fb7e93db64bd6293e8218d084837f427
-  data.tar.gz: 8e49f697a064fcea5b90ded92d88a33f227d3bb7c3a6a4aabe154174bb939b9afc1a5bf54c252f88c4d99a15d37807a412853cddf1686e052de0c8c7c2dc7235
+  metadata.gz: 799ea470eb54add44f91ae4ac3d6675d8669b8a6a2168505a14ab3951b01ec85576bdcdb7b843edf67584bf7c0b866c3da7bfced294190265873a76cadce4fc8
+  data.tar.gz: 796f1127245836476b4d5214883cae08cbcb6e895bea2ed86cabdd4840657de85935ecd260cd503e98bf96f44facccb30666edb06d39702524a90057cf083f8d

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.9.0 / 2017-04-13
+
+* 1 minor enhancement:
+
+  * Added Sexp#pure_ruby_hash from flay-persistent and switched structural_hash to it. Faster than ruby's #hash and stable.
+
 === 2.8.1 / 2016-08-24
 
 * 1 bug fix:
@@ -13,7 +19,7 @@
 * 2 bug fixes:
 
   * Added dev deps and bundler plugin to make flavorjones happy. (flavorjones)
-  * Explictly require rake/tasklib in flay_task.rb. (jasonkarns)
+  * Explicitly require rake/tasklib in flay_task.rb. (jasonkarns)
 
 === 2.7.0 / 2016-01-21
 
@@ -84,7 +90,7 @@ is. In this case, it severely falls short. I'd jump to 4.0 if I could.
   * Added Sexp#+.
   * Added Sexp#code_index to specify where *code starts in some sexps.
   * Added Sexp#has_code?.
-  * Added Sexp#initalize_copy to propagate file/line/modified info.
+  * Added Sexp#initialize_copy to propagate file/line/modified info.
   * Added Sexp#modified, #modified=, and #modified?.
   * Added Sexp#split_at(n). (Something I've wanted in Array for ages).
   * Added Sexp#split_code.

data/lib/flay.rb

@@ -16,7 +16,7 @@ class File
 end
 
 class Flay
-  VERSION = "2.8.1" # :nodoc:
+  VERSION = "2.9.0" # :nodoc:
 
   class Item < Struct.new(:structural_hash, :name, :bonus, :mass, :locations)
     alias identical? bonus
@@ -538,7 +538,7 @@ class Sexp
   # modify the sexp afterwards and expect it to be correct.
 
   def structural_hash
-    @structural_hash ||= self.structure.hash
+    @structural_hash ||= pure_ruby_hash
   end
 
   ##
@@ -610,6 +610,56 @@ class Sexp
   end
 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
+  }
+
+  MAX_INT32 = 2 ** 32 - 1 # :nodoc:
+
+  def pure_ruby_hash # :nodoc: see above
+    hash = 0
+
+    n = NODE_NAMES[first]
+
+    raise "Bad lookup: #{first} in #{sexp.inspect}" unless n
+
+    hash += n          & MAX_INT32
+    hash += hash << 10 & MAX_INT32
+    hash ^= hash >>  6 & MAX_INT32
+
+    each do |o|
+      next unless Sexp === o
+      hash = hash + o.pure_ruby_hash  & MAX_INT32
+      hash = (hash + (hash << 10)) & MAX_INT32
+      hash = (hash ^ (hash >>  6)) & MAX_INT32
+    end
+
+    hash = (hash + (hash <<  3)) & MAX_INT32
+    hash = (hash ^ (hash >> 11)) & MAX_INT32
+    hash = (hash + (hash << 15)) & MAX_INT32
+
+    hash
+  end
+end
+
 class Array # :nodoc:
 
   ##

data/test/test_flay.rb

@@ -7,6 +7,9 @@ require "tmpdir"
 $: << "../../sexp_processor/dev/lib"
 
 class TestSexp < Minitest::Test
+  OPTS = Flay.parse_options %w[--mass=1 -v]
+  DEF_OPTS = {:diff=>false, :mass=>16, :summary=>false, :verbose=>false, :number=>true, :timeout=>10, :liberal=>false, :fuzzy=>false, :only=>nil}
+
   def setup
     # a(1) { |c| d }
     @s = s(:iter,
@@ -16,10 +19,7 @@ class TestSexp < Minitest::Test
   end
 
   def test_structural_hash
-    hash = s(:iter,
-             s(:call, s(:arglist, s(:lit))),
-             s(:lasgn),
-             s(:call, s(:arglist))).hash
+    hash = 3336573932
 
     assert_equal hash, @s.deep_clone.structural_hash
     assert_equal hash, @s.structural_hash
@@ -46,13 +46,13 @@ class TestSexp < Minitest::Test
           s(:call, s(:arglist)))
 
     expected = [
-                s[1]      .hash,
-                s[1][1]   .hash,
-                s[1][1][1].hash,
-                s[2]      .hash,
-                s[3]      .hash,
-                s[3][1]   .hash,
-               ].sort
+                s[1],
+                s[1][1],
+                s[1][1][1],
+                s[2],
+                s[3],
+                s[3][1],
+               ].map(&:structural_hash).sort
 
     assert_equal expected, @s.all_structural_subhashes.sort.uniq
 
@@ -98,7 +98,18 @@ 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)
 
@@ -135,6 +146,8 @@ 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)
 
@@ -209,7 +222,7 @@ class TestSexp < Minitest::Test
   end
 
   def test_report
-    flay = Flay.new Flay.parse_options %w[--mass=1 -v]
+    flay = Flay.new OPTS
 
     flay.process_sexp DOG_AND_CAT.deep_clone
     flay.analyze
@@ -232,7 +245,7 @@ class TestSexp < Minitest::Test
 
   def test_report_io
     out = StringIO.new
-    flay = Flay.new Flay.parse_options %w[--mass=1 -v]
+    flay = Flay.new OPTS
 
     flay.process_sexp DOG_AND_CAT.deep_clone
     flay.analyze
@@ -250,7 +263,7 @@ class TestSexp < Minitest::Test
   end
 
   def test_report_diff
-    flay = Flay.new Flay.parse_options %w[-d --mass=1 -v]
+    flay = Flay.new OPTS.merge(:diff => true)
 
     flay.process_sexp DOG_AND_CAT.deep_clone
     flay.analyze
@@ -287,7 +300,7 @@ class TestSexp < Minitest::Test
   end
 
   def test_report_diff_plugin_converter
-    flay = Flay.new Flay.parse_options %w[-d --mass=1 -v]
+    flay = Flay.new OPTS.merge(:diff => true)
 
     flay.process_sexp DOG_AND_CAT.deep_clone
     flay.analyze
@@ -416,8 +429,7 @@ class TestSexp < Minitest::Test
     dog_and_cat = ["##\n# I am a dog.\n\ndef x\n  return \"Hello\"\nend",
                    "##\n# I\n#\n# am\n# a\n# cat.\n\ndef y\n  return \"Hello\"\nend"]
 
-    opts = Flay.parse_options
-    flay = Flay.new opts
+    flay = Flay.new DEF_OPTS
 
     exp = <<-EOM.gsub(/\d+/, "N").gsub(/^ {6}/, "").chomp
          ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flay
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
+  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,129 +20,130 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
-  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
-  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
-  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
-  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
-  NLq5jm1fq6Y9Uolu3RJbmycf
+  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
+  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
+  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
+  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
+  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
+  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
+  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
+  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: path_expander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.8.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: ruby2ruby
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   Flay analyzes code for structural similarities. Differences in literal
   values, variable, class, method names, whitespace, programming style,
@@ -173,23 +174,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.txt
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Flay analyzes code for structural similarities