rfix 2.0.4 → 3.0.0

data/lib/rfix/formatter.rb

@@ -1,93 +1,109 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/module/concerning"
 require "active_support/core_ext/module/delegation"
-require "rubocop/formatter/simple_text_formatter"
-require "rubocop/cop/offense"
 require "dry/core/constants"
 require "dry/initializer"
+require "tty/progressbar"
 require "tty/screen"
 require "tty/prompt"
+require "tty/table"
 require "tty/box"
-
-RuboCop::Cop::Offense.prepend(Rfix::Extension::Offense)
+require "rubocop"
 
 module Rfix
   class Formatter < RuboCop::Formatter::SimpleTextFormatter
-    attr_reader :indicator
-
     include Dry::Core::Constants
     extend Dry::Initializer
     include Log
 
-    option :indicator, default: -> { Indicator.new }
-    option :reported_offenses
-    option :options
-    option :output
+    NoSuchFileError = Class.new(Error)
 
-    PROMPT = TTY::Prompt.new(symbols: { marker: ">" })
-    SPACE = " "
+    using(Module.new do
+      refine String do
+        def surround(value)
+          value + self + value
+        end
+      end
 
-    delegate :say, to: :PROMPT
+      refine RuboCop::Cop::Offense.const_get(:PseudoSourceRange) do
+        def source_buffer
+          raise NoSuchFileError
+        end
+      end
+    end)
 
-    class NullRepository
-      include Singleton
+    option :reported_offenses, default: -> { EMPTY_ARRAY.dup }
+    option :progress
+    option :options
+    option :output
 
-      def include_file?(*)
-        true
-      end
+    option :params do
+      option :repository
     end
 
+    SURROUNDING_LINES = 2
+    NEWLINE = "\n"
+    SPACE = " "
+    PADDING = 1
+
+    delegate :repository, to: :params
+
     def initialize(output, options = EMPTY_HASH)
-      super(output: output, options: options, reported_offenses: EMPTY_ARRAY.dup)
+      TTY::ProgressBar.new(":current/:total (:eta) [:bar]", output: output).then do |bar|
+        super(output, output: output, options: options, params: options, progress: bar)
+      end
     end
 
     def started(files)
-      # indicator.start("{{italic:rfix}} is linting {{bold:#{files.count}}} files, hold on ...")
-    end
-
-    # @files [Array<File>]
-    def finished(files)
-      # @indicator.stop
-      mark_command_line
-      report_summary(files)
+      progress.configure do |config|
+        config.bar_format = :block
+        config.total = files.count
+        config.clear_head = true
+        config.clear = true
+        config.width = width
+      end
     end
 
     # @file [File]
     # @offenses [Array<Offence>]
-    def file_finished(*, offenses)
+    def file_finished(_file, offenses)
       @reported_offenses += offenses
 
-      # @indicator.stop if offenses?
+      progress.advance
+    end
+
+    # @files [Array<File>]
+    def finished(files)
+      progress.finish
+      mark_command_line
+      reported_offenses.each do |offense|
+        progress.log(NEWLINE)
 
-      length = offenses.length - 1
-      offenses.each_with_index do |offense, _index|
         framed(offense) do
           report_line_with_highlight(offense)
         end
-
-        puts
+      rescue NoSuchFileError
+        # NOP
       end
+      report_summary(files)
     end
 
     private
 
-    using(Module.new do
-      refine String do
-        def surround(value)
-          value + self + value
-        end
-      end
-    end)
+    def width
+      TTY::Screen.width
+    end
 
     def framed(offense, &block)
