capistrano-foreman_export 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef81705c7a150367ed8dc5ec5cdc348c189bb8e3
-  data.tar.gz: 4c17528f1861a2987a22e5c39d223cef11f7c95b
+  metadata.gz: a32b5831060171a13676cebb8c9821a936dd7743
+  data.tar.gz: 86459ab84ed2e216f282eadcb7c47fb52f3ed84a
 SHA512:
-  metadata.gz: 9ab0eed418a5fb34d6a78e3d02006db6642e437d9c64cae41638eb1779e7302adec2f13c2fc3d48d0fa39c58110b4b396bd182238eedd481ec20df79b544507f
-  data.tar.gz: ef50c02950ee766bdd60212ebdc8377257be3d0f795975df78c7933ee1851b70e8f66a000cbe576f10a9ec3306f59cb0d92abab7ef16184b6fa639b6b000f357
+  metadata.gz: 1b50d9e49dbc8681bc8f7ed808135fd8b53d1fab4b8b2cd8890dce1819b1933a0e9215009c8e1e67022fdd91df6ce8552d60fb6a690c104acb0f366f8f876093
+  data.tar.gz: 40c75b76617f00a507e42fa10e0ce77cc4285cf11ac9e8558511956196a7a81aac4ecf8d7de39a3a08a0a44bc999dab971e007530cbe22e116839896ae46ec62

data/lib/capistrano/foreman_export/backend/supervisord.rb

@@ -1,44 +1,53 @@
 
+require 'capistrano/configuration'
+
+
 module Capistrano
   module ForemanExport
     module Backend
       class Supervisord
 
+        def initialize(task)
+          @task = task
+        end
+
         def name
           "supervisord"
         end
 
-        def start_cmd(app_name)
-          wrap_bash <<-CMD
-          #{shell_add_if_new(app_name)}
-          supervisorctl start #{app_name}:*
-          CMD
+        def app_name
+          @task.fetch(:foreman_app)
         end
 
-        def stop_cmd(app_name)
-          wrap_bash <<-CMD
-          supervisorctl stop #{app_name}:*
-          CMD
+        def start_cmd
+          add_or_update_app
+          @task.execute(:sudo, "supervisorctl start #{app_name}:*")
         end
 
-        def restart_cmd(app_name)
-          wrap_bash <<-CMD
-          #{shell_add_if_new(app_name)}
-          supervisorctl restart #{app_name}:*
-          CMD
+        def stop_cmd
+          @task.execute(:sudo, "supervisorctl stop #{app_name}:*")
         end
 
-        def shell_add_if_new(app_name)
-          "supervisorctl reread;  sleep 3; supervisorctl status | grep -w -- '#{app_name}' | grep -qv grep || supervisorctl add #{app_name}"
+        def restart_cmd
+          add_or_update_app
+          @task.execute(:sudo, "supervisorctl restart #{app_name}:*")
         end
 
-        def wrap_bash(cmd)
-          "/bin/bash -c \"#{undent(cmd)}\""
+        def add_or_update_app
+          status = supervisord_reread
+          if status.include?("#{app_name}:")
+            if status.include?('changed')
+              @task.info("Configration changed, update it.")
+              @task.execute(:sudo, "supervisorctl update #{app_name}")
+            elsif status.include('available')
+              @task.info("Configration available, add it.")
+              @task.execute(:sudo, "supervisorctl add #{app_name}")
+            end
+          end
         end
 
-        def undent(str)
-          # from https://github.com/msmorgan/homebrew/blob/master/Library/Homebrew/extend/string.rb
-          str.gsub(/^.{#{str.slice(/^ +/).length}}/, '')
+        def supervisord_reread
+          @task.capture(:sudo, %{supervisorctl reread})
         end
       end
     end

data/lib/capistrano/foreman_export/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module ForemanExport
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/capistrano/tasks/foreman.cap

@@ -5,10 +5,10 @@ namespace :load do
     set :foreman_backend, Capistrano::ForemanExport::Backend::Supervisord
     set :foreman_roles, :app
     set :foreman_port, 5000
-    set :foreman_root, -> { release_path }
+    set :foreman_root, -> { current_path }
     set :foreman_app, -> { fetch(:application) }
-    set :foreman_procfile, -> { release_path.join('Procfile') }
-    set :foreman_log, -> { release_path.join('log') }
+    set :foreman_procfile, -> { current_path.join('Procfile') }
+    set :foreman_log, -> { current_path.join('log') }
     set :foreman_user, 'nginx'
     set :foreman_env_variables, {}
     set :foreman_output, '/etc/supervisor.d'
@@ -49,27 +49,27 @@ namespace :foreman do
     desc "start"
     task :start do
       on roles(fetch(:foreman_roles)) do
-        execute :sudo, backend.start_cmd(fetch(:foreman_app))
+        backend.start_cmd
       end
     end
 
     desc "stop"
     task :stop do
       on roles(fetch(:foreman_roles)) do
-        execute :sudo, backend.stop_cmd(fetch(:foreman_app))
+        backend.stop_cmd
       end
     end
 
     desc "restart"
     task :restart do
       on roles(fetch(:foreman_roles)) do
-        execute :sudo, backend.restart_cmd(fetch(:foreman_app))
+        backend.restart_cmd
       end
     end
 end
 
 def backend
-  @backend ||= fetch(:foreman_backend).new
+  @backend ||= fetch(:foreman_backend).new self
 end
 
 def env_variable_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-foreman_export
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Katsuma Ito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano