rfix 1.0.8.pre.109 → 1.0.15.pre.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4097e2bfdc301c182d0b04d369576a35ffa391f1afa4b7e8643daa52e1dc1aeb
-  data.tar.gz: c324d50979ea839dae4d3738971e23c69e601f05c049d72bc5ebe6cb9dc5cb53
+  metadata.gz: 809c73bd0063eb6e08514f282623524fdd9a0dc1b6b39c38dac2b55207e3f3c2
+  data.tar.gz: afd4053dc8c7dbf7602ed459f3b4f87d7b0a25a1c399c5eaf851e4775efe4683
 SHA512:
-  metadata.gz: 39d7ffdf2ef3d46b6a7e5c9eb19e5942331c0dcf010524c49a8a0ff59c25290998d5196c2199f76cd80dbd5a151d5f0fe9d20d8b7d2de1527824eaeea7e0576e
-  data.tar.gz: 7efe96eef04ec0dc1cf3344db5b5d68a2a88cd56cc2aea8211566d1350053e2a209a19e586a6559274a8853ae34cd8478109bc3d85a01ac2afdec75acaa01395
+  metadata.gz: f93e07417ac0e001888df20f758ce766ff3590ac2de191bd746065de962e506584c8e1c6a4455886b9dd34b43de166d251f0fdf6cd21c70a92e5ac2bec3c06d8
+  data.tar.gz: d87aa4d413f4074db0a2e59b9748478727b554f54a3fa0baba748acd7d59c132771f63d16856c5eb8ebe21b73f6c417a194f3442d966f2d10419591bd0f2dd43

data/.travis.yml

@@ -27,6 +27,7 @@ before_install:
 install:
   - bundle install
 script:
+  - bundle exec rake git:config
   - bundle exec rake spec
   - bundle exec rake install
   - rfix info

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rfix (1.0.8)
+    rfix (1.0.15)
       rainbow (~> 3.0)
       rouge (~> 3.20)
       rubocop (>= 0.80)

data/Rakefile

@@ -95,6 +95,9 @@ end
 
 task :bump do
   cmd("gem", "bump", "-c", "-m", "Bump version to %{version}")
+  cmd("bundle", "install")
+  cmd("git add Gemfile.lock")
+  cmd("git commit --amend --no-edit")
 end
 
 task clear: ["vendor:clear", "gemfile:locks:clear"]

data/exe/rfix

@@ -24,10 +24,6 @@ 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}}}"
-
 options.on("--untracked", "Include untracked files") do
   Rfix.load_untracked!
 end
@@ -55,12 +51,15 @@ end
 
 case cmd = ARGV.shift
 when "info"
+  say "Using RuboCop {{yellow:#{RuboCop::Version.version}}}"
+  say_debug "Current directory {{italic:#{Dir.pwd}}}"
+  say_debug "[Ruby] {{italic:#{RbConfig.ruby}}}"
   say "Using Rfix {{yellow:#{Rfix::VERSION}}}"
   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}}}"
+  say_debug "Current Git branch {{yellow:#{Rfix.current_branch}}}"
+  say_debug "Number of commits {{yellow:#{Rfix.number_of_commits_since}}}"
   exit 0
 when "lint"
   Rfix.lint_mode!
@@ -69,6 +68,8 @@ when "local"
   reference = Rfix.ref_since_push
 when "origin"
   reference = Rfix.ref_since_origin
+when "welcome"
+  abort Rfix.thanks
 when "all"
   reference = false
   Rfix.global_enable!
@@ -88,7 +89,7 @@ when "branch"
 else
   unless display_help
     say_error "Valid rfix commands are:"
-    say_error Rfix.help
+    say_error_sub Rfix.help
     exit 1
   end
 

data/lib/rfix/cmd.rb

@@ -9,8 +9,8 @@ module Rfix::Cmd
 
   def cmd(*args, quiet: false)
     out, err, status = Open3.capture3(*args)
-
-    # say "[Cmd] {{italic:#{args.join(' ')}}}"
+    say_debug "[Cmd] {{command:#{args.join(' ')}}}"
+    
     unless status.success?
       return yield if block_given?
       return if quiet

data/lib/rfix/log.rb

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

data/lib/rfix/rfix.rb

@@ -15,16 +15,19 @@ module Rfix
   include GitHelper
   include Log
 
+  def indent
+    " " * 2
+  end
+
   def thanks
     tx = []
     tx << "\n{{v}} Thank you for installing {{green:rfix v#{Rfix::VERSION}}}!\n"
     tx << "{{i}} Run {{command:rfix}} for avalible commands or any of the following to get started:"
     tx << ""
     # tx << "Here are a few examples that might be useful:"
