alpha_omega 0.0.171 → 0.0.172

data/VERSION

@@ -1 +1 @@
-0.0.171
+0.0.172

data/lib/alpha_omega/deploy.rb

@@ -268,13 +268,13 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
 
     task :bootstrap_code do
       if releases.length < 2 # without services and run as root
-        run "[[ -d #{deploy_to} ]] || #{try_sudo} install -v -d -m #{dir_perms} #{try_sudo.empty? ? '' : "-o #{root_user} -g #{root_group}"} #{deploy_to}"
-        run "#{try_sudo} install -v -d -m #{dir_perms} #{try_sudo.empty? ? '' : "-o #{user} -g #{group}"} #{releases_path} #{deploy_to}/log"
+        run "[[ -d #{deploy_to} ]] || #{try_sudo} install -d -m #{dir_perms} #{try_sudo.empty? ? '' : "-o #{root_user} -g #{root_group}"} #{deploy_to}"
+        run "#{try_sudo} install -d -m #{dir_perms} #{try_sudo.empty? ? '' : "-o #{user} -g #{group}"} #{releases_path} #{deploy_to}/log"
       else
         dirs = [ releases_path, service_path, service_drop, log_path ]
         dir_args = dirs.map {|d| d.sub("#{deploy_to}/", "") }.join(' ')
-        run "#{try_sudo} install -v -d -m #{dir_perms} #{try_sudo.empty? ? '' : "-o #{user} -g #{group}"} #{deploy_to}"
-        run "cd #{deploy_to} && install -v -d -m #{dir_perms} #{dir_args}"
+        run "#{try_sudo} install -d -m #{dir_perms} #{try_sudo.empty? ? '' : "-o #{user} -g #{group}"} #{deploy_to}"
+        run "cd #{deploy_to} && install -d -m #{dir_perms} #{dir_args}"
       end
     end
 
@@ -294,7 +294,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
 
     task :symlink_next do
       if releases.length >= 2
-        run "ln -vnfs #{current_release} #{next_path}.new"
+        run "ln -nfs #{current_release} #{next_path}.new"
         run "mv -T #{next_path}.new #{next_path}"
       end
     end
@@ -312,8 +312,8 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       if releases.length > 0
         on_rollback do
           if rollback_release
-            run "rm -fv #{previous_path} #{next_path}"
-            run "ln -vnfs #{rollback_release} #{current_path}.new"
+            run "rm -f #{previous_path} #{next_path}"
+            run "ln -nfs #{rollback_release} #{current_path}.new"
             run "mv -T #{current_path}.new #{current_path}"
           else
             logger.important "no previous release to rollback to, rollback of symlink skipped"
@@ -321,17 +321,17 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
         end
 
         if releases.length == 1
-          run "ln -vnfs #{current_release} #{current_path}.new"
+          run "ln -nfs #{current_release} #{current_path}.new"
           run "mv -T #{current_path}.new #{current_path}"
         else
-          run "rm -fv #{previous_path} #{next_path}"
-          run "ln -vnfs #{current_release} #{current_path}.new"
+          run "rm -f #{previous_path} #{next_path}"
+          run "ln -nfs #{current_release} #{current_path}.new"
           run "mv -T #{current_path}.new #{current_path}"
           if current_path != external_path
-            run "#{File.dirname(external_path).index(deploy_to) == 0 ? "" : try_sudo} ln -vnfs #{current_path} #{external_path}.new"
+            run "#{File.dirname(external_path).index(deploy_to) == 0 ? "" : try_sudo} ln -nfs #{current_path} #{external_path}.new"
             run "#{File.dirname(external_path).index(deploy_to) == 0 ? "" : try_sudo} mv -T #{external_path}.new #{external_path}"
           end
-          run "ln -vnfs #{rollback_release} #{previous_path}.new"
+          run "ln -nfs #{rollback_release} #{previous_path}.new"
           run "mv -T #{previous_path}.new #{previous_path}"
         end
 
@@ -402,7 +402,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       set :deploy_path_name, "compare"
       set :deploy_release_name, "compare"
       update_code
