rubocop-gradual 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 685de93c46f230379c3a6a10f732634b28312cb8c996d7f401cee9bca6b449c7
-  data.tar.gz: 4c81550b26fdaa11006f007e6f4a007e3bca172448bce4d9d479c5798d7e78f8
+  metadata.gz: ad8fc07a5efc9411a388f7fd1eab366bacd44466ea7d268596b22d2c8a42522c
+  data.tar.gz: 618f6421cca7465ec6b3bfa08fd0a97eda8cf642c605ec8010a944f406d7b8bd
 SHA512:
-  metadata.gz: 2759f62bd101bd82d222789c3ee704e7644000882418746ba09eb80578f3aed202aa80f3b067949d9cf1600c56b829b5900a80c2c5aa9859130320d43f5629df
-  data.tar.gz: 856f18297791f916b8706be43062a5f5aebfe957c7d501d59af0b2808e74ca76d30d8f4a84d8a90474b90271299080d3fee80c3fdd748cec35c27430349062b4
+  metadata.gz: 14a9f2ae2e16a42171257db3d466eb99228e2a094c4e453725a3e07136f09a6d028bd080e158da47efbdbd012e57e8641ee259ff296df388f8515e3da14cbc23
+  data.tar.gz: f8c0d7a36a2f616893bbcdc681f775989b3b376ecdacc6383bdb8ca417fd08b82f06d9f19955b3c2decbb32d4f159fb2957f47b0a518ae22fb29f48e11fa4f4c

data/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [0.3.3] - 2023-10-18
+
+### Fixed
+
+- Throw an error when the `--check` option is used and file hash is outdated. ([@skryukov])
+- Wrap RuboCop errors to make output more pleasant. ([@skryukov])
+
 ## [0.3.2] - 2023-10-10
 
 ### Fixed
@@ -92,7 +99,8 @@ RuboCop::Gradual::RakeTask.new
 
 [@skryukov]: https://github.com/skryukov
 
-[Unreleased]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.2...HEAD
+[Unreleased]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.3...HEAD
+[0.3.3]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.1...v0.3.2
 [0.3.1]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/skryukov/rubocop-gradual/compare/v0.2.0...v0.3.0

data/lib/rubocop/gradual/commands/base.rb

@@ -18,6 +18,9 @@ module RuboCop
           puts "Finished Gradual processing in #{time} seconds" if Configuration.display_time?
 
           exit_code
+        rescue RuboCop::Error => e
+          warn "\nRuboCop Error: #{e.message}"
+          1
         end
 
         private

data/lib/rubocop/gradual/process/calculate_diff.rb

@@ -41,17 +41,18 @@ module RuboCop
           end
 
           def diff_issues(diff, result_file, old_file)
-            fixed_or_moved_issues = old_file.changed_issues(result_file)
-            new_or_moved_issues = result_file.changed_issues(old_file)
-            moved_issues, fixed_issues = split_issues(fixed_or_moved_issues, new_or_moved_issues)
-
-            diff.add_issues(
-              result_file.path,
-              fixed: fixed_issues,
-              moved: moved_issues,
-              new: new_or_moved_issues - moved_issues,
-              unchanged: result_file.issues - new_or_moved_issues - moved_issues
-            )
+            fixed_or_moved = old_file.changed_issues(result_file)
+            new_or_moved = result_file.changed_issues(old_file)
+            moved, fixed = split_issues(fixed_or_moved, new_or_moved)
+            new = new_or_moved - moved
+            unchanged = result_file.issues - new - moved
+
+            if result_file.file_hash != old_file.file_hash && fixed.empty? && new.empty? && moved.empty?
+              moved = unchanged
+              unchanged = []
+            end
+
+            diff.add_issues(result_file.path, fixed: fixed, moved: moved, new: new, unchanged: unchanged)
           end
 
           def split_issues(fixed_or_moved_issues, new_or_moved_issues)

data/lib/rubocop/gradual/results/file.rb

@@ -42,7 +42,7 @@ module RuboCop
           code = ""
           data.each_line.lazy.drop(line).each_with_index do |str, index|
             from = index.zero? ? column : 0
-            length = index.zero? ? length : length - code.length
+            length -= code.length unless index.zero?
             code += str[from, length]
 
             break if code.length >= length

data/lib/rubocop/gradual/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Gradual
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-gradual
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Svyatoslav Kryukov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -94,7 +94,7 @@ dependencies:
         version: '1.0'
 description: Gradually improve your code with RuboCop.
 email:
-- s.g.kryukov@yandex.ru
+- me@skryukov.dev
 executables:
 - rubocop-gradual
 extensions: []