rfix 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c6a5221d4beb6a82e2ec5993f4e6710f6797d44c5132804cb07963b8e1afd5
-  data.tar.gz: 36466eb65888062cba7c5b58a972ec546670d6c997aae5dac3f7df6aa6403a61
+  metadata.gz: 2a31f67814cde7855a4bd826d9825c942cd11841690fb6f2ffaedaf3e64a04ab
+  data.tar.gz: 6f9dea0ec8da3c8ce5074ad47d45d56ec0ad0219a958f9ee04db5a1f1cae4e81
 SHA512:
-  metadata.gz: f5e6e043ae89ed1cfaac1ff174f772e07d180d1e5e2f0fc178a2f3e7db8f4a5cc991ace2118eb8ecc21ee92f7c7d5947a821f7e75a962d46c36c3623aae67c2b
-  data.tar.gz: c1a48cb3b3372c82645c680123e83f7ec9551307fe723b194f99cd073001fd921eab4abf2a04bbff533f41f524c079bda1dfd5dfcfc21ef224e8c58fe400ab3c
+  metadata.gz: '09ef5d35b5bd597e3d0314a5b7d1184991f257bd954f8083b056a563f02e101897bb32ab615f8b0b2e881b7a787651f80d4395dbfd263a9f8460b700ac7d9b81'
+  data.tar.gz: 9ec45b74b60114e0d65debc6aba9a9569d407705e7e05555e38771a3fad3a3147a0f57d67a1966b165a78c68f935742f6084d72cacf5e2079633935463bfe7ce

data/exe/rfix

@@ -1,51 +1,95 @@
-# #!/usr/bin/env ruby
+#!/usr/bin/env -S ruby -W0 --disable-all
+# frozen_string_literal: true
 
+require "rubygems"
+require "pathname"
 require "bundler"
 
-require_relative "../lib/rfix/loader/spec.rb"
-require_relative "../lib/rfix/loader/bundler.rb"
-require_relative "../lib/rfix/loader/env.rb"
+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)
 
-if spec = Bundler.find_locked("rubocop")
-  Gem::Specification.deactivate(spec.name)
-  unless spec.__materialize__&.activation
-    abort "Could not load rubocop spec file"
+  $LOAD_PATH.reject! do |path|
+    spec.load_paths.include?(path)
   end
 end
 
-if spec = Gem.loaded_specs.fetch("rubocop")
-  unless Env.requirement === spec.version
-    abort "RuboCop version #{Env.pretty_req} required by rfix but #{spec.version} was found in Gemfile"
+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
 
-require "cri"
-require "rfix"
-require "rfix/log"
-require "rubocop"
-require "rfix/extensions/string"
-require "rfix/commands/extensions/options"
-require "rfix/commands/helper/loader"
-require "rfix/branch"
+def rfix
+  find("rfix")
+end
 
-include Rfix::Loader
-include Rfix::Log
+def dev?
+  # $PROGRAM_NAME.end_with?("exe/rfix")
+  false
+end
 
-root = Cri::Command.new
+def rfix_path
+  return Pathname(__dir__).parent if dev?
 
-Dir.glob(File.join(__dir__, "../lib/rfix/commands/*.rb")).each do |command|
-  root.add_command(Cri::Command.load_file(command, infer_name: true))
+  Pathname(rfix.full_gem_path)
 end
 
-begin
-  if root.run(ARGV, {}, hard_exit: false)
-    exit 0
-  else
-    prt root.help
-    exit 1
+def commands
+  rfix_path.glob("lib/rfix/commands/*.rb").map do |command|
+    Cri::Command.load_file(command.to_path, infer_name: true)
   end
-rescue RuntimeError => e
-  say_abort e.to_s
-rescue Rfix::Error => e
-  say_abort e.to_s
+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
+
+module Rfix
+  Dry::CLI.new(CLI::Command).call
 end

data/lib/rfix.rb

@@ -1,35 +1,24 @@
-#!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# https://gist.github.com/skanev/9d4bec97d5a6825eaaf6
+$LOAD_PATH.push Pathname(__dir__).join("../vendor/strings-ansi/lib")
+$LOAD_PATH.push Pathname(__dir__).join("../vendor/dry-cli/lib")
 
-require "cli/ui"
-require "require_all"
-require "rfix/version"
-require "rfix/log"
-require "rfix/cmd"
-require "rfix/repository"
-require "rfix/formatter"
-require "rfix/indentation"
-require "rfix/extensions/extensions"
-require "rfix/extensions/offense"
-require "rfix/branch"
-require "rfix/rfix"
-require "rfix/box"
-require "rfix/error"
+require "active_support/core_ext/module/attribute_accessors"
+require "rubocop-ast"
+require "zeitwerk"
+require "rubocop"
 
-module Rfix
-  module Ext; end
-  extend self
-end
+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/commands")
+loader.ignore("#{__dir__}/rfix/extension/strings")
+loader.ignore("#{__dir__}/rfix/extension/pastel")
+loader.inflector.inflect "cli" => "CLI"
 
-RuboCop::CommentConfig.prepend(Rfix::Ext::CommentConfig)
-RuboCop::Cop::Offense.prepend(Rfix::Ext::Offense)
+loader.setup
 
-CLI::UI::StdoutRouter.enable
-
-# TODO: Handle cases where color can't be resolved by CLI::UI
-RuboCop::Formatter::SimpleTextFormatter::COLOR_FOR_SEVERITY.each do |severity, color|
-  id = RuboCop::Cop::Severity::CODE_TABLE.invert.fetch(severity)
-  CLI::UI::Glyph.new(id.to_s, 0x25cf, CLI::UI.resolve_color(color))
+module Rfix
+  mattr_accessor :repo, :test
 end

