reconn 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13aa9f0063ed8270baa802db3b86f308b2aa4066
-  data.tar.gz: 1b7df1c4764ce1a90b64aab61036819d6e6d67c3
+  metadata.gz: 98a521e90dd569d2e385655e695c2b20b573c72a
+  data.tar.gz: 68dea3d08b90bca2e6790d675970783886bab1d3
 SHA512:
-  metadata.gz: 97c1778b30eed241da1babbd81be892ffc32dadc4dfc451864bacc26ecc9dc600c841e8c7752e6b1ba229bd707c3cb58a52ebbf3aeb92c29e419f8ef6d8d3943
-  data.tar.gz: 78d10bae27845cd07162bb3470753c575811cba9bbb3a51b559bac7a9f8911de147d17c376538118fd075ceb5c8531fdaa6292a70b6738658665629c6f1c782b
+  metadata.gz: 50359a392132d7e1bfff84fef8afc3fa4bd0dd8c8504a54dd4d7263630c6e38c0b90f0560142325417e18b4eb43511b2e300a4a6bddef5fc3788e085d5c20bc1
+  data.tar.gz: b2de99d4e108c48ecf5f0acc30f1080fd1639dbcf5cd74eb2a49f36ab70346436688c7d57a4c0d06d335bbed63b467b341ad82d86ae4a6cba3c38c3591690b99

data/bin/reconn

@@ -10,4 +10,4 @@ STDERR.sync = true
 my_path = File.expand_path(File.dirname(__FILE__))
 require_all Dir.glob(my_path + "/../lib/reconn/**/*.rb")
 
-View.new.show
+Reconn::View.new.show

data/lib/reconn/analyzer.rb

@@ -2,10 +2,8 @@
 
 require 'ruby_parser'
 require 'sexp_processor'
-require_relative 'util/project_scanner'
-require_relative 'analyzer/project_elements/class.rb'
-require_relative 'analyzer/project_elements/method.rb'
 
+module Reconn
 module Analyzer
   class Analyzer < MethodBasedSexpProcessor
 
@@ -43,9 +41,10 @@ module Analyzer
         klass.complexity = count_complexity_in_class(klass)
       end
       prune_dependencies
+      find_external_dependencies(paths)
 
       # Deletes empty classes
-      @classes.delete(Class.new(:none))
+      #@classes.delete(Class.new(:none))
 
       @smells = find_code_smells
 
@@ -58,7 +57,7 @@ module Analyzer
     def process_class(exp)
       exp.shift
       in_klass(exp.shift) do
-        @current_class = Class.new(klass_name)
+        @current_class = Class.new(klass_name, [@current_path.to_s])
         @classes << @current_class
         process_until_empty exp
       end
@@ -68,10 +67,10 @@ module Analyzer
     end
 
     def process_defn(exp)
-      exp.shift
+      is_singleton = exp.shift.to_s == "defn" ? false : true
       method_name = exp.shift.to_s
       lines = count_lines_in_method(method_name)
-      @current_method = Method.new(method_name, @current_class.name, lines)
+      @current_method = Method.new(method_name, @current_path.to_s, @current_class.name, lines, is_singleton)
       exp.shift
       process_until_empty exp
 
@@ -163,8 +162,15 @@ module Analyzer
       @classes.each do |klass|
         klass.dependencies =  klass.dependencies.map do |dep|
           dep_split = dep.split('::')
+          if class_names.include?(dep)
+            next dep
+          end
           klass_split = klass.name.split('::')
-          klass_split.pop(dep_split.size)
+          if klass_split.size != dep_split.size
+            klass_split.pop(dep_split.size)
+          else
+            klass_split.pop(dep_split.size - 1)
+          end
           (klass_split + dep_split).join('::')
         end
         klass.dependencies = klass.dependencies.uniq.keep_if {|dep| dep != klass.name && class_names.include?(dep)}
@@ -184,14 +190,32 @@ module Analyzer
       end
     end
 
+    def find_external_dependencies(paths)
+      @classes.each do |klass|
+        external_deps = []
+        klass.filepaths.each do |path|
+          File.foreach(path) do |line|
+            line.strip!
+            if line =~ /^require .*$/
+              dep = line.split(" ")[1].gsub(/([\"\'])/, "")
+              external_deps << dep if !paths.find {|p| p.to_s =~ /.*#{dep}.*/}
+            else
+              next
+            end
+          end
+        end
+        klass.external_deps = external_deps
+      end
+    end
+
     def find_code_smells
       code_smells = []
       @methods.each do |method|
         if method.lines > MAX_METHOD_LENGTH
-          code_smells << CodeSmell.new(:too_big_method, method.class_name, method.name)
+          code_smells << CodeSmell.new(:too_big_method, method)
         end
         if method.complexity > MAX_COMPLEXITY
-          code_smells << CodeSmell.new(:too_complex_method, method.class_name, method.name)
+          code_smells << CodeSmell.new(:too_complex_method, method)
         end
       end
       code_smells
@@ -199,3 +223,4 @@ module Analyzer
 
   end
 end
+end

data/lib/reconn/analyzer/code_smell.rb

@@ -1,16 +1,16 @@
-module Analyzer
-  class CodeSmell
-    attr_reader :type, :class_name, :method_name
+module Reconn
+  module Analyzer
+    class CodeSmell
+      attr_reader :type, :method
 
-    def initialize(type, class_name = :none, method_name)
-      @type = type
-      @class_name = class_name
-      @method_name = method_name
-    end
+      def initialize(type, method)
+        @type = type
+        @method = method
+      end
 
-    def to_s
-      "Smell: #{@type.to_s} in Class: #{@class_name.to_s} "\
-      "Method: #{@method_name.to_s}"
+      def to_s
+        "Smell: #{@type.to_s} in #{@method.to_s} in file: #{method.filepath}"
+      end
     end
   end
 end

data/lib/reconn/analyzer/project_elements/class.rb

@@ -1,8 +1,9 @@
+module Reconn
 module Analyzer
   # Represents a class in the project
   class Class
-    attr_reader :name, :methods
-    attr_accessor :lines, :complexity, :dependencies
+    attr_reader :name, :methods, :filepaths
+    attr_accessor :lines, :complexity, :dependencies, :external_deps
 
     include Comparable
 
@@ -10,8 +11,9 @@ module Analyzer
       name == other.name
     end
 
-    def initialize(name)
+    def initialize(name, filepaths = [])
       @name = name
+      @filepaths = filepaths
       @dependencies = []
       @methods = []
       @lines = 0
@@ -37,6 +39,7 @@ module Analyzer
         end
       end
       @dependencies += other.dependencies
+      @filepaths += other.filepaths
       self
     end
 
@@ -46,3 +49,4 @@ module Analyzer
 
   end
 end
+end

data/lib/reconn/analyzer/project_elements/method.rb

@@ -1,7 +1,8 @@
+module Reconn
 module Analyzer
   # Represents a method in the project
   class Method
-    attr_reader :name, :class_name, :lines, :complexity
+    attr_reader :name, :class_name, :lines, :complexity, :filepath
 
     include Comparable
 
@@ -9,20 +10,27 @@ module Analyzer
       name == other.name && class_name == other.class_name
     end
 
-    def initialize(name, class_name = :none, lines = 0)
+    def initialize(name, filepath = "", class_name = :none, lines = 0, is_singleton = false)
       @name = name
+      @filepath = filepath
       @class_name = class_name
       @lines = lines
       @complexity = 1
+      @is_singleton = is_singleton
     end
 
     def to_s
-      name.to_s
+      class_name.to_s + (is_singleton? ? "::" : "#")  + name.to_s
     end
 
     def incr_complexity
       @complexity += 1
     end
 
+    def is_singleton?
+      @is_singleton
+    end
+
   end
 end
+end

data/lib/reconn/util/project_scanner.rb

@@ -1,28 +1,30 @@
 require 'find'
 
-class ProjectScanner
-  # Scans the given directory and all its subdirectories for ruby files
-  #
-  # @param proj_path [String] path to the project directory
-  # @return [Array<String>] paths to the ruby files
-  # @raise [InvalidPathException] if it can't open the directory
-  def self.scan(proj_path)
-    paths = []
-    begin
-      Find.find(proj_path) do |path|
-        if FileTest.directory?(path)
-          if File.basename(path)[0] == '.'
-            Find.prune
+module Reconn
+  class ProjectScanner
+    # Scans the given directory and all its subdirectories for ruby files
+    #
+    # @param proj_path [String] path to the project directory
+    # @return [Array<String>] paths to the ruby files
+    # @raise [InvalidPathException] if it can't open the directory
+    def self.scan(proj_path)
+      paths = []
+      begin
+        Find.find(proj_path) do |path|
+          if FileTest.directory?(path)
+            if File.basename(path)[0] == '.'
+              Find.prune
+            end
+          end
+          if File.extname(path) == '.rb'
+            paths << path
           end
         end
-        if File.extname(path) == '.rb'
-          paths << path
-        end
+      rescue
+        raise InvalidPathException, "Can't open the directory"
       end
-    rescue
-      raise InvalidPathException, "Can't open the directory"
-    end
 
-    paths
+      paths
+    end
   end
 end

data/lib/reconn/version.rb

@@ -1,3 +1,3 @@
 module Reconn
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/lib/reconn/view/view.rb

@@ -1,6 +1,7 @@
 require_relative '../analyzer.rb'
 require_relative '../visualizer.rb'
 
+module Reconn
 class View
 
 	include GladeGUI
@@ -195,8 +196,8 @@ class View
   end
 
   def build_method_diag_view
-    diagrams = [ {title: "Lines of code", parameter: :lines} ]
-    diagrams << {title: "Cyclomatic complexity", parameter: :complexity}
+    diagrams = [ {title: "Lines of code", parameter: :lines, treshold: Analyzer::Analyzer::MAX_METHOD_LENGTH} ]
+    diagrams << {title: "Cyclomatic complexity", parameter: :complexity, treshold: Analyzer::Analyzer::MAX_COMPLEXITY}
     build_diag_view(@methods, diagrams)
   end
 
@@ -209,7 +210,7 @@ class View
       title = diag[:title]
 
       pie_chart = build_pie_chart(title, data)
-      bar_chart = build_bar_chart(title, data.first(10))
+      bar_chart = build_bar_chart(title, data.first(10), diag[:treshold])
 
       container = Gtk::VBox.new(false, 4)
       container = container.pack_end(pie_chart)
@@ -227,8 +228,8 @@ class View
     chart_to_image(binary_chart)
   end
 
-  def build_bar_chart(title, data)
-    binary_chart = Visualizer.make_bar_chart(title, data)
+  def build_bar_chart(title, data, treshold)
+    binary_chart = Visualizer.make_bar_chart(title, data, treshold)
     chart_to_image(binary_chart)
   end
 
@@ -275,3 +276,4 @@ class View
     :build_method_stats_view, :build_if_smell_view,
     :build_method_smell_view, :build_text_view
 end
+end

data/lib/reconn/visualizer.rb

@@ -1,44 +1,165 @@
 require 'gruff'
 require 'ruby-graphviz'
 
-class Visualizer
-  def self.make_pie_chart(title, data, items_number)
-    chart = Gruff::Pie.new
-    chart.title = title.to_s
-    data = Array.new(data)
-    data.first(items_number).each do |item|
-      chart.data(item[:label], item[:value])
-      data.delete(item)
+module Reconn
+  class Visualizer
+    def self.make_pie_chart(title, data, items_number)
+      chart = Gruff::Pie.new
+      chart.title = title.to_s
+      data = Array.new(data)
+      data.first(items_number).each do |item|
+        chart.data(item[:label], item[:value])
+        data.delete(item)
+      end
+
+      chart.data("other", data.map {|itm| itm[:value]}.inject(:+))
+
+      chart.to_blob
     end
 
-    chart.data("other", data.map {|itm| itm[:value]}.inject(:+))
+    def self.make_bar_chart(title, data, additional_line_value = nil)
+      chart = Gruff::Bar.new
+      chart.minimum_value = 0
+      chart.maximum_value = data.first[:value]
+      chart.additional_line_values = [additional_line_value] unless additional_line_value.nil?
+      chart.title = title.to_s
+      data.each do |item|
+        chart.data(item[:label], item[:value])
+      end
+
+      chart.to_blob
+    end
 
-    chart.to_blob
+    def self.make_dependency_diagram(classes)
+      diagram = GraphViz.new(:G, :type => :digraph)
+      nodes = classes.map { |c| diagram.add_nodes(c.name) }
+      external_nodes = classes.map {|c| c.external_deps}.inject(:+).uniq.map {|n| diagram.add_nodes(n)}
+      classes.each do |klass|
+        classes.each do |other_klass|
+          if !klass.dependencies.index {|d| d == other_klass.name }.nil? || klass.dependencies.find_all {|d| other_klass.name =~ /^.*{0,}::#{d}$/}.size == 1
+            node, other_node = [klass, other_klass].map {|k| nodes.find {|n| n[:label].to_s.gsub('"', '') == k.name}}
+            diagram.add_edges(node, other_node)
+          end
+        end
+        external_nodes.each {|n| n.set {|_n| _n.color = "blue"}}
+        external_nodes.each do |ext_node|
+          if klass.external_deps.include?(ext_node[:label].to_s.gsub('"', ''))
+            node = nodes.find {|n| n[:label].to_s.gsub('"', '') == klass.name}
+            diagram.add_edges(node, ext_node)
+          end
+        end
+      end
+      diagram.output(:png => String)
+    end
   end
+end
+
+#Monkeypatching additional line drawing
+module Gruff
+  class Bar
+    def draw
+      @center_labels_over_point = (@labels.keys.length > @column_count ? true : false)
+      super
+      return unless @has_data
 
-  def self.make_bar_chart(title, data)
-    chart = Gruff::Bar.new
-    chart.minimum_value = 0
-    chart.maximum_value = data.first[:value]
-    chart.title = title.to_s
-    data.each do |item|
-      chart.data(item[:label], item[:value])
+      draw_bars
+      draw_additional_line
     end
+    def draw_bars
+      # Setup spacing.
+      #
+      # Columns sit side-by-side.
+     @bar_spacing ||= @spacing_factor # space between the bars
+      @bar_width = @graph_width / (@column_count * @data.length).to_f
+      padding = (@bar_width * (1 - @bar_spacing)) / 2
 
-    chart.to_blob
-  end
+      @d = @d.stroke_opacity 0.0
+
+      # Setup the BarConversion Object
+      conversion = Gruff::BarConversion.new()
+      conversion.graph_height = @graph_height
+      conversion.graph_top = @graph_top
 
-  def self.make_dependency_diagram(classes)
-    diagram = GraphViz.new(:G, :type => :digraph)
-    nodes = classes.map { |c| diagram.add_nodes(c.name) }
-    classes.each do |klass|
-      classes.each do |other_klass|
-        if !klass.dependencies.index {|d| d == other_klass.name }.nil?
-          node, other_node = [klass, other_klass].map {|k| nodes.find {|n| n[:label].to_s.gsub('"', '') == k.name}}
-          diagram.add_edges(node, other_node)
+      # Set up the right mode [1,2,3] see BarConversion for further explanation
+      if @minimum_value >= 0 then
+        # all bars go from zero to positiv
+        conversion.mode = 1
+      else
+        # all bars go from 0 to negativ
+        if @maximum_value <= 0 then
+          conversion.mode = 2
+        else
+          # bars either go from zero to negativ or to positiv
+          conversion.mode = 3
+          conversion.spread = @spread
+          conversion.minimum_value = @minimum_value
+          conversion.zero = -@minimum_value/@spread
         end
       end
+
+      # iterate over all normalised data
+      @norm_data.each_with_index do |data_row, row_index|
+
+        data_row[DATA_VALUES_INDEX].each_with_index do |data_point, point_index|
+          # Use incremented x and scaled y
+          # x
+          left_x = @graph_left + (@bar_width * (row_index + point_index + ((@data.length - 1) * point_index))) + padding
+          right_x = left_x + @bar_width * @bar_spacing
+          # y
+          conv = []
+          conversion.get_left_y_right_y_scaled( data_point, conv )
+
+          # create new bar
+          @d = @d.fill data_row[DATA_COLOR_INDEX]
+          @d = @d.rectangle(left_x, conv[0], right_x, conv[1])
+
+          # Calculate center based on bar_width and current row
+          label_center = @graph_left + 
+                      (@data.length * @bar_width * point_index) + 
+                      (@data.length * @bar_width / 2.0)
+
+          # Subtract half a bar width to center left if requested
+          draw_label(label_center - (@center_labels_over_point ? @bar_width / 2.0 : 0.0), point_index)
+          if @show_labels_for_bar_values
+            val = (@label_formatting || '%.2f') % @norm_data[row_index][3][point_index]
+            draw_value_label(left_x + (right_x - left_x)/2, conv[0]-30, val.commify, true)
+          end
+        end
+      end
+
+      # Draw the last label if requested
+      draw_label(@graph_right, @column_count) if @center_labels_over_point
+
+      draw_additional_line
+      @d.draw(@base_image)
+    end
+    # Draws additional horizontal line
+    def draw_additional_line
+       @additional_line_colors << '#f61100'
+       @d = @d.stroke_opacity 100.0
+       i = 0
+       @additional_line_values.each do |value|
+         @increment_scaled = @graph_height.to_f / (@maximum_value.to_f / value)
+
+         y = @graph_top + @graph_height - @increment_scaled
+
+         @d = @d.stroke(@additional_line_colors[i])
+         @d = @d.line(@graph_left, y, @graph_right, y)
+
+
+         @d.fill = @additional_line_colors[i]
+         @d.font = @font if @font
+         @d.stroke('transparent')
+         @d.pointsize = scale_fontsize(@marker_font_size)
+         @d.gravity = EastGravity
+         @d = @d.annotate_scaled( @base_image,
+                                 @graph_right - LABEL_MARGIN, 1.0,
+                                 0.0, y - (@marker_font_size/2.0),
+                                 label(value, value), @scale)
+         i += 1
+       end
+
+      @d = @d.stroke_antialias true
     end
-    diagram.output(:png => String)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reconn
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Mateusz Czarnecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vrlib