ansible-powerplay 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ff62bce4702a662d6ead17f9f44f3f668d756e3
-  data.tar.gz: 090eecdd280e81f041e8b4d96517b7e55ec98f67
+  metadata.gz: 69f3a4daf0204e14ee2ef52d7c6aac60b3d8d381
+  data.tar.gz: 7c137de2f93e486edf904d3725a5c7df2d8678cb
 SHA512:
-  metadata.gz: e952db302f3a40c9a18c28d5d10f53baea8a2c9a7985a167e797789123f4618b295977dd1798c235757ae01a41484f1f3908dea736ede1621213fa1bcb81e3e9
-  data.tar.gz: 70a601cb59968f21cffd02f35465da587d670a76816d15740777f317745097edb07fcb258f8d328d94f93dfd04620d1472d7f9537c559a72d19f9fbebc37ecfc
+  metadata.gz: 90c32a85c428d6ed98860b4ed0944c256bc9bcc0b34e8ac3ec6c40074cada8934b4e62b9dddb2504943978c6ab8b434b22a616c106f1cd15bedf1127ddfce7f1
+  data.tar.gz: ad6a6e5bb2d66a78d5c3bd735f0a9f7f7a3599f2d2ee8b093d29bdd557b7a5a23a1d840c72e4919f1c1d3711d7d3233923025636355562f2207db305a2cf32d4

data/.semver

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

data/README.org

@@ -84,7 +84,7 @@
 
 ** Use
    Basically, cd to the root of your Ansible directory,
