capistrano-twingly 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4cefe904ac4285bcda917e3ca3221abe5ab6454b
-  data.tar.gz: 5e223b0068c1578c78d4d467cfcbf90783754a70
+SHA256:
+  metadata.gz: 9219f0a0906443a3e14e4fdf7b8bc200b50b4ed0948f75abc0586c1a11b7ce28
+  data.tar.gz: e2c7d9bcc2f834158d7a1edaea6644e5f1e506f981dfd1f3365167a25cf9ea25
 SHA512:
-  metadata.gz: e68ca32fb17cefaafbd5a8daac48425d7a38b85ee61daaea276ab97b09d00e2755cad121c33a7d63ce6c4c5528004f81d8ad0eef38c2d7377bbc075427f3de0d
-  data.tar.gz: 5b7ccb8c71703d1a9fabbb6dd9e925755afa7b2184c3b3446cedd710af9900013ed8f5456d4fc5171d8794d21df9d746bd10e765283c4591ef363182aa315049
+  metadata.gz: eff5f679774a4d2bd67addff46c89fab8df4350e0e3c1c2750735c7181dd3d0ec8e6c4d6deaefffd43b386a51141333943f45477a21392482281ec24d283f39e
+  data.tar.gz: dc753f6f3a80d0b6c90e7c99807fe2e22638b7f849ef411051134b515ad8a3c2dfc4af095b5a2576d0d2cca9bd339faf3d64b6f990ab46f5c7badc44d412e12f

data/.travis.yml

@@ -1,28 +1,15 @@
 language: ruby
 sudo: false
-
 rvm:
   - 2.4.2
   - ruby-head
-
 matrix:
   allow_failures:
     - rvm: ruby-head
   fast_finish: true
-
 before_install:
-  - gem install bundler
-
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 cache: bundler
-
 notifications:
   email: false
