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

Commit 16e715e

Browse files
authored
Merge pull request #59 from dkdeploy/upgrade_gems
Update gem "capistrano" to 3.14 and "highline" to 2.0
2 parents 980baa6 + a682995 commit 16e715e

5 files changed

Lines changed: 19 additions & 12 deletions

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ rvm:
66
- 2.4
77
- 2.5
88
- 2.6
9+
- 2.7
910

1011
before_install:
1112
- gem install bundler --no-document

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [9.3.0] - 2020-07-06
6+
### Summary
7+
8+
- Update gem `capistrano` to 3.14.x
9+
- Update gem `highline` to 2.0.x
10+
- Test ruby 2.7 via travis
11+
512
## [9.2.3] - 2019-05-29
613
### Summary
714

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The complete list of the dkdeploy constants you find in `/lib/capistrano/dkdeplo
6464

6565
### Prerequisite
6666

67-
rvm (v1.29.x) with installed Ruby 2.2.
67+
rvm (v1.29.x) with installed Ruby 2.2 or newer.
6868

6969
Add the virtual box alias to your `hosts` file
7070

@@ -74,7 +74,7 @@ Add the virtual box alias to your `hosts` file
7474

7575
1. Starting the local box (`vagrant up --provision`)
7676
2. Checking coding styles (`rubocop`)
77-
3. Running BDD cucumber tests (`cucumber`)
77+
3. Running BDD cucumber tests (`BUNDLER_VERSION=2.1.4 cucumber`)
7878

7979
## Contributing
8080

@@ -84,7 +84,7 @@ Add the virtual box alias to your `hosts` file
8484
4. If project is not checked out already do git clone `git@github.com:dkdeploy/dkdeploy-core.git`
8585
5. Checkout origin develop branch (`git checkout --track -b develop origin/develop`)
8686
6. Git flow initialze `git flow init -d`
87-
7. Installing gems `bundle install`
87+
7. Installing gems `BUNDLER_VERSION=1.17.3 bundle install`
8888
8. Create new feature branch (`git flow feature start my-new-feature`)
8989
9. Run tests (README.md Testing)
9090
10. Commit your changes (`git commit -am 'Add some feature'`)

Vagrantfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Vagrant.configure(2) do |config|
1919

2020
config.vm.define('dkdeploy-core', primary: true) do |master_config|
2121
master_config.vm.network 'private_network', ip: ip_address
22+
master_config.vm.hostname = domain
2223

2324
# Chef settings
2425
master_config.vm.provision :chef_solo do |chef|
@@ -43,12 +44,10 @@ Vagrant.configure(2) do |config|
4344
end
4445
end
4546

46-
if Vagrant.has_plugin?('landrush')
47-
config.landrush.enabled = true
48-
config.landrush.guest_redirect_dns = false
49-
config.landrush.tld = 'test'
50-
config.landrush.host domain, ip_address
51-
else
52-
config.vm.post_up_message = "Either install Vagrant plugin 'landrush' or add this entry to your host file: #{ip_address} #{domain}"
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
5352
end
5453
end

dkdeploy-core.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
3030
spec.add_development_dependency 'rspec', '~> 3.5'
3131
spec.add_development_dependency 'rubocop', '~> 0.62.0'
3232

33-
spec.add_dependency 'capistrano', '~> 3.11.0'
34-
spec.add_dependency 'highline', '~> 1.7.1'
33+
spec.add_dependency 'capistrano', '~> 3.14.1'
34+
spec.add_dependency 'highline', '~> 2.0.3'
3535
end

0 commit comments

Comments
 (0)