rfix 1.0.8.pre.108 → 1.0.8.pre.109

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 537cb3de2248f7c030873f1435b0e4b0a8b7568e9bebfc6055a3efca5e126f06
-  data.tar.gz: 104a7dbbe3bbbc108a79629cc81de2d341ddea2a74fc68716e07a38e3d3cf2c3
+  metadata.gz: 4097e2bfdc301c182d0b04d369576a35ffa391f1afa4b7e8643daa52e1dc1aeb
+  data.tar.gz: c324d50979ea839dae4d3738971e23c69e601f05c049d72bc5ebe6cb9dc5cb53
 SHA512:
-  metadata.gz: 72d111d79b2bc9a7420d78f0efa388730b7adf66545280a91af5f3fc3f69d0a234c6ccbab984cd01d800233aa7a6de3e5b7a8f7639e7df067b3bb528fd4885a4
-  data.tar.gz: dfef4fb22d0757f4bf1259d96309358111fd7eeacc08d621c52175d9e39cc4a395e3225a7420293bea7f870c5016918f0da80d852eb066d7c91e265f5c6ef509
+  metadata.gz: 39d7ffdf2ef3d46b6a7e5c9eb19e5942331c0dcf010524c49a8a0ff59c25290998d5196c2199f76cd80dbd5a151d5f0fe9d20d8b7d2de1527824eaeea7e0576e
+  data.tar.gz: 7efe96eef04ec0dc1cf3344db5b5d68a2a88cd56cc2aea8211566d1350053e2a209a19e586a6559274a8853ae34cd8478109bc3d85a01ac2afdec75acaa01395

data/exe/rfix

@@ -20,6 +20,10 @@ extend Rfix::Log
 Rfix.init!
 CLI::UI::StdoutRouter.enable
 
+if ARGV.include?("--debug")
+  Rfix.debug!
+end
+
 say "Using RuboCop {{yellow:#{RuboCop::Version.version}}}"
 say_debug "Current directory {{italic:#{Dir.pwd}}}"
 say_debug "[Ruby] {{italic:#{RbConfig.ruby}}}"
@@ -55,6 +59,8 @@ when "info"
   say "Using OS {{yellow:#{Rfix.current_os}}}"
   say "Using Git {{yellow:#{Rfix.git_version}}}"
   say "Using Ruby {{yellow:#{Rfix.ruby_version}}}"
+  say "Current Git branch {{yellow:#{Rfix.current_branch}}}"
+  say "Number of commits {{yellow:#{Rfix.number_of_commits_since}}}"
   exit 0
 when "lint"
   Rfix.lint_mode!

data/file.rb

@@ -0,0 +1 @@
+"hello"

data/lib/rfix/cmd.rb

@@ -7,11 +7,13 @@ require "rfix/log"
 module Rfix::Cmd
   include Rfix::Log
 
-  def cmd(*args)
+  def cmd(*args, quiet: false)
     out, err, status = Open3.capture3(*args)
 
+    # say "[Cmd] {{italic:#{args.join(' ')}}}"
     unless status.success?
       return yield if block_given?
+      return if quiet
 
       say_error "[Cmd] {{italic:#{args.join(' ')}}}"
       say_error "[Pwd] {{italic:#{Dir.pwd}}}"

data/lib/rfix/git_helper.rb

@@ -9,8 +9,20 @@ module Rfix::GitHelper
   include Rfix::Log
   include Rfix::Cmd
 
-  def git(*args, &block)
-    cmd("git", *args, &block)
+  def git(*args, root: Dir.pwd, quiet: false, &block)
+    args.unshift *["--git-dir", File.join(root, ".git")]
+    args.unshift *["--work-tree", root]
+    cmd("git", *args, quiet: quiet, &block)
+  end
+
+  def has_branch?(branch)
+    cmd_succeeded?("git", "cat-file", "-t", branch)
+  end
+
+  def dirty?(path)
+    Dir.chdir(path) do
+      !cmd_succeeded?("git diff --quiet")
+    end
   end
 
   def params
@@ -28,3 +40,8 @@ module Rfix::GitHelper
     ]
   end
 end
+
+# TODO: Rename above to just ::Git
+module Rfix::Git
+  extend Rfix::GitHelper
+end

data/lib/rfix/log.rb

@@ -17,7 +17,9 @@ module Rfix::Log
   end
 
   def say_debug(message)
-    CLI::UI.puts("{{*}} [{{info:Debug}}] #{message}")
+    unless Rfix.debug?
+      CLI::UI.puts("{{*}} [{{info:Debug}}] #{message}")
+    end
   end
 
   def say_abort(message)

data/lib/rfix/rfix.rb

@@ -48,6 +48,22 @@ module Rfix
     CLI::UI.fmt(cmds.join("\n"), enable_color: true)
   end
 
+  def current_branch
+    git("rev-parse", "--abbrev-ref", "HEAD").first
+  end
+
+  def debug?
+    @debug
+  end
+
+  def debug!
+    @debug = true
+  end
+
+  def number_of_commits_since
+    cmd("git rev-list master..HEAD | wc -l").first
+  end
+
   def config
     @config
   end
@@ -112,6 +128,7 @@ module Rfix
     }
 
     @store = RuboCop::ConfigStore.new
+    @debug = false
     auto_correct!
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.0.8.pre.108
+  version: 1.0.8.pre.109
 platform: ruby
 authors:
 - Linus Oleander
@@ -141,6 +141,7 @@ files:
 - ci/Gemfile.rubocop-0.85.1.lock
 - ci/Gemfile.rubocop-0.85.lock
 - exe/rfix
+- file.rb
 - lib/rfix.rb
 - lib/rfix/cmd.rb
 - lib/rfix/extensions/extensions.rb