-      puts TTY::Box.frame({
-        width: TTY::Screen.width,
-        padding: [1, 1, 0, 1],
+      progress.log TTY::Box.frame({
+        width: width,
+        padding: [PADDING, PADDING, 0, PADDING],
         title: {
           top_left: "#{offense.icon} #{offense.msg}".surround(SPACE),
-          bottom_left: offense.clickable_severity&.surround(SPACE),
-          bottom_right: offense.clickable_path&.surround(SPACE)
-        }.compact
+          bottom_left: offense.clickable_path(repository.path)&.surround(SPACE),
+          top_right: offense.cop_name.surround(SPACE)
+        }
       }, &block)
     end
 
@@ -100,34 +116,20 @@ module Rfix
     end
 
     def mark_command_line
-      # "#{ESC}]1337;SetMark\a"
-      "" # TODO: Activate
-    end
-
-    def report(msg, format: true)
-      msg
-    end
-
-    def newline(amount = 1)
-      report("\n" * amount)
+      # progress.log "\e]1337;SetMark\a"
     end
 
     def report_line_with_highlight(offense)
       location = offense.location
 
-      unless location.respond_to?(:source_buffer)
-        return "Source not found"
-      end
-
       buffer = location.source_buffer
 
       source = buffer.source
       line = location.line
       last_line = buffer.last_line
-      surrounding_lines = 2
 
-      min_line = [line - surrounding_lines * 2, 1].max
-      max_line = [line + surrounding_lines * 2, last_line].min
+      min_line = [line - SURROUNDING_LINES * 2, 1].max
+      max_line = [line + SURROUNDING_LINES * 2, last_line].min
 
       begin_index = buffer.line_range(min_line).begin_pos
       end_index = buffer.line_range(max_line).end_pos
@@ -135,13 +137,11 @@ module Rfix
       visible = begin_index...end_index
       highlight = location.to_range
 
-      highlighter = Highlighter.new(
+      Highlighter.new(
         visible_lines: (min_line..max_line),
         highlight: highlight,
         visible: visible
-      )
-
-      (method(:report) << highlighter).call(source)
+      ).call(source)
     end
 
     def corrected
@@ -159,9 +159,5 @@ module Rfix
     def offenses?
       reported_offenses.any?
     end
-
-    def repository
-      NullRepository.instance
-    end
   end
 end

data/lib/rfix/highlighter.rb

@@ -71,10 +71,8 @@ module Rfix
 
       lines.reduce([0, 1]) do |(position, lineno), tokens|
         print_line_number = lambda do
-          block.call(SPACE * 2)
-
           style = is_h[lineno] ? pastel.yellow.detach : pastel.dim.detach
-          (block << style).call(lineno.to_s.ljust(4, SPACE) + SPACE)
+          block.call((SPACE * 2) + style.call(lineno.to_s.ljust(4, SPACE)) + SPACE)
         end
 
         tokens.reduce(position) do |index, (token, value)|

data/lib/rfix/rake/gemfile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "dry/types"
 require "dry/struct"
 require "dry/logic"
@@ -9,7 +11,8 @@ module Rfix
     end
 
     class Gemfile < Dry::Struct
-      include Dry::Core::Constants, FileUtils
+      include FileUtils
+      include Dry::Core::Constants
 
       module Types
         include Dry::Types()
@@ -32,26 +35,26 @@ module Rfix
 
       FORMAT = "Gemfile.rubocop-%s%s"
       VERSIONS = [
-        '0.82',
-        '0.83',
-        '0.84',
-        '0.92',
-        '0.93',
-        '1.0.0',
-        '1.7.0',
-        '1.5.0',
-        '1.5.1',
-        '1.5.2',
-        '1.6.1',
-        '1.8.1',
-        '1.8.0',
-        '1.9.0',
-        '1.10.0',
-        '1.11.0',
-        '1.12.0',
-        '1.12.1',
-        '1.13.0'
-      ]
+        "0.82",
+        "0.83",
+        "0.84",
+        "0.92",
+        "0.93",
+        "1.0.0",
+        "1.7.0",
+        "1.5.0",
+        "1.5.1",
+        "1.5.2",
+        "1.6.1",
+        "1.8.1",
+        "1.8.0",
+        "1.9.0",
+        "1.10.0",
+        "1.11.0",
+        "1.12.0",
+        "1.12.1",
+        "1.13.0"
+      ].freeze
 
       def self.call(*args, **kwargs, &block)
         (self | AST).call(*args, **kwargs, &block)
@@ -77,9 +80,9 @@ module Rfix
       end
 
       def bundle_lock
-        sh *lock_args
+        sh(*lock_args)
       rescue RuntimeError
-        sh *lock_args[0..-2]
+        sh(*lock_args[0..-2])
       end
 
       def lock_args

data/lib/rfix/repository.rb

@@ -1,89 +1,34 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/string/inflections"
 require "active_support/core_ext/module/delegation"
-require "dry/core/constants"
+require "active_support/core_ext/object/inclusion"
 require "dry/core/memoizable"
+require "dry/core/constants"
+require "concurrent/map"
 require "dry/struct"
 require "rugged"
 
 module Rfix
   class Repository < Dry::Struct
     include Dry::Core::Constants
-    include Log
+    include Dry::Core::Memoizable
 
     attribute :repository, Types.Instance(Rugged::Repository)
-
     attribute :reference, Types.Instance(Branch::Base)
+    attribute :current_path, Types::Path::Relative.default { Pathname(".").freeze }
 
