ruby-watchr 0.1.7.1 → 0.1.8

data/lib/watchr/analyse.rb

@@ -31,10 +31,9 @@ module Watchr
 
       # Create report for each file.
       @files = files.map do |file|
-        file_report = Watchr::FileAnalyse.new(file)
-        file_report.flay(flay.duplications_by_file(file))
-
-        file_report
+        Watchr::FileAnalyse.new(file).tap { |file|
+          file.flay(flay.duplications_by_file(file))
+        }
       end
     end
   end

data/lib/watchr/analysers/flog.rb

@@ -11,7 +11,7 @@ module Watchr
 
       VERY_COMPLEX_METHOD_THRESHOLD = 40
 
-      COMPLEX_METHOD_THRESHOLD = 20
+      COMPLEX_METHOD_THRESHOLD = 25
 
       def analyse_flog(report)
         report.classes.each do |klass|
@@ -34,27 +34,33 @@ module Watchr
       end
 
       def analyse_complexity(target, type)
+        score = target.total_score
+
         add_smell(
           Watchr::Smell.new(
-            get_smell_level?(target, type),
-            target.name, "complexity = #{target.total_score}", target.location
+            smell_type(score, type), target.name, 
+            "complexity = #{score}", target.location,
+            { :complexity => score }
           )
-        ) if target.total_score >= get_threshold(:complex, type.upcase)
+        ) if is_complex?(score, type)
       end
 
-      def get_smell_level?(target, type)
-        threshold = get_threshold(:very_complex, type)
-        complexity = target.total_score >= threshold ? :very_complex : :complex
+      def smell_type(score, type)
+        complexity = is_very_complex?(score, type) ? :very_complex : :complex
 
-        get_smell_type(complexity, type)
+        "#{complexity}_#{type}".to_sym
       end
 
-      def get_threshold(complexity, type)
-        Watchr::Analysers::Flog.const_get("#{complexity.upcase}_#{type.upcase}_THRESHOLD")
+      def is_complex?(score, type)
+        is_complex_by_level?(score, type, :complex)
       end
 
-      def get_smell_type(complexity, type)
-        "#{complexity}_#{type}".to_sym
+      def is_very_complex?(score, type)
+        is_complex_by_level?(score, type, :very_complex)
+      end
+
+      def is_complex_by_level?(score, type, level)
+        score >= Flog.const_get("#{level.upcase}_#{type.upcase}_THRESHOLD")
       end
     end
   end

data/lib/watchr/analysers/reek.rb

@@ -13,7 +13,10 @@ module Watchr
           )
 
           add_smell(Watchr::Smell.new(
-            underscore(smell.smell['subclass']).to_sym, smell.location['context'], smell.smell['message'], location, {}
+            underscore(smell.smell['subclass']).to_sym, 
+            smell.location['context'], 
+            smell.smell['message'], 
+            location
           ))
         end
       end

data/lib/watchr/file_analyse.rb

@@ -1,6 +1,5 @@
 require 'watchr/metrics/flog/report'
 require 'watchr/metrics/reek/report'
-require 'watchr/smell'
 require 'watchr/smells_collector'
 require 'watchr/analysers/flog'
 require 'watchr/analysers/reek'

data/lib/watchr/metrics/flay/diff.rb

@@ -1,15 +1,11 @@
 module Watchr
   module FlayMetric
     class Diff
-      IDENTICAL = :identical
-
-      SIMILAR = :similar
-
       attr_reader :locations, :match, :nodes, :bonus, :mass, :code
 
       def initialize(same, nodes, bonus, mass)
         @locations = []
-        @match = same ? IDENTICAL : SIMILAR
+        @match = same ? :identical : :similar
         @nodes = nodes
         @bonus = bonus
         @mass = mass

data/lib/watchr/metrics/flay/diff_factory.rb

@@ -0,0 +1,18 @@
+module Watchr
+  module FlayMetric
+    class DiffFactory
+      def self.build(same, nodes, bonus, mass)
+        diff = Diff.new(same, nodes, bonus, mass)
+
+        nodes.each do |x|
+          diff.add_location(Location.new(x.file, x.line))
+        end
+
+        #r2r = Ruby2Ruby.new
+        #diff.code = n_way_diff(*nodes.map { |s| r2r.process(s.deep_clone) })
+
+        diff
+      end
+    end
+  end
+end

data/lib/watchr/metrics/flay/report.rb

@@ -1,5 +1,6 @@
 require 'flay'
 require 'watchr/metrics/flay/diff'
+require 'watchr/metrics/flay/diff_factory'
 require 'watchr/location'
 
 module Watchr
@@ -37,16 +38,7 @@ module Watchr
           node = nodes.first
           bonus = same ? nodes.size : 0
 
-          diff = Diff.new(same, nodes, bonus, mass)
-
-          nodes.each do |x|
-            diff.add_location(Location.new(x.file, x.line))
-          end
-
-          r2r = Ruby2Ruby.new
-          diff.code = n_way_diff(*nodes.map { |s| r2r.process(s.deep_clone) })
-
-          @duplications << diff
+          @duplications << DiffFactory.build(same, nodes, bonus, mass)
         end
       end
     end

data/lib/watchr/metrics/flog/class_report_factory.rb

@@ -0,0 +1,26 @@
+require 'watchr/metrics/flog/class'
+require 'watchr/metrics/flog/method'
+require 'watchr/location'
+
+module Watchr
+  module FlogMetric
+    class ClassReportFactory
+      def self.build(klass, total, methods, method_locations)
+        clazz = FlogReportClass.new(klass, total)
+
+        methods.each do |name, score|
+          next if name =~ /#none/
+
+          clazz.add_method(
+            FlogReportMethod.new(
+              clazz, name, score,
+              Location.from_path(method_locations[name])
+            )
+          )
+        end
+
+        clazz
+      end
+    end
+  end
+end

data/lib/watchr/metrics/flog/report.rb

@@ -1,7 +1,5 @@
 require 'flog'
-require 'watchr/metrics/flog/class'
-require 'watchr/metrics/flog/method'
-require 'watchr/location'
+require 'watchr/metrics/flog/class_report_factory'
 
 module Watchr
   module FlogMetric
@@ -47,11 +45,9 @@ module Watchr
 
       private
 
-      def process_result
-        @classes = []
-
+      def process_scores
         scores  = Hash.new 0
-        methods = Hash.new { |h,k| h[k] = [] }
+        methods = Hash.new { |hash,key| hash[key] = [] }
 
         each_by_score(nil) do |class_method, score, call_list|
           klass = class_method.split(/#|::/)[0..-2].join('::')
@@ -60,23 +56,14 @@ module Watchr
           scores[klass]  += score
         end
 
-        scores.each do |klass, total|
-          clazz = FlogReportClass.new(klass, total)
-
-          methods[klass].each do |name, score|
-            next if name =~ /#none/
+        return methods, scores
+      end
 
-            clazz.add_method(
-              FlogReportMethod.new(
-                clazz,
-                name,
-                score,
-                Location.from_path(method_locations[name])
-              )
-            )
-          end
+      def process_result
+        methods, scores = process_scores
 
-          @classes << clazz
+        @classes = scores.map do |klass, total|
+          ClassReportFactory.build(klass, total, methods[klass], method_locations)
         end
       end
     end

data/lib/watchr/rating.rb

@@ -18,15 +18,15 @@ module Watchr
       case smell.type
       when :complex_method,
         :very_complex_method
-        0.45 * smell.options[:score]
+        0.45 * smell.details[:complexity]
 
       when :complex_object,
         :very_complex_object
-        0.65 * smell.options[:score]
+        0.65 * smell.details[:complexity]
 
       when :identical_code,
         :similar_code
-        smell.options[:mass]
+        smell.details[:mass]
       else
         0
       end

data/lib/watchr/smell.rb

@@ -4,12 +4,12 @@ module Watchr
   class Smell
     include SmellTypes
 
-    def initialize(type, context, description, locations, options = {})
+    def initialize(type, context, description, locations, details = {})
       @type = type
       @context = context
       @description = description
       @locations = []
-      @options = options
+      @details = details
 
       Array(locations).each {|l| add_location(l)}
     end
@@ -30,8 +30,8 @@ module Watchr
       @context
     end
 
-    def options
-      @options
+    def details
+      @details
     end
 
     def add_location(location)

data/lib/watchr/version.rb

@@ -1,3 +1,3 @@
 module Watchr
-  VERSION = "0.1.7.1"
+  VERSION = "0.1.8"
 end

data/spec/watchr/analysers/flog_spec.rb

@@ -50,7 +50,8 @@ describe Watchr::Analysers::Flog do
         :complex_method,
         complex_method.name,
         "complexity = #{complex_method.total_score}",
-        complex_method.location
+        complex_method.location,
+        { :complexity => complex_method.total_score }
       )
 
       analyse.expects(:add_smell).returns(smell)
