rfix 1.2.0 → 1.2.2.pre.172

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ef900d9367b33de2920d9023babdd0e4b8a9a9f3b64bcc546f50dda98770b965
4
- data.tar.gz: d120d6254494a84b2f48f65c1922a27d03e66f64444fe51f9769502d3523e618
3
+ metadata.gz: 704cebdb37c95b97087becc1cca6fab240003915dec8ae8423ba4b41d8451834
4
+ data.tar.gz: d888590c884dd572f111799bcfb383d44e512dbd423d7a6a114c14e2ebbc8860
5
5
  SHA512:
6
- metadata.gz: cb754a3d385e02dd9842ff61136cf41d62ab5a5b0543be8e5e0f14fbd4ac56dbe9a3b51823c78b786abfc77b54ef9c561356422857496cc1571405da25ecc8e0
7
- data.tar.gz: be1b3e5dce4181b22a7e158f1ef8053fe642e8046ac8e8bb4c8dcb2594b58e58226bb977c24b1146ead6c03d6889eb14628af2c883cb5c92173f712c6a4e9dd0
6
+ metadata.gz: 7725847efd4a1143f4e646c6bb99ef0e7b8cf30ac66fda0aabc09a588864d271b436c0f02b90a4632269d46a76f60a5d6bcdb5ae9fc0eca12c67a596e834b73b
7
+ data.tar.gz: 0162cf4c212c02167a505afad65de84363b1be6cc803ab0c2b7a05ebc6751c7423839df3ee70fb0d8b0ed7be87ef92a506c03082176e7077bbf0f23bd8111347
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rfix (1.2.0)
4
+ rfix (1.2.2)
5
5
  cri (~> 2.15.10)
6
6
  listen (~> 3.0)
7
7
  rainbow (~> 3.0)
@@ -47,10 +47,13 @@ class Rfix::Repository
47
47
  end
48
48
 
49
49
  def include?(path, line)
50
+ say_debug "Checking #{path}:#{line}"
51
+
50
52
  if file = @files.get(path)
51
53
  return file.include?(line)
52
54
  end
53
55
 
56
+ say_debug "\tSkip file (return false)"
54
57
  return false
55
58
  end
56
59
 
@@ -5,6 +5,7 @@ class Rfix::Tracked < Rfix::File
5
5
 
6
6
  def include?(line)
7
7
  set = diff.each_line.to_a.map{ |l| l.new_lineno }.reject { |l| l == -1 }.to_set
8
+ say_debug "Does {{yellow:#{set}}} contain {{red:#{line}}}"
8
9
  set.include?(line)
9
10
  end
10
11
 
@@ -52,14 +53,10 @@ class Rfix::Tracked < Rfix::File
52
53
  end
53
54
 
54
55
  def diff
55
- upstream.diff(head, {
56
+ upstream.diff_workdir({
56
57
  include_untracked_content: true,
57
- # ignore_whitespace_change: true,
58
58
  recurse_untracked_dirs: true,
59
- disable_pathspec_match: false,
60
- # ignore_whitespace_eol: false,
61
59
  include_untracked: true,
62
- # ignore_whitespace: true,
63
60
  ignore_submodules: true,
64
61
  include_ignored: false,
65
62
  context_lines: 0,
@@ -67,7 +64,6 @@ class Rfix::Tracked < Rfix::File
67
64
  }).tap do |diff|
68
65
  diff.find_similar!(
69
66
  renames_from_rewrites: true,
70
- # ignore_whitespace: true,
71
67
  renames: true,
72
68
  copies: true
73
69
  )
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Rfix
4
- VERSION = "1.2.0"
4
+ VERSION = "1.2.2"
5
5
  end
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
11
11
 
12
12
  if ENV["TRAVIS"]
13
13
  spec.version = "#{Rfix::VERSION}-#{ENV.fetch('TRAVIS_BUILD_NUMBER')}"
14
- elseif ENV["GITHUB_RUN_ID"]
14
+ elsif ENV["GITHUB_RUN_ID"]
15
15
  spec.version = "#{Rfix::VERSION}-#{ENV.fetch('GITHUB_RUN_ID')}"
16
16
  else
17
17
  # rubocop:disable Gemspec/DuplicatedAssignment
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rfix
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.2.pre.172
5
5
  platform: ruby
6
6
  authors:
7
7
  - Linus Oleander
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-07-21 00:00:00.000000000 Z
11
+ date: 2020-07-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cri
@@ -325,7 +325,7 @@ licenses:
325
325
  - MIT
326
326
  metadata:
327
327
  homepage_uri: https://github.com/oleander/rfix-rb
328
- post_install_message:
328
+ post_install_message:
329
329
  rdoc_options: []
330
330
  require_paths:
331
331
  - lib
@@ -337,13 +337,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
337
337
  version: 2.5.0
338
338
  required_rubygems_version: !ruby/object:Gem::Requirement
339
339
  requirements:
340
- - - ">="
340
+ - - ">"
341
341
  - !ruby/object:Gem::Version
342
- version: '0'
342
+ version: 1.3.1
343
343
  requirements:
344
344
  - git, v2.0+
345
345
  rubygems_version: 3.0.3
346
- signing_key:
346
+ signing_key:
347
347
  specification_version: 4
348
348
  summary: RuboCop CLI that only lints and auto-fixes code you committed by utilizing
349
349
  `git-log` and `git-diff`