flay 1.4.2 → 1.4.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.4.3 / 2011-08-10
+
+* 1 bug fix:
+
+  * Fixes for 1.9 with --diff. (mmullis)
+
 === 1.4.2 / 2011-02-18
 
 * 2 bug fixes:

data/README.txt

@@ -1,7 +1,8 @@
 = flay
 
-* http://ruby.sadi.st/
-* http://rubyforge.org/projects/seattlerb
+home :: http://ruby.sadi.st/
+repo :: https://github.com/seattlerb/flay
+rdoc :: http://seattlerb.rubyforge.org/flay
 
 == DESCRIPTION:
 
@@ -80,7 +81,7 @@ braces vs do/end, etc are all ignored. Making this totally rad.
 
 (The MIT License)
 
-Copyright (c) 2008-2009 Ryan Davis, Seattle.rb
+Copyright (c) Ryan Davis, Seattle.rb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -4,7 +4,8 @@ require 'rubygems'
 require 'hoe'
 
 Hoe::add_include_dirs("../../sexp_processor/dev/lib",
-                      "../../ruby_parser/dev/lib")
+                      "../../ruby_parser/dev/lib",
+                      "../../ruby2ruby/dev/lib")
 
 Hoe.plugin :seattlerb
 

data/lib/flay.rb

@@ -1,15 +1,12 @@
 #!/usr/bin/env ruby -w
 
-$: << "../../ruby_parser/dev/lib"
-$: << "../../ruby2ruby/dev/lib"
-
 require 'optparse'
 require 'rubygems'
 require 'sexp_processor'
 require 'ruby_parser'
 
 class Flay
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 
   def self.default_options
     {
@@ -197,7 +194,7 @@ class Flay
 
   def n_way_diff *data
     data.each_with_index do |s, i|
-      c = (?A + i).chr
+      c = (?A.ord + i).chr
       s.group = c
     end
 
@@ -274,7 +271,7 @@ class Flay
 
       nodes.each_with_index do |x, i|
         if option[:diff] then
-          c = (?A + i).chr
+          c = (?A.ord + i).chr
           puts "  #{c}: #{x.file}:#{x.line}"
         else
           puts "  #{x.file}:#{x.line}"

data/test/test_flay.rb

@@ -109,4 +109,59 @@ class TestSexp < MiniTest::Unit::TestCase
 
     assert flay.hashes.empty?
   end
+
+  def test_report
+    # 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
+
+    s = RubyParser.new.process <<-RUBY
+      class Dog
+        def x
+          return "Hello"
+        end
+      end
+      class Cat
+        def y
+          return "Hello"
+        end
+      end
+    RUBY
+
+    flay.process_sexp s
+    flay.analyze
+
+    out, err = capture_io do
+      flay.report nil
+    end
+
+    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: class Dog
+      B: class Cat
+      A:   def x
+      B:   def y
+             return \"Hello\"
+           end
+         end
+    END
+
+    assert_equal '', err
+    assert_equal exp, out.gsub(/\d+/, "N")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flay
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,8 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-02-18 00:00:00 -08:00
-default_executable: 
+date: 2011-08-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -77,12 +76,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 1
         segments: 
         - 2
-        - 0
-        - 2
-        version: 2.0.2
+        - 3
+        - 1
+        version: 2.3.1
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -91,14 +90,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 23
         segments: 
         - 2
-        - 9
-        - 1
-        version: 2.9.1
+        - 10
+        version: "2.10"
   type: :development
   version_requirements: *id004
 description: |-
@@ -127,7 +125,6 @@ files:
 - lib/gauntlet_flay.rb
 - test/test_flay.rb
 - .gemtest
-has_rdoc: true
 homepage: http://ruby.sadi.st/
 licenses: []
 
@@ -158,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.4.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Flay analyzes code for structural similarities