rfix 1.0.7 → 1.0.8.pre.108

data/ci/Gemfile.rubocop-0.85

@@ -1,2 +1,2 @@
-eval_gemfile("../Gemfile")
+eval_gemfile(File.join(__dir__, "../Gemfile.base"))
 gem "rubocop", "0.85.0"

data/ci/Gemfile.rubocop-0.85.1

@@ -1,2 +1,2 @@
-eval_gemfile("../Gemfile")
+eval_gemfile(File.join(__dir__, "../Gemfile.base"))
 gem "rubocop", "0.85.1"

data/ci/Gemfile.rubocop-0.85.1.lock

@@ -1,42 +1,22 @@
-GIT
-  remote: https://github.com/Shopify/cli-ui.git
-  revision: ef976df676f43a80b47249ac2390d5f12b2293d1
-  ref: ef976df676f4
-  specs:
-    cli-ui (1.3.0)
-
-GIT
-  remote: https://github.com/oleander/git-fame-rb.git
-  revision: a9b9c25bbab197feaee00f9a5c970998e76f636c
-  ref: a9b9c25bbab1
-  specs:
-    git_fame (2.5.3)
-      hirb (~> 0.7.3)
-      memoist (~> 0.14.0)
-      method_profiler (~> 2.0.1)
-      progressbar (~> 0.21.0)
-      scrub_rb (~> 1.0.1)
-      trollop (~> 2.1.2)
-
 PATH
-  remote: ..
+  remote: .
   specs:
-    rfix (0.2.0)
+    rfix (1.0.8)
       rainbow (~> 3.0)
       rouge (~> 3.20)
-      rubocop (~> 0.80)
+      rubocop (>= 0.80)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    aruba (1.0.1)
-      childprocess (~> 3.0)
+    aruba (1.0.2)
+      childprocess (>= 2.0, < 5.0)
       contracts (~> 0.16.0)
       cucumber (>= 2.4, < 5.0)
       ffi (~> 1.9)
@@ -44,7 +24,7 @@ GEM
       thor (~> 1.0)
     ast (2.4.1)
     builder (3.2.4)
-    childprocess (3.0.0)
+    childprocess (4.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.6)
     contracts (0.16.0)
@@ -78,6 +58,7 @@ GEM
     diff-lcs (1.3)
     ffi (1.13.1)
     formatador (0.2.5)
+    gem-release (2.1.1)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -92,16 +73,12 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hirb (0.7.3)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.5)
-    memoist (0.14.0)
-    method_profiler (2.0.1)
-      hirb (>= 0.6.0)
+    lumberjack (1.2.6)
     method_source (1.0.0)
     middleware (0.1.0)
     minitest (5.14.1)
@@ -110,10 +87,9 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    progressbar (0.21.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
       middleware
@@ -155,13 +131,11 @@ GEM
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
-    scrub_rb (1.0.1)
     shellany (0.0.1)
     sys-uname (1.2.1)
       ffi (>= 1.0.0)
     thor (1.0.1)
     thread_safe (0.3.6)
-    trollop (2.1.3)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
@@ -171,19 +145,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  cli-ui!
-  git_fame!
+  aruba (~> 1.0)
+  gem-release
   guard
   guard-rspec
-  pry
-  rake (~> 12.0)
+  rake (~> 12.3)
   rfix!
   rspec (~> 3.0)
   rubocop (= 0.85.1)
 
-RUBY VERSION
-   ruby 2.5.0p0
-
 BUNDLED WITH
    2.1.4

data/ci/Gemfile.rubocop-0.85.lock

@@ -1,42 +1,22 @@
-GIT
-  remote: https://github.com/Shopify/cli-ui.git
-  revision: ef976df676f43a80b47249ac2390d5f12b2293d1
-  ref: ef976df676f4
-  specs:
-    cli-ui (1.3.0)
-
-GIT
-  remote: https://github.com/oleander/git-fame-rb.git
-  revision: a9b9c25bbab197feaee00f9a5c970998e76f636c
-  ref: a9b9c25bbab1
-  specs:
-    git_fame (2.5.3)
-      hirb (~> 0.7.3)
-      memoist (~> 0.14.0)
-      method_profiler (~> 2.0.1)
-      progressbar (~> 0.21.0)
-      scrub_rb (~> 1.0.1)
-      trollop (~> 2.1.2)
-
 PATH
-  remote: ..
+  remote: .
   specs:
-    rfix (0.2.0)
+    rfix (1.0.8)
       rainbow (~> 3.0)
       rouge (~> 3.20)
-      rubocop (~> 0.80)
+      rubocop (>= 0.80)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    aruba (1.0.1)
-      childprocess (~> 3.0)
+    aruba (1.0.2)
+      childprocess (>= 2.0, < 5.0)
       contracts (~> 0.16.0)
       cucumber (>= 2.4, < 5.0)
       ffi (~> 1.9)
@@ -44,7 +24,7 @@ GEM
       thor (~> 1.0)
     ast (2.4.1)
     builder (3.2.4)
-    childprocess (3.0.0)
+    childprocess (4.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.6)
     contracts (0.16.0)
@@ -78,6 +58,7 @@ GEM
     diff-lcs (1.3)
     ffi (1.13.1)
     formatador (0.2.5)
+    gem-release (2.1.1)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -92,16 +73,12 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hirb (0.7.3)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.5)
-    memoist (0.14.0)
-    method_profiler (2.0.1)
-      hirb (>= 0.6.0)
+    lumberjack (1.2.6)
     method_source (1.0.0)
     middleware (0.1.0)
     minitest (5.14.1)
