rfix 1.2.0 → 1.2.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef900d9367b33de2920d9023babdd0e4b8a9a9f3b64bcc546f50dda98770b965
-  data.tar.gz: d120d6254494a84b2f48f65c1922a27d03e66f64444fe51f9769502d3523e618
+  metadata.gz: ba53958e4103258b8e86578694c48233c47ffef40f9731086a3cd99b1da5b719
+  data.tar.gz: b8aacca8d0c536a3c4f4135f15951be49fcad5d89524e2d8f2f1b85459667b9f
 SHA512:
-  metadata.gz: cb754a3d385e02dd9842ff61136cf41d62ab5a5b0543be8e5e0f14fbd4ac56dbe9a3b51823c78b786abfc77b54ef9c561356422857496cc1571405da25ecc8e0
-  data.tar.gz: be1b3e5dce4181b22a7e158f1ef8053fe642e8046ac8e8bb4c8dcb2594b58e58226bb977c24b1146ead6c03d6889eb14628af2c883cb5c92173f712c6a4e9dd0
+  metadata.gz: f2bca003e662486e4d96a1619c4f90d2a17e8ac2ec64b43b12b4841fcdbe3d66d18238a62c2d21fb8e210a1bb22e66c0e4ab2162155a6668e6814c44ff522adb
+  data.tar.gz: 9a53c0431ab2ea56084b2cc6de231869b00e0bf91acb6a73cd89fd623ad569c0f638f48927f7a39d55260f62ce990750d33334950a729246d774f97a3b12ce77

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rfix (1.2.0)
+    rfix (1.2.2.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.2.0"
+  VERSION = "1.2.2"
 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.2.0
+  version: 1.2.2.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
@@ -337,9 +337,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - git, v2.0+
 rubygems_version: 3.0.3