RubyGems - rubycritic - Versions diffs - 0.0.5 → 0.0.16 - Mend

rubycritic 0.0.5 → 0.0.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (96) hide show

checksums.yaml +4 -4
data/.travis.yml +10 -0
data/README.md +72 -11
data/bin/rubycritic +2 -0
data/lib/rubycritic/adapters/complexity/flog.rb +22 -0
data/lib/rubycritic/adapters/smell/flay.rb +68 -0
data/lib/rubycritic/adapters/smell/flog.rb +62 -0
data/lib/rubycritic/adapters/smell/reek.rb +44 -0
data/lib/rubycritic/analysers/churn.rb +19 -0
data/lib/rubycritic/analysers/config.reek +8 -0
data/lib/rubycritic/analysers/flay.rb +15 -0
data/lib/rubycritic/analysers/flog.rb +1 -2
data/lib/rubycritic/analysers/stats.rb +31 -0
data/lib/rubycritic/analysers_runner.rb +15 -14
data/lib/rubycritic/cli.rb +35 -14
data/lib/rubycritic/configuration.rb +24 -0
data/lib/rubycritic/core/analysed_file.rb +50 -0
data/lib/rubycritic/{location.rb → core/location.rb} +6 -2
data/lib/rubycritic/core/rating.rb +22 -0
data/lib/rubycritic/{smell.rb → core/smell.rb} +5 -12
data/lib/rubycritic/files_initializer.rb +15 -0
data/lib/rubycritic/orchestrator.rb +23 -0
data/lib/rubycritic/report_generators/assets/javascripts/application.js +87 -8
data/lib/rubycritic/report_generators/assets/javascripts/highcharts.src-4.0.1.js +17672 -0
data/lib/rubycritic/report_generators/assets/javascripts/jquery.floatThead-v1.2.7.js +754 -0
data/lib/rubycritic/report_generators/assets/javascripts/jquery.scrollTo-1.4.11.js +186 -0
data/lib/rubycritic/report_generators/assets/javascripts/jquery.tablesorter-2.0.js +1031 -0
data/lib/rubycritic/report_generators/assets/javascripts/jquery.timeago-v1.4.1.js +214 -0
data/lib/rubycritic/report_generators/assets/stylesheets/application.css +204 -1
data/lib/rubycritic/report_generators/assets/stylesheets/prettify.custom_theme.css +1 -4
data/lib/rubycritic/report_generators/base.rb +49 -0
data/lib/rubycritic/report_generators/code_file.rb +38 -0
data/lib/rubycritic/report_generators/code_index.rb +24 -0
data/lib/rubycritic/report_generators/current_code_file.rb +17 -0
data/lib/rubycritic/report_generators/line.rb +31 -0
data/lib/rubycritic/report_generators/overview.rb +25 -0
data/lib/rubycritic/report_generators/smells_index.rb +24 -0
data/lib/rubycritic/report_generators/templates/code_file.html.erb +36 -0
data/lib/rubycritic/report_generators/templates/code_index.html.erb +26 -0
data/lib/rubycritic/report_generators/templates/layouts/application.html.erb +27 -16
data/lib/rubycritic/report_generators/templates/overview.html.erb +5 -0
data/lib/rubycritic/report_generators/templates/smells_index.html.erb +20 -0
data/lib/rubycritic/report_generators/view_helpers.rb +28 -9
data/lib/rubycritic/reporters/base.rb +24 -0
data/lib/rubycritic/reporters/main.rb +52 -0
data/lib/rubycritic/reporters/mini.rb +30 -0
data/lib/rubycritic/revision_comparator.rb +21 -28
data/lib/rubycritic/serializer.rb +32 -0
data/lib/rubycritic/smells_status_setter.rb +7 -16
data/lib/rubycritic/source_control_systems/base.rb +60 -0
data/lib/rubycritic/source_control_systems/double.rb +19 -0
data/lib/rubycritic/source_control_systems/git.rb +47 -37
data/lib/rubycritic/source_locator.rb +8 -12
data/lib/rubycritic/turbulence.rb +17 -0
data/lib/rubycritic/version.rb +1 -1
data/lib/rubycritic.rb +2 -27
data/rubycritic.gemspec +3 -0
data/test/lib/rubycritic/adapters/complexity/flog_test.rb +18 -0
data/test/lib/rubycritic/adapters/smell/flay_test.rb +34 -0
data/test/lib/rubycritic/adapters/smell/flog_test.rb +26 -0
data/test/lib/rubycritic/adapters/smell/reek_test.rb +35 -0
data/test/lib/rubycritic/analysers/churn_test.rb +38 -0
data/test/lib/rubycritic/configuration_test.rb +17 -0
data/test/lib/rubycritic/core/analysed_file_test.rb +71 -0
data/test/lib/rubycritic/{location_test.rb → core/location_test.rb} +8 -4
data/test/lib/rubycritic/core/smell_test.rb +73 -0
data/test/lib/rubycritic/{smells_array_test.rb → core/smells_array_test.rb} +1 -1
data/test/lib/rubycritic/smells_status_setter_test.rb +5 -5
data/test/lib/rubycritic/source_control_systems/source_control_system_test.rb +5 -11
data/test/lib/rubycritic/source_locator_test.rb +26 -17
data/test/lib/rubycritic/turbulence_test.rb +17 -0
data/test/lib/rubycritic/version_test.rb +1 -0
data/test/samples/flay/smelly.rb +17 -0
data/test/samples/flog/complex.rb +11 -0
data/test/samples/flog/smelly.rb +7 -2
data/test/samples/reek/not_smelly.rb +31 -3
data/test/test_helper.rb +1 -0
metadata +97 -32
data/SPEC.md +0 -58
data/lib/rubycritic/report_generators/base_generator.rb +0 -42
data/lib/rubycritic/report_generators/file_generator.rb +0 -42
data/lib/rubycritic/report_generators/index_generator.rb +0 -28
data/lib/rubycritic/report_generators/line_generator.rb +0 -27
data/lib/rubycritic/report_generators/reporter.rb +0 -45
data/lib/rubycritic/report_generators/templates/file.html.erb +0 -3
data/lib/rubycritic/report_generators/templates/index.html.erb +0 -14
data/lib/rubycritic/smell_adapters/flog.rb +0 -41
data/lib/rubycritic/smell_adapters/reek.rb +0 -35
data/lib/rubycritic/smells_aggregator.rb +0 -29
data/lib/rubycritic/smelly_pathnames_serializer.rb +0 -34
data/lib/rubycritic/source_control_systems/source_control_system.rb +0 -42
data/test/lib/rubycritic/metric_adapters/flog_adapter_test.rb +0 -25
data/test/lib/rubycritic/metric_adapters/reek_adapter_test.rb +0 -34
data/test/lib/rubycritic/smell_test.rb +0 -71
data/test/lib/rubycritic/smells_aggregator_test.rb +0 -47
/data/lib/rubycritic/report_generators/assets/javascripts/{prettify.js → prettify-4-Mar-2013.js} +0 -0