-      run "ln -vnfs #{deploy_release} #{deploy_path}.new"
+      run "ln -nfs #{deploy_release} #{deploy_path}.new"
       run "mv -T #{deploy_path}.new #{deploy_path}"
     end
 
@@ -415,9 +415,8 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       task :revision do
         if previous_release
           system "#{figlet} -w 200 on #{previous_release_name}"
-          run "rm -fv #{previous_path} #{next_path}"
-
-          run "ln -vnfs #{previous_release} #{current_path}.new"
+          run "rm -f #{previous_path} #{next_path}"
+          run "ln -nfs #{previous_release} #{current_path}.new"
           run "mv -T #{current_path}.new #{current_path}"
         else
           abort "could not rollback the code because there is no prior release"
@@ -462,7 +461,7 @@ Capistrano::Configuration.instance(:must_exist).load do |config|
       set :deploy_path_name, "migrate"
       set :deploy_release_name, "migrate"
       update_code
-      run "ln -vnfs #{deploy_release} #{deploy_path}.new"
+      run "ln -nfs #{deploy_release} #{deploy_path}.new"
       run "mv -T #{deploy_path}.new #{deploy_path}"
     end
 

data/lib/alpha_omega/utils.rb

@@ -72,7 +72,7 @@ module AlphaOmega
         end
 
         # each pod task sets the pod context for host/group tasks
-        config.task "#{pod_name}.#{tsuffix}" do # task default, pod1
+        config.task "#{pod_name}.#{tsuffix}" do # task pod1
           set :current_pod, pod_name
         end
       end
@@ -84,30 +84,31 @@ module AlphaOmega
           node_dna[remote_name] = {}
           node_dna[remote_name].deep_merge!(n)
 
-          if node_filter.nil? || node_filter.call(this_node, n)
-            config.task "#{task_name}.#{pod_name}.app" do # task host.default.app, host.pod1.app
-              role :app, remote_name
-              set :dna, node_dna[remote_name]
-            end
-          
-            config.task "#{task_name}.#{pod_name}.echo" do # task host.default.echo, host.pod1.echo
-              puts "#{AlphaOmega.magic_prefix} #{remote_name}"
-            end
-          
-            config.task "#{task_name}.#{pod_name}.yaml" do # task host.default.yaml, host.pod1..yaml
-              StringIO.new({ remote_name => n }.to_yaml).lines.to_a[1..-1].each {|l| puts "#{AlphaOmega.magic_prefix} #{l}" }
+          cap_roles = node_filter.call(this_node, n)
+          return nil unless cap_roles
+
+          config.task "#{task_name}.#{pod_name}.app" do # task host.pod1.app
+            cap_roles.each do |cap_role, cap_preds|
+              role cap_role, remote_name, cap_preds
             end
-          
-            %w(app echo yaml).each do |tsuffix|
-              config.task "#{task_name}.#{tsuffix}" do # task host -> host.current_pod
-                config.after "#{task_name}.#{tsuffix}", "#{task_name}.#{current_pod}.#{tsuffix}"
-              end
+            set :dna, node_dna[remote_name]
+          end
+        
+          config.task "#{task_name}.#{pod_name}.echo" do # task host.pod1.echo
+            puts "#{AlphaOmega.magic_prefix} #{remote_name}"
+          end
+        
+          config.task "#{task_name}.#{pod_name}.yaml" do # task host.pod1.yaml
+            StringIO.new({ remote_name => n }.to_yaml).lines.to_a[1..-1].each {|l| puts "#{AlphaOmega.magic_prefix} #{l}" }
+          end
+        
+          %w(app echo yaml).each do |tsuffix|
+            config.task "#{task_name}.#{tsuffix}" do # task host -> host.current_pod
+              config.after "#{task_name}.#{tsuffix}", "#{task_name}.#{current_pod}.#{tsuffix}"
             end
-
-            n
-          else
-            nil
           end
+
+          n
         end
 
       AlphaOmega.what_groups hosts do |task_name, nodes|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: alpha_omega
 version: !ruby/object:Gem::Version 
-  hash: 329
+  hash: 327
   prerelease: 
   segments: 
   - 0
   - 0
-  - 171
-  version: 0.0.171
+  - 172
+  version: 0.0.172
 platform: ruby
 authors: 
 - David Nghiem