rfix 1.4.1 → 2.0.0

data/lib/rfix/commands/branch.rb

@@ -1,15 +0,0 @@
-r_args = []
-
-helper("help", binding)
-helper("rubocop", binding)
-helper("args", binding)
-
-param :branch
-usage "rfix branch BRANCH [opts] [-p path ..]"
-option :p, :path, "Path to be passed to RuboCop", argument: :required, multiple: true
-summary "Fix changes made between HEAD and <branch>"
-
-run do |opts, args, _cmd|
-  branch = Rfix::Branch::Reference.new(args[:branch])
-  setup(r_args, opts, args, files: opts[:path] || [], reference: branch)
-end

data/lib/rfix/commands/extensions/options.rb

@@ -1,8 +0,0 @@
-module Rfix::Ext::Opt
-  def define_options
-    @define_options ||= super
-  end
-  alias opts define_options
-end
-
-RuboCop::Options.prepend(Rfix::Ext::Opt)

data/lib/rfix/commands/help.rb

@@ -1,7 +0,0 @@
-extend Rfix::Log
-
-summary "Displays help"
-
-run do |_opts, _args, cmd|
-  prt cmd.supercommand.help
-end

data/lib/rfix/commands/helper/args.rb

@@ -1,141 +0,0 @@
-option :r, :root, "{{*}} Project root path", default: Dir.pwd, argument: :required
-option :b, :"main-branch", "{{*}} Branch to use", argument: :required
-option :l, :limit, "{{*}} Limit number of files", argument: :required, transform: method(:Integer)
-
-flag nil, :dry, "{{*}} Run in dry mode"
-flag nil, :untracked, "{{*}} Load untracked files"
-flag nil, :"clear-cache", "{{*}} Clear Rubocop`s cache"
-flag nil, :test, "{{*}} Used in tests"
-
-def validate!(files:)
-  return [] unless files.is_a?(Array)
-
-  files.each do |file|
-    unless File.exist?(file)
-      say_abort "Passed file {{error:#{file}}} does not exist"
-    end
-  end
-
-  files
-end
-
-def setup(r_args = [], opts, _args, files: [], reference:)
-  # files    = validate!(files: files)
-  options  = RuboCop::Options.new
-  store    = RuboCop::ConfigStore.new
-
-  params = {
-    force_exclusion: true,
-    formatters: ["Rfix::Formatter"],
-    auto_correct: true
-  }
-
-  if opts.key?(:format)
-    params.delete(:formatters)
-  end
-
-  if opts.key?(:dry)
-    params[:auto_correct] = false
-  end
-
-  if opts.key?(:test)
-    params.delete(:formatters)
-    params[:format] = "json"
-    params[:cache] = "false"
-    Rfix.test = true
-
-    unless opts.key?(:root)
-      raise "No --root passed with --test"
-    end
-
-    unless opts.key?(:config)
-      raise "No --config passed with --test"
-    end
-  end
-
-  if opts[:cache] == "false"
-    params[:cache] = "false"
-  end
-
-  begin
-    Rfix.repo = repo = Rfix::Repository.new(
-      root_path: opts[:root],
-      load_untracked: opts[:untracked],
-      reference: reference,
-      paths: files || []
-    )
-  rescue Rugged::RepositoryError => e
-    say_abort e.to_s
-  rescue Rfix::Error => e
-    say_abort e.to_s
-  end
-
-  # RuboCop::ResultCache.cleanup(store, true)
-
-  if opts[:"clear-cache"]
-    RuboCop::ResultCache.cleanup(store, true)
-    params[:cache] = "false"
-    say_debug "Cleared Rubocop`s cache"
-  end
-
-  if opts[:debug]
-    Rfix.test = true
-  end
-
-  if block_given?
-    yield(repo, [])
-  end
-
-  begin
-    params2, paths = options.parse(r_args)
-  rescue OptionParser::MissingArgument => e
-    say_abort e.to_s
-  end
-
-  params2.merge!(params)
-
-  begin
-    if config = opts[:config]
-      store.options_config = config
-    elsif root_path = opts[:root]
-      store.for(root_path)
-    end
-  rescue RuboCop::Error => e
-    say_abort e.to_s
-  rescue TypeError => e
-    say_abort e.to_s
-  rescue Psych::SyntaxError => e
-    say_abort e.to_s
-  end
-
-  # unless files.empty?
-  #   say "Loading files from {{italic:#{files.join(', ')}}}"
-  # end
-
-  if !files.empty?
-    paths = files
-  elsif paths.empty? && repo.paths.empty?
-    if opts[:format] == "json"
-      prt JSON.pretty_generate({ "files": [] })
-      exit 0
-    else
-      say_exit "Everything looks good, nothing to lint"
-    end
-  elsif paths.empty?
-    paths = repo.paths
-  end
-
-  if limit = opts[:limit]
-    paths = paths.take(limit)
-  end
-
-  env = RuboCop::CLI::Environment.new(params2, store, paths)
-
-  begin
-    exit RuboCop::CLI::Command::ExecuteRunner.new(env).run
-  rescue RuboCop::Runner::InfiniteCorrectionLoop => e
-    say_abort e.to_s
-  rescue RuboCop::Error => e
-    say_abort e.to_s
-  end
-end