data/lib/rubycritic/report_generators/templates/code_index.html.erb ADDED Viewed

@@ -0,0 +1,26 @@
+<table id="js-index-table" class="index-table sortable-table">
+<thead>
+  <tr>
+    <th class="first-cell">Name</th>
+    <th class="numeric-cell" title="Number of times a file has changed">Churn</th>
+    <th class="numeric-cell" title="Overall amount of code in a file">Complexity</th>
+    <th class="numeric-cell" title="Amount of code that is similar to other code">Duplication</th>
+    <th class="numeric-cell">Smells</th>
+    <th class="centered-cell last-cell">Rating</th>
+  </tr>
+</thead>
+<tbody>
+  <% @analysed_files.each do |analysed_file| %>
+    <tr>
+      <td class="first-cell">
+        <a href="<%= file_path(analysed_file.pathname.sub_ext('.html')) %>"><%= analysed_file.name %></a>
+      </td>
+      <td class="numeric-cell"><%= analysed_file.churn %></td>
+      <td class="numeric-cell"><%= analysed_file.complexity %></td>
+      <td class="numeric-cell"><%= analysed_file.duplication %></td>
+      <td class="numeric-cell"><%= analysed_file.smells.length %></td>
+      <td class="centered-cell last-cell"><span class="rating-<%= analysed_file.rating.to_s.downcase %> circled-rating circle"><%= analysed_file.rating %></td>
+    </tr>
+  <% end %>
+</tbody>
+</table>

data/lib/rubycritic/report_generators/templates/layouts/application.html.erb CHANGED Viewed

