capistrano-foreman 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a074314158aaf705130e0fc22a91fe9cd598e70b
-  data.tar.gz: 30cf5f1dc0b200c517247310b4de12a05e800ffe
+  metadata.gz: 72d27f301f00f266dfa92a4789280b467e825456
+  data.tar.gz: 13d23913abd8b7831cc87aab90f574ea9c281010
 SHA512:
-  metadata.gz: 4f093dd032f43b9114beeee3939d6fce1dbef4cd33bd9e41ba9be5e8a506d972693ff45766257d96fdca7c7147af76fde745178127e88c787c036ea3c9dc5f2f
-  data.tar.gz: 9f4997e77dd54fc68614c980b9b58ea182f4d3cbfb9e75ed40a9a62b31954d2557a256c3a19e6df0471fad2c3e8a83079129d38f3bbb9270e97a9d2b592cc44b
+  metadata.gz: 590652ab4c24ac7f27abf4e2b93dc1b2e7b68b963b8b661996ba0c245a065fb8adcf35ed448f42a6afd3f6466504afaa9734ca274eb5ffcb7bf2a13e1ead7e74
+  data.tar.gz: 2b7d6c5c9d78765b6c8bdd8ea8fbbfe80ec2a3aa0ee357983705e5d0878f3883b7f375261cb33d0c0b43c13ae3a785310e5a796e51d629e30509213c0fe7d21a

data/README.md

@@ -2,7 +2,7 @@
 
 [![Code Climate](https://img.shields.io/codeclimate/github/hyperoslo/capistrano-foreman.svg?style=flat)](https://codeclimate.com/github/hyperoslo/capistrano-foreman)
 
-Capistrano tasks for foreman and upstart.
+Capistrano tasks for foreman and upstart/systemd.
 
 ## Installation
 
@@ -16,19 +16,19 @@ require 'capistrano/foreman'
 # Default settings
 set :foreman_use_sudo, false # Set to :rbenv for rbenv sudo, :rvm for rvmsudo or true for normal sudo
 set :foreman_roles, :all
-set :foreman_template, 'upstart'
-set :foreman_export_path, File.join(Dir.home, '.init')
-set :foreman_options, {
+set :foreman_init_system, 'upstart'
+set :foreman_export_path, ->{ File.join(Dir.home, '.init') }
+set :foreman_options, ->{ {
   app: application,
   log: File.join(shared_path, 'log')
-}
+} }
 ```
 
-See [exporting options](http://ddollar.github.io/foreman/#EXPORTING0) for an exhaustive list of foreman options.
+See [exporting options](http://ddollar.github.io/foreman/#EXPORTING) for an exhaustive list of foreman options.
 
 ## Usage
 
-Export Procfile to upstart:
+Export Procfile to upstart/systemd:
 
     $ bundle exec cap production foreman:export
 

data/capistrano-foreman.gemspec

@@ -5,8 +5,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |gem|
   gem.authors       = ["Johannes Gorset", 'John Bellone']
   gem.email         = ["jgorset@gmail.com", 'jbellone@bloomberg.net']
-  gem.description   = "Capistrano tasks for foreman and upstart."
-  gem.summary       = "Capistrano tasks for foreman and upstart."
+  gem.description   = "Capistrano tasks for foreman and upstart/systemd."
+  gem.summary       = "Capistrano tasks for foreman and upstart/systemd."
   gem.homepage      = "http://github.com/hyperoslo/capistrano-foreman"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "capistrano-foreman"
   gem.require_paths = ["lib"]
-  gem.version       = '1.2.0'
+  gem.version       = '1.3.0'
 
   gem.add_dependency 'capistrano', '~> 3.1'
   gem.add_dependency 'capistrano-bundler', '~> 1.1'

data/lib/capistrano/tasks/foreman.rb

@@ -12,11 +12,13 @@ namespace :foreman do
         log: File.join(shared_path, 'log'),
       }.merge fetch(:foreman_options, {})
 
+      opts.merge!(host.properties.fetch(:foreman_options) || {})
+
       execute(:mkdir, "-p", opts[:log])
 
       within release_path do
         foreman_exec :foreman, 'export',
-          fetch(:foreman_template),
+          fetch(:foreman_init_system),
           fetch(:foreman_export_path),
           opts.map { |opt, value| "--#{opt}=\"#{value}\"" }.join(' ')
       end
@@ -26,21 +28,38 @@ namespace :foreman do
   desc 'Start the application services'
   task :start do
     on roles fetch(:foreman_roles) do
-      foreman_exec :start, fetch(:foreman_app)
+      case fetch(:foreman_init_system)
+      when 'systemd'
+        foreman_exec :systemctl, :enable, fetch(:foreman_app_name_systemd)
+        foreman_exec :systemctl, :start, fetch(:foreman_app_name_systemd)
+      else
+        foreman_exec :start, fetch(:foreman_app)
+      end
     end
   end
 
   desc 'Stop the application services'
   task :stop do
     on roles fetch(:foreman_roles) do
-      foreman_exec :stop, fetch(:foreman_app)
+      case fetch(:foreman_init_system)
+      when 'systemd'
+        foreman_exec :systemctl, :stop, fetch(:foreman_app_name_systemd)
+        foreman_exec :systemctl, :disable, fetch(:foreman_app_name_systemd)
+      else
+        foreman_exec :stop, fetch(:foreman_app)
+      end
     end
   end
 
   desc 'Restart the application services'
   task :restart do
     on roles fetch(:foreman_roles) do
-      foreman_exec :restart, fetch(:foreman_app)
+      case fetch(:foreman_init_system)
+      when 'systemd'
+        foreman_exec :systemctl, :restart, fetch(:foreman_app_name_systemd)
+      else
+        foreman_exec :restart, fetch(:foreman_app)
+      end
     end
   end
 
@@ -54,6 +73,8 @@ namespace :foreman do
       execute(:rbenv, :sudo, *args)
     when 'rvm'
       execute(:rvmsudo, *args)
+    when 'chruby'
+      execute(:sudo, 'chruby-exec', fetch(:chruby_ruby), '--', *args)
     else
       sudo_type ? sudo(*args) : execute(*args)
     end
@@ -64,10 +85,11 @@ namespace :load do
   task :defaults do
     set :bundle_bins, fetch(:bundle_bins, []).push(:foreman)
     set :foreman_use_sudo, false
-    set :foreman_template, 'upstart'
+    set :foreman_init_system, 'upstart'
     set :foreman_export_path, '/etc/init/sites'
     set :foreman_roles, :all
     set :foreman_app, -> { fetch(:application) }
+    set :foreman_app_name_systemd, -> { "#{ fetch(:foreman_app) }.target" }
 
     if !fetch(:rvm_map_bins).nil?
       set :rvm_map_bins, fetch(:rvm_map_bins).push('foreman')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-foreman
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Johannes Gorset
@@ -9,37 +9,37 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-description: Capistrano tasks for foreman and upstart.
+description: Capistrano tasks for foreman and upstart/systemd.
 email:
 - jgorset@gmail.com
 - jbellone@bloomberg.net
@@ -47,7 +47,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - LICENSE.md
@@ -66,18 +66,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
-summary: Capistrano tasks for foreman and upstart.
+summary: Capistrano tasks for foreman and upstart/systemd.
 test_files: []