-    delegate :head, :branches, :workdir, :rev_parse, :diff_workdir, to: :repository
-
-    OPTIONS = {
-      include_untracked_content: true,
-      ignore_whitespace_change: false,
-      recurse_untracked_dirs: true,
-      ignore_whitespace_eol: false,
-      include_unmodified: true,
-      include_untracked: true,
-      ignore_submodules: true,
-      include_ignored: false,
-      context_lines: 0
-    }.freeze
-
-    def initialize(*)
-      super
-      call
-    end
-
-    def origin
-      reference.resolve
-    end
-
-    def status(found = EMPTY_HASH.dup)
-      @status ||= begin
-        repository.status do |path, statuses|
-          statuses.each do |status|
-            (found[path] ||= []) << status
-          end
-        end
-
-        if repository.head_unborn?
-          return found
-        end
-
-        origin.diff_workdir(**OPTIONS.dup).tap do |diff|
-          diff.find_similar!(
-            renames_from_rewrites: true,
-            renames: true,
-            copies: true
-          )
-        end.each_delta.each_with_object(found) do |delta, acc|
-          (acc[delta.new_file[:path]] ||= []) << delta.status
-        end
-      end
-    end
-
-    def call
-      status.each do |path, statuses|
-        build(path, statuses)
-      end
-    end
+    INCLUDED = [File::Untracked, File::Tracked].to_set.freeze
+    INIT = Hash.new { |h, k| h[k] = EMPTY_ARRAY.dup }.freeze
 
-    def path
-      Pathname(workdir)
-    end
+    delegate_missing_to :repository
 
-    # @path [String]
-    def refresh!(*)
-      # NOP
+    def self.method_added(name)
+      super.tap { memoize(name) }
     end
 
-    # @path [String]
-    # @line [Integer]
-    # @return Bool
     def include?(path, line)
-      get(path).include?(line)
-    rescue KeyError
-      false
+      cache[path].include?(line)
     end
 
     def skipped
@@ -91,62 +36,80 @@ module Rfix
     end
 
     def tracked
-      files.values.select(&:tracked?)
+      files.select(&:tracked?)
     end
 
     def ignored
-      files.values.select(&:ignored?)
+      files.select(&:ignored?)
     end
 
     def untracked
-      files.values.select(&:untracked?)
+      files.select(&:untracked?)
     end
 
     def deleted
-      files.values.select(&:deleted?)
+      files.select(&:deleted?)
     end
 
-    def permitted
-      untracked + tracked
+    def path
+      Pathname(workdir)
     end
 
-    def to_s
-      options = {
-        untracked: untracked.map(&:basename).join(", "),
-        tracked: tracked.map(&:basename).join(", "),
-        ignored: ignored.map(&:basename).join(", "),
-        deleted: deleted.map(&:basename).join(", ")
-      }
-
-      "Repository<Untracked: %<untracked>s, Tracked: %<tracked>s, Ignored: %<ignored>s, Deleted: %<deleted>s>" % options
+    def cache
+      Concurrent::Map.new do |storage, path|
+        storage.fetch(Types::Path::Absolute.call(path).to_s, File::Null)
+      end.tap do |storage|
+        files.each { |file| storage.compute_if_absent(file.key) { file } }
+      end
     end
 
     def files
-      @files ||= EMPTY_HASH.dup
+      Diff.new(repository: self, current_path: current_path).deltas.map do |delta|
+        File::Tracked.call(**delta.new_file, repository: self, status: delta.status)
+      end
     end
 
-    def paths
-      permitted.map(&:basename)
+    def permitted
+      files
+    end
+
+    def to_s
+      files.each_with_object(INIT.dup) do |file, object|
+        object[file.class] << file
+      end.map do |type, files|
+        "%<type>s[%<count>i]:%<files>s" % {
+          files: files.map(&:to_s).join(", "),
+          type: type.name.demodulize,
+          count: files.count
+        }
+      end.then do |types|
+        "Repository<%<types>s>" % { types: types.join(", ") }
+      end
     end
+    alias inspect to_s
 
-    def include_file?(path)
-      permitted.include?(files.fetch(path, Undefined))
+    def paths
+      permitted.map(&:key).to_a
     end
 
-    private
+    def include_file?(path, line = Undefined)
+      return cache[path].exists? if line == Undefined
 
-    def store(file)
-      files.store(file.key, file)
+      cache[path].include?(line)
     end
 
-    def get(path)
-      files.fetch(path)
+    alias contains? include_file?
+    alias include? include_file?
+
+    # TODO: Refactor
+    def origin
+      repository.lookup(repository.rev_parse(reference.name).oid)
+    rescue Rugged::Error, Rugged::InvalidError, Rugged::ReferenceError
+      raise Error, "Reference #{reference.name.inspect} not found"
     end
 
-    def build(path, status)
-      store(Rfix::File.call(basename: path, status: status, repository: self))
-    rescue Dry::Struct::Error => e
-      raise Error, { path: path, status: status, message: e.message }.inspect
+    def collector
+      Collector.call(repository: self, reference: reference.name)
     end
   end
 end