@@ -1,19 +1,30 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>RubyCritic</title>
-        <link href="<%= stylesheet_path(:application) %>" media="screen, projection, print" rel="stylesheet" type="text/css">
-        <link href="<%= stylesheet_path(:'prettify.custom_theme') %>" media="screen, projection, print" rel="stylesheet" type="text/css">
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-    </head>
-    <body>
-        <h1><a href="<%= index_path %>">RubyCritic</a></h1>
-        <%= yield %>
-        <script src="<%= javascript_path(:'jquery-2.1.0') %>"></script>
-        <script src="<%= javascript_path(:prettify) %>"></script>
-        <script src="<%= javascript_path(:application) %>"></script>
-    </body>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>RubyCritic</title>
+    <link href="<%= stylesheet_path(:application) %>" media="screen, projection, print" rel="stylesheet" type="text/css">
+    <link href="<%= stylesheet_path(:'prettify.custom_theme') %>" media="screen, projection, print" rel="stylesheet" type="text/css">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <header class="project-header group">
+      <h1 class="logo"><a href="<%= file_path('overview.html') %>" class="logo-link">RubyCritic</a></h1>
+      <nav class="project-nav">
+        <a href="<%= file_path('overview.html') %>" class="project-nav-item">Overview</a>
+        <a href="<%= file_path('code_index.html') %>" class="project-nav-item">Code</a>
+        <a href="<%= file_path('smells_index.html') %>" class="project-nav-item">Smells</a>
+      </nav>
+    </header>
+    <%= yield %>
+    <%= javascript_tag(:'jquery-2.1.0') %>
+    <%= javascript_tag(:'jquery.tablesorter-2.0') %>
+    <%= javascript_tag(:'jquery.floatThead-v1.2.7') %>
+    <%= javascript_tag(:'jquery.timeago-v1.4.1') %>
+    <%= javascript_tag(:'highcharts.src-4.0.1') %>
+    <%= javascript_tag(:'jquery.scrollTo-1.4.11') %>
+    <%= javascript_tag(:'prettify-4-Mar-2013') %>
+    <%= javascript_tag(:application) %>
+  </body>
 </html>

data/lib/rubycritic/report_generators/templates/overview.html.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<div id="js-chart-container" class="chart-container"></div>
+<script type="text/javascript">
+  var turbulenceData = <%= @turbulence_data %>;
+</script>

data/lib/rubycritic/report_generators/templates/smells_index.html.erb ADDED Viewed

@@ -0,0 +1,20 @@
+<table id="js-index-table" class="index-table sortable-table">
+<thead>
+  <tr>
+    <th class="first-cell">Smell</th>
+    <th class="last-cell">Locations</th>
+  </tr>
+</thead>
+<tbody>
+  <% @smells.each do |smell| %>
+    <tr>
+      <td class="first-cell"><%= smell.type %></td>
+      <td class="last-cell">
+        <% smell.locations.each do |location| %>
+          <a href="<%= smell_location_path(location) %>"><%= location.file_name %></a>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+</tbody>
+</table>

data/lib/rubycritic/report_generators/view_helpers.rb CHANGED Viewed

@@ -1,25 +1,44 @@
+require "pathname"
 module Rubycritic
   module ViewHelpers
-    def javascript_path(file)
-      asset_path(File.join("javascripts", "#{file}.js"))
+    def timeago_tag(time)
+      "<time class='js-timeago' datetime='#{time}'>#{time}</time>"
+    end
+    def javascript_tag(file)
+      "<script src='" + asset_path("javascripts", "#{file}.js").to_s + "'></script>"
     end
     def stylesheet_path(file)
-      asset_path(File.join("stylesheets", "#{file}.css"))
+      asset_path("stylesheets", "#{file}.css")
+    end
+    def asset_path(*fragments)
+      relative_path(([root_directory, "assets"] + fragments).reduce(:+))
     end
-    def asset_path(file)
-      File.join(root_directory, "assets", file)
+    def file_path(file)
+      relative_path(root_directory + file)
     end
     def smell_location_path(location)
-      pathname = location.pathname
-      File.join(root_directory, File.dirname(pathname), "#{pathname.basename.sub_ext("")}.html#L#{location.line}")
+      relative_path(root_directory + "#{location.pathname.sub_ext('.html')}#L#{location.line}")
+    end
+    private
+    def relative_path(pathname)
+      pathname.relative_path_from(file_directory)
+    end
+    def file_directory
+      raise NotImplementedError.new("The #{self.class} class must implement the #{__method__} method.")
     end
