capistrano-twingly 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef60e39ce2b8e4a5218b7ffd0249b4d2c8409fc0eb3d2ae65f5f6d8ce80fa52
-  data.tar.gz: c0bbdc520e398af97204b30ddeccb89d33326f6dd1c2f2136bde7be4db700de9
+  metadata.gz: 75fa4a0261e7641d6b29921d6dcfe7615790f703e6393e92d57147eb21a163c4
+  data.tar.gz: 00f98265254260053e4fe778f3dfd9df8d442d293a527c06bedcab2fb4d9d004
 SHA512:
-  metadata.gz: 9f89921332157eaa1858d737a65ca284539a8a2e615947287f2dfafe3ae376bcbd7d04ab014a60fd05af2f31698627e2c59a2c0639762aeb2f803d692a6cb157
-  data.tar.gz: d1bddf27f3bb9c280015c6d9bb5b4395f32d412a87a1eb657885da20a94c9da45e6e67322728a868a596fa29afea6a714cdbe746bea6cb6743e71ad77f5702ef
+  metadata.gz: bfaf032744fbf5f61a113f4c6702c5ca1d1b3a5a81cba5d5ed3f4765050d85724a9e384fd13ef317d78f029e3da8ec3b73ead1cc3d37d770b57e9455d56825a4
+  data.tar.gz: c3b2685e826ea9e7a0961becedb167ab506420733f144070c932d36748b538787ea4576e515438aa12e4929128c8a3350d7b7db7340cfd6d1c6bbc67d18ec1cb

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v2.3.0](https://github.com/twingly/capistrano-twingly/tree/v2.3.0) (2018-10-04)
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v2.2.0...v2.3.0)
+
+**Merged pull requests:**
+
+- Lookup app servers using multiple SRV records [\#42](https://github.com/twingly/capistrano-twingly/pull/42) ([roback](https://github.com/roback))
+
 ## [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)
 

data/README.md

@@ -103,6 +103,21 @@ namespace :deploy do
 end
 ```
 
+It's also possible to use a different Procfile for each host by setting `procfile_contents` to a Hash:
+
+```ruby
+# config/deploy.rb
+set :procfile_contents, -> {
+  servers = fetch(:servers_from_srv_record)
+
+  servers.each_with_object({}) do |hostname, procfiles_by_host|
+    contents = "web: CURRENT_HOST=#{hostname} bundle exec puma"
+
+    procfiles_by_host[hostname] = contents
+  end
+}
+```
+
 ### Tag deploys in Git
 
 ```Ruby

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.3.0'
+  spec.version       = '2.4.0'
   spec.authors       = ["Twingly AB"]
   spec.email         = ["support@twingly.com"]
   spec.summary       = %q{Capistrano 3 tasks used for Twingly's Ruby deployment}

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

@@ -25,8 +25,8 @@ namespace :deploy do
   namespace :foreman do
     desc 'Upload Procfile to server'
     task :upload_procfile do
-      on roles(:app) do
-        upload! 'tmp/Procfile', "#{fetch(:deploy_to)}/current/Procfile"
+      on roles(:app) do |host|
+        upload! "tmp/Procfile_#{host.name}", "#{fetch(:deploy_to)}/current/Procfile"
       end
     end
 
@@ -34,9 +34,20 @@ namespace :deploy do
     task  :generate_procfile do
       Dir.mkdir('tmp') unless Dir.exist?('tmp')
 
-      File.open('tmp/Procfile', 'w') do |conf|
-        fetch(:procfile_contents).each_line do |line|
-          conf.puts "#{line.chomp} 2>&1 | logger -t #{fetch(:app_name)}"
+      procfile_contents = fetch(:procfile_contents)
+
+      on roles(:app) do |host|
+        procfile_contents_string =
+          if procfile_contents.is_a?(Hash)
+            procfile_contents.fetch(host.hostname)
+          else
+            procfile_contents
+          end
+
+        File.open("tmp/Procfile_#{host.hostname}", 'w') do |conf|
+          procfile_contents_string.each_line do |line|
+            conf.puts "#{line.chomp} 2>&1 | logger -t #{fetch(:app_name)}"
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-twingly
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Twingly AB