capistrano-twingly 2.4.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75fa4a0261e7641d6b29921d6dcfe7615790f703e6393e92d57147eb21a163c4
-  data.tar.gz: 00f98265254260053e4fe778f3dfd9df8d442d293a527c06bedcab2fb4d9d004
+  metadata.gz: 000dcbd7e977d7e37ce27e2cd5f61278a835aa79febecf7dbb8edbd74fb8bf2b
+  data.tar.gz: 6954ff08beb258f8d0d3f598fd34652dc56c062b1070c1a8c396ee1bf68ac467
 SHA512:
-  metadata.gz: bfaf032744fbf5f61a113f4c6702c5ca1d1b3a5a81cba5d5ed3f4765050d85724a9e384fd13ef317d78f029e3da8ec3b73ead1cc3d37d770b57e9455d56825a4
-  data.tar.gz: c3b2685e826ea9e7a0961becedb167ab506420733f144070c932d36748b538787ea4576e515438aa12e4929128c8a3350d7b7db7340cfd6d1c6bbc67d18ec1cb
+  metadata.gz: d827b49fcf10fcec1f3d9127b27e026b3dc30327fa0406c0ae10714160e1ecd72c7accd00ea22629e9bc5d28eb7ce4ba4f4dfcd7b2028605a8b2a296c76b4a75
+  data.tar.gz: 5a97a343b609656ba2dabbd99d4d9536669e66131f4eda02374946b7a71f0a622736706e780f00e9b77c62cdf5d38a62087e40d1da187b92aed4a6b2a694cef9

data/.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+name: CI
+
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    strategy:
+      matrix:
+        ruby: [2.7.1, head]
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run
+        run: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 # Change Log
 
+## [v4.0.1](https://github.com/twingly/capistrano-twingly/tree/v4.0.1) (2019-05-02)
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v4.0.0...v4.0.1)
+
+**Fixed bugs:**
+
+- Initial deploy for systemd fails since \#47 [\#49](https://github.com/twingly/capistrano-twingly/issues/49)
+
+**Merged pull requests:**
+
+- Make sure systemd target is loaded before trying to stop it [\#50](https://github.com/twingly/capistrano-twingly/pull/50) ([roback](https://github.com/roback))
+
+## [v4.0.0](https://github.com/twingly/capistrano-twingly/tree/v4.0.0) (2019-04-29)
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v3.0.0...v4.0.0)
+
+**Closed issues:**
+
+- Add systemd support [\#45](https://github.com/twingly/capistrano-twingly/issues/45)
+
+**Merged pull requests:**
+
+- Generate systemd config in addition to upstart [\#47](https://github.com/twingly/capistrano-twingly/pull/47) ([roback](https://github.com/roback))
+
+## [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)
+
+## [v2.4.0](https://github.com/twingly/capistrano-twingly/tree/v2.4.0) (2018-10-04)
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v2.3.0...v2.4.0)
+
+**Merged pull requests:**
+
+- Each server can have different Procfiles [\#43](https://github.com/twingly/capistrano-twingly/pull/43) ([roback](https://github.com/roback))
+
 ## [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)
 

data/README.md

@@ -45,7 +45,7 @@ require 'capistrano/twingly/nginx'
 
 # config/deploy.rb
 set :app_name, 'contest-bamba'
-set :server_names, %w(bamba.bloggportalen.se) # Optional
+set :server_names, %w(bamba.bloggportalen.se)
 set :use_https, true # Optional
 
 namespace :deploy do
@@ -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       = '2.4.0'
+  spec.version       = '4.0.2'
   spec.authors       = ["Twingly AB"]
   spec.email         = ["support@twingly.com"]
   spec.summary       = %q{Capistrano 3 tasks used for Twingly's Ruby deployment}
@@ -17,15 +17,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capistrano", "~> 3.6.0"
-  spec.add_dependency "capistrano-bundler", "1.1.4"
+  spec.add_dependency "capistrano", "~> 3.14"
+  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 "ed25519", ">= 1.2", "< 1.3"
   spec.add_dependency "bcrypt_pbkdf", ">= 1.0", "< 2.0"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "rake"
 end

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/nginx.rake

@@ -6,8 +6,7 @@ namespace :deploy do
 
       app_dir      = fetch(:deploy_to)
       app_name     = fetch(:app_name)
-      server_names = Array(fetch(:server_names))
-      server_names << "#{app_name}.live.lkp.primelabs.se"
+      server_names = fetch(:server_names)
 
       https_port = ":443" if fetch(:use_https)
 

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

@@ -1,7 +1,6 @@
 require 'resolv'
 
 SRV_RECORDS = %w[
-  _rubyapps._tcp.live.lkp.primelabs.se
   _rubyapps._tcp.sth.twingly.network
 ]
 

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

@@ -0,0 +1,128 @@
+namespace :deploy do
+  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
+    set :bundle_binstubs, -> { shared_path.join('bin') }
+
+    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
+      load_state =
+        capture "systemctl show #{fetch(:application)}.target -p LoadState --value"
+
+      if load_state == "loaded"
+        sudo :systemctl, "stop #{fetch(:application)}.target"
+      end
+
+      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: 2.4.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Twingly AB
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capistrano-chruby
   requirement: !ruby/object:Gem::Requirement
@@ -120,20 +120,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -169,9 +155,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -182,19 +168,19 @@ 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,9 +195,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Capistrano 3 tasks used for Twingly's Ruby deployment
 test_files:

data/.travis.yml

@@ -1,28 +0,0 @@
-language: ruby
-sudo: false
-
-rvm:
-  - 2.4.2
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  fast_finish: true
-
-before_install:
-  - gem install bundler
-
-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/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.name}", "#{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__)