rfix 1.2.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef900d9367b33de2920d9023babdd0e4b8a9a9f3b64bcc546f50dda98770b965
-  data.tar.gz: d120d6254494a84b2f48f65c1922a27d03e66f64444fe51f9769502d3523e618
+  metadata.gz: 0c8798e4878ee4ad37aab733473ce82d50881bedadb93daaa5ced93bea364480
+  data.tar.gz: '08d0952d66e3c3cfb68f906a5ec0154bba294c8a8aaf628279ed8f84bc808abe'
 SHA512:
-  metadata.gz: cb754a3d385e02dd9842ff61136cf41d62ab5a5b0543be8e5e0f14fbd4ac56dbe9a3b51823c78b786abfc77b54ef9c561356422857496cc1571405da25ecc8e0
-  data.tar.gz: be1b3e5dce4181b22a7e158f1ef8053fe642e8046ac8e8bb4c8dcb2594b58e58226bb977c24b1146ead6c03d6889eb14628af2c883cb5c92173f712c6a4e9dd0
+  metadata.gz: a97a0f8265bf1c24d01f3b73a4c012e040914e85b9f4b69506f9003e7fd26ee1cd10d9d30a4fc16a5e19bbe029ee1127a2e0869ad82d61247721a819e96874c0
+  data.tar.gz: cee388a2b404aa6313bed6bb0c655370b1a0ab67af41112676f9c28ad3e4c6fa2fb857d16942baa9c0317df502f5e5e3d70cdc3e64e2b4312a26acf7d8072031

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rfix (1.2.0)
+    rfix (1.2.4)
       cri (~> 2.15.10)
       listen (~> 3.0)
       rainbow (~> 3.0)

data/lib/rfix/branches/main.rb

@@ -10,7 +10,7 @@ module Rfix
         raise Error.new("Please run {{command:rfix setup}} first")
       end
 
-      String.new(name).resolve(with: with)
+      Branch::Name.new(name).resolve(with: with)
     end
 
     def self.set(branch, at: Dir.pwd)

data/lib/rfix/commands/helper/args.rb

@@ -1,5 +1,5 @@
 option :r, :root, "{{*}} Project root path", default: Dir.pwd, argument: :required
-option :b, :"main-branch", "{{*}} Branch to use", default: "master", argument: :required
+option :b, :"main-branch", "{{*}} Branch to use", argument: :required
 option :l, :limit, "{{*}} Limit number of files", argument: :required, transform: method(:Integer)
 
 flag nil, :dry, "{{*}} Run in dry mode"
@@ -78,6 +78,10 @@ def setup(r_args = [], opts, _args, files: [], reference:)
     say_debug "Cleared Rubocop`s cache"
   end
 
+  if opts[:debug]
+    Rfix.test = true
+  end
+
   if block_given?
     yield(repo, [])
   end

data/lib/rfix/repository.rb

@@ -47,10 +47,13 @@ class Rfix::Repository
   end
 
   def include?(path, line)
+    say_debug "Checking #{path}:#{line}"
+
     if file = @files.get(path)
       return file.include?(line)
     end
 
+    say_debug "\tSkip file (return false)"
     return false
   end
 
@@ -110,7 +113,7 @@ class Rfix::Repository
       params[:paths] = @paths
     end
 
-    say_debug("Run diff on #{reference}")
+    say_debug("Run diff on {{info:#{reference}}}")
     upstream.diff(head, **params).tap do |diff|
       diff.find_similar!(
         renames_from_rewrites: true,

data/lib/rfix/tracked.rb

@@ -5,6 +5,7 @@ class Rfix::Tracked < Rfix::File
 
   def include?(line)
     set = diff.each_line.to_a.map{ |l| l.new_lineno }.reject { |l| l == -1 }.to_set
+    say_debug "Does {{yellow:#{set}}} contain {{red:#{line}}}"
     set.include?(line)
   end
 
@@ -52,14 +53,10 @@ class Rfix::Tracked < Rfix::File
   end
 
   def diff
-    upstream.diff(head, {
+    upstream.diff_workdir({
       include_untracked_content: true,
-      # ignore_whitespace_change: true,
       recurse_untracked_dirs: true,
-      disable_pathspec_match: false,
-      # ignore_whitespace_eol: false,
       include_untracked: true,
-      # ignore_whitespace: true,
       ignore_submodules: true,
       include_ignored: false,
       context_lines: 0,
@@ -67,7 +64,6 @@ class Rfix::Tracked < Rfix::File
     }).tap do |diff|
       diff.find_similar!(
         renames_from_rewrites: true,
-        # ignore_whitespace: true,
         renames: true,
         copies: true
       )

data/lib/rfix/version.rb

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

data/rfix.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   if ENV["TRAVIS"]
     spec.version = "#{Rfix::VERSION}-#{ENV.fetch('TRAVIS_BUILD_NUMBER')}"
-  elseif ENV["GITHUB_RUN_ID"]
+  elsif ENV["GITHUB_RUN_ID"]
     spec.version = "#{Rfix::VERSION}-#{ENV.fetch('GITHUB_RUN_ID')}"
   else
     # rubocop:disable Gemspec/DuplicatedAssignment

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.4
 platform: ruby
 authors:
 - Linus Oleander
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri