rubocop-changed 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8649e7a626497e84a5a036b3914c58730983db8eb18daf7ca36eaad53931c03d
-  data.tar.gz: 94cfdabd8eca2087ce11767a219429da91fedeeaf08de0f65564c8a99e702532
+  metadata.gz: '09483b56d167f91f1954a53c6e9c073195d31701b34db56502ecf9a5ffefc397'
+  data.tar.gz: 3be0d8c2565f4339a5e6dccacc064daec628613c9991b4bc51b54e8d8828db5c
 SHA512:
-  metadata.gz: 4d85ad0827e304a6c83fd8fc59c703a0c13b3ce1670c56e97873f81f96264ff8c05acc9838f16b62318ab2aaa0889469c896365491aa6a2a414403172f55ed38
-  data.tar.gz: 979f5697bcda191823041b345adbc3e63ccfdc19eb1a7e8c6a253f8f0a78c9fd706fe39ab5f3dd2e24d8ae5bb00b07499153c1620f564d507a85074d47e4cbbd
+  metadata.gz: 17ac53cd4aa5c7d6699160fce359444d9a4c03347698a4c9a16020547a2847e6a5359adbe4f90304b8a32273bb3f8a340a2fc9a35d49be7af1002d94aeb1a1d9
+  data.tar.gz: 2aa6cf3ff10ea4a7c7b736bf6180d4998c119f3678582f94440a15457272ef40e62f250b9a2cbcc7b0dcfc2ad192f40af3420e2d3a6dfe68ed2b97ee08dfaf27

data/lib/rubocop/changed/command_error.rb

@@ -6,23 +6,30 @@ module RuboCop
     class CommandError < StandardError
       ISSUE_URL = 'https://github.com/dukaev/rubocop-changed/issues'
       MESSAGES = {
-        'git: not found' => 'Git is not installed. Make shure that container has git installed',
-        'fatal: not a git repository' => 'Not found .git directory. Make shure that branch is copied',
-        'fatal: ambiguous argument' => 'Not found setted branch. Make shure that branch is downladed.'
+        'git: not found' =>
+          'The git binary is not available in the PATH. You may need to install git or update the PATH variable to ' \
+          'include the installation directory.',
+        'fatal: not a git repository' =>
+          'The .git directory was not found. Rubocop-changed only works with projects in a git repository.',
+        'fatal: ambiguous argument' =>
+          'The set branch was not found. Ensure that the branch has a local tracking branch or specify the full ' \
+          'reference in the RUBOCOP_CHANGED_BRANCH_NAME environment variable.'
       }.freeze
 
       def initialize(output, cmd)
         key = MESSAGES.keys.find { |error| output.include?(error) }
-        msg = MESSAGES[key] || default_message(cmd, output)
-
-        super(msg)
+        message = MESSAGES[key] || "Unknown error. Please, create issue on #{ISSUE_URL}."
+        super(exception_message(cmd, output, message))
       end
 
-      def default_message(cmd, output)
+      def exception_message(cmd, output, message)
         <<~HEREDOC
-          Unknown error. Please, create issue on #{ISSUE_URL}.
-          Command: #{cmd}
-          Message: #{output}
+          #{message}
+          Command:
+          #{cmd}
+          Output:
+          #{output}
+
         HEREDOC
       end
     end

data/lib/rubocop/changed/commands.rb

@@ -11,11 +11,16 @@ module RuboCop
       GIT_COMMANDS = {
         changed_files: 'git diff-tree -r --no-commit-id --name-status %<compared_branch>s %<current_branch>s',
         current_branch: 'git rev-parse --abbrev-ref HEAD',
-        default_branch: 'git symbolic-ref refs/remotes/origin/HEAD'
+        default_branch: 'git symbolic-ref refs/remotes/origin/HEAD',
+        new_files: 'git status --porcelain=v1'
       }.freeze
 
       class << self
         def changed_files(branch = compared_branch)
+          (diffed_files(branch) + new_files).uniq
+        end
+
+        def diffed_files(branch = compared_branch)
           command = format(
             GIT_COMMANDS.fetch(:changed_files),
             compared_branch: branch,
@@ -34,6 +39,12 @@ module RuboCop
           branch
         end
 
+        def new_files
+          command = format(GIT_COMMANDS.fetch(:new_files))
+          run(command).split("\n")
+                      .map { |file| File.absolute_path(file[3..]) }
+        end
+
         private
 
         def current_branch
@@ -50,8 +61,10 @@ module RuboCop
         end
 
         def run(cmd)
+          warn("COMMAND: #{cmd}") if verbose_logging?
           output = shell(cmd)
-          raise Rubocop::Changed::ExecutionError.new(output, cmd) if output.match?(Regexp.union(ERRORS))
+          warn("OUTPUT:  #{output}\n") if verbose_logging?
+          raise CommandError.new(output, cmd) if output.match?(Regexp.union(ERRORS))
 
           output
         end
@@ -59,6 +72,10 @@ module RuboCop
         def shell(cmd)
           `#{cmd} 2>&1`
         end
+
+        def verbose_logging?
+          ENV.fetch('RUBOCOP_CHANGED_VERBOSE_LOGGING', false) != false
+        end
       end
     end
   end

data/lib/rubocop/changed/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Changed
-    VERSION = '0.0.2'
+    VERSION = '0.0.4'
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-changed
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Aslan Dukaev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2024-01-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: RuboCop extensions for lint only changed files in PRs