Skip to content

Commit e164aeb

Browse files
authored
Merge pull request #15 from atomic111/master
update Gemfile and fix rubocop issues
2 parents a3169e9 + 2acca98 commit e164aeb

3 files changed

Lines changed: 7 additions & 13 deletions

File tree

.rubocop.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
AllCops:
33
Exclude:
44
- vendor/**/*
5-
- "*/puppet/Puppetfile"
6-
- "*/puppet/.tmp/**/*"
75
Documentation:
86
Enabled: false
97
AlignParameters:
108
Enabled: true
119
Encoding:
12-
Enabled: true
10+
Enabled: false
1311
HashSyntax:
1412
Enabled: true
1513
LineLength:
@@ -26,3 +24,5 @@ Metrics/PerceivedComplexity:
2624
Max: 10
2725
Metrics/AbcSize:
2826
Max: 29
27+
Metrics/BlockLength:
28+
Max: 29

Gemfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22

33
source 'https://rubygems.org'
44

5-
# pin dependency for Ruby 1.9.3 since bundler is not
6-
# detecting that net-ssh 3 does not work with 1.9.3
7-
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
8-
gem 'net-ssh', '~> 2.9'
9-
end
10-
115
gem 'rake'
12-
gem 'inspec', '~> 0.9'
13-
gem 'rubocop', '~> 0.36.0'
6+
gem 'inspec', '~> 1'
7+
gem 'rubocop', '~> 0.44.0'
148
gem 'highline', '~> 1.6.0'
159

1610
group :tools do

libraries/docker.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def inspect(id)
4040

4141
def path
4242
cmd = inspec.command('systemctl show -p FragmentPath docker.service')
43-
return nil if cmd.exit_status.to_i != 0
43+
return nil if cmd.exit_status.to_i.nonzero?
4444

4545
# parse data
4646
params = parse_systemd_values(cmd.stdout.chomp)
@@ -51,7 +51,7 @@ def path
5151

5252
def socket
5353
cmd = inspec.command('systemctl show -p FragmentPath docker.socket')
54-
return nil if cmd.exit_status.to_i != 0
54+
return nil if cmd.exit_status.to_i.nonzero?
5555

5656
# parse data
5757
params = parse_systemd_values(cmd.stdout.chomp)

0 commit comments

Comments
 (0)