analdiffist 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/analdiffist.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{analdiffist}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Pearson", "Dave Foley"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/analdiffist/reek_metrics.rb",
     "lib/analdiffist/reek_parser.rb",
     "lib/analdiffist/standard_diffist.rb",
+    "lib/analdiffist/std_out_reporter.rb",
     "lib/analdiffist/target_finder.rb",
     "lib/analdiffist/text_based_diffist.rb",
     "spec/fixtures/other_smelly_file.rb",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
     "spec/lib/analdiffist/reek_metrics_spec.rb",
     "spec/lib/analdiffist/reek_parser_spec.rb",
     "spec/lib/analdiffist/standard_diffist_spec.rb",
+    "spec/lib/analdiffist/std_out_reporter_spec.rb",
     "spec/lib/analdiffist/target_finder_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -60,6 +62,7 @@ Gem::Specification.new do |s|
     "spec/lib/analdiffist/reek_metrics_spec.rb",
     "spec/lib/analdiffist/reek_parser_spec.rb",
     "spec/lib/analdiffist/standard_diffist_spec.rb",
+    "spec/lib/analdiffist/std_out_reporter_spec.rb",
     "spec/lib/analdiffist/target_finder_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/anal_diffist.rb

@@ -4,8 +4,8 @@ module AnalDiffist
   require 'analdiffist/reek_parser'
   require 'analdiffist/flog_parser'
   require 'analdiffist/diff_set'
-  require 'analdiffist/text_based_diffist'
   require 'analdiffist/standard_diffist'
+  require 'analdiffist/std_out_reporter'
 
   class Diffist
   end

data/lib/analdiffist/flog_parser.rb

@@ -10,16 +10,18 @@ module AnalDiffist
       f = Flog.new
       f.flog(@paths)
       problems = []
-      f.each_by_score{|class_method, score, ignore_for_now| problems << FlogProblem.new(class_method, score)}
-      problems.select {|p| p.score >= @flog_threshold}
+      f.each_by_score{|class_method, score, ignore_for_now| problems << FlogProblem.new(class_method, score, @flog_threshold)}
+      problems
+      #problems.select {|p| p.score >= @flog_threshold}
     end
   end
 
   class FlogProblem
     attr_accessor :context, :score
-    def initialize class_method, score
+    def initialize class_method, score, threshold = 10
       @context = class_method || '(none)'
-      @score = score
+      @score = score.round(1)
+      @flog_threshold = threshold
     end
 
     def type
@@ -27,15 +29,18 @@ module AnalDiffist
     end
 
     def diff other
-      return self if other.nil?
+      return nil if score < @flog_threshold
+      return FlogDiff.new(@context, 0, score) if other.nil?
+
       return nil if other.score >= score
       FlogDiff.new(@context, other.score, score)
     end
 
     def description
-      "Flog score: #{score}"
+      "Flog: #{score}"
     end
   end
+
   class FlogDiff
     attr_accessor :context, :score
     def initialize context, previous_score, current_score
@@ -48,8 +53,9 @@ module AnalDiffist
       (@current_score - @previous_score).round(1)
     end
 
-    def description
-      "Flog: #{@current_score.round(1)} (+#{(@current_score - @previous_score).round(1)})"
+    def description(mode = :added)
+      indicator = (mode == :added) ? "+" : "-"
+      "Flog: #{@current_score.round(1)} (#{indicator}#{(@current_score - @previous_score).round(1)})"
     end
   end
 end

data/lib/analdiffist/reek_parser.rb

@@ -30,9 +30,9 @@ module AnalDiffist
       self if other.nil?
     end
     def score
-      1
+      2
     end
-    def description
+    def description mode = :added
       "Reek: #{type}"
     end
   end

data/lib/analdiffist/standard_diffist.rb

@@ -41,24 +41,4 @@ module AnalDiffist
     end
   end
 
-  class StdOutReporter
-    def report diff, from_rev, to_rev
-      puts "\n\nAnaldifference between revisions: \n #{from_rev}\n #{to_rev}"
-      puts "\nAdded:\n"
-      puts describe(diff.added_problems)
-      puts "\nRemoved:\n"
-      puts describe(diff.removed_problems)
-      puts "\n\n"
-    end
-
-    def describe(problems)
-      by_context = problems.group_by {|prob| prob.context}
-      results = []
-      by_context.keys.sort.each do |k|  
-        results << "  #{k}"
-        results << by_context[k].map {|p| "    #{p.description}"}.join("\n")
-      end.collect
-      results.join("\n")
-    end
-  end
 end

