rfix 2.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e6b7496f3ebaeaf53eeb228174761dffe2b1aa2a6bb9c2cf1a216dcf8f6ec7
-  data.tar.gz: 7c9d47278a8d71226afb731d673f31701db9e940b215f75c29055759edc46b08
+  metadata.gz: 3a7fa6803ed26d756483ddbebd07a92bb34f485112ea984754eda6ff8af4e18e
+  data.tar.gz: bf4954a1f5b938c826ed21390e25f22f6bb3095fd803149c9c977339e24ecd97
 SHA512:
-  metadata.gz: 6bbd5525b43116a769b127bf2550ad4aa77ccf3c2f1adec696abf6e8feff46c5a1d6b241bd23bec3c699d3d0dc138a71ea571e5145acd007a57385888d50219f
-  data.tar.gz: 9cc4eb38f99db4f0a478450dbf9f689a920a002ee20b1ad806d4ee725c3f27db465ac9e85d67a6a6fd47f8787c70e5fbd38f2dfcc8508c25671ad09223fdb3fe
+  metadata.gz: 05031f0a115d547614fe9bd3b675c3aba36e1713230b363f67faf726b5971707b4165788b83b3aa911a0bda38faf865bc155ac9c9f553ffe5815ad2dea54defc
+  data.tar.gz: ae3b638be3c3423fe57abf01c5665870ec83f9e7fddbac7ec46ea2a5a2cb4c00973983e1f51871c4c2da7aa4ecda9e450141a9a4427687fad1252ca7ecdba317

data/exe/rfix

@@ -1,95 +1,16 @@
-#!/usr/bin/env -S ruby -W0 --disable-all
+#!/usr/bin/env -S ruby -W0 --disable-all --enable=gems
 # frozen_string_literal: true
 
-require "rubygems"
-require "pathname"
-require "bundler"
+require_relative "../lib/rfix"
 
-module Path
-  HOME = Pathname("~").expand_path
-  DIR = Pathname(__dir__)
-  LOCK = "Gemfile.lock"
-  PWD = Pathname.getwd
-  PROJECT = DIR.join("..").expand_path
-end
-
-def lock_path
-  Path::PWD.ascend.find do |path|
-    return if (path <=> Path::HOME) == -1
-
-    path.join(Path::LOCK).file?
-  end.join(Path::LOCK)
-end
-
-def find(name, env: Bundler.rubygems)
-  env.loaded_specs(name) || env.find_name(name).max_by(&:version)
-end
-
-def deactivate(spec)
-  Gem.loaded_specs.delete(spec.name)
-
-  $LOAD_PATH.reject! do |path|
-    spec.load_paths.include?(path)
-  end
-end
-
-def specs
-  return [] unless (path = lock_path)
-
-  Bundler::LockfileParser.new(path.read).specs
-end
-
-def overlapping_specs
-  specs.select do |spec|
-    spec.name.start_with?("rubocop")
-  end
-end
-
-def rfix
-  find("rfix")
-end
-
-def dev?
-  # $PROGRAM_NAME.end_with?("exe/rfix")
-  false
-end
-
-def rfix_path
-  return Pathname(__dir__).parent if dev?
-
-  Pathname(rfix.full_gem_path)
-end
-
-def commands
-  rfix_path.glob("lib/rfix/commands/*.rb").map do |command|
-    Cri::Command.load_file(command.to_path, infer_name: true)
-  end
-end
-
-def deactivate_all!
-  Gem.loaded_specs.each do |_name, spec|
-    deactivate(spec)
-  end
-end
-
-deactivate_all!
-
-require "bundler/inline"
-gemfile(false, ui: Bundler::UI::Silent.new) do
-  overlapping_specs.each do |spec|
-    gem spec.name, spec.version
-  end
-
-  path rfix_path do
-    gem "rfix"
-  end
-
-  path rfix_path.join("vendor") do
-    gem "dry-cli", require: "dry/cli"
-    gem "strings-ansi"
-  end
-end
+require "rubocop"
+require "dry/cli"
+require "rainbow"
 
-module Rfix
-  Dry::CLI.new(CLI::Command).call
+begin
+  exit Rfix::CLI::Command.setup
+rescue Errno::ENOENT, RuboCop::Error => e
+  abort [Rainbow("\n==>").red, e.message].join(" ")
+rescue Interrupt
+  exit 1
 end

data/lib/rfix.rb

@@ -1,22 +1,23 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.push Pathname(__dir__).join("../vendor/strings-ansi/lib")
-$LOAD_PATH.push Pathname(__dir__).join("../vendor/dry-cli/lib")
-
 require "active_support/core_ext/module/attribute_accessors"
-require "rubocop-ast"
+require "active_support/core_ext/module/concerning"
 require "zeitwerk"
-require "rubocop"
 
 loader = Zeitwerk::Loader.for_gem
