Skip to content

Commit a81ba80

Browse files
committed
rubocop automatic fixes
1 parent d45c17a commit a81ba80

File tree

12 files changed

+21
-22
lines changed

12 files changed

+21
-22
lines changed

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
source "https://rubygems.org"
1+
# frozen_string_literal: true
2+
3+
source 'https://rubygems.org'
24

35
gemspec

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ Bundler::GemHelper.install_tasks :name => 'openscap'
77
task :test do
88
$LOAD_PATH.unshift('lib')
99
$LOAD_PATH.unshift('test')
10-
Dir.glob('./test/**/*_test.rb') { |f| require f }
10+
Dir.glob('./test/**/*_test.rb').each { |f| require f }
1111
end

lib/openscap/xccdf/item.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def self.build(t)
2525
end
2626

2727
def initialize(t)
28-
if self.class == OpenSCAP::Xccdf::Item
28+
if instance_of?(OpenSCAP::Xccdf::Item)
2929
raise OpenSCAP::OpenSCAPError, "Cannot initialize #{self.class.name} abstract base class."
3030
end
3131

lib/openscap/xccdf/session.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def load(opts = {})
3131
def profile=(p)
3232
@profile = p
3333
if OpenSCAP.xccdf_session_set_profile_id(@s, p) == false
34-
raise OpenSCAPError, "No profile '" + p + "' found"
34+
raise OpenSCAPError, "No profile '#{p}' found"
3535
end
3636
end
3737

lib/openscap/xccdf/testresult.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
module OpenSCAP
99
module Xccdf
1010
class TestResult
11-
attr_reader :rr
12-
attr_reader :raw
11+
attr_reader :rr, :raw
1312

1413
def initialize(t)
1514
case t

openscap.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require File.expand_path('lib/openscap/version', __dir__)
66
GEMSPEC = Gem::Specification.new do |gem|
77
gem.name = 'openscap'
88
gem.version = OpenSCAP::VERSION
9-
gem.date = Date.today.to_s
109
gem.platform = Gem::Platform::RUBY
1110

1211
gem.author = 'Simon Lukasik'

test/ds/arf_test.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def test_arf_new_nil
1515
rescue OpenSCAP::OpenSCAPError => e
1616
msg = e.to_s
1717
end
18-
assert msg.start_with?("Cannot initialize OpenSCAP::DS::Arf with ''"), 'Message was: ' + msg
18+
assert msg.start_with?("Cannot initialize OpenSCAP::DS::Arf with ''"), "Message was: #{msg}"
1919
end
2020

2121
def test_arf_new_wrong_format
@@ -27,7 +27,7 @@ def test_arf_new_wrong_format
2727
msg = e.to_s
2828
end
2929
assert msg.include?('Could not create Result DataStream session: File is not Result DataStream.'),
30-
'Message was: ' + msg
30+
"Message was: #{msg}"
3131
end
3232

3333
def test_create_arf_and_get_html
@@ -58,7 +58,7 @@ def test_new_memory
5858

5959
def test_new_bz_memory
6060
bziped_file = new_arf_bz
61-
raw_data = File.open(bziped_file, 'rb').read
61+
raw_data = File.binread(bziped_file)
6262
assert !raw_data.empty?
6363
len = File.size(bziped_file)
6464
FileUtils.rm bziped_file
@@ -77,8 +77,8 @@ def test_new_bz_file
7777

7878
def new_arf_bz
7979
create_arf
80-
system('/usr/bin/bzip2 ' + REPORT)
81-
REPORT + '.bz2'
80+
system("/usr/bin/bzip2 #{REPORT}")
81+
"#{REPORT}.bz2"
8282
end
8383

8484
def new_arf

test/source_test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def test_source_new_nil
1313
rescue OpenSCAP::OpenSCAPError => e
1414
msg = e.to_s
1515
end
16-
assert msg.start_with?('No filename specified!'), 'Message was: ' + msg
16+
assert msg.start_with?('No filename specified!'), "Message was: #{msg}"
1717
end
1818

1919
def test_source_new_ok
@@ -59,11 +59,11 @@ def test_validate_invalid
5959
msg = e.to_s
6060
end
6161
assert msg.start_with?('Invalid XCCDF Checklist (1.2) content in ../data/invalid.xml.'),
62-
'Message was: ' + msg
62+
"Message was: #{msg}"
6363
assert msg.include?("../data/invalid.xml:3: Element '{http"),
64-
'Message was: ' + msg
64+
"Message was: #{msg}"
6565
assert msg.include?('This element is not expected. Expected is'),
66-
'Message was: ' + msg
66+
"Message was: #{msg}"
6767
s.destroy
6868
end
6969

test/xccdf/arf_test.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ def benchmark_from_arf_file
3838
_test_results = arf.test_result
3939
source_datastream = arf.report_request
4040
bench_source = source_datastream.select_checklist!
41-
benchmark = OpenSCAP::Xccdf::Benchmark.new(bench_source)
42-
benchmark
41+
OpenSCAP::Xccdf::Benchmark.new(bench_source)
4342
end
4443
end

test/xccdf/session_ds_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,6 @@ def test_remediate
111111
def assert_exported(files)
112112
# libopenscap compiled with --enable-debug creates debug files
113113
FileUtils.rm_rf(Dir.glob('oscap_debug.log.*'))
114-
assert files.sort == Dir.glob('*').sort
114+
assert files.sort == Dir.glob('*')
115115
end
116116
end

0 commit comments

Comments
 (0)