ansible-powerplay 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9dd462851801b5fa3560bf9b8dd5f08c0d80728
-  data.tar.gz: ec3da1aaf3afb7fbff91780979630e703aa9591c
+  metadata.gz: 88303d0e049d649b8d969e872a412cffc9d96162
+  data.tar.gz: ffc30cbff29524a0a3abdf69d8362b02e1d05981
 SHA512:
-  metadata.gz: 016606a083317be2b29d41c09c11a229163de64813236f1f047f6d6ae9579ad08295ab58f286dbc4300ddef4cdb4f5fcfcf56666c1efe78f2f4a152cd5c41fac
-  data.tar.gz: b7415bda872425c58cb4c022968dd7b33a858d065d42d9693b3a61f9d7bcae3548c7feec1c9a9ce0e579310b8b8dcadf68a5c78fcdd8bb65f878d4e693c623a7
+  metadata.gz: 31e69ea4973bb82ef4e4e6318ca7eb55aea56b1905bda91ee4b88bcd2df385b2ebf46c67e92428f9461bac505528516bc567d34bf4d3550ee80f98701538893b
+  data.tar.gz: 454af5e1e9112a5cdfddd017aa68598fbdef398091a726120f40bb7dca0cd225fe03e8b51449757c603e03fe3e828dbcaebf530dbb7f7acf3ee29f255e944baf

data/.semver

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 0
-:patch: 4
+:patch: 5
 :special: ''

data/ansible-powerplay.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ansible-powerplay 0.0.4 ruby lib
+# stub: ansible-powerplay 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ansible-powerplay"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/ansible-powerplay/cli.rb

@@ -16,6 +16,7 @@ module Powerplay
       option :tmux, type: :boolean, aliases: '-m', banner: "send output to all tmux panes in the current window"
       option :play, type: :string, banner: "[NAME|all] Which playbook shelf", required: true
       option :group, type: :string, banner: "[NAME|all] Which group to execute", default: "all"
+      option :congroups, type: :boolean, aliases: '-c', banner: "Run the groups themselves concurrently"
       option :book, type: :string, banner: "[NAME|all] Which book to execute", default: "all"
       option :dryrun, type: :boolean, banner: "Dry run, do not actually execute."
       def play(script)

data/lib/ansible-powerplay/powerplay.rb

@@ -50,36 +50,43 @@ module Powerplay
       def self.power_run
         buch = Play::clopts[:book].to_sym
         dryrun = Play::clopts[:dryrun]
-        
+        congroups = Play::clopts[:congroups]
         playbooks do |pname, playbook|
+          thrgroups = []
           puts "PLAYBOOK #{pname} (group=#{Play::clopts[:group]}) -->"
           groups playbook do |group|
-            puts "    GROUP #{group.type} (book=#{buch}) -->"
-            thrs = []
-            errors = []
-            group.books.zip(Tmux.pane_ptys) do |book, tty|
-              tty ||= Tmux.pane_ptys.last
-              if buch == :all or book.type == buch
-                puts "        BOOK #{book.type}"
-                apcmd = %|#{PLAYBOOK} #{OPTS} #{book.config[:playbook_directory].first}/#{book.yaml} --extra-vars "#{book.aparams}" >#{tty}|
-                thrs << Thread.new {
-                  std, status = Open3.capture2e apcmd
-                  errors << [book.yaml, apcmd, std] unless status.success?
-                } unless dryrun
+            tg = nil
+            thrgroups << (tg = Thread.new { 
+              puts "    GROUP #{group.type} (book=#{buch}, cg=#{congroups}) -->"
+              thrbooks = []
+              errors = []
+              group.books.zip(Tmux.pane_ptys) do |book, tty|
+                tty ||= Tmux.pane_ptys.last
+                if buch == :all or book.type == buch
+                  puts "        BOOK #{book.type}"
+                  apcmd = %|#{PLAYBOOK} #{OPTS} #{book.config[:playbook_directory].first}/#{book.yaml} --extra-vars "#{book.aparams}" >#{tty}|
+                  thrbooks << Thread.new {
+                    std, status = Open3.capture2e apcmd
+                    errors << [book.yaml, apcmd, std] unless status.success?
+                  } unless dryrun
+                end
               end
-            end
-            thrs.each{ |t| t.join }
-            unless errors.empty?
-              errors.each do |yaml, cmd, txt|
-                puts '=' * 30
-                puts ('*' * 10) + ' ' + yaml
-                puts txt
-                puts '-' * 30
-                puts cmd
+              thrbooks.each{ |t| t.join }
+              unless errors.empty?
+                errors.each do |yaml, cmd, txt|
+                  puts '=' * 30
+                  puts ('*' * 10) + ' ' + yaml
+                  puts txt
+                  puts '-' * 30
+                  puts cmd
+                end
+                exit 10
               end
-              exit 10
-            end
+            })
+            # Always wait here unless we're concurrent
+            thrgroups.join unless congroups
           end
+          thrgroups.each{ |t| t.join }
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansible-powerplay
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Fred Mitchell