Bump rubocop
This commit is contained in:
parent
c1cd297811
commit
4e73fd8ea3
11 changed files with 15 additions and 19 deletions
|
|
@ -196,10 +196,6 @@ Style/DateTime:
|
||||||
- "lib/diaspora_federation/discovery/xrd_document.rb"
|
- "lib/diaspora_federation/discovery/xrd_document.rb"
|
||||||
- "spec/lib/diaspora_federation/discovery/xrd_document_spec.rb"
|
- "spec/lib/diaspora_federation/discovery/xrd_document_spec.rb"
|
||||||
|
|
||||||
# broken in 0.52.1
|
|
||||||
Layout/EmptyLinesAroundArguments:
|
|
||||||
Enabled: false
|
|
||||||
|
|
||||||
### backward compatibility
|
### backward compatibility
|
||||||
|
|
||||||
# only with ruby >= 2.3
|
# only with ruby >= 2.3
|
||||||
|
|
|
||||||
2
Gemfile
2
Gemfile
|
|
@ -19,7 +19,7 @@ group :development do
|
||||||
# code style
|
# code style
|
||||||
gem "pronto", "0.9.5", require: false
|
gem "pronto", "0.9.5", require: false
|
||||||
gem "pronto-rubocop", "0.9.0", 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
|
# automatic test runs
|
||||||
gem "guard-rspec", require: false
|
gem "guard-rspec", require: false
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,7 @@ GEM
|
||||||
octokit (4.8.0)
|
octokit (4.8.0)
|
||||||
sawyer (~> 0.8.0, >= 0.5.3)
|
sawyer (~> 0.8.0, >= 0.5.3)
|
||||||
parallel (1.12.1)
|
parallel (1.12.1)
|
||||||
parser (2.5.0.0)
|
parser (2.5.0.2)
|
||||||
ast (~> 2.4.0)
|
ast (~> 2.4.0)
|
||||||
powerpack (0.1.1)
|
powerpack (0.1.1)
|
||||||
pronto (0.9.5)
|
pronto (0.9.5)
|
||||||
|
|
@ -183,9 +183,9 @@ GEM
|
||||||
rspec-mocks (~> 3.7.0)
|
rspec-mocks (~> 3.7.0)
|
||||||
rspec-support (~> 3.7.0)
|
rspec-support (~> 3.7.0)
|
||||||
rspec-support (3.7.1)
|
rspec-support (3.7.1)
|
||||||
rubocop (0.52.1)
|
rubocop (0.53.0)
|
||||||
parallel (~> 1.10)
|
parallel (~> 1.10)
|
||||||
parser (>= 2.4.0.2, < 3.0)
|
parser (>= 2.5)
|
||||||
powerpack (~> 0.1)
|
powerpack (~> 0.1)
|
||||||
rainbow (>= 2.2.2, < 4.0)
|
rainbow (>= 2.2.2, < 4.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
|
|
@ -253,7 +253,7 @@ DEPENDENCIES
|
||||||
rspec-collection_matchers (~> 1.1.2)
|
rspec-collection_matchers (~> 1.1.2)
|
||||||
rspec-json_expectations (~> 2.1)
|
rspec-json_expectations (~> 2.1)
|
||||||
rspec-rails (~> 3.7.0)
|
rspec-rails (~> 3.7.0)
|
||||||
rubocop (= 0.52.1)
|
rubocop (= 0.53.0)
|
||||||
simplecov (= 0.15.1)
|
simplecov (= 0.15.1)
|
||||||
simplecov-rcov (= 0.2.3)
|
simplecov-rcov (= 0.2.3)
|
||||||
spring
|
spring
|
||||||
|
|
|
||||||
2
Rakefile
2
Rakefile
|
|
@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
|
||||||
end
|
end
|
||||||
|
|
||||||
if defined?(::Rails)
|
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/engine.rake"
|
||||||
load "rails/tasks/statistics.rake"
|
load "rails/tasks/statistics.rake"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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:
|
# Maintain your gem's version:
|
||||||
require "diaspora_federation/version"
|
require "diaspora_federation/version"
|
||||||
|
|
|
||||||
|
|
@ -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:
|
# Maintain your gem's version:
|
||||||
require "diaspora_federation/version"
|
require "diaspora_federation/version"
|
||||||
|
|
|
||||||
|
|
@ -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:
|
# Maintain your gem's version:
|
||||||
require "diaspora_federation/version"
|
require "diaspora_federation/version"
|
||||||
|
|
|
||||||
|
|
@ -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:
|
# Maintain your gem's version:
|
||||||
require "diaspora_federation/version"
|
require "diaspora_federation/version"
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ module DiasporaFederation
|
||||||
# @param [String] iv AES initialization vector
|
# @param [String] iv AES initialization vector
|
||||||
# @return [String] base64 encoded ciphertext
|
# @return [String] base64 encoded ciphertext
|
||||||
# @raise [ArgumentError] if any of the arguments is missing or not the correct type
|
# @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) &&
|
raise ArgumentError unless data.instance_of?(String) &&
|
||||||
key.instance_of?(String) &&
|
key.instance_of?(String) &&
|
||||||
iv.instance_of?(String)
|
iv.instance_of?(String)
|
||||||
|
|
@ -41,7 +41,7 @@ module DiasporaFederation
|
||||||
# @param [String] iv AES initialization vector
|
# @param [String] iv AES initialization vector
|
||||||
# @return [String] decrypted plain message
|
# @return [String] decrypted plain message
|
||||||
# @raise [ArgumentError] if any of the arguments is missing or not the correct type
|
# @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) &&
|
raise ArgumentError unless ciphertext.instance_of?(String) &&
|
||||||
key.instance_of?(String) &&
|
key.instance_of?(String) &&
|
||||||
iv.instance_of?(String)
|
iv.instance_of?(String)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Add your own tasks in files placed in lib/tasks ending in .rake,
|
# 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.
|
# 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
|
Rails.application.load_tasks
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# Set up gems listed in the Gemfile.
|
# 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"])
|
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__)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue