Skip to content

Commit 03a6295

Browse files
committed
Merge pull request #1617 from will-in-wi/rubocop_special_global_vars
Enable SpecialGlobalVars cop
2 parents 8fe9916 + 93213be commit 03a6295

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.rubocop.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ Style/Not:
6161
Enabled: false
6262
Style/RescueModifier:
6363
Enabled: false
64-
Style/SpecialGlobalVars:
65-
Enabled: false
6664
Style/ModuleFunction:
6765
Enabled: false
6866
Style/BlockEndNewline:

capistrano.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
1212
gem.summary = "Capistrano - Welcome to easy deployment with Ruby over SSH"
1313
gem.homepage = "http://capistranorb.com/"
1414

15-
gem.files = `git ls-files`.split($/)
15+
gem.files = `git ls-files -z`.split("\x0")
1616
gem.executables = %w(cap capify)
1717
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
1818
gem.require_paths = ["lib"]

features/support/vagrant_helpers.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require "English"
2+
13
module VagrantHelpers
24
extend self
35

@@ -19,7 +21,7 @@ def vagrant_cli_command(command)
1921
puts "[vagrant] #{line}"
2022
end
2123
end
22-
$?
24+
$CHILD_STATUS
2325
end
2426

2527
def run_vagrant_command(command)

spec/support/test_app.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
require "English"
12
require "fileutils"
23
require "pathname"
34

@@ -91,7 +92,7 @@ def run(command)
9192
Dir.chdir(test_app_path) do
9293
output = %x[#{command}]
9394
end
94-
[$?.success?, output]
95+
[$CHILD_STATUS.success?, output]
9596
end
9697

9798
def stage

0 commit comments

Comments
 (0)