jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368609 )
Change subject: Fix Rubocop Offenses ...................................................................... Fix Rubocop Offenses - Update rubocop to version 0.49.1 - Disable SpaceAroundOperators rule - Fix error raised by rubocop Change-Id: I3f32ac6f9497d87550e2f60bdf9e96a105398175 --- M .rubocop.yml M Rakefile M lib/mediawiki_api/client.rb M mediawiki_api.gemspec M spec/client_spec.rb M spec/response_spec.rb 6 files changed, 15 insertions(+), 12 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop.yml b/.rubocop.yml index ab49de5..5a185f7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -21,3 +21,7 @@ Style/TrivialAccessors: ExactNameMatch: true + +# See https://github.com/bbatsov/rubocop/issues/4637 +SpaceAroundOperators: + Enabled: false diff --git a/Rakefile b/Rakefile index 3a24c05..8fa0645 100644 --- a/Rakefile +++ b/Rakefile @@ -13,7 +13,7 @@ task default: [:test] desc 'Run all build/tests commands (CI entry point)' -task test: [:build, :rubocop, :spec, :yard] +task test: %i[build rubocop spec yard] desc 'Generate all documentations' task doc: [:yard] diff --git a/lib/mediawiki_api/client.rb b/lib/mediawiki_api/client.rb index 28ec7bc..293b3e9 100644 --- a/lib/mediawiki_api/client.rb +++ b/lib/mediawiki_api/client.rb @@ -35,12 +35,10 @@ def action(name, params = {}) raw_action(name, params) rescue ApiError => e - if e.code == 'badtoken' - @tokens.clear # ensure fresh token on re-try - raw_action(name, params) # no rescue this time; only re-try once. - else - raise # otherwise, propagate the exception - end + # propagate the exception + raise unless e.code == 'badtoken' + @tokens.clear # ensure fresh token on re-try + raw_action(name, params) # no rescue this time; only re-try once. end def create_account(username, password) diff --git a/mediawiki_api.gemspec b/mediawiki_api.gemspec index a07b747..cd378c8 100644 --- a/mediawiki_api.gemspec +++ b/mediawiki_api.gemspec @@ -1,4 +1,5 @@ # coding: utf-8 + lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'mediawiki_api/version' @@ -31,7 +32,7 @@ spec.add_development_dependency 'bundler', '~> 1.3' spec.add_development_dependency 'rake', '~> 0' spec.add_development_dependency 'rspec', '~> 3.0', '>= 3.0.0' - spec.add_development_dependency 'rubocop', '~> 0.29.1' + spec.add_development_dependency 'rubocop', '~> 0.49.1' spec.add_development_dependency 'webmock', '~> 1.17', '>= 1.17.2' spec.add_development_dependency 'redcarpet' spec.add_development_dependency 'yard' diff --git a/spec/client_spec.rb b/spec/client_spec.rb index 3681820..17df3b5 100644 --- a/spec/client_spec.rb +++ b/spec/client_spec.rb @@ -91,7 +91,7 @@ end context 'array parameters' do - let(:params) { { foo: %w(one two) } } + let(:params) { { foo: %w[one two] } } before do @request = stub_action_request(action, foo: 'one|two').to_return(response) diff --git a/spec/response_spec.rb b/spec/response_spec.rb index f431497..c52bbd4 100644 --- a/spec/response_spec.rb +++ b/spec/response_spec.rb @@ -28,14 +28,14 @@ end context 'and a multi-level envelope' do - let(:envelope) { %w(query result) } + let(:envelope) { %w[query result] } let(:nested_object) { response_object['query']['result'] } it { is_expected.to eq(nested_object) } end context "and a multi-level envelope that doesn't completely match" do - let(:envelope) { %w(query something) } + let(:envelope) { %w[query something] } let(:partially_nested_object) { response_object['query'] } it { is_expected.to eq(partially_nested_object) } @@ -46,7 +46,7 @@ let(:body) { '[ "something" ]' } context 'with any expected envelope' do - let(:envelope) { %w(what ever) } + let(:envelope) { %w[what ever] } it { is_expected.to eq(response_object) } end -- To view, visit https://gerrit.wikimedia.org/r/368609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f32ac6f9497d87550e2f60bdf9e96a105398175 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/ruby/api Gerrit-Branch: master Gerrit-Owner: Bekicot <yana.develo...@gmail.com> Gerrit-Reviewer: Bekicot <yana.develo...@gmail.com> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: John Vandenberg <jay...@gmail.com> Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
