nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump rubocop

Browse source
This commit is contained in:
Benjamin Neff 2016-11-09 23:21:38 +01:00
parent 4671ed9fd4
commit b6dc082c24
4 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.rubocop.yml
View file

@ -159,7 +159,7 @@ Metrics/CyclomaticComplexity:
Metrics/PerceivedComplexity: Metrics/PerceivedComplexity:
Max: 10 Max: 10
Metric/BlockLength: Metrics/BlockLength:
Exclude: Exclude:
- "Rakefile" - "Rakefile"
- "**/*.rake" - "**/*.rake"

2
Gemfile
View file

@ -17,7 +17,7 @@ end
group :development do group :development do
# code style # code style
gem "rubocop", "0.44.1" gem "rubocop", "0.45.0"
gem "pronto", "0.7.1" gem "pronto", "0.7.1"
gem "pronto-rubocop", "0.7.0", require: false gem "pronto-rubocop", "0.7.0", require: false

6
Gemfile.lock
View file

@ -226,7 +226,7 @@ GEM
rspec-mocks (~> 3.5.0) rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0) rspec-support (~> 3.5.0)
rspec-support (3.5.0) rspec-support (3.5.0)
rubocop (0.44.1) rubocop (0.45.0)
parser (>= 2.3.1.1, < 3.0) parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
@ -307,7 +307,7 @@ DEPENDENCIES
rspec-collection_matchers (~> 1.1.2) rspec-collection_matchers (~> 1.1.2)
rspec-core (~> 3.5.1) rspec-core (~> 3.5.1)
rspec-rails (~> 3.5.1) rspec-rails (~> 3.5.1)
rubocop (= 0.44.1) rubocop (= 0.45.0)
simplecov (= 0.12.0) simplecov (= 0.12.0)
simplecov-rcov (= 0.2.3) simplecov-rcov (= 0.2.3)
spring spring
@ -319,4 +319,4 @@ DEPENDENCIES
yard yard
BUNDLED WITH BUNDLED WITH
1.12.5 1.13.6

8
test/dummy/config/logging.rb
View file

@ -29,6 +29,7 @@ Logging::Rails.configure do |config|
# Configure an appender that will write log events to STDOUT. A colorized # Configure an appender that will write log events to STDOUT. A colorized
# pattern layout is used to format the log events into strings before # pattern layout is used to format the log events into strings before
# writing. # writing.
if config.log_to.include? "stdout"
Logging.appenders.stdout( Logging.appenders.stdout(
"stdout", "stdout",
auto_flushing: true, auto_flushing: true,
@ -36,12 +37,14 @@ Logging::Rails.configure do |config|
pattern: pattern, pattern: pattern,
color_scheme: "bright" color_scheme: "bright"
) )
) if config.log_to.include? "stdout" )
end
# Configure an appender that will write log events to a file. The file will # Configure an appender that will write log events to a file. The file will
# be rolled on a daily basis, and the past 7 rolled files will be kept. # be rolled on a daily basis, and the past 7 rolled files will be kept.
# Older files will be deleted. The default pattern layout is used when # Older files will be deleted. The default pattern layout is used when
# formatting log events into strings. # formatting log events into strings.
if config.log_to.include? "file"
Logging.appenders.rolling_file( Logging.appenders.rolling_file(
"file", "file",
filename: config.paths["log"].first, filename: config.paths["log"].first,
@ -50,7 +53,8 @@ Logging::Rails.configure do |config|
truncate: false, truncate: false,
auto_flushing: true, auto_flushing: true,
layout: layout layout: layout
) if config.log_to.include? "file" )
end
# Setup the root logger with the Rails log level and the desired set of # Setup the root logger with the Rails log level and the desired set of
# appenders. The list of appenders to use should be set in the environment # appenders. The list of appenders to use should be set in the environment