-  hipchat:
-    rooms:
-      secure: "ILGWgc1QgHVRhwxWgYo+DxLySgOPdwahOV8py1dlRhi4juRUvMcMJSFYvTS47T1Mm8JSJXGaJtEcz24YgWF4XQsL2OawntdxJDNuzmFhF0fC+syN3qHXVzaRIplfcbGOj5rW4Uga8HumvvrQl/g5fscgsGM02BAOKgJhRPM7YLY="
-    on_success: never
-    on_failure: change
-    template:
-    - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}
-      (<a href="%{build_url}">Details</a>/<a href="%{compare_url}">Change view</a>)'
-    format: html

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v3.0.0](https://github.com/twingly/capistrano-twingly/tree/v3.0.0) (2018-11-08)
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v2.4.1...v3.0.0)
+
+**Merged pull requests:**
+
+- Remove LKP traces [\#44](https://github.com/twingly/capistrano-twingly/pull/44) ([walro](https://github.com/walro))
+
 ## [v2.4.1](https://github.com/twingly/capistrano-twingly/tree/v2.4.1) (2018-10-05)
 [Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v2.4.0...v2.4.1)
 

data/README.md

@@ -56,11 +56,11 @@ namespace :deploy do
 end
 ```
 
-### Upstart
+### Upstart/Systemd
 
 ```Ruby
 # Capfile
-require 'capistrano/twingly/upstart'
+require 'capistrano/twingly/service'
 
 # config/deploy.rb
 set :procfile_contents, -> {
@@ -74,29 +74,6 @@ set :procfile_contents, -> {
 }
 
 namespace :deploy do
-  desc 'Start application'
-  task :start do
-    invoke 'deploy:export_upstart'
-    on roles(:app) do
-      sudo :start, fetch(:application)
-    end
-  end
-
-  desc 'Restart application'
-  task :restart do
-    invoke 'deploy:export_upstart'
-    on roles(:app) do
-      execute "sudo restart #{fetch(:application)} || sudo start #{fetch(:application)}"
-    end
-  end
-
-  desc 'Stop application'
-  task :stop do
-    on roles(:app) do
-      sudo :stop, fetch(:application)
-    end
-  end
-
   after :stop, 'deploy:disable_autostart'
   after :start, 'deploy:enable_autostart'
   after :restart, 'deploy:enable_autostart'
@@ -148,13 +125,13 @@ end
 
 * Bump the version in `capistrano-twingly.gemspec` in a commit, no need to push (the release task does that).
 
+* Ensure you are signed in to RubyGems.org as [twingly][twingly-rubygems] with `gem signin`.
+
 * Build and [publish](http://guides.rubygems.org/publishing/) the gem. This will create the proper tag in git, push the commit and tag and upload to RubyGems.
 
         bundle exec rake release
 
-    * If you are not logged in as [twingly][twingly-rubygems] with ruby gems, the rake task will fail and tell you to set credentials via `gem push`, do that and run the `release` task again. It will be okay.
-
-* 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`, commit and push manually.
+* 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.
 
         github_changelog_generator
 

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       = '3.0.0'
+  spec.version       = '4.0.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.rb

@@ -13,7 +13,7 @@ require "capistrano/bundler"
 
 # Twingly tasks
 require "capistrano/twingly/nginx"
-require "capistrano/twingly/upstart"
+require "capistrano/twingly/service"
 require "capistrano/twingly/tag_deploy_in_git"
 require "capistrano/twingly/current_git_branch"
 require "capistrano/twingly/servers_from_srv_record"

data/lib/capistrano/twingly/service.rb

@@ -0,0 +1 @@
+load File.expand_path("../tasks/service.rake", __FILE__)

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

@@ -0,0 +1,123 @@
+namespace :deploy do
+  set :bundle_binstubs, -> { shared_path.join('bin') }
+
+  desc 'Lookup which service manager is used on each server'
+  task :lookup_server_service_manager do
+    init_system_pid = 1
+
+    on roles(:app) do |host|
+      service_manager_name =
+        capture "ps -p#{init_system_pid} co command | grep systemd || echo upstart"
+
+      server(host).add_role(service_manager_name.to_sym)
+    end
+  end
+
+  desc 'Export service script'
+  task export_service: %w[lookup_server_service_manager foreman:upload_procfile] do
+    on roles(:upstart) do
+      within current_path do
+        sudo fetch(:chruby_exec), "#{fetch(:chruby_ruby)} -- #{fetch(:bundle_binstubs)}/foreman export upstart /etc/init -a #{fetch(:application)} -u \`whoami\` -l #{shared_path}/log"
+      end
+    end
+
+    on roles(:systemd) do
+      sudo :systemctl, "stop #{fetch(:application)}.target"
+
+      within current_path do
+        sudo fetch(:chruby_exec), "#{fetch(:chruby_ruby)} -- #{fetch(:bundle_binstubs)}/foreman export systemd /etc/systemd/system -a #{fetch(:application)} -u \`whoami\` -l #{shared_path}/log"
+      end
+
+      sudo :systemctl, "daemon-reload"
+    end
+  end
+
+  desc "Start application"
+  task start: :lookup_server_service_manager do
+    invoke "deploy:export_service"
+
+    on roles(:upstart) do
+      sudo :start, fetch(:application)
+    end
+
+    on roles(:systemd) do
+      sudo :systemctl, "start #{fetch(:application)}.target"
+    end
+  end
+
+  desc "Restart application"
+  task restart: :lookup_server_service_manager do
+    invoke "deploy:export_service"
+
+    on roles(:upstart) do
+      execute "sudo restart #{fetch(:application)} || sudo start #{fetch(:application)}"
+    end
+
+    on roles(:systemd) do
+      application = fetch(:application)
+      execute "sudo systemctl restart #{application}.target || sudo systemctl start #{application}.target"
+    end
+  end
+
+  desc "Stop application"
+  task stop: :lookup_server_service_manager do
+    on roles(:upstart) do
+      sudo :stop, fetch(:application)
+    end
+
+    on roles(:systemd) do
+      sudo :systemctl, "stop #{fetch(:application)}.target"
+    end
+  end
+
+  task disable_autostart: :lookup_server_service_manager do
+    on roles(:upstart) do
+      execute "/bin/echo manual | sudo /usr/bin/tee /etc/init/#{fetch(:application)}.override"
+    end
+
+    on roles(:systemd) do
+      sudo :systemctl, "disable #{fetch(:application)}.target"
+    end
+  end
+
+  task enable_autostart: :lookup_server_service_manager do
+    on roles(:upstart) do
+      execute "/bin/echo | sudo /usr/bin/tee /etc/init/#{fetch(:application)}.override"
+    end
+
+    on roles(:systemd) do
+      sudo :systemctl, "enable #{fetch(:application)}.target"
+    end
+  end
+
+  namespace :foreman do
+    desc 'Upload Procfile to server'
+    task upload_procfile: :generate_procfile do
+      on roles(:app) do |host|
+        upload! "tmp/Procfile_#{host.hostname}", "#{fetch(:deploy_to)}/current/Procfile"
+      end
+    end
+
+    desc 'Generate Procfile'
+    task  :generate_procfile do
+      Dir.mkdir('tmp') unless Dir.exist?('tmp')
+
+      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
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-twingly
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -182,13 +182,13 @@ files:
 - lib/capistrano/twingly/current_git_branch.rb
 - lib/capistrano/twingly/nginx.rb
 - lib/capistrano/twingly/servers_from_srv_record.rb
+- lib/capistrano/twingly/service.rb
 - lib/capistrano/twingly/tag_deploy_in_git.rb
 - lib/capistrano/twingly/tasks/current_git_branch.rake
 - lib/capistrano/twingly/tasks/nginx.rake
 - lib/capistrano/twingly/tasks/servers_from_srv_record.rake
+- lib/capistrano/twingly/tasks/service.rake
 - lib/capistrano/twingly/tasks/tag_deploy_in_git.rake
-- lib/capistrano/twingly/tasks/upstart.rake
-- lib/capistrano/twingly/upstart.rb
 - spec/integration/net_ssh_spec.rb
 homepage: https://github.com/twingly/capistrano-twingly
 licenses:
@@ -209,8 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Capistrano 3 tasks used for Twingly's Ruby deployment

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

@@ -1,58 +0,0 @@
-namespace :deploy do
-  set :bundle_binstubs, -> { shared_path.join('bin') }
-
-  desc 'Export upstart script'
-  task :export_upstart do
-    on roles(:app) do
-      within current_path do
-        sudo fetch(:chruby_exec), "#{fetch(:chruby_ruby)} -- #{fetch(:bundle_binstubs)}/foreman export upstart /etc/init -a #{fetch(:application)} -u \`whoami\` -l #{shared_path}/log"
-      end
-    end
-  end
-
-  task :disable_autostart do
-    on roles(:app) do
-      execute "/bin/echo manual | sudo /usr/bin/tee /etc/init/#{fetch(:application)}.override"
-    end
-  end
-
-  task :enable_autostart do
-    on roles(:app) do
-      execute "/bin/echo | sudo /usr/bin/tee /etc/init/#{fetch(:application)}.override"
-    end
-  end
-
-  namespace :foreman do
-    desc 'Upload Procfile to server'
-    task :upload_procfile do
-      on roles(:app) do |host|
-        upload! "tmp/Procfile_#{host.hostname}", "#{fetch(:deploy_to)}/current/Procfile"
-      end
-    end
-
-    desc 'Generate Procfile'
-    task  :generate_procfile do
-      Dir.mkdir('tmp') unless Dir.exist?('tmp')
-
-      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
-  end
-
-  before 'deploy:export_upstart', 'deploy:foreman:upload_procfile'
-  before 'deploy:foreman:upload_procfile', 'deploy:foreman:generate_procfile'
-end

data/lib/capistrano/twingly/upstart.rb

@@ -1 +0,0 @@
-load File.expand_path("../tasks/upstart.rake", __FILE__)