flay 2.3.1 → 2.4.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.4.0 / 2013-07-24
+
+* 1 minor enhancement:
+
+  * Allow plugins to provide sexp to source converters for --diff. (UncleGene)
+
 === 2.3.1 / 2013-07-11
 
 * 1 bug fix:

data/lib/flay.rb

@@ -15,7 +15,7 @@ class File
 end
 
 class Flay
-  VERSION = "2.3.1" # :nodoc:
+  VERSION = "2.4.0" # :nodoc:
 
   ##
   # Returns the default options.
@@ -165,8 +165,6 @@ class Flay
     self.masses         = {}
     self.total          = 0
     self.mass_threshold = @option[:mass]
-
-    require 'ruby2ruby' if @option[:diff]
   end
 
   ##
@@ -488,11 +486,24 @@ class Flay
 
       if option[:diff] then
         puts
-        r2r = Ruby2Ruby.new
-        puts n_way_diff(*nodes.map { |s| r2r.process(s.deep_clone) })
+        sources = nodes.map do |s|
+          msg = "sexp_to_#{File.extname(s.file).sub(/./, '')}"
+          self.respond_to?(msg) ? self.send(msg, s) : sexp_to_rb(s)
+        end
+        puts n_way_diff(*sources)
       end
     end
   end
+
+  def sexp_to_rb sexp
+    begin
+      require 'ruby2ruby'
+    rescue LoadError
+      return 'ruby2ruby is required for diff'
+    end
+    @r2r ||= Ruby2Ruby.new
+    @r2r.process sexp.deep_clone
+  end
 end
 
 class String

data/test/test_flay.rb

@@ -287,6 +287,47 @@ class TestSexp < Minitest::Test
     assert_equal exp, out.gsub(/\d+/, "N").gsub(/^ {3}$/, "")
   end
 
+  def test_report_diff_plugin_converter
+    # make sure we run through options parser
+    $*.clear
+    $* << "-d"
+    $* << "--mass=1"
+    $* << "-v"
+
+    opts = nil
+    capture_io do # ignored
+      opts = Flay.parse_options
+    end
+
+    flay = Flay.new opts
+
+    flay.process_sexp DOG_AND_CAT.deep_clone
+    flay.analyze
+
+    # (string) does not have extension, maps to :sexp_to_
+    Flay.send(:define_method, :sexp_to_){|s| "source code #{s.line}"}
+
+    out, err = capture_io do
+      flay.report nil
+    end
+
+    Flay.send(:remove_method, :sexp_to_)
+
+    exp = <<-END.gsub(/\d+/, "N").gsub(/^ {6}/, "")
+      Total score (lower is better) = 16
+
+      1) Similar code found in :class (mass = 16)
+        A: (string):1
+        B: (string):6
+
+      A: source code 1
+      B: source code 6
+    END
+
+    assert_equal '', err
+    assert_equal exp, out.gsub(/\d+/, "N").gsub(/^ {3}$/, "")
+  end
+
   def test_n_way_diff
     dog_and_cat = ["##\n# I am a dog.\n\nclass Dog\n  def x\n    return \"Hello\"\n  end\nend",
                    "##\n# I\n#\n# am\n# a\n# cat.\n\nclass Cat\n  def y\n    return \"Hello\"\n  end\nend"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flay
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 2
-  - 3
-  - 1
-  version: 2.3.1
+  - 4
+  - 0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-07-11 00:00:00 Z
+date: 2013-07-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -106,11 +106,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 3
-        - 6
-        version: "3.6"
+        - 7
+        version: "3.7"
   type: :development
   version_requirements: *id005
 description: |-
@@ -140,8 +140,8 @@ files:
 - test/test_flay.rb
 - .gemtest
 homepage: http://ruby.sadi.st/
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --main