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

Commit

Permalink
Merge branch 'release/v9.3'
Browse files Browse the repository at this point in the history
* release/v9.3:
  bump version file and changelog
  updated dependencies
  run bundler-audit
  • Loading branch information
ncreuschling committed Jul 6, 2020
2 parents 16e715e + 623ad6e commit 4f370fa
Show file tree
Hide file tree
Showing 8 changed files with 209 additions and 199 deletions.
42 changes: 34 additions & 8 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,51 @@ AllCops:
- 'config/**/*'
- 'Vagrantfile'
- 'vendor/**/*'
TargetRubyVersion: 2.3
TargetRubyVersion: 2.5
ExtraDetails: true
DisplayStyleGuide: true
DisplayCopNames: true
GlobalVars:
Style/GlobalVars:
AllowedVariables: []
MethodLength:
Metrics/MethodLength:
Max: 25
LineLength:
Layout/LineLength:
Max: 200
SpecialGlobalVars:
Style/SpecialGlobalVars:
Enabled: false
BracesAroundHashParameters:
Enabled: false
CyclomaticComplexity:
Metrics/CyclomaticComplexity:
Max: 10
Metrics/BlockLength:
Enabled: false
Style/FormatStringToken:
Enabled: false
Style/MixinUsage:
Enabled: false
Layout/EmptyLinesAroundAttributeAccessor:
Enabled: true
Layout/SpaceAroundMethodCallOperator:
Enabled: true
Lint/DeprecatedOpenSSLConstant:
Enabled: true
Lint/MixedRegexpCaptureTypes:
Enabled: true
Lint/RaiseException:
Enabled: true
Lint/StructNewOverride:
Enabled: true
Style/ExponentialNotation:
Enabled: true
Style/HashEachMethods:
Enabled: true
Style/HashTransformKeys:
Enabled: true
Style/HashTransformValues:
Enabled: true
Style/RedundantFetchBlock:
Enabled: true
Style/RedundantRegexpCharacterClass:
Enabled: true
Style/RedundantRegexpEscape:
Enabled: true
Style/SlicingWithRange:
Enabled: true
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ sudo: false
language: ruby
cache: bundler
rvm:
- 2.3
- 2.4
- 2.5
- 2.6
- 2.7

before_install:
- gem install bundler --no-document
- gem install bundler --no-doc
- gem install bundler-audit --no-doc

script:
- bundle exec rubocop
- bundle-audit check --update
- bundle exec rubocop --display-cop-names --extra-details
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).

- Update gem `capistrano` to 3.14.x
- Update gem `highline` to 2.0.x
- Update gem 'aruba' to 1.0.x
- Test ruby 2.7 via travis
- Requires Ruby v2.5 or later

## [9.2.3] - 2019-05-29
### Summary
Expand Down
12 changes: 6 additions & 6 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ Vagrant.configure(2) do |config|
'--audio', 'none'
]
end
end

unless Vagrant.has_plugin?('vagrant-hostsupdater')
master_config.vm.post_up_message = <<-HEREDOC
Add following entries to your host file or install vagrant plugin vagrant-hostsupdater ("vagrant plugin install vagrant-hostsupdater") and restart virtual box
#{ip_address} #{domain}
HEREDOC
unless Vagrant.has_plugin?('vagrant-hostsupdater')
master_config.vm.post_up_message = <<-HEREDOC
Add following entries to your host file or install vagrant plugin vagrant-hostsupdater ("vagrant plugin install vagrant-hostsupdater") and restart virtual box
#{ip_address} #{domain}
HEREDOC
end
end
end
10 changes: 5 additions & 5 deletions dkdeploy-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ Gem::Specification.new do |spec|
spec.description = 'dkd basic deployment tasks and strategies'
spec.summary = 'dkd basic deployment tasks and strategies'
spec.homepage = 'https://github.com/dkdeploy/dkdeploy-core'
spec.required_ruby_version = '~> 2.3'
spec.required_ruby_version = '~> 2.5'

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

spec.add_development_dependency 'aruba', '~> 0.14.1'
spec.add_development_dependency 'aruba', '~> 1.0'
spec.add_development_dependency 'bundler'
spec.add_development_dependency 'cucumber', '~> 2.4'
spec.add_development_dependency 'dkdeploy-test_environment', '~> 2.0'
spec.add_development_dependency 'mysql2', '~> 0.3'
spec.add_development_dependency 'pry', '~> 0.10'
spec.add_development_dependency 'rake'
spec.add_development_dependency 'rspec', '~> 3.5'
spec.add_development_dependency 'rubocop', '~> 0.62.0'
spec.add_development_dependency 'rubocop', '~> 0.86.0'

spec.add_dependency 'capistrano', '~> 3.14.1'
spec.add_dependency 'highline', '~> 2.0.3'
Expand Down
4 changes: 2 additions & 2 deletions lib/dkdeploy/core/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ module Core
#
class Version
MAJOR = 9
MINOR = 2
PATCH = 3
MINOR = 3
PATCH = 0

def self.to_s
[MAJOR, MINOR, PATCH].join('.')
Expand Down
Loading

0 comments on commit 4f370fa

Please sign in to comment.