diff --git a/.rubocop.yml b/.rubocop.yml index dea8886..764dd32 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -10,9 +10,6 @@ Layout/EndOfLine: Layout/IndentHeredoc: Enabled: false -Lint/SplatKeywordArguments: - Enabled: false - Metrics/AbcSize: Enabled: false diff --git a/Gemfile.lock b/Gemfile.lock index 4bc62f8..a46cd5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,11 +13,12 @@ GEM docile (1.3.0) elftools (1.0.1) bindata (~> 2) + jaro_winkler (1.5.1) json (2.1.0) parallel (1.12.1) - parser (2.5.1.0) + parser (2.5.1.2) ast (~> 2.4.0) - powerpack (0.1.1) + powerpack (0.1.2) rainbow (3.0.0) rake (12.3.1) rspec (3.8.0) @@ -33,20 +34,21 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.56.0) + rubocop (0.58.2) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - unicode-display_width (1.3.2) + unicode-display_width (1.4.0) yard (0.9.16) PLATFORMS @@ -56,7 +58,7 @@ DEPENDENCIES one_gadget! rake (~> 12.3) rspec (~> 3.7) - rubocop (~> 0.55) + rubocop (~> 0.58) simplecov (~> 0.16.1) yard (~> 0.9) diff --git a/one_gadget.gemspec b/one_gadget.gemspec index 84b1601..d131827 100644 --- a/one_gadget.gemspec +++ b/one_gadget.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rake', '~> 12.3' s.add_development_dependency 'rspec', '~> 3.7' - s.add_development_dependency 'rubocop', '~> 0.55' + s.add_development_dependency 'rubocop', '~> 0.58' s.add_development_dependency 'simplecov', '~> 0.16.1' s.add_development_dependency 'yard', '~> 0.9' end diff --git a/spec/emulators/i386_spec.rb b/spec/emulators/i386_spec.rb index b2bfb2b..c0be142 100644 --- a/spec/emulators/i386_spec.rb +++ b/spec/emulators/i386_spec.rb @@ -36,7 +36,7 @@ describe OneGadget::Emulators::I386 do 5ef46: 8d 86 9f a0 fa ff lea eax,[esi-0x55f61] 5ef4c: 50 push eax 5ef4d: e8 be 07 05 00 call af710 - EOS + EOS gadget.each_line { |s| @processor.process(s) } expect(@processor.registers['esp'].to_s).to eq 'esp-0xc' expect(@processor.stack[-0xc].to_s).to eq 'esi-0x55f61'