data/lib/rfix/commands/helper/help.rb

@@ -1,6 +0,0 @@
-extend Rfix::Log
-
-flag   :h,  :help, "show help for this command" do |_value, cmd|
-  prt cmd.help
-  exit 0
-end

data/lib/rfix/commands/helper/loader.rb

@@ -1,6 +0,0 @@
-module Rfix::Loader
-  def helper(file, bind)
-    path = File.join(__dir__, file + ".rb")
-    eval(IO.read(path), bind, path)
-  end
-end

data/lib/rfix/commands/helper/rubocop.rb

@@ -1,17 +0,0 @@
-RuboCop::Options.new.opts.instance_eval("@stack", __FILE__, __LINE__).map(&:list).flatten.each do |opt|
-  short = opt.short.map { |arg| arg.delete_prefix("-") }
-  long = opt.long.map { |arg| arg.delete_prefix("--") }
-
-  short.unshift(nil) if opt.short.empty?
-  long.unshift(nil) if opt.long.empty?
-
-  if opt.arg
-    option(*short, *long, opt.desc.join(" "), argument: :optional) do |value|
-      r_args.append(*opt.long, value)
-    end
-  else
-    flag(*short, *long, opt.desc.join(" ")) do
-      r_args.append(*opt.long)
-    end
-  end
-end

data/lib/rfix/commands/info.rb

@@ -1,30 +0,0 @@
-require "rbconfig"
-require "rugged"
-
-extend Rfix::Log
-extend Rfix::Cmd
-
-def git_version
-  cmd("git --version").last.split(/\s+/, 3).last
-end
-
-def ruby_version
-  RbConfig::CONFIG["ruby_version"] || "<unknown>"
-end
-
-def current_os
-  RbConfig::CONFIG["host_os"] || "<unknown>"
-end
-
-helper("help", binding)
-
-summary "Display runtime dependencies and their version"
-
-run do |_opts, _args|
-  say "Using RuboCop {{info:#{RuboCop::Version.version}}}"
-  say "Using Rugged {{info:#{Rugged::VERSION}}}"
-  say "Using Rfix {{info:#{Rfix::VERSION}}}"
-  say "Using OS {{info:#{current_os}}}"
-  say "Using Git {{info:#{git_version}}}"
-  say "Using Ruby {{info:#{ruby_version}}}"
-end

data/lib/rfix/commands/lint.rb

@@ -1,22 +0,0 @@
-r_args = []
-
-helper("help", binding)
-helper("rubocop", binding)
-helper("args", binding)
-
-summary "Lints commits and untracked files not yet pushed to upstream"
-usage "rfix lint [opts] [path ..]"
-description "Lint (read-only) files"
-
-run do |opts, args, _cmd|
-  opts[:dry] = true
-  opts[:untracked] = true
-
-  if main = opts[:"main-branch"]
-    branch = Rfix::Branch::Name.new(main)
-  else
-    branch = Rfix::Branch::MAIN
-  end
-
-  setup(r_args, opts, args, files: args.each.to_a, reference: branch)
-end

data/lib/rfix/commands/local.rb

@@ -1,12 +0,0 @@
-r_args = []
-
-helper("help", binding)
-helper("rubocop", binding)
-helper("args", binding)
-
-summary "Auto-fixes commits not yet pushed to upstream"
-usage "rfix local [opts] [path ..]"
-
-run do |opts, args, _cmd|
-  setup(r_args, opts, args, files: args.each.to_a, reference: Rfix::Branch::UPSTREAM)
-end

data/lib/rfix/commands/origin.rb

@@ -1,19 +0,0 @@
-r_args = []
-
-helper("help", binding)
-helper("rubocop", binding)
-helper("args", binding)
-
-summary "Auto-fixes commits between HEAD and origin branch"
-usage "rfix origin [opts] [path ..]"
-
-run do |opts, args, _cmd|
-  if main = opts[:"main-branch"]
-    branch = Rfix::Branch::Name.new(main)
-  else
-    branch = Rfix::Branch::MAIN
-  end
-
-  # say "Using {{red:#{branch}}} as main branch"
-  setup(r_args, opts, args, files: args.each.to_a, reference: branch)
-end

data/lib/rfix/commands/setup.rb

