rfix 1.0.15 → 1.1.0.pre.147

data/lib/rfix/commands/lint.rb

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,24 @@
+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

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

data/lib/rfix/error.rb

@@ -0,0 +1,2 @@
+class Rfix::Error < StandardError
+end

data/lib/rfix/extensions/extensions.rb

@@ -2,39 +2,17 @@
 
 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
-    end
-  end
-
-  module Runner
-    # Called _after_ @source has been 'auto fixed' by Rubocop
-    def check_for_infinite_loop(source, offences)
-      # rubocop:disable Style/Semicolon
-      Rfix.refresh!(source); super
-      # rubocop:enable Style/Semicolon
-    end
-  end
-
-  module Options
-    # Appends custom --args to RuboCop CLI
-    def define_options
-      super.tap do |options|
-        @ons.each do |args, block|
-          option(options, *args, &block)
-        end
-      end
-    end
-
-    # Helper method used by rfix to append cli --args to Rubocop
-    def on(*args, &block)
-      @ons ||= []
-      @ons += [[args, block]]
+    rescue StandardError
+      say_abort "[Rfix::Enabled] #{$ERROR_INFO}"
     end
   end
 end

data/lib/rfix/extensions/offense.rb

@@ -33,7 +33,8 @@ module Rfix::Ext
     end
 
     def relative_path
-      Rfix.to_relative(path: location.source_buffer.name)
+      # TODO: Fix this, do not use Dir.getwd, use git root
+      location.source_buffer.name.sub(File.join(Dir.getwd, "/"), "")
     end
 
     def clickable_path

data/lib/rfix/extensions/string.rb

@@ -0,0 +1,8 @@
+require "rfix/log"
+
+# TODO: Use refinements instead
+class String
+  def fmt
+    Rfix::Log.fmt self
+  end
+end

data/lib/rfix/file.rb

@@ -0,0 +1,46 @@
+require "rugged"
+require "shellwords"
+require "digest"
+require "listen"
+
+class Rfix::File < Struct.new(:path, :repo, :ref)
+  include Rfix::Log
+
+  def initialize(path, repo, ref)
+    # check_absolute!(path)
+    super(path, repo, ref)
+  end
+
+  def check_absolute!(path)
+    if Pathname.new(path).absolute?
+      say_abort "Path must be relative #{path}"
+    end
+  end
+
+  def include?(_)
+    raise Rfix::Error.new("#include? not implemented")
+  end
+
+  def refresh!
+    raise Rfix::Error.new("#refresh! not implemented")
+  end
+
+  def inspect
+    raise Rfix::Error.new("#inspect not implemented")
+  end
+
+  def git_path
+    @git_path ||= Pathname.new(repo.workdir)
+  end
+
+  def absolute_path
+    path
+    # @absolute_path ||= to_abs(path)
+  end
+
+  def to_abs(path)
+    File.join(repo.workdir, path)
+  end
+
+  alias to_s path
+end

data/lib/rfix/file_cache.rb

@@ -0,0 +1,59 @@
+class FileCache
+  attr_reader :root_path
+  include Rfix::Log
+
+  def initialize(path)
+    @files = Hash.new
+    @paths = Hash.new
+    @root_path = path
+  end
+
+  def add(file)
+    key = normalized_file_path(file)
+
+    if @files.key?(key)
+      return say_debug("File already exists with path {{error:#{file.path}}} using #{key}")
+    end
+
+    say_debug("Adding file with path {{green:#{file.path}}} using key {{info:#{key}}}")
+    @files[key] = file
+  end
+
+  def get(path)
+    key = normalize_path(path)
+
+    if file = @files[key]
+      say_debug("Found file #{file} with path #{path}")
+      return file
+    end
+
+    say_debug("Could {{error:NOT}} find path #{path}")
+    nil
+  end
+
+  def pluck(&block)
+    @files.values.map(&block)
+  end
+
+  private
+
+  def normalized_file_path(file)
+    normalize_path(file.absolute_path)
+  end
+
+  def to_abs(path)
+    File.join(root_path, path)
+  end
+
+  def normalize_path(path)
+    if cached = @paths[path]
+      return cached
+    end
+
+    if Pathname.new(path).absolute?
+      @paths[path] = File.realdirpath(path)
+    else
+      @paths[path] = File.realdirpath(to_abs(path))
+    end
+  end
+end

data/lib/rfix/formatter.rb

@@ -7,26 +7,50 @@ require "shellwords"
 
 module Rfix
   class Formatter < RuboCop::Formatter::SimpleTextFormatter
+    include Rfix::Log
+
     def started(files)
-      theme = Rouge::Themes::Gruvbox.new
+      theme      = Rouge::Themes::Gruvbox.new
       @formatter = Rouge::Formatters::TerminalTruecolor.new(theme)
