Skip to content

Commit a39c730

Browse files
authored
Update rubocop 0.56.0 -> 1.12.1 (#231)
* Update rubocop 0.56.0 -> 1.12.1 - Disable NewCops by default - Follow the rubycop's incompatible changes(e.g. rule name modification) - Apply automatic correct for lib/line/bot/client.rb - Do not use RUBY_VERSION in line-bot-api.gemspec https://sue445.hatenablog.com/entry/2016/09/02/121047 - Install rubycop-rake, rubycop-rspec (suggested by rubocop) * remove rubocop-rspec and rubocop-rmake. Since rubocop-rspec depends on Ruby 2.5.0+ (line-bot-sdk-ruby supports 2.4.0)
1 parent 89718cc commit a39c730

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

.rubocop.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ AllCops:
22
TargetRubyVersion: 2.4
33
Exclude:
44
- 'examples/**/*'
5+
NewCops: disable
56

67
Gemspec/RequiredRubyVersion:
78
Enabled: false
@@ -34,32 +35,40 @@ Style/EachWithObject:
3435
Enabled: false
3536
Style/FrozenStringLiteralComment:
3637
Enabled: false
38+
Style/StringConcatenation:
39+
Enabled: false
40+
Style/RedundantAssignment:
41+
Enabled: false
3742

3843
Naming/HeredocDelimiterNaming:
3944
Enabled: false
40-
Naming/UncommunicativeMethodParamName:
45+
Naming/MethodParameterName:
4146
Enabled: false
4247
Naming/ConstantName:
4348
Enabled: false
4449
Naming/AccessorMethodName:
4550
Enabled: false
4651
Naming/MethodName:
4752
Enabled: false
53+
Naming/FileName:
54+
Enabled: false
4855

49-
Metrics/LineLength:
50-
Max: 200
5156
Metrics/BlockLength:
5257
Enabled: false
5358
Metrics/MethodLength:
5459
Enabled: false
5560
Metrics/ClassLength:
5661
Enabled: false
5762

63+
Layout/LineLength:
64+
Max: 200
5865
Layout/SpaceInsideBlockBraces:
5966
Enabled: false
67+
Layout/HashAlignment:
68+
Enabled: false
6069
Layout/SpaceInsideHashLiteralBraces:
6170
Enabled: false
62-
Layout/IndentHeredoc:
71+
Layout/HeredocIndentation:
6372
Enabled: false
6473
Layout/ExtraSpacing:
6574
Enabled: false

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ gemspec
44

55
group :development, :test do
66
# ref: http://docs.rubocop.org/en/latest/installation/
7-
gem 'rubocop', '~> 0.56.0', require: false
7+
gem 'rubocop', '~> 1.12.1', require: false
88
gem 'yard', '~> 0.9.20'
99
end

lib/line/bot/client.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ def parse_events_from(request_body)
954954
def validate_signature(content, channel_signature)
955955
return false if !channel_signature || !channel_secret
956956

957-
hash = OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, channel_secret, content)
957+
hash = OpenSSL::HMAC.digest(OpenSSL::Digest.new('SHA256'), channel_secret, content)
958958
signature = Base64.strict_encode64(hash)
959959

960960
variable_secure_compare(channel_signature, signature)
@@ -986,6 +986,7 @@ def content_type(file)
986986
if file.respond_to?(:content_type)
987987
content_type = file.content_type
988988
raise ArgumentError, "invalid content type: #{content_type}" unless ['image/jpeg', 'image/png'].include?(content_type)
989+
989990
content_type
990991
else
991992
case file.path

line-bot-api.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
2020
spec.required_ruby_version = '>= 2.4.0'
2121

2222
spec.add_development_dependency "addressable", "~> 2.3"
23-
spec.add_development_dependency "bundler", "~> 1.11" if RUBY_VERSION < "2.3"
2423
spec.add_development_dependency 'rake', "~> 13.0"
2524
spec.add_development_dependency "rspec", "~> 3.0"
2625
spec.add_development_dependency "webmock", "~> 3.8"

0 commit comments

Comments
 (0)