capistrano-twingly 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cde4d6c870666c9bd379fca8d998ecb160d2b6c2804a0a04ba299c9d388db726
-  data.tar.gz: ee35ab692fcb2a21905df91258c0a7c2b1bcff88f11ed984bc0cd95f5284effc
+  metadata.gz: aef60e39ce2b8e4a5218b7ffd0249b4d2c8409fc0eb3d2ae65f5f6d8ce80fa52
+  data.tar.gz: c0bbdc520e398af97204b30ddeccb89d33326f6dd1c2f2136bde7be4db700de9
 SHA512:
-  metadata.gz: fb10f31d5b97fb05f6b680232442616faef0e46e4a3bf189882e5a0486ca48035cb4bc2b6fe70e693e2836126da53527fbe466f032f898fe125b8390e5aea5d5
-  data.tar.gz: e67b899e6a32ee36d02ab40b358daa75fbb8ae99e9a5f10fa3b90ef8bda3879e30bce4260d40f3454bbd5bd681aac282c7daf93342e38d4d613147799af31095
+  metadata.gz: 9f89921332157eaa1858d737a65ca284539a8a2e615947287f2dfafe3ae376bcbd7d04ab014a60fd05af2f31698627e2c59a2c0639762aeb2f803d692a6cb157
+  data.tar.gz: d1bddf27f3bb9c280015c6d9bb5b4395f32d412a87a1eb657885da20a94c9da45e6e67322728a868a596fa29afea6a714cdbe746bea6cb6743e71ad77f5702ef

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v2.2.0](https://github.com/twingly/capistrano-twingly/tree/v2.2.0) (2017-12-18)
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v2.1.0...v2.2.0)
+
+**Implemented enhancements:**
+
+- Support ed25519 SSH keys [\#38](https://github.com/twingly/capistrano-twingly/issues/38)
+- Release gem to rubygems.org [\#24](https://github.com/twingly/capistrano-twingly/issues/24)
+
+**Merged pull requests:**
+
+- Be able to use the gem with ssh-ed25519 keys [\#39](https://github.com/twingly/capistrano-twingly/pull/39) ([dentarg](https://github.com/dentarg))
+
 ## [v2.1.0](https://github.com/twingly/capistrano-twingly/tree/v2.1.0) (2016-09-22)
 [Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v2.0.1...v2.1.0)
 

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       = '2.2.0'
+  spec.version       = '2.3.0'
   spec.authors       = ["Twingly AB"]
   spec.email         = ["support@twingly.com"]
   spec.summary       = %q{Capistrano 3 tasks used for Twingly's Ruby deployment}
@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "capistrano-bundler", "1.1.4"
   spec.add_dependency "capistrano-chruby", "0.1.2"
   spec.add_dependency "foreman", "~> 0.82"
-  spec.add_dependency "rbnacl", ">= 3.2", "< 5.0"
-  spec.add_dependency "rbnacl-libsodium"
+  spec.add_dependency "net-ssh", "~> 5.0"
+  spec.add_dependency "ed25519", ">= 1.2", "< 1.3"
   spec.add_dependency "bcrypt_pbkdf", ">= 1.0", "< 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"

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

@@ -1,14 +1,17 @@
 require 'resolv'
 
-SRV_RECORD = '_rubyapps._tcp.live.lkp.primelabs.se'
+SRV_RECORDS = %w[
+  _rubyapps._tcp.live.lkp.primelabs.se
+  _rubyapps._tcp.sth.twingly.network
+]
 
 resolver = Resolv::DNS.new
-resources = resolver.getresources(
-  SRV_RECORD,
-  Resolv::DNS::Resource::IN::SRV)
-servers = resources.map(&:target).map(&:to_s)
 
-raise "Can't find any servers, no records for #{SRV_RECORD}" if servers.empty?
+servers = SRV_RECORDS.map do |srv_record|
+  resolver.getresources(srv_record, Resolv::DNS::Resource::IN::SRV)
+end.flatten.map(&:target).map(&:to_s)
+
+raise "Can't find any servers, no records for #{SRV_RECORDS}" if servers.empty?
 
 set :servers_from_srv_record, servers
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-twingly
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -67,39 +67,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.82'
 - !ruby/object:Gem::Dependency
-  name: rbnacl
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rbnacl-libsodium
+  name: ed25519
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Capistrano 3 tasks used for Twingly's Ruby deployment