rfix 1.1.4.pre → 1.2.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fbe425b94572358cfdd552e9e3167739344b05bee8d7348744fc2a7402d670c
-  data.tar.gz: ab127357057f5ce2e23fd3a8625e19ef68f70d6328f6cdd6b76ef80e656a84b4
+  metadata.gz: 6bcd6aef2b13140e3ad5906afe8c58fce8f3a8647d1be0f681fecf242c878244
+  data.tar.gz: a4eef1a0ad07ea98f95c921a22df5fd81ea9629f5cc5d95c00fab79555ffef2f
 SHA512:
-  metadata.gz: d03d86c10e9160006bb3a0bedc1d04dffa975666105c229ac961d50452781f6cdb039b392b98566bc75c27f97f3afe0880e5b6a13c00c021d36b69813bd1567b
-  data.tar.gz: bb6237ef9601094acc513b17121ed7047c3dfa049835d562782a0f52ebea35e9b33001fd6939e105b0e2f9450c4d18295152b5f9ef1d486af98c30f673a92722
+  metadata.gz: b82cdb96773687c33e7cdcf2f3f28e4c8f6a848f3b46bda42b4a539f98dca280770bada8a5c000897b67aa2c0758842eacdd5b00fa9c05fca8af5c5b5716f705
+  data.tar.gz: 3f44de0851696fa862db4de220a328f54671670837ae4fb455050f5a1176074c0acbe591687d2b6194aed248ef82b4f4ec1d4bb19c5b3df2c9705f66d4ac8031

data/Gemfile.lock

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

data/lib/rfix/log.rb

@@ -31,9 +31,9 @@ module Rfix::Log
   end
 
   def say_debug(message)
-    if debug? or test?
+    # if debug? or test?
       prt("{{i}} #{strip(message)}", to: $stderr)
-    end
+    # end
   end
 
   def say_abort(message)

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
 

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.1.4.pre"
+  VERSION = "1.2.3"
 end

data/rfix.gemspec

@@ -11,11 +11,11 @@ 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
-    spec.version = Rfix::VERSION
+    spec.version = [Rfix::VERSION, "pre"].join(".")
     # rubocop:enable Gemspec/DuplicatedAssignment
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.1.4.pre
+  version: 1.2.3.pre
 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