rfix 2.0.4 → 3.0.0

data/lib/rfix/diff.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require "dry/struct"
+require "rugged"
+
+module Rfix
+  class Diff < Dry::Struct
+    # https://github.com/libgit2/rugged/blob/master/ext/rugged/rugged_diff.c
+
+    attribute :options, Types::Hash.default(EMPTY_HASH)
+    attribute :current_path, Types::Path::Relative.default(Pathname(".").freeze)
+    attribute :repository, Repository
+
+    delegate :index, :origin, to: :repository
+    delegate :each_line, to: :diff
+
+    alias lines each_line
+
+    OPTIONS = {
+      context_lines: 1,
+      ignore_whitespace: true,
+      ignore_whitespace_change: true,
+      ignore_whitespace_eol: true,
+      disable_pathspec_match: false,
+      ignore_submodules: true,
+      include_ignored: false,
+      include_unmodified: false,
+      skip_binary_check: true,
+      ignore_filemode: true,
+      include_untracked_content: false,
+      include_typechange: false
+    }.freeze
+
+    def deltas
+      diff.deltas.reject(&:deleted?)
+    end
+
+    def files
+      deltas.map(&:new_file).map do |file|
+        repository.path.join(file.fetch(:path))
+      end
+    end
+
+    private
+
+    def diff
+      origin.diff(index, **extended_options).tap do |diff|
+        diff.merge!(index.diff(**extended_options))
+        diff.find_similar!(all: true, ignore_whitespace: true)
+      end
+    end
+
+    def absolute_path
+      repository.path.join(current_path)
+    end
+
+    def extended_options
+      unless absolute_path.exist?
+        raise Error, "#{current_path} path does not exist in #{repository.path}"
+      end
+
+      unless absolute_path.directory?
+        raise Error, "#{current_path} is not a directory"
+      end
+
+      OPTIONS.merge(**options, paths: [current_path.join("**/*").to_s])
+    end
+  end
+end

data/lib/rfix/extension/comment_config.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "rubocop"
+
+module RuboCop
+  class CommentConfig
+    concerning :Fallback, prepend: true do
+      def cop_enabled_at_line?(_, line)
+        super && repository.include?(processed_source.file_path, line)
+      rescue StandardError => e
+        abort e.full_message(highlight: true)
+      end
+    end
+  end
+end

data/lib/rfix/extension/offense.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/string/inflections"
+require "dry/core/constants"
 require "shellwords"
 require "pathname"
 require "tty-link"
 require "rainbow"
+require "rubocop"
+require "rubocop/cop/offense"
 
-module Rfix
-  module Extension
-    module Offense
+module RuboCop
+  module Cop
+    class Offense
+      # concerning :Features do
       STAR = Rainbow("⭑").yellow
       CROSS = Rainbow("✗").red
       CHECK = Rainbow("✓").green
@@ -32,32 +36,30 @@ module Rfix
         message.split(": ", 2).first
       end
 
-      def relative_path
+      def relative_path(root_path)
         return EMPTY_STRING unless location.respond_to?(:source_buffer)
 
-        location.source_buffer.name.sub(Dir.pwd, EMPTY_STRING).chars.drop_while do |char|
-          char == "/"
-        end.join
-      rescue ArgumentError
-        nil
+        Pathname(location.source_buffer.name).relative_path_from(root_path)
       end
 
-      def clickable_path
-        Rainbow("#{relative_path}:#{where}").italic
+      def clickable_path(root_path)
+        Rainbow("#{relative_path(root_path)}:#{where}").italic
       end
 
-      def clickable_plain_severity
+      def href
         cop_name.split("/", 2).then do |department, cop|
           return nil if [cop, department].any?(&:nil?)
 
           { type: department.parameterize, cop: cop.parameterize }
         end.then do |options|
           "https://docs.rubocop.org/rubocop/cops_%<type>s.html#%<type>s%<cop>s" % options
-        end.then do |url|
-          TTY::Link.link_to(cop_name, url)
         end
       end
 
+      def clickable_plain_severity
+        TTY::Link.link_to(cop_name, href)
+      end
+
       def clickable_severity
         clickable_plain_severity && Rainbow(clickable_plain_severity).italic
       end
@@ -74,6 +76,7 @@ module Rfix
       def escape(str)
         Shellwords.escape(str)
       end
+      # end
     end
   end
 end

data/lib/rfix/extension/pastel.rb

@@ -1,11 +1,14 @@
-require "strings-ansi"
+# frozen_string_literal: true
+
 require "pastel"
+require "strings"
 
 module Pastel
   class Color
-    def strip(*strings)
-      modified = strings.map(&Strings::ANSI.method(:sanitize))
-      modified.size == 1 ? modified[0] : modified
+    concerning :Fallback, prepend: true do
+      def strip(*strings)
+        super(*strings.map(&Strings::ANSI.method(:sanitize)))
+      end
     end
   end
 end

data/lib/rfix/extension/progresbar.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "tty/progressbar"
+
+module TTY
+  class ProgressBar
+    concerning :Log, prepend: true do
+      def log(input)
+        input.each_line do |line|
+          super(line.strip)
+        end
+      end
+    end
+  end
+end

data/lib/rfix/extension/strings.rb

@@ -1,9 +1,17 @@
+# frozen_string_literal: true
+
 require "strings"
 
 module Strings
   module Wrap
-    def self.wrap(line, *, **)
-      line
+    concerning :Fallback, prepend: true do
+      class_methods do
+        def wrap(line, *, **)
+          super
+        rescue IndexError
+          line
+        end
+      end
     end
   end
 end