-      @lexer = Rouge::Lexers::Ruby.new
-      out "{{v}} Loading {{yellow:#{files.count}}} files"
-      out("\n")
-      @pg = CLI::UI::Progress.new
-      @total = files.count
-      @current = 0
-      @files = {}
+      @current   = 0
+      @total     = files.count
+      @files     = {}
+      @lexer     = Rouge::Lexers::Ruby.new
+      @pg        = CLI::UI::Progress.new
+      @all_files = files
+    end
+
+    def truncate(path)
+      path.sub(::File.join(Dir.getwd, "/"), "")
+    end
+
+    def render_files(files)
+      return unless Rfix.test?
+
+      files.each do |file|
+        offenses = @files.fetch(file)
+        corrected = offenses.select(&:corrected?)
+
+        if offenses.empty?
+          say truncate(file)
+        elsif offenses.count == corrected.count
+          say truncate(file)
+        else
+          say_error truncate(file)
+        end
+      end
     end
 
     def finished(files)
+      render_files(files)
+
       files.each do |file|
         render_file(file, @files.fetch(file))
       end
 
       offenses = @files.values.flatten
       corrected = offenses.select(&:corrected?)
-      out("\n")
+      out("\n") unless @total.zero?
       report_summary(files.size, offenses.count, corrected.count)
     end
 
@@ -46,8 +70,11 @@ module Rfix
     end
 
     def file_finished(file, offenses)
+      out("\n") if @current == 0.0
       @current += 1.0
-      @pg.tick(set_percent: (@current / @total))
+      unless Rfix.test?
+        @pg.tick(set_percent: (@current / @total))
+      end
       @files[file] = offenses
     end
 

data/lib/rfix/git_helper.rb

@@ -4,17 +4,29 @@ require "open3"
 require "rfix"
 require "rfix/log"
 require "rfix/cmd"
+require "shellwords"
 
 module Rfix::GitHelper
   include Rfix::Log
   include Rfix::Cmd
 
-  def git(*args, root: Dir.pwd, quiet: false, &block)
+  def git(*params, root: Dir.pwd, quiet: false, &block)
+    args = split_args(params)
     args.unshift *["--git-dir", File.join(root, ".git")]
     args.unshift *["--work-tree", root]
     cmd("git", *args, quiet: quiet, &block)
   end
 
+  def split_args(params)
+    return if params.empty?
+    return split(params.first) if params.count == 1
+    return params
+  end
+
+  def split(str)
+    Shellwords.split(str)
+  end
+
   def has_branch?(branch)
     cmd_succeeded?("git", "cat-file", "-t", branch)
   end

data/lib/rfix/log.rb

@@ -4,31 +4,128 @@ require "rfix"
 require "cli/ui"
 
 module Rfix::Log
+  extend self
   def say(message)
-    CLI::UI.puts("{{v}} #{message}")
+    prt("{{v}} #{message}")
   end
 
   def say_error(message)
-    CLI::UI.puts("{{x}} #{message}")
+    prt("{{x}} #{message}")
   end
 
   def say_error_sub(message)
-    CLI::UI.puts(message.to_s)
+    prt(message.to_s)
+  end
+
+  def error_box(title)
+    box(title, color: :red) { yield }
+  end
+
+  def abort_box(title)
+    error_box(title) { yield }
+    exit 1
+  end
+
+  def say_test(message)
+    prt("{{i}} #{strip(message)}")
   end
 
   def say_debug(message)
-    if Rfix.debug?
-      CLI::UI.puts("{{*}} [{{info:Debug}}] #{message}")
+    if debug? or test?
+      prt("{{i}} #{strip(message)}", to: $stderr)
     end
   end
 
   def say_abort(message)
-    CLI::UI.puts("{{x}} #{message}")
+    prt("{{x}} #{message}")
     exit 1
   end
 
+  def debug?
+    return false unless defined?(RSpec)
+    return RSpec.configuration.debug?
+  end
+
+  def test?
+    Rfix.test?
+  end
+
   def say_exit(message)
-    CLI::UI.puts("{{v}} #{message}")
+    prt("{{v}} #{message}")
     exit 0
   end
+
+  def say_plain(message)
+    prt(message)
+  end
+
+  def debug_box(title)
+    unless_debug do
+      box(title) { yield }
+    end
+  end
+
+  def prt(*args)
+    CLI::UI.puts(*args)
+  end
+
+  def fmt(*args)
+    CLI::UI.fmt(*args)
+  end
+
+  alias ftm fmt
+
+  def log_items(items, title:)
+    box("#{title} (#{items.count})") do
+      return margin(2) do
+        prt "{{warning:No items found}}"
+      end if items.empty?
+
+      items.each do |item|
+        if block_given?
+          say strip(yield item)
+        else
+          say strip(item.to_s)
+        end
+      end
+    end
+  end
+
+  def box(title, color: :reset)
+    margin do
+      CLI::UI::Frame.open(title, color: color) do
+        margin(2) do
+          yield
+        end
+      end
+    end
+  end
+
+  def strip(msg)
+    msg
+    # msg.gsub(current_path, "").gsub(Dir.pwd, ".").chomp
+  end
+
+  def current_path
+    File.join(Dir.pwd, "/")
+  end
+
+  def div(title, **args)
+    CLI::UI::Frame.divider(title, **args)
+    margin { yield }
+  end
+
+  def margin(n = 1)
+    new_line(n)
+    yield
+    new_line(n)
+  end
+
+  def new_line(n = 1)
+    say_plain("\n" * n)
+  end
+
+  def unless_debug
+    yield unless Rfix.debug?
+  end
 end