@@ -1,29 +0,0 @@
-helper("help", binding)
-
-option :r, :root, "{{*}} Project root path", default: Dir.pwd, argument: :required
-option :b, :"main-branch", "{{*}} Branch to use", argument: :optional
-
-summary "Sets the default branch for {{command:rfix local}}"
-
-def set_branch(root_path, branch)
-  Rfix::Branch::Main.set(branch, at: root_path)
-  say "Main branch was set to {{italic:#{branch}}}"
-end
-
-run do |opts, _args|
-  if branch = Rfix::Branch::Main.get(at: opts[:root])
-    say "Current main branch set to {{info:#{branch}}}"
-  end
-
-  if branch = opts[:"main-branch"]
-    next set_branch(opts[:root], branch)
-  end
-
-  CLI::UI::Prompt.ask("Which one is your main branch?") do |handler|
-    Rfix::Branch.local(at: opts[:root]).each do |branch|
-      handler.option(branch) do |selection|
-        set_branch(opts[:root], selection)
-      end
-    end
-  end
-end

data/lib/rfix/commands/welcome.rb

@@ -1,24 +0,0 @@
-r_args = []
-
-helper("help", binding)
-
-summary "This is how you get started with {{command:rfix}}"
-
-run do |_opts, _args, _cmd|
-  indent = " " * 2
-  prt "{{v}} Thank you for installing {{green:rfix v#{Rfix::VERSION}}}!\n"
-  prt ""
-  prt "{{i}} Run {{command:rfix help}} for avalible commands or any of the following to get started:"
-  prt ""
-  prt "#{indent}{{command:$ rfix local}}   {{italic:# Auto-fixes commits not yet pushed to upstream}}"
-  prt "#{indent}{{command:$ rfix origin}}  {{italic:# Auto-fixes commits between HEAD and origin branch}}"
-  prt "#{indent}{{command:$ rfix lint}}    {{italic:# Lints commits and untracked files not yet pushed to upstream}}"
-  prt ""
-  prt "{{*}} {{bold:ProTip:}} Append {{command:--dry}} to run {{command:rfix}} in {{warning:read-only}} mode"
-  prt ""
-  prt "{{i}} {{bold:Issues}} {{italic:https://github.com/oleander/rfix-rb/issues}}"
-  prt "{{i}} {{bold:Readme}} {{italic:https://github.com/oleander/rfix-rb/blob/master/README.md}}"
-  prt "{{i}} {{bold:Travis}} {{italic:https://travis-ci.org/github/oleander/rfix-rb}}"
-  prt ""
-  prt "{{italic:~ Linus}}\n"
-end

data/lib/rfix/deleted.rb

@@ -1,13 +0,0 @@
-class Rfix::Deleted < Rfix::File
-  def include?(_)
-    return false
-  end
-
-  def refresh!
-    # NOP
-  end
-
-  def inspect
-    "<Deleted({{info:#{path}}})>"
-  end
-end

data/lib/rfix/extensions/extensions.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require "rubocop"
-require "rainbow"
-require "rfix/log"
-
-module Rfix::Ext
-  module CommentConfig
-    include Rfix::Log # TODO: Remove
-    # Called by RuboCop on every line to see
-    # if its suppose to run against it or not
-    def cop_enabled_at_line?(_cop, line)
-      Rfix.enabled?(processed_source.file_path, line) && super
-    rescue StandardError
-      say_abort "[Rfix::Enabled] #{$ERROR_INFO}"
-    end
-  end
-end

data/lib/rfix/extensions/offense.rb

@@ -1,78 +0,0 @@
-module Rfix::Ext
-  module Offense
-    def where
-      line.to_s + ":" + real_column.to_s
-    end
-
-    def info
-      message.split(": ", 2).last.delete("\n")
-    end
-
-    def msg
-      CLI::UI.resolve_text("{{italic:#{info}}}", truncate_to: CLI::UI::Terminal.width - 10)
-    end
-
-    def code
-      message.split(": ", 2).first
-    end
-
-    def star
-      Rainbow("⭑")
-    end
-
-    def cross
-      Rainbow("✗").red
-    end
-
-    def check
-      Rainbow("✓").green
-    end
-
-    def circle
-      Rainbow("⍟")
-    end
-
-    def relative_path
-      # TODO: Fix this, do not use Dir.getwd, use git root
-      location.source_buffer.name.sub(File.join(Dir.getwd, "/"), "")
-    end
-
-    def clickable_path
-      "{{italic:#{relative_path}:#{where}}}"
-    end
-
-    def clickable_plain_severity
-      to_url("https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/#{code}", code)
-    end
-
-    def clickable_severity
-      "{{#{severity.code}}} {{italic:#{clickable_plain_severity}}}"
-    end
-
-    def icon
-      return check.green if corrected?
-      return star.yellow if correctable?
-
-      cross.red
-    end
-
-    def to_clickable(url, title)
-      esc = CLI::UI::ANSI::ESC
-      cmd = esc + "]8;;"
-      slash = "\x07"
-      cmd + "#{escape(url)}#{slash}#{escape(title)}" + cmd + slash
-    end
-
-    def to_path(path, title)
-      to_clickable("file://#{path}", title)
-    end
-
-    def to_url(url, title)
-      to_clickable(url, title)
-    end
-
-    def escape(str)
-      Shellwords.escape(str)
-    end
-  end
-end