diff --git a/.rubocop.yml b/.rubocop.yml index b6259b4..2564b28 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -190,6 +190,10 @@ Layout/EmptyLineBetweenDefs: Style/NumericPredicate: EnforcedStyle: comparison +Style/AccessModifierDeclarations: + Exclude: + - "lib/diaspora_federation/test/factories.rb" + # disable this for now, needs to be rechecked later Style/DateTime: Exclude: @@ -201,6 +205,8 @@ Style/DateTime: # only with ruby >= 2.3 Layout/IndentHeredoc: Enabled: false +Layout/ClosingHeredocIndentation: + Enabled: false # for rails 4 and ruby < 2.2.2 Rails/HttpPositionalArguments: diff --git a/Gemfile b/Gemfile index f381092..01fa4bd 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ group :development do # code style gem "pronto", "0.9.5", require: false gem "pronto-rubocop", "0.9.0", require: false - gem "rubocop", "0.54.0", require: false + gem "rubocop", "0.57.2", require: false # automatic test runs gem "guard-rspec", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 8cf11ce..f073b9b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,6 +87,7 @@ GEM multi_xml (>= 0.5.2) i18n (1.0.1) concurrent-ruby (~> 1.0) + jaro_winkler (1.5.1) json (2.1.0) json-schema (2.8.0) addressable (>= 2.4) @@ -119,9 +120,9 @@ GEM octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) parallel (1.12.1) - parser (2.5.0.5) + parser (2.5.1.0) ast (~> 2.4.0) - powerpack (0.1.1) + powerpack (0.1.2) pronto (0.9.5) gitlab (~> 4.0, >= 4.0.0) httparty (>= 0.13.7) @@ -183,7 +184,8 @@ GEM rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) rspec-support (3.7.1) - rubocop (0.54.0) + rubocop (0.57.2) + jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5) powerpack (~> 0.1) @@ -221,7 +223,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.3.0) + unicode-display_width (1.4.0) uuid (2.3.8) macaddr (~> 1.0) valid (1.2.0) @@ -253,7 +255,7 @@ DEPENDENCIES rspec-collection_matchers (~> 1.1.2) rspec-json_expectations (~> 2.1) rspec-rails (~> 3.7.0) - rubocop (= 0.54.0) + rubocop (= 0.57.2) simplecov (= 0.16.1) simplecov-rcov (= 0.2.3) spring diff --git a/lib/diaspora_federation/discovery/host_meta.rb b/lib/diaspora_federation/discovery/host_meta.rb index 076306f..b7a8b95 100644 --- a/lib/diaspora_federation/discovery/host_meta.rb +++ b/lib/diaspora_federation/discovery/host_meta.rb @@ -1,4 +1,3 @@ - module DiasporaFederation module Discovery # Generates and parses Host Meta documents.