-    def index_path
-      File.join(root_directory, "index.html")
+    def root_directory
+      raise NotImplementedError.new("The #{self.class} class must implement the #{__method__} method.")
     end
   end

data/lib/rubycritic/reporters/base.rb ADDED Viewed

@@ -0,0 +1,24 @@
+require "fileutils"
+module Rubycritic
+  module Reporter
+    class Base
+      ASSETS_DIR = File.expand_path("../../report_generators/assets", __FILE__)
+      def create_directories_and_files(generators)
+        Array(generators).each do |generator|
+          FileUtils.mkdir_p(generator.file_directory)
+          File.open(generator.file_pathname, "w+") do |file|
+            file.write(generator.render)
+          end
+        end
+      end
+      def copy_assets_to_report_directory
+        FileUtils.cp_r(ASSETS_DIR, ::Rubycritic.configuration.root)
+      end
+    end
+  end
+end

data/lib/rubycritic/reporters/main.rb ADDED Viewed

@@ -0,0 +1,52 @@
+require "rubycritic/reporters/base"
+require "rubycritic/report_generators/overview"
+require "rubycritic/report_generators/smells_index"
+require "rubycritic/report_generators/code_index"
+require "rubycritic/report_generators/code_file"
+module Rubycritic
+  module Reporter
+    class Main < Base
+      def initialize(analysed_files)
+        @analysed_files = analysed_files
+        @smells = analysed_files.flat_map(&:smells).uniq
+      end
+      def generate_report
+        create_directories_and_files(generators)
+        copy_assets_to_report_directory
+        report_location
+      end
+      private
+      def generators
+        [overview_generator, code_index_generator, smells_index_generator] + file_generators
+      end
+      def overview_generator
+        @overview_generator ||= Generator::Overview.new(@analysed_files)
+      end
+      def code_index_generator
+        Generator::CodeIndex.new(@analysed_files)
+      end
+      def smells_index_generator
+        Generator::SmellsIndex.new(@smells)
+      end
+      def file_generators
+        @analysed_files.map do |analysed_file|
+          Generator::CodeFile.new(analysed_file)
+        end
+      end
+      def report_location
+        overview_generator.file_href
+      end
+    end
+  end
+end

data/lib/rubycritic/reporters/mini.rb ADDED Viewed

@@ -0,0 +1,30 @@
+require "rubycritic/reporters/base"
+require "rubycritic/report_generators/current_code_file"
+module Rubycritic
+  module Reporter
+    class Mini < Base
+      def initialize(analysed_files)
+        @analysed_file = analysed_files.first
+      end
+      def generate_report
+        create_directories_and_files(file_generator)
+        copy_assets_to_report_directory
+        report_location
+      end
+      private
+      def file_generator
+        @file_generator ||= Generator::CurrentCodeFile.new(@analysed_file)
+      end
+      def report_location
+        file_generator.file_href
+      end
+    end
+  end
+end

data/lib/rubycritic/revision_comparator.rb CHANGED Viewed

@@ -1,54 +1,47 @@
-require "rubycritic/smelly_pathnames_serializer"
-require "rubycritic/source_locator"
+require "rubycritic/serializer"
+require "rubycritic/files_initializer"
 require "rubycritic/analysers_runner"
-require "rubycritic/smells_aggregator"
 require "rubycritic/smells_status_setter"
 module Rubycritic
   class RevisionComparator
-    SNAPSHOTS_DIR = File.expand_path("tmp/rubycritic/snapshots", Dir.getwd)
+    SNAPSHOTS_DIR_NAME = "snapshots"
-    def initialize(paths, source_control_system)
-      @paths = paths
+    def initialize(analysed_files, source_control_system)
+      @analysed_files_now = analysed_files
       @source_control_system = source_control_system
     end
-    def compare
-      SmellsStatusSetter.new(smelly_pathnames_before, smelly_pathnames_now).smelly_pathnames
+    def set_statuses
+      SmellsStatusSetter.set(
+        analysed_files_before.flat_map(&:smells),
+        @analysed_files_now.flat_map(&:smells)
+      )
     end
     private
-    def smelly_pathnames_before
-      serializer = SmellyPathnamesSerializer.new(revision_file)
+    def analysed_files_before
+      serializer = Serializer.new(revision_file)
       if File.file?(revision_file)
         serializer.load
       else