-    indent = " " * 3
-    tx << "#{indent}{{command:rfix local}}   {{italic:# Auto-fixes commits not yet pushed to upstream}}"
-    tx << "#{indent}{{command:rfix origin}}  {{italic:# Auto-fixes commits between HEAD and origin branch}}"
-    tx << "#{indent}{{command:rfix lint}}    {{italic:# Lints commits and untracked files not yet pushed to upstream}}"
+    tx << "#{indent}{{command:$ rfix local}}   {{italic:# Auto-fixes commits not yet pushed to upstream}}"
+    tx << "#{indent}{{command:$ rfix origin}}  {{italic:# Auto-fixes commits between HEAD and origin branch}}"
+    tx << "#{indent}{{command:$ rfix lint}}    {{italic:# Lints commits and untracked files not yet pushed to upstream}}"
     tx << ""
     tx << "{{*}} {{bold:ProTip:}} Append {{command:--dry}} to run {{command:rfix}} in read-only mode"
     tx << ""
@@ -37,14 +40,14 @@ module Rfix
   end
 
   def help
-    cmds = []
-    cmds << "\t{{bold:rfix [cmd] [options]}} -- {{italic:--dry --help --list-files --limit-files --config --untracked}}"
-    cmds << "\t{{bold:rfix branch <branch>}} -- {{italic:Fix changes made between HEAD and <branch>}}"
-    cmds << "\t{{bold:rfix origin}}          -- {{italic:Fix changes made between HEAD and origin branch}}"
-    cmds << "\t{{bold:rfix local}}           -- {{italic:Fix changes not yet pushed to upstream branch}}"
-    cmds << "\t{{bold:rfix info}}            -- {{italic:Display runtime dependencies and their versions}}"
-    cmds << "\t{{bold:rfix all}}             -- {{italic:Fix all files in this repository}} {{warning:(not recommended)}}"
-    cmds << "\t{{bold:rfix lint}}            -- {{italic:Shortcut for 'local --dry --untracked'}}"
+    cmds = [""]
+    cmds << "#{indent}{{command:$ rfix [cmd] [options]}} # {{italic:--dry --help --list-files --limit-files --config --untracked}}"
+    cmds << "#{indent}{{command:$ rfix branch <branch>}} #  {{italic:Fix changes made between HEAD and <branch>}}"
+    cmds << "#{indent}{{command:$ rfix origin}}          #  {{italic:Fix changes made between HEAD and origin branch}}"
+    cmds << "#{indent}{{command:$ rfix local}}           #  {{italic:Fix changes not yet pushed to upstream branch}}"
+    cmds << "#{indent}{{command:$ rfix info}}            #  {{italic:Display runtime dependencies and their versions}}"
+    cmds << "#{indent}{{command:$ rfix all}}             #  {{italic:Fix all files in this repository}} {{warning:(not recommended)}}"
+    cmds << "#{indent}{{command:$ rfix lint}}            #  {{italic:Shortcut for 'local --dry --untracked'}}"
     CLI::UI.fmt(cmds.join("\n"), enable_color: true)
   end
 
@@ -58,6 +61,7 @@ module Rfix
 
   def debug!
     @debug = true
+    @config[:debug] = true
   end
 
   def number_of_commits_since
@@ -122,13 +126,13 @@ module Rfix
   def init!
     @files ||= {}
     @global_enable = false
+    @debug = false
     @config = {
       force_exclusion: true,
       formatters: ["Rfix::Formatter"]
     }
 
     @store = RuboCop::ConfigStore.new
-    @debug = false
     auto_correct!
   end
 
@@ -171,7 +175,7 @@ module Rfix
   end
 
   def load_tracked!(reference)
-    cached(git("log", "--name-only", "--pretty=format:", *params, "#{reference}..HEAD").map do |path|
+    cached(git("log", "--name-only", "--pretty=format:", *params, "#{reference}...HEAD").map do |path|
       TrackedFile.new(path, reference, root_dir)
     end.select(&:file?).to_set)
   end

data/lib/rfix/tracked_file.rb

@@ -4,7 +4,7 @@ require "rfix/git_file"
 
 class Rfix::TrackedFile < Rfix::GitFile
   def refresh!
-    @ranges = git("--no-pager", "diff", *params, ref, path)
+    @ranges = git("--no-pager", "diff", *params, "#{ref}...HEAD", path)
               .grep(/^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/) do
       Regexp.last_match(1).to_i...(Regexp.last_match(1).to_i + (Regexp.last_match(2) || 1).to_i)
     end

data/lib/rfix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfix
-  VERSION = "1.0.8"
+  VERSION = "1.0.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.0.8.pre.109
+  version: 1.0.15.pre.116
 platform: ruby
 authors:
 - Linus Oleander