Merge pull request #6436 from deivid-rodriguez/fix_interrupted_exit_s…

…tatus Fix exit status when rubocop is interrupted
rubocop · Nov 1, 2018 · c5a8470 · c5a8470
2 parents 18eaa7a + 75df7f2
commit c5a8470
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * [#5934](https://github.com/rubocop-hq/rubocop/issues/5934): Handle the combination of `--auto-gen-config` and `--config FILE` correctly. ([@jonas054][])
 * [#5970](https://github.com/rubocop-hq/rubocop/issues/5970): Make running `--auto-gen-config` in a subdirectory work. ([@jonas054][])
 * [#6412](https://github.com/rubocop-hq/rubocop/issues/6412): Fix an `unknown keywords` error when using `Psych.safe_load` with Ruby 2.6.0-preview2. ([@koic][])
+* [#6436](https://github.com/rubocop-hq/rubocop/pull/6436): Fix exit status code to be 130 when rubocop is interrupted. ([@deivid-rodriguez][])
 
 ## 0.60.0 (2018-10-26)
 

diff --git a/lib/rubocop/cli.rb b/lib/rubocop/cli.rb
@@ -10,9 +10,10 @@ class CLI
     SKIPPED_PHASE_1 = 'Phase 1 of 2: run Metrics/LineLength cop (skipped ' \
                       'because the default Metrics/LineLength:Max is ' \
                       'overridden)'.freeze
-    STATUS_SUCCESS  = 0
-    STATUS_OFFENSES = 1
-    STATUS_ERROR    = 2
+    STATUS_SUCCESS     = 0
+    STATUS_OFFENSES    = 1
+    STATUS_ERROR       = 2
+    STATUS_INTERRUPTED = 128 + Signal.list['INT']
 
     class Finished < RuntimeError; end
 
@@ -163,7 +164,9 @@ def execute_runner(paths)
 
       all_pass_or_excluded = all_passed || @options[:auto_gen_config]
 
-      if all_pass_or_excluded && !runner.aborting? && runner.errors.empty?
+      if runner.aborting?
+        STATUS_INTERRUPTED
+      elsif all_pass_or_excluded && runner.errors.empty?
         STATUS_SUCCESS
       else
         STATUS_OFFENSES

diff --git a/spec/rubocop/cli_spec.rb b/spec/rubocop/cli_spec.rb
@@ -8,11 +8,11 @@
   subject(:cli) { described_class.new }
 
   context 'when interrupted' do
-    it 'returns 1' do
+    it 'returns 130' do
       allow_any_instance_of(RuboCop::Runner)
         .to receive(:aborting?).and_return(true)
       create_empty_file('example.rb')
-      expect(cli.run(['example.rb'])).to eq(1)
+      expect(cli.run(['example.rb'])).to eq(130)
     end
   end