-        smelly_pathnames = nil
+        analysed_files = FilesInitializer.init(["."])
         @source_control_system.travel_to_head do
-          smelly_pathnames = smelly_pathnames(paths_of_tracked_files)
+          AnalysersRunner.new(analysed_files, @source_control_system).run
         end
-        serializer.dump(smelly_pathnames)
-        smelly_pathnames
+        serializer.dump(analysed_files)
+        analysed_files
       end
     end
-    def smelly_pathnames_now
-      smelly_pathnames(@paths)
-    end
-    def smelly_pathnames(paths)
-      smell_adapters = AnalysersRunner.new(paths).run
-      SmellsAggregator.new(smell_adapters).smelly_pathnames
-    end
     def revision_file
-      @revision_file ||= File.join(SNAPSHOTS_DIR, @source_control_system.head_reference)
-    end
-    def paths_of_tracked_files
-      SourceLocator.new(["."]).paths
+      @revision_file ||= File.join(
+        ::Rubycritic.configuration.root,
+        SNAPSHOTS_DIR_NAME,
+        @source_control_system.head_reference
+      )
     end
   end

data/lib/rubycritic/serializer.rb ADDED Viewed

@@ -0,0 +1,32 @@
+require "fileutils"
+module Rubycritic
+  class Serializer
+    def initialize(file)
+      @file = file
+    end
+    def load
+      Marshal.load(File.binread(@file))
+    end
+    def dump(content)
+      create_file_directory
+      File.open(@file, "w+") do |file|
+        Marshal.dump(content, file)
+      end
+    end
+    private
+    def create_file_directory
+      FileUtils.mkdir_p(file_directory)
+    end
+    def file_directory
+      File.dirname(@file)
+    end
+  end
+end

data/lib/rubycritic/smells_status_setter.rb CHANGED Viewed

@@ -1,25 +1,16 @@
 module Rubycritic
-  class SmellsStatusSetter
-    def initialize(smelly_pathnames_before, smelly_pathnames_now)
-      @smelly_pathnames_before = smelly_pathnames_before
-      @smelly_pathnames_now = smelly_pathnames_now
-    end
-    def smelly_pathnames
-      @smelly_pathnames_now.each do |pathname, smells_now|
-        smells_before = @smelly_pathnames_before[pathname] || []
-        old_smells = smells_now & smells_before
-        set_status(old_smells, :old)
-        new_smells = smells_now - smells_before
-        set_status(new_smells, :new)
-      end
-      @smelly_pathnames_now
+  module SmellsStatusSetter
+    def self.set(smells_before, smells_now)
+      old_smells = smells_now & smells_before
+      set_status(old_smells, :old)
+      new_smells = smells_now - smells_before
+      set_status(new_smells, :new)
     end
     private
-    def set_status(smells, status)
+    def self.set_status(smells, status)
       smells.each { |smell| smell.status = status }
     end
   end

data/lib/rubycritic/source_control_systems/base.rb ADDED Viewed

@@ -0,0 +1,60 @@
+require "shellwords"
+module Rubycritic
+  module SourceControlSystem
+    class Base
+      @@systems = []
+      def self.register_system
+        @@systems << self
+      end
+      def self.create
+        supported_system = systems.detect(&:supported?)
+        if supported_system
+          supported_system.new
+        else
+          puts "Rubycritic requires a #{system_names} repository."
+          Double.new
+        end
+      end
+      def self.systems
+        @@systems
+      end
+      def self.system_names
+        systems.join(", ")
+      end
+      def self.supported?
+        raise NotImplementedError.new("The #{self.class} class must implement the #{__method__} method.")
+      end
+      def has_revision?
+        raise NotImplementedError.new("The #{self.class} class must implement the #{__method__} method.")
+      end
+      def head_reference
+        raise NotImplementedError.new("The #{self.class} class must implement the #{__method__} method.")
+      end
+      def travel_to_head
+        raise NotImplementedError.new("The #{self.class} class must implement the #{__method__} method.")
+      end
+      def revisions_count(path)
+        raise NotImplementedError.new("The #{self.class} class must implement the #{__method__} method.")
+      end
+      def date_of_last_commit(path)
+        raise NotImplementedError.new("The #{self.class} class must implement the #{__method__} method.")
+      end
+    end
+  end
+end
+require "rubycritic/source_control_systems/double"
+require "rubycritic/source_control_systems/git"