-loader.ignore("#{__dir__}/rfix/rake/paths")
+
 loader.ignore("#{__dir__}/rfix/rake/support")
-loader.ignore("#{__dir__}/rfix/loader")
+loader.ignore("#{__dir__}/rfix/rake/paths")
+loader.ignore("#{__dir__}/rfix/extension")
 loader.ignore("#{__dir__}/rfix/commands")
-loader.ignore("#{__dir__}/rfix/extension/strings")
-loader.ignore("#{__dir__}/rfix/extension/pastel")
+loader.ignore("#{__dir__}/rfix/rake")
+
 loader.inflector.inflect "cli" => "CLI"
 
+loader.on_load("Rfix::Formatter") do
+  Pathname(__dir__).glob("rfix/extension/*", &method(:require))
+end
+
 loader.setup
 
 module Rfix

data/lib/rfix/branch/reference.rb

@@ -7,8 +7,8 @@ module Rfix
 
       def resolve
         repository.lookup(repository.rev_parse(name).oid)
-      rescue Rugged::Error, Rugged::InvalidError
-        raise Error, name
+      rescue Rugged::Error, Rugged::InvalidError, Rugged::ReferenceError
+        raise Error, "Reference #{name.inspect} not found"
       end
     end
   end

data/lib/rfix/branch/upstream.rb

@@ -3,10 +3,8 @@
 module Rfix
   module Branch
     class Upstream < Base
-      def resolve
-        repository.rev_parse("@{upstream}")
-      rescue Rugged::ConfigError
-        raise Error, "No upstream branch defined"
+      def name
+        "@{upstream}"
       end
 
       def to_s

data/lib/rfix/cli/command.rb

@@ -13,7 +13,20 @@ module Rfix
       register "setup", Setup
       register "lint", Lint
       register "info", Info
-      register "help", Help
+      register "all", All
+      register "status", Status
+
+      # register "help", Help
+
+      def setup
+        Dry::CLI.new(self).call
+      rescue Error => e
+        abort e.message
+      else
+        exit 0
+      end
+
+      module_function :setup
     end
   end
 end

data/lib/rfix/cli/command/all.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Rfix
+  module CLI
+    module Command
+      class All < Base
+        def call(**params)
+          walker = Rugged::Walker.new(Rugged::Repository.discover)
+          walker.sorting(Rugged::SORT_TOPO | Rugged::SORT_REVERSE)
+          walker.push("HEAD")
+
+          unless oid = walker.each_oid(limit: 1).first
+            raise Error, "Repository contains no commits"
+          end
+
+          define(Rfix::Branch::Reference.new(name: oid), **params)
+        end
+      end
+    end
+  end
+end

data/lib/rfix/cli/command/base.rb

@@ -6,9 +6,6 @@ require "rubocop"
 require "rainbow"
 require "rugged"
 
-require "rfix/extension/pastel"
-require "rfix/extension/strings"
-
 module Rfix
   module CLI
     module Command
@@ -16,29 +13,22 @@ module Rfix
         include Log
         include Dry::Core::Constants
 
-        class RuboCop::CommentConfig
-          concerning :Verification, prepend: true do
-            def cop_enabled_at_line?(_, line)
-              repository.include?(processed_source.file_path, line)
-            rescue StandardError => e
-              abort e.full_message(highlight: true)
-            end
-          end
-        end
-
         option :formatters, type: :array, default: ["Rfix::Formatter"]
         option :format, type: :string, default: "Rfix::Formatter"
         option :auto_correct_all, type: :boolean, default: true
         option :auto_correct, type: :boolean, default: true
+        option :parallel, type: :boolean, default: false
         option :cache, type: :boolean, default: true
         option :debug, type: :boolean, default: false
         option :only_recognized_file_types, type: :boolean, default: true
+        option :no_cache, type: :boolean, default: false
         option :force_exclusion, type: :boolean, default: true
 
         private
 
         def define(reference, args: Undefined, **params)
           handler = Rfix::Repository.new(
+            current_path: Pathname.pwd.relative_path_from(reference.repository.workdir),
             repository: reference.repository,
             reference: reference
           )
@@ -49,15 +39,36 @@ module Rfix
             end
           end
 
-          config = RuboCop::ConfigStore.new.tap do |config|
-            config.options_config = RuboCop::ConfigLoader.configuration_file_for(handler.workdir)
+          paths = handler.paths
+
+          variadic_args = Undefined.default(args, EMPTY_ARRAY)
+          RuboCop::Options.new.parse(variadic_args).then do |user_defined_options, user_defined_paths|
+            params.merge!(user_defined_options)
+
+            unless user_defined_paths.empty?
+              paths.replace(user_defined_paths)
+            end
+          end
+
+          config = RuboCop::ConfigStore.new.tap do |config_store|
+            RuboCop::ConfigLoader.configuration_file_for(handler.workdir).then do |loader|
+              config_store.options_config = loader
+            rescue RuboCop::Cop::AmbiguousCopName => e
+              abort e.message
+            end
           end
 
