flay 1.4.3 → 2.0.0.b1

data/History.txt

@@ -1,3 +1,18 @@
+=== 2.0.0.b1 / 2012-08-07
+
+* 2 major enhancements:
+
+  * Parses ruby 1.9! (still in beta)
+  * Moved Sexp#deep_each and Sexp#each_sexp to sexp_processor
+
+* 1 minor enhancements:
+
+  * Use File.binread (File.read in 1.8) to bypass encoding errors
+
+* 1 bug fix:
+
+  * Fixed failing tests against ruby_parser 3
+
 === 1.4.3 / 2011-08-10
 
 * 1 bug fix:

data/README.txt

@@ -27,10 +27,11 @@ braces vs do/end, etc are all ignored. Making this totally rad.
 
 * Editor integration (emacs, textmate, other contributions welcome).
 * Score sequence fragments (a;b;c;d;e) vs (b;c;d) etc.
+* Persistent DB for efficient cross-project flaying.
 
 == SYNOPSIS:
 
-  % flay -v ~/Work/svn/ruby/ruby_1_8/lib/cgi.rb
+  % flay -v --diff ~/Work/svn/ruby/ruby_1_8/lib/cgi.rb
   Processing /Users/ryan/Work/svn/ruby/ruby_1_8/lib/cgi.rb...
   
   Matches found in :defn (mass = 184)
@@ -72,6 +73,7 @@ braces vs do/end, etc are all ignored. Making this totally rad.
 
 * ruby_parser
 * sexp_processor
+* ruby2ruby -- soft dependency: only if you want to use --diff
 
 == INSTALL:
 

data/Rakefile

@@ -15,8 +15,8 @@ Hoe.spec 'flay' do
   self.rubyforge_name = 'seattlerb'
   self.flay_threshold = 250
 
-  extra_deps << ['sexp_processor', '~> 3.0']
-  extra_deps << ['ruby_parser',    '~> 2.0']
+  extra_deps << ['sexp_processor', '~> 4.0']
+  extra_deps << ['ruby_parser',    '~> 3.0.0.a4']
 end
 
 # vim: syntax=ruby

data/lib/flay.rb

@@ -5,8 +5,16 @@ require 'rubygems'
 require 'sexp_processor'
 require 'ruby_parser'
 
+class File
+  RUBY19 = "<3".respond_to? :encoding
+
+  class << self
+    alias :binread :read unless RUBY19
+  end
+end
+
 class Flay
-  VERSION = '1.4.3'
+  VERSION = '2.0.0.b1'
 
   def self.default_options
     {
@@ -162,7 +170,7 @@ class Flay
   end
 
   def process_rb file
-    RubyParser.new.process(File.read(file), file)
+    RubyParser.new.process(File.binread(file), file)
   end
 
   def process_sexp pt
@@ -303,21 +311,4 @@ class Sexp
     end
     hashes
   end
-
-  # REFACTOR: move to sexp.rb
-  def deep_each(&block)
-    self.each_sexp do |sexp|
-      block[sexp]
-      sexp.deep_each(&block)
-    end
-  end
-
-  # REFACTOR: move to sexp.rb
-  def each_sexp
-    self.each do |sexp|
-      next unless Sexp === sexp
-
-      yield sexp
-    end
-  end
 end

data/test/test_flay.rb

@@ -53,7 +53,7 @@ class TestSexp < MiniTest::Unit::TestCase
   def test_process_sexp
     flay = Flay.new
 
-    s = RubyParser.new.process <<-RUBY
+    s = Ruby18Parser.new.process <<-RUBY
       def x(n)
         if n % 2 == 0
           return n
@@ -63,9 +63,7 @@ class TestSexp < MiniTest::Unit::TestCase
       end
     RUBY
 
-    expected = [[:block],
-                # HACK [:defn],
-                [:scope]] # only ones big enough
+    expected = [] # only ones big enough
 
     flay.process_sexp s
 
@@ -77,7 +75,7 @@ class TestSexp < MiniTest::Unit::TestCase
   def test_process_sexp_full
     flay = Flay.new(:mass => 1)
 
-    s = RubyParser.new.process <<-RUBY
+    s = Ruby18Parser.new.process <<-RUBY
       def x(n)
         if n % 2 == 0
           return n
@@ -87,14 +85,11 @@ class TestSexp < MiniTest::Unit::TestCase
       end
     RUBY
 
-    expected = [[:arglist, :arglist, :arglist],
-                [:block],
-                [:call, :call],
+    expected = [[:call, :call],
                 [:call],
                 [:if],
                 [:return],
-                [:return],
-                [:scope]]
+                [:return]]
 
     flay.process_sexp s
 
@@ -124,7 +119,7 @@ class TestSexp < MiniTest::Unit::TestCase
 
     flay = Flay.new opts
 
-    s = RubyParser.new.process <<-RUBY
+    s = Ruby18Parser.new.process <<-RUBY
       class Dog
         def x
           return "Hello"

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: flay
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
+  hash: 4094303487
+  prerelease: 6
   segments: 
+  - 2
+  - 0
+  - 0
+  - b
   - 1
-  - 4
-  - 3
-  version: 1.4.3
+  version: 2.0.0.b1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +38,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-08-10 00:00:00 Z
+date: 2012-08-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -46,11 +48,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 27
         segments: 
-        - 3
+        - 4
         - 0
-        version: "3.0"
+        version: "4.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -61,11 +63,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 4094286549
         segments: 
-        - 2
+        - 3
         - 0
-        version: "2.0"
+        - 0
+        - a
+        - 4
+        version: 3.0.0.a4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -74,31 +79,45 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
-        - 2
         - 3
-        - 1
-        version: 2.3.1
+        - 2
+        version: "3.2"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
-        - 2
+        - 3
         - 10
-        version: "2.10"
+        version: "3.10"
   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 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id005
 description: |-
   Flay analyzes code for structural similarities. Differences in literal
   values, variable, class, method names, whitespace, programming style,
@@ -146,16 +165,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Flay analyzes code for structural similarities