data/lib/rubycritic/source_control_systems/double.rb ADDED Viewed

@@ -0,0 +1,19 @@
+module Rubycritic
+  module SourceControlSystem
+    class Double < Base
+      def has_revision?
+        false
+      end
+      def revisions_count(path)
+        "N/A"
+      end
+      def date_of_last_commit(path)
+        nil
+      end
+    end
+  end
+end

data/lib/rubycritic/source_control_systems/git.rb CHANGED Viewed

@@ -1,53 +1,63 @@
 module Rubycritic
+  module SourceControlSystem
-  class Git < SourceControlSystem
-    register_system
+    class Git < Base
+      register_system
-    def self.supported?
-      `git branch 2>&1` && $?.success?
-    end
+      def self.supported?
+        `git branch 2>&1` && $?.success?
+      end
-    def self.to_s
-      "Git"
-    end
+      def self.to_s
+        "Git"
+      end
-    def has_revision?
-      head_reference && $?.success?
-    end
+      def has_revision?
+        head_reference && $?.success?
+      end
-    def head_reference
-      `git rev-parse --verify HEAD`.chomp
-    end
+      def head_reference
+        `git rev-parse --verify HEAD`.chomp!
+      end
-    def travel_to_head
-      stash_successful = stash_changes
-      yield
-    ensure
-      travel_to_original_state if stash_successful
-    end
+      def travel_to_head
+        stash_successful = stash_changes
+        yield
+      ensure
+        travel_to_original_state if stash_successful
+      end
-    private
+      def revisions_count(path)
+        `git log --follow --format=oneline #{path.shellescape}`.count("\n")
+      end
-    def stash_changes
-      return false if everything_commmited?
+      def date_of_last_commit(path)
+        `git log -1 --date=iso --format=%ad #{path.shellescape}`.chomp!
+      end
-      stashes_count_before = stashes_count
-      `git stash`
-      stashes_count_after = stashes_count
-      stashes_count_after > stashes_count_before
-    end
+      private
-    def everything_commmited?
-      `git status --porcelain`.empty?
-    end
+      def stash_changes
+        return false if everything_commmited?
-    def stashes_count
-      `git stash list`.split("\n").length
-    end
+        stashes_count_before = stashes_count
+        `git stash`
+        stashes_count_after = stashes_count
+        stashes_count_after > stashes_count_before
+      end
+      def everything_commmited?
+        `git status --porcelain`.empty?
+      end
-    def travel_to_original_state
-      `git stash pop`
+      def stashes_count
+        `git stash list`.count("\n")
+      end
+      def travel_to_original_state
+        `git stash pop`
+      end
     end
-  end
+  end
 end

data/lib/rubycritic/source_locator.rb CHANGED Viewed

@@ -7,31 +7,27 @@ module Rubycritic
     RUBY_FILES = File.join("**", "*#{RUBY_EXTENSION}")
     def initialize(paths)
-      @user_paths = paths
-    end
-    def pathnames
-      @pathnames ||= expand_paths
+      @initial_paths = paths
     end
     def paths
       @paths ||= pathnames.map(&:to_s)
     end
+    def pathnames
+      @pathnames ||= expand_paths
+    end
     private
     def expand_paths
-      @user_paths.map do |path|
+      @initial_paths.map do |path|
         if File.directory?(path)
-          Pathname.glob(files_contained_in(path))
+          Pathname.glob(File.join(path, RUBY_FILES))
         elsif File.exists?(path) && File.extname(path) == RUBY_EXTENSION
           Pathname.new(path)
         end
-      end.flatten.compact.sort
-    end
-    def files_contained_in(path)
-      (path == ".") ? RUBY_FILES : File.join(path, RUBY_FILES)
+      end.flatten.compact.map(&:cleanpath).sort
     end
   end

data/lib/rubycritic/turbulence.rb ADDED Viewed

@@ -0,0 +1,17 @@
+require "json"
+module Rubycritic
+  module Turbulence
+    def self.data(analysed_files)
+      analysed_files.map do |analysed_file|
+        {
+          :name => analysed_file.pathname,
+          :x => analysed_file.churn,
+          :y => analysed_file.complexity
+        }
+      end.to_json
+    end
+  end
+end

data/lib/rubycritic/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Rubycritic
-  VERSION = "0.0.5"
+  VERSION = "0.0.16"
 end