capistrano-twingly 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5eca6ea50991714c2600ca2f700235fb3a5284320f70cde25534de3606e3a30
-  data.tar.gz: 0757c016c4a0dca706fef45c342a95425c11b5d15647501b07a960cdbe1391b7
+  metadata.gz: afd47e4da563c1ea3af2ba4cedfe12d6a00a3b41f97c86f677b39c8e74f73e32
+  data.tar.gz: 59b39f7f78d66d8ff2fdd97bc9c45558c0be8c2f15828d919d69ff105d33ed77
 SHA512:
-  metadata.gz: 86c947ed2c3a163875739769ffd4c1410d055f5c4ec976629b55ba44d6d1180f14a83a4bcbb11e7a06682c569fc7da714193d1af4b74d4f82dc72f23e82d8bc2
-  data.tar.gz: ea462c70951642dcf469e4e8fe23c987d602274cc9b00c0f3b5039b4532332d5f78194cf8740c75732d63aebb843a36eb8711fd9a98643cbd1617c78e6f4dd9f
+  metadata.gz: 0b73b92f74a51106df9d265027585c633ea577b85eac876f2465f9f20fd3de2d9084f634b1ff902207b7f6b68d807e57a02e3d91b59f996e3d969e621e990c4b
+  data.tar.gz: c5fa361fb1b561791060a843055005e8cd26afd85836a6ec9738167d11801223296152cd53115f8bce6c1b39af9f496f9936c24244b5e9cdf4637fdc51dc23fa

data/.github/workflows/ci.yml

@@ -6,15 +6,15 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
-        ruby: [2.7.1, head]
+        ruby: [2.7.6, 3.0.4, 3.1.2]
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [v4.0.4](https://github.com/twingly/capistrano-twingly/tree/v4.0.4) (2022-06-28)
+
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v4.0.3...v4.0.4)
+
+**Merged pull requests:**
+
+- Use net-ssh ~\> 7.0 [\#66](https://github.com/twingly/capistrano-twingly/pull/66) ([Pontus4](https://github.com/Pontus4))
+- Run CI on latest Rubies [\#64](https://github.com/twingly/capistrano-twingly/pull/64) ([walro](https://github.com/walro))
+- Ruby 3.0.0 on CI [\#62](https://github.com/twingly/capistrano-twingly/pull/62) ([walro](https://github.com/walro))
+
+## [v4.0.3](https://github.com/twingly/capistrano-twingly/tree/v4.0.3) (2021-01-14)
+
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v4.0.2...v4.0.3)
+
+**Implemented enhancements:**
+
+- Deprecation warnings from capistrano-bundler [\#61](https://github.com/twingly/capistrano-twingly/issues/61)
+
+**Merged pull requests:**
+
+- Explicitly use the git plugin [\#60](https://github.com/twingly/capistrano-twingly/pull/60) ([walro](https://github.com/walro))
+- Trigger CI on pull-request events [\#59](https://github.com/twingly/capistrano-twingly/pull/59) ([walro](https://github.com/walro))
+
 ## [v4.0.2](https://github.com/twingly/capistrano-twingly/tree/v4.0.2) (2020-11-24)
 
 [Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v4.0.1...v4.0.2)

data/README.md

@@ -131,9 +131,9 @@ end
 
         bundle exec rake release
 
-* Update the changelog with [GitHub Changelog Generator](https://github.com/skywinder/github-changelog-generator/) (`gem install github_changelog_generator` if you don't have it, set `CHANGELOG_GITHUB_TOKEN` to a personal access token to avoid rate limiting by GitHub). This command will update `CHANGELOG.md`. You need to commit and push manually.
+* Update the changelog with [GitHub Changelog Generator](https://github.com/github-changelog-generator/github-changelog-generator) (`gem install github_changelog_generator` if you don't have it, set `CHANGELOG_GITHUB_TOKEN` to a personal access token to avoid rate limiting by GitHub). This command will update `CHANGELOG.md`. You need to commit and push manually.
 
-        github_changelog_generator
+        github_changelog_generator -u twingly -p capistrano-twingly
 
 ## Note about `CHANGELOG.md`
 

data/capistrano-twingly.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-twingly"
-  spec.version       = '4.0.3'
+  spec.version       = '4.1.0'
   spec.authors       = ["Twingly AB"]
   spec.email         = ["support@twingly.com"]
   spec.summary       = %q{Capistrano 3 tasks used for Twingly's Ruby deployment}
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "capistrano-bundler", "~> 2.0"
   spec.add_dependency "capistrano-chruby", "0.1.2"
   spec.add_dependency "foreman", "~> 0.82"
-  spec.add_dependency "net-ssh", "~> 5.0"
+  spec.add_dependency "net-ssh", "~> 7.0"
   spec.add_dependency "ed25519", ">= 1.2", "< 1.3"
   spec.add_dependency "bcrypt_pbkdf", ">= 1.0", "< 2.0"
 

data/lib/capistrano/twingly/tasks/servers_from_srv_record.rake

@@ -3,14 +3,25 @@ require 'resolv'
 SRV_RECORDS = %w[
   _rubyapps._tcp.sth.twingly.network
 ]
+FALLBACK_DNS_SERVER = "gateway.sth.twingly.network"
 
-resolver = Resolv::DNS.new
+def lookup_srv_records(resolver: Resolv::DNS.new)
+  SRV_RECORDS.map do |srv_record|
+    resolver.getresources(srv_record, Resolv::DNS::Resource::IN::SRV)
+  end.flatten.map(&:target).map(&:to_s)
+end
+
+servers = lookup_srv_records
 
-servers = SRV_RECORDS.map do |srv_record|
-  resolver.getresources(srv_record, Resolv::DNS::Resource::IN::SRV)
-end.flatten.map(&:target).map(&:to_s)
+# Query datacenter gateway directly if local DNS server is unable to find the SRV records
+if servers.empty?
+  datacenter_dns_server_address = Resolv.getaddress(FALLBACK_DNS_SERVER)
 
-raise "Can't find any servers, no records for #{SRV_RECORDS}" if servers.empty?
+  resolver = Resolv::DNS.new(nameserver: datacenter_dns_server_address)
+  servers  = lookup_srv_records(resolver: resolver)
+
+  raise "Can't find any servers, no records for #{SRV_RECORDS}" if servers.empty?
+end
 
 set :servers_from_srv_record, servers
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-twingly
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ed25519
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Capistrano 3 tasks used for Twingly's Ruby deployment