Skip to content

Commit bd1e12b

Browse files
authored
Merge pull request #71 from dev-sec/newlint
Change linting to Cookstyle
2 parents e395a0a + a57d045 commit bd1e12b

File tree

7 files changed

+12
-36
lines changed

7 files changed

+12
-36
lines changed

.rubocop.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,3 @@
22
AllCops:
33
Exclude:
44
- vendor/**/*
5-
Documentation:
6-
Enabled: false
7-
Layout/ParameterAlignment:
8-
Enabled: true
9-
HashSyntax:
10-
Enabled: true
11-
LineLength:
12-
Enabled: false
13-
EmptyLinesAroundBlockBody:
14-
Enabled: false
15-
Style/Encoding:
16-
Enabled: false
17-
MethodLength:
18-
Max: 40
19-
NumericLiterals:
20-
MinDigits: 10
21-
Metrics/BlockLength:
22-
Max: 35
23-
Metrics/CyclomaticComplexity:
24-
Max: 10
25-
Metrics/PerceivedComplexity:
26-
Max: 10
27-
Metrics/AbcSize:
28-
Max: 30
29-
# Lint/AmbiguousBlockAssociation is incompatible with RSpec
30-
# https://github.com/rubocop-hq/rubocop/issues/4222
31-
Lint/AmbiguousBlockAssociation:
32-
Enabled: false

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source 'https://rubygems.org'
44

5+
gem 'cookstyle'
56
gem 'highline'
67
gem 'rack'
78
gem 'rake'

Rakefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env rake
22
# frozen_string_literal: true
33

4+
require 'cookstyle'
45
require 'rake/testtask'
56
require 'rubocop/rake_task'
67

@@ -10,6 +11,10 @@ task :rubocop do
1011
RuboCop::RakeTask.new
1112
end
1213

14+
RuboCop::RakeTask.new(:cookstyle) do |task|
15+
task.options << '--display-cop-names'
16+
end
17+
1318
# lint the project
1419
desc 'Run robocop linter'
1520
task lint: [:rubocop]

controls/mysql_conf.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# encoding: utf-8
21
# frozen_string_literal: true
32

4-
# Copyright 2014, Deutsche Telekom AG
5-
# Copyright 2018, Christoph Hartmann
3+
# Copyright:: 2014, Deutsche Telekom AG
4+
# Copyright:: 2018, Christoph Hartmann
65
#
76
# Licensed under the Apache License, Version 2.0 (the "License");
87
# you may not use this file except in compliance with the License.

controls/mysql_db.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# encoding: utf-8
21
# frozen_string_literal: true
32

4-
# Copyright 2014, Deutsche Telekom AG
5-
# Copyright 2018, Christoph Hartmann
3+
# Copyright:: 2014, Deutsche Telekom AG
4+
# Copyright:: 2018, Christoph Hartmann
65
#
76
# Licensed under the Apache License, Version 2.0 (the "License");
87
# you may not use this file except in compliance with the License.

libraries/mysql_distribution.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
# Copyright 2020, Sebastian Gumprich
3+
# Copyright:: 2020, Sebastian Gumprich
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

libraries/mysql_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
# Copyright 2020, Sebastian Gumprich
3+
# Copyright:: 2020, Sebastian Gumprich
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)