data/lib/analdiffist/std_out_reporter.rb

@@ -0,0 +1,34 @@
+module AnalDiffist
+  class StdOutReporter
+    def report diff, from_rev, to_rev
+      puts "\n\nAnaldifference between revisions: \n #{from_rev}\n #{to_rev}"
+      puts "\nAdded:\n"
+      puts describe(diff.added_problems, :added).join("\n")
+      puts "\nRemoved:\n"
+      puts describe(diff.removed_problems, :removed).join("\n")
+      puts "\n\n"
+    end
+
+    def describe(problems, mode)
+      results = []
+      by_type = problems.group_by do |prob|
+        prob.context.split(/(\#|\.)/).first
+      end
+
+      by_type.keys.sort.each do |type_name|
+        results << "  #{type_name}"
+        type_problems = by_type[type_name]
+        by_context = type_problems.group_by do |prob|
+          name = prob.context[type_name.length..-1]
+        end
+
+        by_context.keys.sort.each do |k|
+          results << "    #{k == '' ? '(none)' : k}"
+          results += by_context[k].map {|p| "      #{p.description(mode)}"}
+        end
+      end
+
+      results
+    end
+  end
+end

data/spec/lib/analdiffist/diff_set_spec.rb

@@ -55,8 +55,8 @@ describe 'diffing two files' do
 
   context 'when scores change' do
     before do
-      before = [AnalDiffist::FlogProblem.new('bar', 7.1)]
-      after = [AnalDiffist::FlogProblem.new('bar', 8.5)]
+      before = [AnalDiffist::FlogProblem.new('bar', 17.1)]
+      after = [AnalDiffist::FlogProblem.new('bar', 18.5)]
       @diff = AnalDiffist::DiffSet.new(before, after)
     end
 

data/spec/lib/analdiffist/std_out_reporter_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe AnalDiffist::StdOutReporter do
+  before do
+    problems = [
+      fake_problem('SomeType#foo', 1, 'A'),
+      fake_problem('SomeType#foo', 2, 'B'),
+      fake_problem('SomeType#bar', 3, 'C'),
+      fake_problem('XXXXSomeOtherType#foobar', 4, 'D'),
+    ]
+    @results = AnalDiffist::StdOutReporter.new.describe(problems, :added)
+  end
+
+  it 'should have a header for the type' do
+    @results.first.should == "  SomeType"
+  end
+
+  it 'should have an entry for the method' do
+    @results[1].should == "    #bar"
+  end
+
+  it 'should have an entry for each problem' do
+    @results[2].should == "      C"
+  end
+
+  def fake_problem(context, score, description) 
+    stub('fake problem').tap {|problem| 
+      problem.stub(:context) {context}
+      problem.stub(:description) {description}
+    }
+  end
+end
+

metadata

@@ -2,7 +2,7 @@
 name: analdiffist
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Adam Pearson
@@ -106,6 +106,7 @@ files:
 - lib/analdiffist/reek_metrics.rb
 - lib/analdiffist/reek_parser.rb
 - lib/analdiffist/standard_diffist.rb
+- lib/analdiffist/std_out_reporter.rb
 - lib/analdiffist/target_finder.rb
 - lib/analdiffist/text_based_diffist.rb
 - spec/fixtures/other_smelly_file.rb
@@ -115,6 +116,7 @@ files:
 - spec/lib/analdiffist/reek_metrics_spec.rb
 - spec/lib/analdiffist/reek_parser_spec.rb
 - spec/lib/analdiffist/standard_diffist_spec.rb
+- spec/lib/analdiffist/std_out_reporter_spec.rb
 - spec/lib/analdiffist/target_finder_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -131,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4153762444283860543
+      hash: -1146240536421962276
       segments: 
       - 0
       version: "0"
@@ -156,5 +158,6 @@ test_files:
 - spec/lib/analdiffist/reek_metrics_spec.rb
 - spec/lib/analdiffist/reek_parser_spec.rb
 - spec/lib/analdiffist/standard_diffist_spec.rb
+- spec/lib/analdiffist/std_out_reporter_spec.rb
 - spec/lib/analdiffist/target_finder_spec.rb
 - spec/spec_helper.rb