data/lib/rfix/branch.rb

@@ -1,31 +1,9 @@
-require "rfix/repository"
-require "rfix/error"
-autoload_rel "branches/*.rb"
+# frozen_string_literal: true
 
-module Rfix
-  module Branch
-    class UnknownBranchError < Rfix::Error
-    end
-
-    class NotYetImplementedError < Rfix::Error
-    end
-  end
-end
-
-Pathname(__dir__).glob("branches/*.rb").each(&method(:require))
+require "rugged"
 
 module Rfix
   module Branch
-    UPSTREAM = Branch::Upstream.new
-    MAIN     = Branch::Main.new
-    HEAD     = Branch::Head.new
-
-    def self.local(at: Dir.pwd)
-      repo(at: at).branches.each_name(:local).sort
-    end
-
-    def self.repo(at:)
-      Rugged::Repository.new(at)
-    end
+    # NOP
   end
 end

data/lib/rfix/branch/base.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "dry/struct"
+
+module Rfix
+  module Branch
+    class Base < Dry::Struct
+      attribute? :repository, Types::Rugged.default { Rugged::Repository.discover }
+
+      class UnknownBranchError < Error
+        def initialize(name)
+          super("Could not find branch {{error:#{name}}}")
+        end
+      end
+
+      # @abstract
+      def resolve(*)
+        raise NotYetImplementedError, self.class.name
+      end
+
+      # @abstract
+      def to_s
+        raise NotYetImplementedError, self.class.name
+      end
+    end
+  end
+end

data/lib/rfix/branch/head.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Rfix
+  module Branch
+    class Head < Base
+      def resolve
+        repository.lookup(repository.head.target_id)
+      end
+
+      def to_s
+        "HEAD"
+      end
+    end
+  end
+end

data/lib/rfix/branch/main.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Rfix
+  module Branch
+    class Main < Name
+      KEY = "rfix.main.branch"
+
+      class NoMainBranchSetError < Error
+        def initialize
+          super("Run 'rfix setup' to set the main branch")
+        end
+      end
+
+      def self.call(repository: Rugged::Repository.discover)
+        unless (name = repository.config[KEY])
+          raise NoMainBranchSetError
+        end
+
+        super(repository: repository, name: name)
+      rescue NoMainBranchSetError
+        if repository.head_detached?
+          raise Error, "HEAD is detached"
+        end
+
+        repository.branches[repository.head.name].then do |branch|
+          repository.config[KEY] = branch.name
+        end
+
+        retry
+      end
+    end
+  end
+end

data/lib/rfix/branch/name.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Rfix
+  module Branch
+    class Name < Base
+      attribute :name, Types::String
+
+      def resolve
+        unless (branch = repository.branches[name])
+          raise UnknownBranchError, branch
+        end
+
+        repository.lookup(repository.merge_base(branch.target_id, repository.head.target_id))
+      rescue Rugged::ReferenceError
+        raise UnknownBranchError, name
+      end
+
+      alias to_s name
+    end
+  end
+end

data/lib/rfix/branch/reference.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Rfix
+  module Branch
+    class Reference < Base
+      attribute :name, Types::String
+
+      def resolve
+        repository.lookup(repository.rev_parse(name).oid)
+      rescue Rugged::Error, Rugged::InvalidError
+        raise Error, name
+      end
+    end
+  end
+end

data/lib/rfix/branch/upstream.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Rfix
+  module Branch
+    class Upstream < Base
+      def resolve
+        repository.rev_parse("@{upstream}")
+      rescue Rugged::ConfigError
+        raise Error, "No upstream branch defined"
+      end
+
+      def to_s
+        "upstream"
+      end
+    end
+  end
+end

data/lib/rfix/cli/command.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "dry/cli"
+
+module Rfix
+  module CLI
+    module Command
+      extend Dry::CLI::Registry
+
+      register "origin", Origin
+      register "branch", Branch
+      register "local", Local
+      register "setup", Setup
+      register "lint", Lint
+      register "info", Info
+      register "help", Help
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/module/concerning"
+require "dry/core/constants"
+require "rubocop"
+require "rainbow"
+require "rugged"
+
+require "rfix/extension/pastel"
+require "rfix/extension/strings"
+
+module Rfix
+  module CLI
+    module Command
+      class Base < Dry::CLI::Command
+        include Log
+        include Dry::Core::Constants
+
+        class RuboCop::CommentConfig
+          concerning :Verification, prepend: true do
+            def cop_enabled_at_line?(cop, line)
+              repository.include?(processed_source.file_path, line) && super(cop, 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 :cache, type: :boolean, default: true
+        option :debug, type: :boolean, default: false
+        option :only_recognized_file_types, type: :boolean, default: true
+        option :force_exclusion, type: :boolean, default: true
+
+        private
+
+        def define(reference, args: Undefined, **params)
+          handler = Rfix::Repository.new(
+            repository: reference.repository,
+            reference: reference
+          )
+
+          RuboCop::CommentConfig.class_eval do
+            concerning :Repository do
+              define_method(:repository, &handler.method(:itself))
+            end
+          end
+
+          Undefined.default(args, handler.paths).then do |paths|
+            RuboCop::CLI::Environment.new(params, RuboCop::ConfigStore.new, paths)
+          end.then do |env|
+            RuboCop::CLI::Command::ExecuteRunner.new(env).run
+          end
+        end
+      end
+    end
+  end
+end