@@ -110,10 +87,9 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    progressbar (0.21.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
       middleware
@@ -155,13 +131,11 @@ GEM
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
-    scrub_rb (1.0.1)
     shellany (0.0.1)
     sys-uname (1.2.1)
       ffi (>= 1.0.0)
     thor (1.0.1)
     thread_safe (0.3.6)
-    trollop (2.1.3)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
@@ -171,19 +145,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  cli-ui!
-  git_fame!
+  aruba (~> 1.0)
+  gem-release
   guard
   guard-rspec
-  pry
-  rake (~> 12.0)
+  rake (~> 12.3)
   rfix!
   rspec (~> 3.0)
   rubocop (= 0.85.0)
 
-RUBY VERSION
-   ruby 2.5.0p0
-
 BUNDLED WITH
    2.1.4

data/exe/rfix

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+
 # frozen_string_literal: true
 
 require "rfix"
@@ -9,55 +10,37 @@ require "cli/ui"
 should_list_files = false
 limit_files       = false
 options           = RuboCop::Options.new
-config            = RuboCop::ConfigStore.new
+
 display_help      = ARGV.include?("--help")
 is_dry            = ARGV.include?("--dry")
 config_path       = false
+clear_cache       = false
 
 extend Rfix::Log
 Rfix.init!
 CLI::UI::StdoutRouter.enable
 
 say "Using RuboCop {{yellow:#{RuboCop::Version.version}}}"
+say_debug "Current directory {{italic:#{Dir.pwd}}}"
+say_debug "[Ruby] {{italic:#{RbConfig.ruby}}}"
 
-base_config = {
-  color: true,
-  force_exclusion: true,
-  auto_correct: true,
-  formatters: ["Rfix::Formatter"]
-}
-
-# For version 0.80.x .. 0.83.x:
-# Otherwise it will exit with status code = 1
-if (0.80..0.83).include?(RuboCop::Version::STRING.to_f)
-  if is_dry
-    base_config[:fail_level] = :autocorrect
-  else
-    base_config[:fail_level] = :warning
-  end
-end
-
-def load_config
-  yield
-rescue RuboCop::Error => e
-  say_abort "[Config] #{e}"
-rescue TypeError => e
-  say_abort "[Config] #{e}"
+options.on("--untracked", "Include untracked files") do
+  Rfix.load_untracked!
 end
 
 options.on("--dry", "No auto correct") do
   say "Will run rfix in {{red:read-only}} mode"
-  base_config.merge!({ auto_correct: false })
-end
-
-options.on("--untracked", "Include untracked files") do
-  Rfix.load_untracked!
+  Rfix.no_auto_correct!
 end
 
 options.on("--list-files", "List files found by git") do
   should_list_files = true
 end
 
+options.on("--clear-cache", "Clear RuboCop cache") do
+  clear_cache = true
+end
+
 options.on("--limit-files NUM", Integer, "Limit number of files") do |limit|
   limit_files = limit
 end
@@ -73,6 +56,9 @@ when "info"
   say "Using Git {{yellow:#{Rfix.git_version}}}"
   say "Using Ruby {{yellow:#{Rfix.ruby_version}}}"
   exit 0
+when "lint"
+  Rfix.lint_mode!
+  reference = Rfix.ref_since_push
 when "local"
   reference = Rfix.ref_since_push
 when "origin"
@@ -96,14 +82,7 @@ when "branch"
 else
   unless display_help
     say_error "Valid rfix commands are:"
-    say_error_sub "\n"
-    say_error_sub "\t{{bold:rfix branch <branch>}} -- {{italic:Fix changes made between HEAD and <branch>}}"
-    say_error_sub "\t{{bold:rfix origin}}          -- {{italic:Fix changes made between HEAD and origin branch}}"
-    say_error_sub "\t{{bold:rfix local}}           -- {{italic:Fix changes not yet pushed to upstream branch}}"
-    say_error_sub "\t{{bold:rfix info}}            -- {{italic:Display runtime dependencies and their versions}}"
-    say_error_sub "\t{{bold:rfix all}}             -- {{italic:Fix all files in this repository}} {{warning:(not recommended)}}"
-    say_error_sub "\n"
-    say_error_sub "\t{{italic:Optional args: --dry --help --list-files --limit-files --config --untracked}}"
+    say_error Rfix.help
     exit 1
   end
 
@@ -117,15 +96,22 @@ rescue OptionParser::MissingArgument => e
 end
 
 if path = config_path
-  load_config do
+  Rfix.load_config do |config|
+    say_debug "[Config:Option] Load from #{path}"
     config.options_config = path
   end
 else
-  load_config do
+  Rfix.load_config do |config|
+    say_debug "[Config:PWD] Load from #{Dir.pwd}"
     config.for(Dir.pwd)
   end
 end
 
+if clear_cache
+  say "Clearing cache"
+  Rfix.clear_cache!
+end
+
 if ref = reference
   say "Compare against {{yellow:#{ref}}}"
 
@@ -148,9 +134,11 @@ if should_list_files
   end
 end
 
+say_debug "[Config:Dump] #{Rfix.store}"
+
 env = RuboCop::CLI::Environment.new(
-  base_config.merge(options),
-  config,
+  Rfix.config.merge(options),
+  Rfix.store,
   paths
 )
 

data/lib/rfix.rb

@@ -4,10 +4,23 @@
 # https://gist.github.com/skanev/9d4bec97d5a6825eaaf6
 
 require "rfix/version"
-require "rfix/log"
-require "rfix/extensions"
+require "cli/ui"
+require "rfix/extensions/extensions"
+require "rfix/extensions/offense"
 require "rfix/rfix"
 
 module Rfix
+  module Ext; end
   extend self
 end
+
+RuboCop::Options.prepend(Rfix::Ext::Options)
+RuboCop::Runner.prepend(Rfix::Ext::Runner)
+RuboCop::CommentConfig.prepend(Rfix::Ext::CommentConfig)
+RuboCop::Cop::Offense.prepend(Rfix::Ext::Offense)
+
+# 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))
+end

data/lib/rfix/cmd.rb

@@ -13,7 +13,7 @@ module Rfix::Cmd
     unless status.success?
       return yield if block_given?
 
-      say_error "[Cmd] {{italic:#{args.join(" ")}}}"
+      say_error "[Cmd] {{italic:#{args.join(' ')}}}"
       say_error "[Pwd] {{italic:#{Dir.pwd}}}"
       say_error "[Err] {{error:#{err.strip}}}"
 
@@ -23,6 +23,10 @@ module Rfix::Cmd
     out.lines.map(&:chomp)
   end
 
+  def cmd_succeeded?(*cmd)
+    Open3.capture2e(*cmd).last.success?
+  end
+
   def params
     [
       "--word-diff-regex=[^[:space:]]",