-   and a .play file (see the example at: [[https://github.com/flajann2/ansible-powerplay/blob/master/examples/test.play][test.play]].
+   and a .play file (see the example at: [[https://github.com/flajann2/ansible-powerplay/blob/master/examples/stack.play][stack.play]].)
 
    You can place a config clause either globally,
    inside of playbooks, inside of groups, and the
@@ -203,6 +203,31 @@ Options:
     shall be adding many more subcommands and options as our needs demands.
     If you like to see something here, please submit it as an issue on Github.
 
+    And for an example of play help, (note that this may not be up-to-date, so
+    please run 'powerplay help play' on your installe version!)
+    #+BEGIN_SRC doc
+powerplay help play
+Usage:
+  powerplay play [script] -p, --play, --power, --play=[NAME[ NAME2...]|all]
+
+Options:
+  -m, [--tmux=[WINDOWNUMBERopt]]                                                                                              #  Send output to all tmux panes in the current window, or the numeric window specified.
+  -p, --play, --power, --play=[NAME[ NAME2...]|all]                                                                           # Which PowerPlay playbooks (as opposed to Ansible playbooks) to specifically execute.
+  -g, [--group=[NAME[ NAME2...]|all]]                                                                                         #  Which groups to execute.
+                                                                                                                              # Default: [:all]
+  -c, [--congroups], [--no-congroups]                                                                                         # Run the groups themselves concurrently
+  -b, [--book=[NAME[ NAME2...]|all]]                                                                                          # Which books to execute.
+                                                                                                                              # Default: [:all]
+  -u, [--dryrun], [--no-dryrun]                                                                                               # Dry run, do not actually execute.
+  -x, --extra-vars, [--extra=<BOOKNAME|all>:"key1a=value1a key2a=value2a... " [BOOKNAME2:"key1b=value1b key2b=value2b... "]]  # Pass custom parameters directly to playbooks. You may either pass parameters to all playbooks or specific ones.
+  -v, [--verbose=[1|2|3]]
+                                                                                                                              # Default: 0
+
+Description:
+  Plays a PowerPlay script. The entries in the script, as specified inside of a group, are run in parallel by default.
+    #+END_SRC
+
+
 *** Example .play Script
     To play around with the example .play script,
     Clone the [[https://github.com/flajann2/ansible-powerplay][Ansible Powerplay]] project locally:

data/RELEASE_NOTES.org

@@ -7,18 +7,19 @@
   major number. Of course, you can read all about it here.
 
 ** Release Notes
-   | Release | Feature / Bug                    | Description                                                                    |       Date |
-   |---------+----------------------------------+--------------------------------------------------------------------------------+------------|
-   | v0.2.0  | powerplay play (behavior change) | If script is not given, now defaults to 'stack.play' in the current directory. | 2016-02-29 |
-   | v0.1.3  | --tmux                           | Better handling at distributing the panes.                                     | 2016-02-26 |
-   | v0.1.2  | --tmux. --no-tmux                | Default output now goes to current tty                                         | 2016-02-23 |
-   | v0.1.1  | --book, --group, --play          | Minor bug with the array handling                                              | 2016-02-22 |
-   | v0.1.0  | --book, --group, --play          | Now each can take multiple specifications                                      | 2016-02-22 |
-   | v0.0.8  | Creation of these Release Notes  | About bloody time. The prior releases were all mostly bug fixes, and so...     | 2016-02-20 |
-   |         | --tmux                           | Now you can optionally specify the window number                               |            |
-   |         | --tmux                           | Now checks to ensure it does not dump to its own pane                          |            |
-   |         | --book                           | You can select an individual playbook to run                                   |            |
-   |         | --group                          | You can select an individual group to run                                      |            |
+   | Release | Feature / Bug                    | Description                                                                        |       Date |
+   |---------+----------------------------------+------------------------------------------------------------------------------------+------------|
+   | v0.2.1  | --extra-vars                     | A way of passing extra vars to the Ansible playbooks. Please see the documentation | 2016-03-01 |
+   | v0.2.0  | powerplay play (behavior change) | If script is not given, now defaults to 'stack.play' in the current directory.     | 2016-02-29 |
+   | v0.1.3  | --tmux                           | Better handling at distributing the panes.                                         | 2016-02-26 |
+   | v0.1.2  | --tmux. --no-tmux                | Default output now goes to current tty                                             | 2016-02-23 |
+   | v0.1.1  | --book, --group, --play          | Minor bug with the array handling                                                  | 2016-02-22 |
+   | v0.1.0  | --book, --group, --play          | Now each can take multiple specifications                                          | 2016-02-22 |
+   | v0.0.8  | Creation of these Release Notes  | About bloody time. The prior releases were all mostly bug fixes, and so...         | 2016-02-20 |
+   |         | --tmux                           | Now you can optionally specify the window number                                   |            |
+   |         | --tmux                           | Now checks to ensure it does not dump to its own pane                              |            |
+   |         | --book                           | You can select an individual playbook to run                                       |            |
+   |         | --group                          | You can select an individual group to run                                          |            |
 
 ** Known Outstanding Issues
    Bugs and missing features that needs to be addressed. As they are,

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.2.0 ruby lib
+# stub: ansible-powerplay 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ansible-powerplay"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   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-29"
+  s.date = "2016-03-01"
   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/cli.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'ansible-powerplay'
 
 include Powerplay::DSL
@@ -16,14 +17,21 @@ module Powerplay
         if [script] is not given, it defaults to 'stack.play'
         in the current directory.
       LONGDESC
-      option :tmux,      type: :numeric, lazy_default: 0, aliases: '-m', banner: "[WINDOWNUMBERopt] Send output to all tmux panes in the current window, or the numeric window specified."
-      option :play,      type: :array,  aliases: '-p', banner: "[NAME[ NAME2...]|all] Which playbook shelves", required: true
-      option :group,     type: :array,  aliases: '-g', banner: "[NAME[ NAME2...]|all] Which groups to execute", default: [:all]
-      option :congroups, type: :boolean, aliases: '-c', banner: "Run the groups themselves concurrently"
-      option :book,      type: :array,  aliases: '-b', banner: "[NAME[ NAME2...]|all] Which books to execute", default: [:all]
-      option :dryrun,    type: :boolean, aliases: '-u', banner: "Dry run, do not actually execute."
+      option :tmux,      type: :numeric, aliases: '-m', banner: "[WINDOWNUMBERopt]", lazy_default: 0,
+                                                        desc: ' Send output to all tmux panes in the current window, or the numeric window specified.'
+      option :play,      type: :array,   aliases: ['-p', '--play', '--power'], banner: "[NAME[ NAME2...]|all]", required: true,
+                                                        desc: 'Which PowerPlay playbooks (as opposed to Ansible playbooks) to specifically execute.'
+      option :group,     type: :array,   aliases: '-g', banner: "[NAME[ NAME2...]|all]", default: [:all],
+                                                        desc: ' Which groups to execute.'
+      option :congroups, type: :boolean, aliases: '-c', desc: "Run the groups themselves concurrently"
+      option :book,      type: :array,   aliases: '-b', banner: "[NAME[ NAME2...]|all]", default: [:all],
+                                                        desc: 'Which books to execute.'
+      option :dryrun,    type: :boolean, aliases: '-u', desc: "Dry run, do not actually execute."
+      option :extra,     type: :array,   aliases: ['-x', '--extra-vars'],
+                                                        banner: %(<BOOKNAME|all>:"key1a=value1a key2a=value2a... " [BOOKNAME2:"key1b=value1b key2b=value2b... "]), default: [],
+                                                        desc: 'Pass custom parameters directly to playbooks. You may either pass parameters to all playbooks or specific ones.'
       def play(script = 'stack.play')
-        DSL::_global[:options] = options
+        DSL::_global[:options] = massage options
         puts "script %s " % [script] if DSL::_global[:options][:verbose] >= 1
         load script, true
         pp DSL::_global if DSL::_verbosity >= 3
@@ -34,6 +42,14 @@ module Powerplay
       def ttys
         puts Play::Tmux::pane_ptys
       end
+
+      no_commands do
+        def massage(options)
+          opt = Thor::CoreExt::HashWithIndifferentAccess.new options
+          opt[:extra] = Thor::CoreExt::HashWithIndifferentAccess.new opt[:extra].map{ |s| s.split(':', 2)}.to_h
+          opt
+        end
+      end
     end
   end
 end

data/lib/ansible-powerplay/powerplay.rb

@@ -6,7 +6,7 @@ CRITICAL = Mutex.new
 module Powerplay
   module Play
     def self.clopts
-      @cliots ||= DSL::_global[:options]
+      @clopts ||= Thor::CoreExt::HashWithIndifferentAccess.new DSL::_global[:options]
     end
 
     module Tmux
@@ -68,52 +68,56 @@ module Powerplay
         end
       end
 
+      def self.run_book(book, bucher, book_threads, errors)
+        dryrun = Play::clopts[:dryrun]
+        extra = Play::clopts[:extra]
+        tty ||= Tmux.grab_a_tty
+        puts " tty == #{tty} (#{Tmux.pane_ttys.last})" unless DSL::_verbosity < 2
+        if bucher.first == :all or bucher.member?(book.type)
+          puts "        BOOK #{book.type}"
+          inv = if book.config.member? :inventory 
+                  "-i #{book.config[:inventory].first}" 
+                else
+                  ''
+                end
+          xxv = [extra[book.type], extra[:all]].compact.join(' ')
+          apcmd = %|#{PLAYBOOK} #{OPTS} #{inv} #{book.config[:playbook_directory].first}/#{book.yaml} --extra-vars "#{book.aparams} #{xxv}" >#{tty}|
+          book_threads << Thread.new {
+            std, status = Open3.capture2e apcmd
+            errors << [book.yaml, apcmd, std] unless status.success?
+          } unless dryrun
+        end
+      end
+
       def self.power_run
         bucher = Play::clopts[:book].map{ |b| b.to_sym }
-        dryrun = Play::clopts[:dryrun]
         congroups = Play::clopts[:congroups]
         playbooks do |pname, playbook|
-          thrgroups = []
+          group_threads = []
           puts "PLAYBOOK #{pname} (group=#{Play::clopts[:group]}) -->"
           groups playbook do |group|
             tg = nil
-            thrgroups << (tg = Thread.new {
-                            puts "    GROUP #{group.type} (book=#{bucher}, cg=#{congroups}) -->"
-                            thrbooks = []
-                            errors = []
-                            group.books.each do | book |
-                              tty ||= Tmux.grab_a_tty
-                              puts " tty == #{tty} (#{Tmux.pane_ttys.last})" unless DSL::_verbosity < 2
-                              if bucher.first == :all or bucher.member?(book.type)
-                                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
-                          })
+            group_threads << (tg = Thread.new {
+                                puts "    GROUP #{group.type} (book=#{bucher}, cg=#{congroups}) -->"
+                                book_threads = []
+                                errors = []
+                                group.books.each { |book| run_book(book, bucher, book_threads, errors) }
+                                book_threads.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
+            group_threads.join unless congroups
           end
-          thrgroups.each{ |t| t.join }
+          group_threads.each{ |t| t.join }
         end
       end
     end

metadata

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