ansible-powerplay 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59c6967f5d7e959a86e1b746b443fb03ec7031e
-  data.tar.gz: bd9a4431839188117f0f092c5f4bd8cb013b87c4
+  metadata.gz: c5cfb3603dc0e590de6f8fc01c069e1e15d06c59
+  data.tar.gz: 46bd40dfeb1db350ed3da7a4b05a25396f7932bf
 SHA512:
-  metadata.gz: f7d17b9b006f13de8f541d813b1fad5d18be11763722927eb611015341092f79d5cdec96fc91160cdfd87cead6270448742e3a4a9070bbdce04724c113c2c134
-  data.tar.gz: e87aaf34027d707437a0ffd9ee94a486571f37e9ff549c535e594eebe9346a7ae7f0a3fe1607ec629b7346a58bb03a12fe8704b365eeec747799ce0556daa37a
+  metadata.gz: 3c0fc843b9cf1c6a41ede49e8392914e6a6acab1af54f2d0712ff62eac983a691f68d15f27ca5648a4974eeee1a16323ad4bf7f96118d0d406c5ee852dddd39d
+  data.tar.gz: 38ffe69ce84327a335130c73187c11879f98eac8d258d31e71284fad61cef3a9354389cf8c54fc6d8b3fd32113318bacfe30ec6be5b12e094bf1ece2f9a36e42

data/.semver

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

data/ansible-powerplay.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ansible-powerplay 0.0.6 ruby lib
+# stub: ansible-powerplay 0.0.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ansible-powerplay"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Fred Mitchell"]
-  s.date = "2016-02-18"
+  s.date = "2016-02-19"
   s.description = "Ansible Powerplay, by way of its DSL, allows you to\n                       specify your Ansible playbooks and their vars, and common\n                       vars to all, so that you can run your\n                       indeoendent playbooks in full parallel."
   s.email = "fred.mitchell@gmx.de"
   s.executables = ["powerplay"]

data/lib/ansible-powerplay/dsl.rb

@@ -3,6 +3,7 @@ module Powerplay
   module DSL
     @@config_stack = [{}]
     @@global_config = {}
+    SPECIAL_PARAMS = [:playbook_directory, :inventory]
 
     def _bump
       @@config_stack.push @@config_stack.last.clone
@@ -62,9 +63,10 @@ module Powerplay
       end
 
       # Ansible playbook parameters
-      # TODO: there is a bogus playbook_directory param here.
       def aparams
-        config.map{ |k,v| "#{k}=#{v.first}"}.join(' ')
+        config.map{ |k,v|          
+          "#{k}=#{v.first}" unless DSL::SPECIAL_PARAMS.member?(k)
+        }.compact.join(' ')
       end
     end
 

data/lib/ansible-powerplay/powerplay.rb

@@ -39,8 +39,8 @@ module Powerplay
       def self.playbooks
         play = Play::clopts[:play].to_sym
         if play == :all
-          DSL::_global[:playbooks].each do |play, group|
-            yield play, group
+          DSL::_global[:playbooks].each do |pplay, group|
+            yield pplay, group
           end
         else
           yield play, DSL::_global[:playbooks][play]
@@ -64,33 +64,38 @@ module Powerplay
           puts "PLAYBOOK #{pname} (group=#{Play::clopts[:group]}) -->"
           groups playbook do |group|
             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
-              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
-            })
+            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}"
+                                inv = if book.config.member? :inventory 
+                                        "-i #{book.config[:inventory].first}" 
+                                      else
+                                        ''
+                                      end
+                                apcmd = %|#{PLAYBOOK} #{OPTS} #{inv} #{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
+                            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
+                          })
             # Always wait here unless we're concurrent
             thrgroups.join unless congroups
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible-powerplay
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Fred Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor