Skip to content
This repository was archived by the owner on Jan 30, 2024. It is now read-only.

Commit 4f370fa

Browse files
committed
Merge branch 'release/v9.3'
* release/v9.3: bump version file and changelog updated dependencies run bundler-audit
2 parents 16e715e + 623ad6e commit 4f370fa

8 files changed

Lines changed: 209 additions & 199 deletions

File tree

.rubocop.yml

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,51 @@ AllCops:
55
- 'config/**/*'
66
- 'Vagrantfile'
77
- 'vendor/**/*'
8-
TargetRubyVersion: 2.3
8+
TargetRubyVersion: 2.5
99
ExtraDetails: true
1010
DisplayStyleGuide: true
1111
DisplayCopNames: true
12-
GlobalVars:
12+
Style/GlobalVars:
1313
AllowedVariables: []
14-
MethodLength:
14+
Metrics/MethodLength:
1515
Max: 25
16-
LineLength:
16+
Layout/LineLength:
1717
Max: 200
18-
SpecialGlobalVars:
18+
Style/SpecialGlobalVars:
1919
Enabled: false
20-
BracesAroundHashParameters:
21-
Enabled: false
22-
CyclomaticComplexity:
20+
Metrics/CyclomaticComplexity:
2321
Max: 10
2422
Metrics/BlockLength:
2523
Enabled: false
2624
Style/FormatStringToken:
2725
Enabled: false
2826
Style/MixinUsage:
2927
Enabled: false
28+
Layout/EmptyLinesAroundAttributeAccessor:
29+
Enabled: true
30+
Layout/SpaceAroundMethodCallOperator:
31+
Enabled: true
32+
Lint/DeprecatedOpenSSLConstant:
33+
Enabled: true
34+
Lint/MixedRegexpCaptureTypes:
35+
Enabled: true
36+
Lint/RaiseException:
37+
Enabled: true
38+
Lint/StructNewOverride:
39+
Enabled: true
40+
Style/ExponentialNotation:
41+
Enabled: true
42+
Style/HashEachMethods:
43+
Enabled: true
44+
Style/HashTransformKeys:
45+
Enabled: true
46+
Style/HashTransformValues:
47+
Enabled: true
48+
Style/RedundantFetchBlock:
49+
Enabled: true
50+
Style/RedundantRegexpCharacterClass:
51+
Enabled: true
52+
Style/RedundantRegexpEscape:
53+
Enabled: true
54+
Style/SlicingWithRange:
55+
Enabled: true

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ sudo: false
22
language: ruby
33
cache: bundler
44
rvm:
5-
- 2.3
6-
- 2.4
75
- 2.5
86
- 2.6
97
- 2.7
108

119
before_install:
12-
- gem install bundler --no-document
10+
- gem install bundler --no-doc
11+
- gem install bundler-audit --no-doc
1312

1413
script:
15-
- bundle exec rubocop
14+
- bundle-audit check --update
15+
- bundle exec rubocop --display-cop-names --extra-details

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
77

88
- Update gem `capistrano` to 3.14.x
99
- Update gem `highline` to 2.0.x
10+
- Update gem 'aruba' to 1.0.x
1011
- Test ruby 2.7 via travis
12+
- Requires Ruby v2.5 or later
1113

1214
## [9.2.3] - 2019-05-29
1315
### Summary

Vagrantfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ Vagrant.configure(2) do |config|
4242
'--audio', 'none'
4343
]
4444
end
45-
end
4645

47-
unless Vagrant.has_plugin?('vagrant-hostsupdater')
48-
master_config.vm.post_up_message = <<-HEREDOC
49-
Add following entries to your host file or install vagrant plugin vagrant-hostsupdater ("vagrant plugin install vagrant-hostsupdater") and restart virtual box
50-
#{ip_address} #{domain}
51-
HEREDOC
46+
unless Vagrant.has_plugin?('vagrant-hostsupdater')
47+
master_config.vm.post_up_message = <<-HEREDOC
48+
Add following entries to your host file or install vagrant plugin vagrant-hostsupdater ("vagrant plugin install vagrant-hostsupdater") and restart virtual box
49+
#{ip_address} #{domain}
50+
HEREDOC
51+
end
5252
end
5353
end

dkdeploy-core.gemspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ Gem::Specification.new do |spec|
1313
spec.description = 'dkd basic deployment tasks and strategies'
1414
spec.summary = 'dkd basic deployment tasks and strategies'
1515
spec.homepage = 'https://github.com/dkdeploy/dkdeploy-core'
16-
spec.required_ruby_version = '~> 2.3'
16+
spec.required_ruby_version = '~> 2.5'
1717

1818
spec.files = `git ls-files`.split($/)
19-
spec.executables = spec.files.grep(%r{^bin\/}) { |f| File.basename(f) }
20-
spec.test_files = spec.files.grep(%r{^(test|spec|features)\/})
19+
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
20+
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
2121
spec.require_paths = ['lib']
2222

23-
spec.add_development_dependency 'aruba', '~> 0.14.1'
23+
spec.add_development_dependency 'aruba', '~> 1.0'
2424
spec.add_development_dependency 'bundler'
2525
spec.add_development_dependency 'cucumber', '~> 2.4'
2626
spec.add_development_dependency 'dkdeploy-test_environment', '~> 2.0'
2727
spec.add_development_dependency 'mysql2', '~> 0.3'
2828
spec.add_development_dependency 'pry', '~> 0.10'
2929
spec.add_development_dependency 'rake'
3030
spec.add_development_dependency 'rspec', '~> 3.5'
31-
spec.add_development_dependency 'rubocop', '~> 0.62.0'
31+
spec.add_development_dependency 'rubocop', '~> 0.86.0'
3232

3333
spec.add_dependency 'capistrano', '~> 3.14.1'
3434
spec.add_dependency 'highline', '~> 2.0.3'

lib/dkdeploy/core/version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module Core
66
#
77
class Version
88
MAJOR = 9
9-
MINOR = 2
10-
PATCH = 3
9+
MINOR = 3
10+
PATCH = 0
1111

1212
def self.to_s
1313
[MAJOR, MINOR, PATCH].join('.')

0 commit comments

Comments
 (0)