flay 1.4.0 → 1.4.1

data.tar.gz.sig

@@ -0,0 +1,4 @@
+L��`�
���A�a���D��0�
+���CYS��S�<�D��L�wt��%+�d�TCg �%Bꧠ�q�D[�$�P"�,C��༧�oK����Ձ�}2�v!�C�x�΅�<�҃��@Ӣ�k(�X��"��[�&���N�E5��
+A�ψI��{��[�Ø؀>`����Kac���޵J�Ⱥ���֌�U/���6`n۷�a$���V��	{P'�ژ�S^�y�>�92Wc�S�c�,
+�e�A	<,*�̋+��f

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.4.1 / 2010-09-01
+
+* 2 minor enhancements:
+
+  * Added extra error handling for ERB flay to deal with tons of bad ERB
+  * Skip plugin if another version already loaded (eg local vs gem).
+
+* 1 bug fix:
+
+  * Fixed all tests that were having problems on 1.9 due to unstable hashes
+
 === 1.4.0 / 2009-08-14
 
 * 4 minor enhancements:

data/lib/flay.rb

@@ -9,7 +9,7 @@ require 'sexp_processor'
 require 'ruby_parser'
 
 class Flay
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 
   def self.default_options
     {
@@ -85,17 +85,20 @@ class Flay
 
   def self.load_plugins
     unless defined? @@plugins then
+      @@plugins = []
+
       plugins = Gem.find_files("flay_*.rb").reject { |p| p =~ /flay_task/ }
 
       plugins.each do |plugin|
+        plugin_name = File.basename(plugin, '.rb').sub(/^flay_/, '')
+        next if @@plugins.include? plugin_name
         begin
           load plugin
+          @@plugins << plugin_name
         rescue LoadError => e
           warn "error loading #{plugin.inspect}: #{e.message}. skipping..."
         end
       end
-
-      @@plugins = plugins.map { |f| File.basename(f, '.rb').sub(/^flay_/, '') }
     end
     @@plugins
   rescue
@@ -304,6 +307,7 @@ class Sexp
     hashes
   end
 
+  # REFACTOR: move to sexp.rb
   def deep_each(&block)
     self.each_sexp do |sexp|
       block[sexp]
@@ -311,6 +315,7 @@ class Sexp
     end
   end
 
+  # REFACTOR: move to sexp.rb
   def each_sexp
     self.each do |sexp|
       next unless Sexp === sexp

data/lib/flay_erb.rb

@@ -8,7 +8,12 @@ class Flay
   def process_erb file
     erb = File.read file
 
-    src = ERB.new(erb).src
-    RubyParser.new.process(src, file)
+    ruby = ERB.new(erb).src
+    begin
+      RubyParser.new.process(ruby, file)
+    rescue => e
+      warn ruby if option[:verbose]
+      raise e
+    end
   end
 end

data/test/test_flay.rb

@@ -5,22 +5,6 @@ require 'flay'
 
 $: << "../../sexp_processor/dev/lib"
 
-require 'pp' # TODO: remove
-
-ON_1_9 = RUBY_VERSION =~ /1\.9/
-SKIP_1_9 = true && ON_1_9 # HACK
-
-class Symbol # for testing only, makes the tests concrete
-  def hash
-    to_s.hash
-  end
-
-  alias :crap :<=> if :blah.respond_to? :<=>
-  def <=> o
-    Symbol === o && self.to_s <=> o.to_s
-  end
-end
-
 class TestSexp < Test::Unit::TestCase
   def setup
     # a(1) { |c| d }
@@ -31,22 +15,29 @@ class TestSexp < Test::Unit::TestCase
   end
 
   def test_structural_hash
-    s = s(:iter,
-          s(:call, nil, :a, s(:arglist, s(:lit, 1))),
-          s(:lasgn, :c),
-          s(:call, nil, :d, s(:arglist)))
-
-    hash = 955256285
+    hash = s(:iter,
+             s(:call, s(:arglist, s(:lit))),
+             s(:lasgn),
+             s(:call, s(:arglist))).hash
 
-    assert_equal hash, s.structural_hash,             "hand copy"
-    assert_equal hash, @s.structural_hash,            "ivar from setup"
-    assert_equal hash, @s.deep_clone.structural_hash, "deep clone"
-    assert_equal hash, s.deep_clone.structural_hash,  "copy deep clone"
-  end unless SKIP_1_9
+    assert_equal hash, @s.structural_hash
+    assert_equal hash, @s.deep_clone.structural_hash
+  end
 
   def test_all_structural_subhashes
-    expected = [-704571402, -282578980, -35395725,
-                160138040, 815971090, 927228382]
+    s = s(:iter,
+          s(:call, s(:arglist, s(:lit))),
+          s(:lasgn),
+          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
 
     assert_equal expected, @s.all_structural_subhashes.sort.uniq
 
@@ -57,7 +48,7 @@ class TestSexp < Test::Unit::TestCase
     end
 
     assert_equal expected, x.sort.uniq
-  end unless SKIP_1_9
+  end
 
   def test_process_sexp
     flay = Flay.new

metadata

@@ -1,47 +1,122 @@
 --- !ruby/object:Gem::Specification 
 name: flay
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  hash: 5
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2010-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rubyforge
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 7
+        - 1
+        version: 1.7.1
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 19
+        segments: 
+        - 2
+        - 6
+        - 2
+        version: 2.6.2
+  type: :development
+  version_requirements: *id005
 description: |-
   Flay analyzes code for structural similarities. Differences in literal
   values, variable, class, method names, whitespace, programming style,
@@ -78,21 +153,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Flay analyzes code for structural similarities