rfix 1.0.7.pre.66 → 1.0.7.pre.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba09b69185ab60b9f686736e5c9e7fb31f304076e34da632c680d086cc2b2ad
-  data.tar.gz: 0cec0d7801f62c92660cfada322c883aded3ea5a5a2912fafcc8b25d106847ce
+  metadata.gz: 18adac7bf6bfb125c3cac54933353fb5c52a6a60854f0001afa0c5bdc69ece87
+  data.tar.gz: 1f1656bec3253bb8d609fa35fd157d60c45510e2fc787cf44139ae39dda756f7
 SHA512:
-  metadata.gz: 774c1bef50501190800a11c878d887071c3a531b32605d05eb1d92e6f7d3b5ba7a757801dfb2d6cf90e11c223766f24a80ec6d1ce4a33a6785e5064893a8096a
-  data.tar.gz: 46872dec584d09199205210c3a13f3f278164702407acfe7833f58280307b2f27888a8d705d31901be73cb280689ee7c8c87f74a0f213ec5c2c30c53b0b5bca1
+  metadata.gz: 6dac6c467ca60c677bceb2926e3f78ee86164ecda79b50a010595d40a8a5e924fa2182fbe7d90f64b5158abd36aa5b7860b107b2c2495748abfed15154da50d6
+  data.tar.gz: 29c0aca1abaa4ba8b3d13169128f052324061709ca7c03b01296b395d6f00b8dae8e76f231bd59942a350811ed6cb9d5b8a425b37bfd32a8bd01e7b368ed16a1

data/exe/rfix

@@ -20,38 +20,13 @@ CLI::UI::StdoutRouter.enable
 
 say "Using RuboCop {{yellow:#{RuboCop::Version.version}}}"
 
-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
@@ -73,6 +48,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"
@@ -102,6 +80,7 @@ else
     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 "\t{{bold:rfix lint}}             -- {{italic:Shortcut for 'local --dry --untracked'}}"
     say_error_sub "\n"
     say_error_sub "\t{{italic:Optional args: --dry --help --list-files --limit-files --config --untracked}}"
     exit 1
@@ -117,11 +96,11 @@ rescue OptionParser::MissingArgument => e
 end
 
 if path = config_path
-  load_config do
+  Rfix.load_config do
     config.options_config = path
   end
 else
-  load_config do
+  Rfix.load_config do
     config.for(Dir.pwd)
   end
 end
@@ -149,7 +128,7 @@ if should_list_files
 end
 
 env = RuboCop::CLI::Environment.new(
-  base_config.merge(options),
+  Rfix.config.merge(options),
   config,
   paths
 )

data/lib/rfix/rfix.rb

@@ -13,6 +13,39 @@ module Rfix
   include GitHelper
   include Log
 
+  def config
+    @config
+  end
+
+  def set_fail_level(lint)
+    if
+      if lint
+      else
+        @config[:fail_level] = :warning
+      end
+    end
+  end
+
+  def no_auto_correct!
+    @config[:auto_correct] = false
+  end
+
+  def load_config
+    yield
+  rescue RuboCop::Error => e
+    say_abort "[Config] #{e}"
+  rescue TypeError => e
+    say_abort "[Config] #{e}"
+  end
+
+  def lint_mode!
+    @config[:auto_correct] = false
+    if old?
+      @config[:fail_level] = :warning
+    end
+    load_untracked!
+  end
+
   def git_version
     cmd("git --version").last.split(/\s+/, 3).last
   end
@@ -36,6 +69,16 @@ module Rfix
   def init!
     @files ||= {}
     @global_enable = false
+    @config = {
+      color: true,
+      force_exclusion: true,
+      auto_correct: true,
+      formatters: ["Rfix::Formatter"]
+    }
+
+    if old?
+      @config[:fail_level] = :autocorrect
+    end
   end
 
   def files
@@ -100,6 +143,12 @@ module Rfix
 
   private
 
+  def old?
+    # For version 0.80.x .. 0.83.x:
+    # Otherwise it will exit with status code = 1
+    (0.80..0.83).include?(RuboCop::Version::STRING.to_f)
+  end
+
   def get_file(path, &block)
     if file = @files[path]
       block.call(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.0.7.pre.66
+  version: 1.0.7.pre.67
 platform: ruby
 authors:
 - Linus Oleander