data/lib/rfix/file.rb

@@ -2,10 +2,12 @@
 
 module Rfix
   module File
-    Self = Deleted | Ignored | Tracked | Untracked
+    def self.sum
+      Deleted | Ignored | Tracked | Untracked
+    end
 
-    def self.call(input)
-      Self.call(input)
+    class << self
+      delegate :call, to: :sum
     end
   end
 end

data/lib/rfix/file/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/string/inflections"
 require "rugged"
 require "pathname"
 require "dry/struct"
@@ -35,32 +36,38 @@ module Rfix
       abstract_class self
 
       attribute :repository, Repository
-      attribute :basename, Types::String
+      attribute :basename, Types::Path::Relative
 
-      UNTRACKED = [:worktree_new, :index_new]
-      DELETED = [:deleted, :worktree_deleted]
-      IGNORED = [:ignored, :unmodified].freeze
+      UNTRACKED = %i[worktree_new index_new].freeze
+      DELETED = %i[deleted worktree_deleted].freeze
+      IGNORED = %i[ignored unmodified].freeze
       TRACKED = [:added].freeze
 
-      def key
-        path.to_s
+      delegate :delete, to: :path
+      delegate :to_s, to: :basename
+
+      def to_table
+        [basename]
       end
 
-      # @return [Pathnane]
-      def path
-        repository.path.join(basename)
+      def key
+        raise NotImplementedError
       end
 
-      def include?(*, **)
-        raise NotImplementedError, self.class.name
+      def lines
+        EMPTY_ARRAY
       end
 
-      def refresh!(*)
-        # NOP
+      def contains?(file)
+        path == file
       end
 
       def inspect
-        "<#{self.class.name}(#{status.join(', ')}:#{basename})>"
+        "<#{self.class.name.demodulize}(#{status.join(', ')}:#{self})>"
+      end
+
+      def exists?
+        false
       end
 
       %i[untracked? tracked? ignored? deleted?].each do |name|

data/lib/rfix/file/deleted.rb

@@ -3,6 +3,8 @@
 module Rfix
   module File
     class Deleted < Base
+      ID = "[D]".color(:red).freeze
+
       attribute :status, Types::Status::Deleted
 
       def deleted?

data/lib/rfix/file/ignored.rb

@@ -3,6 +3,8 @@
 module Rfix
   module File
     class Ignored < Base
+      ID = "[I]".color(:blue).freeze
+
       attribute :status, Types::Status::Ignored
 
       def include?(*)

data/lib/rfix/file/null.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Rfix
+  module File
+    module Null
+      def include?(*)
+        false
+      end
+
+      def exists?
+        false
+      end
+
+      module_function :include?, :exists?
+    end
+  end
+end

data/lib/rfix/file/tracked.rb

@@ -1,41 +1,57 @@
 # frozen_string_literal: true
 
+require "rainbow/ext/string"
+
 module Rfix
   module File
-    class Tracked < Base
-      attribute :status, Types::Status::Tracked
+    class Tracked < Dry::Struct
+      ID = "[T]".color(:lightseagreen).freeze
+
+      attribute :status, Types::Symbol
+      attribute :path, Types::Path::Relative
+      attribute :repository, Repository
+
+      delegate :include?, to: :lines
+
+      def key
+        absolute_path.to_s
+      end
 
-      OPTIONS = {
-        include_untracked_content: true,
-        recurse_untracked_dirs: true,
-        include_untracked: true,
-        ignore_submodules: true,
-        include_ignored: false,
-        context_lines: 0
-      }.freeze
+      def absolute_path
+        repository.path.join(path)
+      end
 
-      def include?(line)
-        diff.each_line.map(&:new_lineno).select(&:positive?).to_set.include?(line)
+      def exists?
+        true
       end
 
       def tracked?
         true
       end
 
-      private
+      def to_s
+        "%s:%s" % [path, to_str_range]
+      end
+
+      def to_str_range
+        lines
+          .to_a
+          .sort
+          .chunk_while { |i, j| i + 1 == j }
+          .map { |a| a.length < 3 ? a : "#{a.first}-#{a.last}" }
+          .join(",")
+          .then { |res| res.empty? ? "-" : res }
+      end
 
-      def options
-        OPTIONS.dup.merge(paths: [basename])
+      def to_table
+        [path, to_str_range]
       end
 
-      def diff
-        repository.origin.diff_workdir(**options).tap do |diff|
-          diff.find_similar!(
-            renames_from_rewrites: true,
-            renames: true,
-            copies: true
-          )
-        end
+      def lines
+        Diff.new(repository: repository, options: {
+          paths: [path.to_path],
+          disable_pathspec_match: true,
+        }).lines.lazy.map(&:new_lineno).select(&:positive?)
       end
     end
   end

data/lib/rfix/file/undefined.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Rfix
+  module File
+    class Undefined < Base
+      ID = "[U]".color(:orange).freeze
+
+      def include?(*)
+        false
+      end
+
+      def ignored?
+        true
+      end
+    end
+  end
+end

data/lib/rfix/file/untracked.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require "dry/types"
+require "rainbow/ext/string"
 
 module Rfix
   module File
     class Untracked < Base
+      ID = "[U]".color(:palevioletred)
+
       attribute :status, Types::Status::Untracked
 
       def untracked?
@@ -14,7 +17,6 @@ module Rfix
       def include?(*)
         true
       end
-
     end
   end
 end