mascherano 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjhmZDVkMTczM2ZkYzkwMjVjZDdhZmI1MjEzYWFiZThmNmFjNWZkMA==
+    M2VjYjVlOTY0Y2NjZGFkZmQ1MDM5NTRkOTM3M2Q3NzgxZGVjYjMzZg==
   data.tar.gz: !binary |-
-    MjhhMzJjYWQzMmU5NzcxNTFkYzBkODFjYzVjMTQwOTBiOWQ3ZjYxMQ==
+    YzVmYjY1ZjgwNGQ0OTY4ZGJlMzZkYWY0YThmOGFiZmE2YzA0NTlhYQ==
 SHA512:
   metadata.gz: !binary |-
-    NjBmMmY3MTJhNTJhYTk4YWVkYzcxOWM1OTM1NGU5ZTNhNDRjNjczZGE5NmQy
-    Y2QwNGFkNjBhOTIyODk3MzM1MGRjY2E0ZDczNDNjYWY0OWU2MzQ1NmQ0Y2Ux
-    MzQ0ZjViMTgzYzFiYjcwMTk1YjM2YTIzNDU1MjljNzAxZjI3ZDA=
+    ZjYwMDNjZjAwODJjZmNjZDFhYWQ5NTQ3NTlkNDU1ZjJiZWJiYWIzMTZlNGQ4
+    YTczN2E4YjJiZjcyYTI1MmFlZDIzZDQ4MjUzYTU5ZWM1YTIwYTQ3NzUzOTAx
+    YmM3M2I1ODEyNWQyNWJkNWMzNWFjM2VkNDZiN2ZlM2MxMmQ3M2U=
   data.tar.gz: !binary |-
-    ZTM2NWVkZmUxZDdkNjYzZDVhODk5ZmViODQyZjkzYjFlNGU1MGU2MWRmNzBk
-    YzUzZTBhNzI3ODNkZTZjZDQ3YmZkZmEyN2RiMjFhZGI5ODhiYmQzNjNlNzM5
-    YjYyYmVlY2JjODliZGIwMGI2NjgxYWVkMTZmMTgxMzQ1MmUzYWU=
+    Nzg1MDQ4ODMzZjQwOGQzNmJkMTZmMjFiYjg1Yzg5MjFlMzZiNGFiZWUwZGZl
+    ODQ0ODIzYTQwYmVmODdmZjg0MmM0YTk1NWRlYjY2ZDdmNWZmOTNlODVlMmNj
+    ZWY5MTA5ZDU5NTI1MmI5NjU0ZDI5ZmI2YmExZjFhMWNhMGUwYmE=

data/README.md

@@ -38,6 +38,7 @@ Mascherano currently have several recipes:
 | __token__      | Manage and generate random secret token                                                               |
 | __passenger__  | Manage Pushion Passenger based application                                                            |
 | __auth_basic__ | Manage and generate HTTP basic authentication `.htpasswd`                                             |
+| __supervisor__ | Manage applications through supervisor process manager                                                |
 | _more to come_ | _pull request are welcome ;)_                                                                         |
 
 This package also provides a `noscm` recipe for when you don't need source code on your deployment box (usually application already compiled).
@@ -59,6 +60,7 @@ require 'mascherano/upstart'
 require 'mascherano/token'
 require 'mascherano/passenger'
 require 'mascherano/auth_basic'
+require 'mascherano/supervisor'
 ```
 
 Then on `config/deploy/{env}.rb` you can customize the options:

data/lib/mascherano/supervisor.rb

@@ -0,0 +1 @@
+load File.expand_path('../tasks/supervisor.cap', __FILE__)

data/lib/mascherano/tasks/auth_basic.cap

@@ -6,7 +6,7 @@ namespace :auth_basic do
     htpasswd = nil
 
     run_locally do
-      htpasswd = execute(:htpasswd, '-nb', fetch(:auth_basic_user), passwd).stdout
+      htpasswd = capture(:htpasswd, '-nb', fetch(:auth_basic_user), passwd)
       htpasswd.chomp!
     end
 

data/lib/mascherano/tasks/figaro.cap

@@ -23,7 +23,7 @@ namespace :figaro do
         figaro_cmd = %Q(Figaro.env("#{figaro_stage}").to_yaml)
       end
 
-      figaro_data = execute(:rails, "runner 'puts #{figaro_cmd}'").stdout
+      figaro_data = capture(:rails, "runner 'puts #{figaro_cmd}'")
     end
 
     if figaro_data

data/lib/mascherano/tasks/supervisor.cap

@@ -0,0 +1,94 @@
+require 'figaro'
+require 'erb'
+require 'pry'
+
+class SupervisorConf < OpenStruct
+  def render(template)
+    ERB.new(template).result(binding)
+  end
+
+  def render_file(template_file)
+    render(File.read(template_file))
+  end
+
+  def env_pair
+    self.marshal_dump.map { |key, val| %Q[#{key}="#{val}"] }.join(",\n  ")
+  end
+end
+
+namespace :supervisor do
+  desc 'Export supervisor configuration'
+  task :export do
+    supervisor_config = nil
+
+    run_locally do
+      figaro_cmd  = %Q(Figaro.env("#{fetch(:supervisor_stage)}").to_yaml)
+      figaro_data = capture(:rails, "runner 'puts #{figaro_cmd}'")
+      data = YAML.load(figaro_data)
+
+      template = SupervisorConf.new(data)
+      supervisor_config = template.render_file(fetch(:supervisor_template))
+    end
+
+    if supervisor_config
+      on roles(fetch(:supervisor_roles)) do
+        upload! StringIO.new(supervisor_config), fetch(:supervisor_target)
+      end
+    end
+  end
+
+  desc 'Symlink supervisord config to the conf.d'
+  task :symlink do
+    on roles(fetch(:supervisor_roles)) do
+      execute :ln, '-sf', fetch(:supervisor_target), fetch(:supervisor_confd)
+    end
+  end
+
+  desc 'Reread supervisord'
+  task :reread do
+    on roles(fetch(:supervisor_roles)) do
+      execute :supervisorctl, 'reread'
+    end
+  end
+
+  desc 'Update supervisord'
+  task :update do
+    on roles(fetch(:supervisor_roles)) do
+      execute :supervisorctl, 'update'
+    end
+  end
+
+  desc 'Restart application'
+  task :restart do
+    on roles(fetch(:supervisor_roles)) do
+      execute :supervisorctl, 'restart', "#{fetch(:supervisor_application)}:*"
+    end
+  end
+
+  desc 'Update configuration or restart application'
+  task :refresh do
+    on roles(fetch(:supervisor_roles)) do
+      if test "supervisorctl reread | grep 'No config updates to processes'"
+        execute :supervisorctl, 'restart', "#{fetch(:supervisor_application)}:*"
+      else
+        execute :supervisorctl, 'update'
+      end
+    end
+  end
+end
+
+namespace :load do
+  task :defaults do
+    set :supervisor_application, -> { fetch(:application) }
+    set :supervisor_stage,       -> { fetch(:stage) }
+    set :supervisor_template,    -> { "config/supervisor/#{fetch(:supervisor_stage)}.conf" }
+    set :supervisor_target,      -> { shared_path.join('supervisord.conf') }
+    set :supervisor_confd,       -> { "/etc/supervisor/conf.d/#{fetch(:supervisor_application)}.conf" }
+    set :supervisor_roles,       :all
+  end
+end
+
+namespace :deploy do
+  after :updating,   'supervisor:symlink'
+  after :publishing, 'supervisor:refresh'
+end

data/lib/mascherano/version.rb

@@ -1,3 +1,3 @@
 module Mascherano
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mascherano
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Alif Rachmawadi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -74,12 +74,14 @@ files:
 - lib/mascherano/foreman.rb
 - lib/mascherano/go.rb
 - lib/mascherano/passenger.rb
+- lib/mascherano/supervisor.rb
 - lib/mascherano/tasks/auth_basic.cap
 - lib/mascherano/tasks/env.cap
 - lib/mascherano/tasks/figaro.cap
 - lib/mascherano/tasks/foreman.cap
 - lib/mascherano/tasks/go.cap
 - lib/mascherano/tasks/passenger.cap
+- lib/mascherano/tasks/supervisor.cap
 - lib/mascherano/tasks/token.cap
 - lib/mascherano/tasks/upstart.cap
 - lib/mascherano/token.rb
@@ -111,3 +113,4 @@ signing_key:
 specification_version: 4
 summary: Capistrano 3.x recipes
 test_files: []
+has_rdoc: