capistrano-unformatt 2.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce9932d827a5bea729294644d71450468d531aec
-  data.tar.gz: 67615dbf4b891cc2f6f07cc7651229211a510d8e
+  metadata.gz: cd2d1f6e3286697ea327d825b0ac10896feacb19
+  data.tar.gz: 1a619611105567559684c4dd92ca150f5b47f913
 SHA512:
-  metadata.gz: de2104371536f967fe3e23dcfeb88728377ab11f95da4a086c56c1da01de6dd7366a95b4a168826b751cdef05d58c7eaea4a8a439328a3e6a0b266ca44ceabe3
-  data.tar.gz: 283fffcb4e617f9aeeb88d23616a0add00a6253a04519252d8bc3aedeeae21261799a1e9ddae7da671ba79b2449d440cd0a9465766b2990dd42905660cc4fa76
+  metadata.gz: cfc4f5d1f8acfe764506aef882d1b466b5b33f3188f0b146fdadefb864d83529fbf4884a906f6355d355f21a4f2ead18db8b7f647c96ffa8c7b1b96ea187ea52
+  data.tar.gz: c9115b1c04a76a403ed557376922b9e260df5445f004629c4bfdead75a1e34e452e43e1d3f47853b0e3c64a11143036c4dd9d97f89efb73c7e2308c52556848a

data/CHANGELOG.md

@@ -97,3 +97,7 @@
 ## v2.0
 
 * Added methods for partial setup, improved check on daemon services
+
+## v2.1
+
+* Fixes on deploy install, improved methods for partial setup

data/capistrano-unformatt.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-unformatt"
-  spec.version       = '2.0'
+  spec.version       = '2.1'
   spec.authors       = ["unformatt"]
   spec.email         = ["unformatt@gmail.com"]
   spec.description   = "Custom recipes for Unformatt projects"

data/lib/capistrano/tasks/setup.rake

@@ -1,39 +1,41 @@
 namespace :deploy do
   namespace :install do
-    namespace :yml do
-      fetch(:setup_yamls, []).each do |yaml|
-        desc "Creates yaml file for #{yaml}."
-        task yaml do
-          append :templating_paths, File.expand_path('../../../vendor/templates', File.dirname(__FILE__))
+    desc "Creates config for yml"
+    task :yaml, :command do |task, args|
+      append :templating_paths, File.expand_path('../../../vendor/templates', File.dirname(__FILE__))
 
-          on roles :app do
-            execute "mkdir -p #{shared_path}/{config,tmp,log,pids}"
+      on roles :app do
+        execute "mkdir -p #{shared_path}/{config,tmp,log,pids}"
 
-            template "#{yaml}.yml.erb", "#{shared_path}/config/#{yaml}.yml"
-          end
+        yamls = fetch(:setup_yamls, [])
+        yamls.keep_if { |x| args[:command].split('/').map(&:strip).include?(x.to_s) }
+
+        yamls.each do |yaml|
+          template "#{yaml}.yml.erb", "#{shared_path}/config/#{yaml}.yml"
         end
       end
     end
 
-    namespace :daemon do
-      fetch(:setup_daemons, []).each do |daemon|
-        desc "Creates daemon files for #{daemon}."
-        task daemon do
-          append :templating_paths, File.expand_path('../../../vendor/templates', File.dirname(__FILE__))
-
-          on roles :app do
-            execute "mkdir -p #{shared_path}/{config,tmp,log,pids}"
+    desc "Creates config for daemon"
+    task :daemon, :command do |task, args|
+      append :templating_paths, File.expand_path('../../../vendor/templates', File.dirname(__FILE__))
 
-            if daemon[:config] == true
-              template "#{daemon[:name]}.rb.erb", "#{shared_path}/config/#{daemon[:name]}.rb", 0644
-            end
+      on roles :app do
+        execute "mkdir -p #{shared_path}/{config,tmp,log,pids}"
 
-            template "#{daemon[:name]}.daemon.erb", "#{shared_path}/tmp/#{daemon[:name]}.daemon", 0755
-            execute "sudo mv -f #{shared_path}/tmp/#{daemon[:name]}.daemon #{fetch(:daemons_path)}/#{fetch(:application)}-#{daemon[:name]}"
+        daemons = fetch(:setup_daemons, [])
+        daemons.keep_if { |x| args[:command].split('/').map(&:strip).include?(x[:name].to_s) }
 
-            template "#{daemon[:name]}.monit.erb", "#{shared_path}/tmp/#{daemon[:name]}.monit", 0644
-            execute "sudo mv -f #{shared_path}/tmp/#{daemon[:name]}.monit #{fetch(:monit_scripts_path)}/#{fetch(:application)}-#{daemon[:name]}"
+        daemons.each do |daemon|
+          if daemon[:config] == true
+            template "#{daemon[:name]}.rb.erb", "#{shared_path}/config/#{daemon[:name]}.rb", 0644
           end
+
+          template "#{daemon[:name]}.daemon.erb", "#{shared_path}/tmp/#{daemon[:name]}.daemon", 0755
+          execute "sudo mv -f #{shared_path}/tmp/#{daemon[:name]}.daemon #{fetch(:daemons_path)}/#{fetch(:application)}-#{daemon[:name]}"
+
+          template "#{daemon[:name]}.monit.erb", "#{shared_path}/tmp/#{daemon[:name]}.monit", 0644
+          execute "sudo mv -f #{shared_path}/tmp/#{daemon[:name]}.monit #{fetch(:monit_scripts_path)}/#{fetch(:application)}-#{daemon[:name]}"
         end
       end
     end
@@ -54,15 +56,13 @@ namespace :deploy do
     desc "Creates all project files."
     task :all do
       unless ENV['SKIP_YAMLS'] == 'true'
-        fetch(:setup_yamls, []).each do |yaml|
-          invoke "deploy:install:yml:#{yaml}"
-        end
+        yaml_names_param = fetch(:setup_yamls, []).map { |x| x.to_s }.join('/')
+        invoke "deploy:install:yaml[#{yaml_names_param}]"
       end
 
       unless ENV['SKIP_DAEMONS'] == 'true'
-        fetch(:setup_daemons, []).each do |daemon|
-          invoke "deploy:install:daemon:#{daemon}"
-        end
+        daemon_names_param = fetch(:setup_daemons, []).map { |x| x[:name].to_s }.join('/')
+        invoke "deploy:install:daemon[#{daemon_names_param}]"
       end
 
       if fetch(:setup_nginx, false) == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unformatt
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.1'
 platform: ruby
 authors:
 - unformatt