debtective 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 609f9971e421988a317405b19b0cb8aacc172ee246e29d2484d290f6fb6649ab
-  data.tar.gz: b084f3772dfb519af3a3e254fa04f576d0edcbe59961841192cd5370c2daf7ac
+  metadata.gz: 3a9c75632f4f3a8785af1c96209c22b68772f8bde253cbd76e2bdb774a3812a8
+  data.tar.gz: d4b50399a0806ad8e4a6fb20305429882847ef79dd42bd176d17be3f5f1df786
 SHA512:
-  metadata.gz: 84a8a437407fba597289be78946a41094d34cca1eeb27fed496c010e0d062adba149f47832f2e9c558d92d9b0b23e13bd2fbd551168761eafeb02757c7816861
-  data.tar.gz: 0fb7f4326d4e3e9ee29c54117287f4eb3f9fd74083e0706b99bf2b30e68e31ef4b4f865511a80857f3b5aea49a2000f14d1f214427cdf3078115fb08b2be470a
+  metadata.gz: 59b68258f51e5f7a83992c8d24d0bc028fcb7dcdea2f379d0af011a8ec9c5dba645d6ffef4f94652d3ce7f0662185597934b96a6c8d2fa74ccc392b027b207fe
+  data.tar.gz: a5556a654c194fc442727c67f6c06686c6df851fe4008540670603d5aac8203e67e96a62d498b0eb57b91bdae76a2c967d789b29709659b84d3178632e7b893f

data/README.md

@@ -1,14 +1,16 @@
 # Debtective
 
-Help find out todos in your application.
+Find todos in your codebase so you don't forget to pay off your debts! 💰
 
 ## Usage
 
-Run the task:
+Run the task with:
 
-- `bundle exec rake debtective:todo_list`
+```bash
+bundle exec rake debtective:todo_list
+```
 
-More tasks to come!
+It outputs the todos positions with the concerned lines of code and some counts.
 
 ## Installation
 
@@ -16,7 +18,7 @@ Add this line to your application's Gemfile:
 
 ```ruby
 group :development do
-  gem 'debtective'
+  gem "debtective"
 end
 ```
 
@@ -32,6 +34,16 @@ Or install it yourself as:
 $ gem install debtective
 ```
 
+Configure the paths that should be analyzed (all by default):
+
+```ruby
+# config/initializers/debtective.rb
+
+Debtective.configure do |config|
+  config.paths = ["app/**/*", "lib/**/*"]
+end
+```
+
 ## Contributing
 
 This gem is still a work in progress. You can use GitHub issue to start a discussion.

data/lib/debtective/end_of_statement.rb

@@ -1,69 +1,81 @@
 # frozen_string_literal: true
 
+require "parser/current"
+
 module Debtective
-  # Find end of a block given its first line and the next lines
-  #
-  # With a class, a def, an if statement... or any "block statement"
-  #
-  # 0   def foo
-  # 1     do_this <--
-  # 2   end
-  # 3 end
-  #
-  # The end of the block is the last line before the `end` keyword (index 1)
-  #
-  # With a carriage return
-  #
-  # 0   User
-  # 1     .where(draft: true)
-  # 2     .preload(:tasks)    <--
-  # 3 end
-  #
-  # The end of the block is the last line of the statement (index 2)
+  # Find the index of the line ending a statement
   #
-  # With a single line (no block)
-  #
-  # 0   do_this <--
-  # 1   do_that
-  # 2 end
-  #
-  # Then the end is the first line (index 0)
+  # EndOfStatement.new(
+  #   [
+  #     "class User",
+  #     "  def example",
+  #     "    x + y",
+  #     "  end"
+  #     "end"
+  #   ],
+  #   1
+  # ).call
+  # => 3
   #
   class EndOfStatement
-    NON_ENDING_KEYWORDS_REGEX = /^(\s*)(else$|elsif\s|(rescue(\s|$))|ensure)/
-
     # @param lines [Array<String>] lines of code
-    def initialize(lines)
+    # @param index [Integer] index of the statement first line
+    def initialize(lines, first_line_index)
       @lines = lines
+      @first_line_index = first_line_index
     end
 
-    # ends of the statement
+    # index of the line ending the statement
     # @return [Integer]
     def call
-      @lines[1..]&.index { end_of_statement?(_1) } || 0
+      suppress_stderr do
+        last_line_index || @first_line_index
+      end
     end
 
     private
 
-    # indent (number of spaces) of the first line | for memoization
-    # @return [Integer]
-    def first_line_indent
-      @first_line_indent ||= indent(@lines[0])
+    # index of the line ending the statement
+    # @return[Integer, void]
+    # @note it is possible that no line ends the statement
+    # especially if first line is not the start of a statement
+    def last_line_index
+      @lines.index.with_index do |_line, index|
+        index >= @first_line_index &&
+          statement?(index) &&
+          !chained?(index)
+      end
     end
 
-    # return true if the line is the end of the statement
-    # @return [Boolean]
-    def end_of_statement?(line)
-      return false if line.match?(NON_ENDING_KEYWORDS_REGEX)
+    # check if the code from first index to given index is a statement
+    # e.i. can be parsed by a ruby parser (using whitequark/parser)
+    # @param index [Integer]
+    # @return boolean
+    def statement?(index)
+      code = @lines[@first_line_index..index].join("\n")
+      ::Parser::CurrentRuby.parse(code)
+      true
+    rescue Parser::SyntaxError
+      false
+    end
 
-      indent(line) <= first_line_indent
+    # check if current line is chained
+    # e.i. next line start with a .
+    # @param index [Integer]
+    # @return boolean
+    def chained?(index)
+      @lines[index + 1]&.match?(/^(\s*)\./)
     end
 
-    # returns the indent (number of spaces) of the line
-    # @param line [String]
-    # @return [Integer]
-    def indent(line)
-      line.match(/^(\s*).*$/)[1].length
+    # silence the $stderr
+    # to avoid logs from the parser
+    # @return void
+    def suppress_stderr
+      original_stderr = $stderr.clone
+      $stderr.reopen(File.new("/dev/null", "w"))
+      yield
+    ensure
+      $stderr.reopen(original_stderr)
     end
   end
 end

data/lib/debtective/file_todos.rb

@@ -5,10 +5,11 @@ require "debtective/end_of_statement"
 module Debtective
   # Find the todos comments and their boundaries
   class FileTodos
-    Result = Struct.new(:pathname, :boundaries)
+    Result = Struct.new(:pathname, :todo_index, :boundaries)
 
-    BEFORE_LINE_TODO_REGEX = /^\s*#\stodo:\s/i
-    INLINE_TODO_REGEX = /\s*#\stodo:\s/i
+    BEFORE_LINE_TODO_REGEX = /^\s*#\sTODO:\s/
+    INLINE_TODO_REGEX = /\s*#\sTODO:\s/
+    COMMENT_REGEX = /\s*#/
 
     # @param pathname [Pathname]
     def initialize(pathname)
@@ -18,34 +19,43 @@ module Debtective
     # @return [Array<FileTodos::Result>]
     def call
       lines.filter_map.with_index do |line, index|
-        case line
-        when BEFORE_LINE_TODO_REGEX
-          Result.new(@pathname, boundaries(index))
-        when INLINE_TODO_REGEX
-          Result.new(@pathname, index..index)
-        end
+        boundaries = boundaries(line, index)
+        next if boundaries.nil?
+
+        Result.new(@pathname, index, boundaries)
       end
     end
 
     private
 
+    # return todo boundaries if there is a todo
+    # @param line [String]
+    # @param index [Integer]
+    # @return [Range, nil]
+    def boundaries(line, index)
+      case line
+      when BEFORE_LINE_TODO_REGEX
+        first_line_index = statement_first_line_index(index)
+        last_line_index = EndOfStatement.new(@lines, first_line_index).call
+        first_line_index..last_line_index
+      when INLINE_TODO_REGEX
+        index..index
+      end
+    end
+
     # @return [Array<String>]
     def lines
       @lines ||= @pathname.readlines
     end
 
-    # @param index [Integer]
-    # @return [Boundaries]
-    def boundaries(index)
-      offset = index + 2
-      offset..end_line(index) + offset
-    end
-
-    # @param index [Integer]
+    # @param todo_index [Integer]
     # @return [Integer]
-    def end_line(index)
-      next_lines = lines[(index + 1)..]
-      EndOfStatement.new(next_lines).call
+    def statement_first_line_index(todo_index)
+      @lines.index.with_index do |line, i|
+        i > todo_index &&
+          !line.strip.empty? &&
+          !line.match?(COMMENT_REGEX)
+      end
     end
   end
 end

data/lib/debtective/todo_list.rb

@@ -27,7 +27,7 @@ module Debtective
       Debtective.configuration&.paths || DEFAULT_PATHS
     end
 
-    # @return [Array<Pathname>] only path to ruby files
+    # @return [Array<Pathname>] only pathes to ruby files
     def ruby_pathnames
       paths
         .flat_map { File.extname(_1) == "" ? Dir[_1] : [_1] }

data/lib/debtective/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Debtective
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/tasks/debtective/todo_list.rake

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "debtective/report"
+require "debtective/todo_list"
 
 begin
   require "#{Rails.root}/config/initializers/debtective" if defined?(Rails)
@@ -11,6 +11,52 @@ end
 namespace :debtective do
   desc "Todo List"
   task :todo_list do
-    Debtective::Report.new.call
+    todo_list = Debtective::TodoList.new.call
+    todos = todo_list.todos.sort_by { _1.boundaries.size }.reverse
+
+    separator = Array.new(120 + 3 + 12 + 3 + 12) { "-" }.join
+
+    puts separator
+
+    puts "todo list"
+
+    puts separator
+
+    puts(
+      [
+        "pathname".ljust(120),
+        "lines".rjust(12)
+      ].join(" | ")
+    )
+
+    puts separator
+
+    todos.each do |todo|
+      location = "#{todo.pathname}:#{todo.todo_index + 1}".ljust(120)
+      puts(
+        [
+          location,
+          [todo.boundaries.first + 1, todo.boundaries.last + 1].join(":").rjust(12),
+          todo.boundaries.size.to_s.rjust(12)
+        ].join(" | ")
+      )
+    end
+
+    puts separator
+
+    puts "todos count"
+    puts todos.count
+
+    puts separator
+
+    puts "combined lines count"
+    puts todo_list.combined_count
+
+    puts separator
+
+    puts "extended lines count"
+    puts todo_list.extended_count
+
+    puts separator
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: debtective
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Edouard Piron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +123,6 @@ files:
 - lib/debtective/end_of_statement.rb
 - lib/debtective/file_todos.rb
 - lib/debtective/railtie.rb
-- lib/debtective/report.rb
 - lib/debtective/todo_list.rb
 - lib/debtective/version.rb
 - lib/tasks/debtective/todo_list.rake

data/lib/debtective/report.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-require "debtective/todo_list"
-
-module Debtective
-  # Output information about the debt
-  class Report
-    # output todo list
-    def call
-      puts_separator
-      puts "todo list"
-      puts_separator
-      puts table_header
-      puts_separator
-      puts_table_content
-      puts_separator
-      puts_todos_count
-      puts_separator
-      puts_combines_lines_count
-      puts_separator
-      puts_extended_lines_count
-      puts_separator
-    end
-
-    private
-
-    # @return [TodoList::Result]
-    def todo_list
-      @todo_list ||= Debtective::TodoList.new.call
-    end
-
-    # @return [Array<FileTodos::Result>]
-    def todos
-      @todos ||= todo_list.todos.sort_by { _1.boundaries.size }.reverse
-    end
-
-    # @return [String]
-    def puts_separator
-      puts Array.new(table_header.length) { "-" }.join
-    end
-
-    # @return [void]
-    def table_header
-      @table_header ||= [
-        "pathname".ljust(120),
-        "boundaries".rjust(12),
-        "lines".rjust(12)
-      ].join(" | ")
-    end
-
-    # @return [void]
-    def puts_table_content
-      todos.each do |todo|
-        puts(
-          [
-            todo.pathname.to_s.ljust(120),
-            todo.boundaries.to_s.rjust(12),
-            todo.boundaries.size.to_s.rjust(12)
-          ].join(" | ")
-        )
-      end
-    end
-
-    # @return [void]
-    def puts_todos_count
-      puts "todos count"
-      puts todos.count
-    end
-
-    # @return [void]
-    def puts_combines_lines_count
-      puts "combined lines count"
-      puts todo_list.combined_count
-    end
-
-    # @return [void]
-    def puts_extended_lines_count
-      puts "extended lines count"
-      puts todo_list.extended_count
-    end
-  end
-end