Bump rubocop

This commit is contained in:
Benjamin Neff 2018-03-05 23:28:33 +01:00
parent c1cd297811
commit 4e73fd8ea3
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
11 changed files with 15 additions and 19 deletions

View file

@ -196,10 +196,6 @@ Style/DateTime:
- "lib/diaspora_federation/discovery/xrd_document.rb"
- "spec/lib/diaspora_federation/discovery/xrd_document_spec.rb"
# broken in 0.52.1
Layout/EmptyLinesAroundArguments:
Enabled: false
### backward compatibility
# only with ruby >= 2.3

View file

@ -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.52.1", require: false
gem "rubocop", "0.53.0", require: false
# automatic test runs
gem "guard-rspec", require: false

View file

@ -119,7 +119,7 @@ GEM
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.12.1)
parser (2.5.0.0)
parser (2.5.0.2)
ast (~> 2.4.0)
powerpack (0.1.1)
pronto (0.9.5)
@ -183,9 +183,9 @@ GEM
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rubocop (0.52.1)
rubocop (0.53.0)
parallel (~> 1.10)
parser (>= 2.4.0.2, < 3.0)
parser (>= 2.5)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
@ -253,7 +253,7 @@ DEPENDENCIES
rspec-collection_matchers (~> 1.1.2)
rspec-json_expectations (~> 2.1)
rspec-rails (~> 3.7.0)
rubocop (= 0.52.1)
rubocop (= 0.53.0)
simplecov (= 0.15.1)
simplecov-rcov (= 0.2.3)
spring

View file

@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
end
if defined?(::Rails)
APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
load "rails/tasks/engine.rake"
load "rails/tasks/statistics.rake"

View file

@ -1,4 +1,4 @@
$LOAD_PATH.push File.expand_path("../lib", __FILE__)
$LOAD_PATH.push File.expand_path("lib", __dir__)
# Maintain your gem's version:
require "diaspora_federation/version"

View file

@ -1,4 +1,4 @@
$LOAD_PATH.push File.expand_path("../lib", __FILE__)
$LOAD_PATH.push File.expand_path("lib", __dir__)
# Maintain your gem's version:
require "diaspora_federation/version"

View file

@ -1,4 +1,4 @@
$LOAD_PATH.push File.expand_path("../lib", __FILE__)
$LOAD_PATH.push File.expand_path("lib", __dir__)
# Maintain your gem's version:
require "diaspora_federation/version"

View file

@ -1,4 +1,4 @@
$LOAD_PATH.push File.expand_path("../lib", __FILE__)
$LOAD_PATH.push File.expand_path("lib", __dir__)
# Maintain your gem's version:
require "diaspora_federation/version"

View file

@ -19,7 +19,7 @@ module DiasporaFederation
# @param [String] iv AES initialization vector
# @return [String] base64 encoded ciphertext
# @raise [ArgumentError] if any of the arguments is missing or not the correct type
def self.encrypt(data, key, iv)
def self.encrypt(data, key, iv) # rubocop:disable Naming/UncommunicativeMethodParamName
raise ArgumentError unless data.instance_of?(String) &&
key.instance_of?(String) &&
iv.instance_of?(String)
@ -41,7 +41,7 @@ module DiasporaFederation
# @param [String] iv AES initialization vector
# @return [String] decrypted plain message
# @raise [ArgumentError] if any of the arguments is missing or not the correct type
def self.decrypt(ciphertext, key, iv)
def self.decrypt(ciphertext, key, iv) # rubocop:disable Naming/UncommunicativeMethodParamName
raise ArgumentError unless ciphertext.instance_of?(String) &&
key.instance_of?(String) &&
iv.instance_of?(String)

View file

@ -1,6 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path("../config/application", __FILE__)
require File.expand_path("config/application", __dir__)
Rails.application.load_tasks

View file

@ -1,5 +1,5 @@
# Set up gems listed in the Gemfile.
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../../Gemfile", __FILE__)
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
$LOAD_PATH.unshift File.expand_path("../../../../lib", __FILE__)
$LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)