@@ -63,7 +64,8 @@ describe Watchr::Analysers::Flog do
         :very_complex_method,
         very_complex_method.name,
         "complexity = #{very_complex_method.total_score}",
-        very_complex_method.location
+        very_complex_method.location,
+        { :complexity => very_complex_method.total_score }
       )
 
       analyse.expects(:add_smell).returns(smell)
@@ -76,7 +78,8 @@ describe Watchr::Analysers::Flog do
         :very_complex_object,
         clazz.name,
         "complexity = #{clazz.total_score}",
-        clazz.location
+        clazz.location,
+        { :complexity => clazz.total_score }
       )
 
       analyse.expects(:add_smell).returns(smell)

data/spec/watchr/rating_spec.rb

@@ -6,7 +6,7 @@ describe Watchr::Rating do
   let(:complexity_smell) { 
     stub('smell', 
       :type => :complex_method,
-      :options => {:score => 29.3}
+      :details => {:complexity => 29.3}
     )
   }
 
@@ -19,7 +19,7 @@ describe Watchr::Rating do
   let(:duplication_smell) { 
     stub('smell', 
       :type => :identical_code,
-      :options => {:mass => 72})
+      :details => {:mass => 72})
   }
 
   let(:smells) { [complexity_smell, other_smell, duplication_smell] }

data/spec/watchr/smell_spec.rb

@@ -13,9 +13,9 @@ describe Watchr::Smell do
 
   let(:context) { 'context' }
 
-  let(:options) { stub('options') }
+  let(:details) { stub('details') }
 
-  let(:smell) { Watchr::Smell.new(type, context, description, locations, options) }
+  let(:smell) { Watchr::Smell.new(type, context, description, locations, details) }
 
   subject { smell }
 
@@ -39,7 +39,7 @@ describe Watchr::Smell do
 
   its(:description) { should == description }
 
-  its(:options) { should == options }
+  its(:details) { should == details }
 
   its(:context) { should == context }
 end

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  - 1
-  version: 0.1.7.1
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Petr Janda
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-14 00:00:00 +02:00
+date: 2012-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,8 +91,10 @@ files:
 - lib/watchr/file_analyse.rb
 - lib/watchr/location.rb
 - lib/watchr/metrics/flay/diff.rb
+- lib/watchr/metrics/flay/diff_factory.rb
 - lib/watchr/metrics/flay/report.rb
 - lib/watchr/metrics/flog/class.rb
+- lib/watchr/metrics/flog/class_report_factory.rb
 - lib/watchr/metrics/flog/method.rb
 - lib/watchr/metrics/flog/report.rb
 - lib/watchr/metrics/reek/report.rb
@@ -109,9 +110,9 @@ files:
 - spec/watchr/analyse_spec.rb
 - spec/watchr/analysers/flog_spec.rb
 - spec/watchr/file_analyse_spec.rb
-- spec/watchr/flay/report_spec.rb
-- spec/watchr/flog_metric/flog_matric/flog_report_spec.rb
 - spec/watchr/location_spec.rb
+- spec/watchr/metrics/flay/report_spec.rb
+- spec/watchr/metrics/flog/flog_report_spec.rb
 - spec/watchr/paths_spec.rb
 - spec/watchr/rating_spec.rb
 - spec/watchr/smell_spec.rb
@@ -156,9 +157,9 @@ test_files:
 - spec/watchr/analyse_spec.rb
 - spec/watchr/analysers/flog_spec.rb
 - spec/watchr/file_analyse_spec.rb
-- spec/watchr/flay/report_spec.rb
-- spec/watchr/flog_metric/flog_matric/flog_report_spec.rb
 - spec/watchr/location_spec.rb
+- spec/watchr/metrics/flay/report_spec.rb
+- spec/watchr/metrics/flog/flog_report_spec.rb
 - spec/watchr/paths_spec.rb
 - spec/watchr/rating_spec.rb
 - spec/watchr/smell_spec.rb