-          Undefined.default(args, handler.paths).then do |paths|
-            RuboCop::CLI::Environment.new(params, config, paths)
-          end.then do |env|
-            RuboCop::CLI::Command::ExecuteRunner.new(env).run
+          if params[:no_cache]
+            RuboCop::ResultCache.cleanup(config, true)
+            XDG::Config.new.home.then do |cache_path|
+              cache_path.rmtree if cache_path.exist?
+            end
           end
+
+          params.merge!(repository: handler)
+
+          env = RuboCop::CLI::Environment.new(params, config, paths)
+          RuboCop::CLI::Command::ExecuteRunner.new(env).run
         end
       end
     end

data/lib/rfix/cli/command/branch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rfix
   module CLI
     module Command

data/lib/rfix/cli/command/help.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rfix
   module CLI
     module Command

data/lib/rfix/cli/command/info.rb

@@ -1,9 +1,14 @@
+# frozen_string_literal: true
+
+require "rubocop"
+
 module Rfix
   module CLI
     module Command
       class Info < Base
         def call(**)
-          raise NotImplementedError
+          puts "Rubocop: #{RuboCop::Version.version}"
+          puts "Rfix: #{VERSION}"
         end
       end
     end

data/lib/rfix/cli/command/local.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rfix
   module CLI
     module Command

data/lib/rfix/cli/command/origin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rfix
   module CLI
     module Command

data/lib/rfix/cli/command/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rfix
   module CLI
     module Command

data/lib/rfix/cli/command/status.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "active_support/all"
+require "tty/tree"
+require "pry"
+
+module Rfix
+  module CLI
+    module Command
+      class Status < Base
+        def call(**_params)
+          walker = Rugged::Walker.new(Rugged::Repository.discover)
+          walker.sorting(Rugged::SORT_TOPO | Rugged::SORT_REVERSE)
+          walker.push("HEAD")
+
+          unless oid = walker.each_oid(limit: 1).first
+            raise Error, "Repository contains no commits"
+          end
+
+          ref = Rfix::Branch::Reference.new(name: oid)
+          repo = Repository.new(repository: Rugged::Repository.discover, reference: ref)
+          files = repo.permitted
+
+          pp files.map(&:status).uniq
+
+          result = files.map do |file|
+            file.to_s.split("/").reverse.reduce({}) do |acc, part|
+              next { "#{part} (#{file.class}:#{file.status.join(', ')})" => {} } if acc.empty?
+
+              { part.to_s => acc }
+            end
+          end.reduce(EMPTY_HASH, :deep_merge)
+
+          puts TTY::Tree.new({ root: result }).render
+        end
+      end
+    end
+  end
+end

data/lib/rfix/collector.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require "dry/struct"
+
+module Rfix
+  class Collector < Dry::Struct
+    # https://github.com/libgit2/rugged/blob/master/lib/rugged/tree.rb
+    OPTIONS = {
+      include_untracked_content: true,
+      ignore_whitespace_change: false,
+      recurse_untracked_dirs: true,
+      ignore_whitespace_eol: false,
+      disable_pathspec_match: true,
+      include_unmodified: true,
+      include_untracked: true,
+      ignore_submodules: true,
+      include_ignored: false,
+      deltas_are_icase: true,
+      ignore_filemode: true,
+      force_text: true,
+      context_lines: 0
+    }.freeze
+
+    attribute :repository, Repository
+    attribute :reference, Types::String
+
+    delegate_missing_to :repository
+
+    include Enumerable
+
+    def each(&block)
+      construct = lambda do |path, statuses|
+        File.call(basename: path, status: statuses, repository: repository)
+      end
+
+      statuses = Hash.new(EMPTY_ARRAY).tap do |statuses|
+        repository.status do |path, status|
+          statuses[path] = status
+        end
+      end
+
+      if repository.head_unborn?
+        statuses.each do |path, status|
+          (block << construct).call(path, status)
+        end
+      else
+        origin.diff_workdir(**OPTIONS.dup).tap do |diff|
+          diff.find_similar!(
+            renames_from_rewrites: true,
+            renames: true,
+            copies: true
+          )
+        end.each_delta do |delta|
+          delta.new_file.fetch(:path).then do |file_path|
+            (block << construct).call(file_path, statuses[file_path] + [delta.status])
+          end
+        end
+      end
+    end
+
+    private
+
+    def origin
+      repository.lookup(repository.rev_parse(reference).oid)
+    rescue Rugged::Error, Rugged::InvalidError, Rugged::ReferenceError
+      raise Error, "Reference #{reference.inspect} not found"
+    end
+  end
+end