ansible-powerplay 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0418dd150878ba2b36901fee9daaae5b16fbefb6
-  data.tar.gz: 5e193e41177a494105c1855a42795043b2f37f70
+  metadata.gz: 4190194915cad33eb4578e63fd965b9ac87431d1
+  data.tar.gz: d3d3e3289b5e4232c68d0f33fc5dd1d9bfeca75b
 SHA512:
-  metadata.gz: 4d625d89cb73f235dc380eba57780ae4c7a265b1eef83344fa331108439e7c44a416f0438e8284234b1f2d4a43597520b9e40752544b5bb17945bf291ac2fd71
-  data.tar.gz: e0bad3f05079770e834ddadb5e910918e36a8d6b1a90d7c83b276eb59ed5eec610a458d2bd43e59219641238c9aad3c1f247e172fe194bac0f666527811f2a0b
+  metadata.gz: cda9fb902dfa37287191a1d097f8522ee593297b425eacfaa3deae1ac5a1cca81160568acf90c763761c345d4eb689741127cb5ee05f3a8d1535166b8ae36291
+  data.tar.gz: 8f53c342b3c3d36bea51d8833079e424461f9b58d7d97588c49cda84773e5417783d8fde67b8bc4026639bfaa46f6f0eb1fdaa72a5d08c1e665883a4930e8525

data/.semver

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

data/README.org

@@ -550,3 +550,15 @@ Description:
           group_threads.each{ |t| t.join }
         end
     #+end_src
+*** Old tmux option parsing functional
+    #+begin_src ruby
+      .inspect
+      .chop
+      .split(",")
+      .map{ |s| s.strip.sub(/\\n|\"/, '') }
+      .reject{ |pty| pty == %x(tty).chop }
+      .reject{ |pty| pty == '' }
+    #+end_src
+
+
+

data/RELEASE_NOTES.org

@@ -9,6 +9,7 @@
 ** Release Notes
    | Release | Feature / Bug                          | Description                                                                                   |       Date |
    |---------+----------------------------------------+-----------------------------------------------------------------------------------------------+------------|
+   | v1.2.0  | Tmux pane numbering                    | Allows you to specify precisely which panes on your target window that will receive the dump. | 2016-09-01 |
    | v1.1.0  | Group sequencing                       | Allows you to run a group multiple times with sequence numbers.                               | 2016-08-09 |
    | v1.0.8  | --ttys                                 | List specific terminals you'd like the output to go to.                                       | 2016-07-07 |
    | v1.0.7  | Verosity Switch --apverbose=n (-Vn)    | Pass to ansible-powerplay -v, -vv, etc.                                                       |            |

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 1.1.0 ruby lib
+# stub: ansible-powerplay 1.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ansible-powerplay"
-  s.version = "1.1.0"
+  s.version = "1.3.0"
 
   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-08-09"
+  s.date = "2016-09-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", "pp"]

data/lib/ansible-powerplay/cli.rb

@@ -17,8 +17,28 @@ module Powerplay
         if [script] is not given, it defaults to 'stack.play'
         in the current directory.
       LONGDESC
-      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 :tmux,      type: :string, aliases: '-m',  banner: "[WINDOWNUMBERopt[:PANENUMBER[,PANENUMBER...]]]", lazy_default: "0",
+                                                        desc: <<-LONGDESC
+
+Send output to all tmux panes in the current window, or the numeric
+window specified. Additionally, you can precisely specify pane indices,
+as are shown by the "<tmux-key> q" command (or whatever you may have
+mapped it to.
+
+Examples:
+ -m       -- will send the output to "random" panes of the current TMUX
+             window.
+ -m=2     -- will send the output to the TMUX window two, and "randomly" 
+             select panes for the output.
+ -m=2:2,3 -- will send the outputs to only pane indices 2 and 3 of TMUX window 2.
+ -m=0:1,4 -- will send the outputs to only pane indices 1 and 4 of the current
+             TMUX window. '0' always mean 'current TMUX window'.
+
+Note that you will need to use the '=' now, when you specify windows and panes.
+It will not work properly without it.
+
+LONGDESC
+      
       option :ttys,      type: :array,   aliases: '-M', banner: "[TTY1[ TTY2 ...]]",
                                                         desc: ' Send output to specified (pseudo) ttys.'
       option :play,      type: :array,   aliases: ['-p', '--power'], banner: "[NAME[ NAME2...]|all]", required: true,

data/lib/ansible-powerplay/powerplay.rb

@@ -14,28 +14,45 @@ module Powerplay
         %x[tty].chop
       end
 
+      # Either this list is empty, or a list
+      # of window indices that was passed in from command-line.
+      def self.list_of_pane_indices
+        @slst ||= Play::clopts[:tmux].split(':')[1]
+        @lst ||= unless @slst.nil?
+                   @slst
+                     .split(',')
+                     .map{ |n| n.to_i }
+                 else
+                   []
+                 end
+      end
+      
       # Get a list of the ptys
       # Note that this code is a bit innefficient, but will only be
       # executed once in the loop.
       def self.pane_ttys
-        @window = if Play::clopts.nil? or Play::clopts[:tmux] == 0
+        @window = if Play::clopts.nil? or Play::clopts[:tmux].split(':').first.to_i == 0
                     ''
                   else
-                    " -t #{Play::clopts[:tmux]} "
+                    " -t #{Play::clopts[:tmux].split(':').first} "
                   end
         @ptys ||= if Play::clopts[:ttys]
                     Play::clopts[:ttys]
                   elsif Play::clopts.nil? or Play::clopts[:tmux]
-                    %x[tmux list-panes #{@window} -F '\#{pane_tty},']
+                    %x[tmux list-panes #{@window} -F '\#{pane_index}:\#{pane_tty},']
                       .inspect
                       .chop
-                      .split(",")
+                      .split(',')
                       .map{ |s| s.strip.sub(/\\n|\"/, '') }
-                      .reject{ |pty| pty == %x(tty).chop }
                       .reject{ |pty| pty == '' }
+                      .map{ |s| s.split(':') }
+                      .reject{ |idx,pty| pty == '' }
+                      .map{ |i,t| [i.to_i, t] }
+                      .reject{ |i,pty| not (list_of_pane_indices.empty? or list_of_pane_indices.member?(i)) }
+                      .to_h
                   else
-                    [current_tty]
-                  end
+                    {nur: current_tty}
+                  end        
       end
       
       # thread-safe way to grab a new tty
@@ -44,7 +61,7 @@ module Powerplay
         CRITICAL.synchronize {
           @@tty_count ||= -1
           @@tty_count = (@@tty_count+1) % pane_ttys.size
-          tty = pane_ttys[@@tty_count] 
+          tty = pane_ttys.values[@@tty_count]
         }
         tty
       end
@@ -85,7 +102,7 @@ module Powerplay
         extra   = Play::clopts[:extra]
         tags    = Play::clopts[:tags]
         sktags  = Play::clopts[:sktags]
-        tmuxout = Play::clopts[:tmux]
+        tmuxout, tmuxpanes = Play::clopts[:tmux]
         apverb  = Play::clopts[:apverbose]
 
         verb = (apverb == 0) ? '' : ('-' + ('v' * apverb))
@@ -97,7 +114,7 @@ module Powerplay
         tagstr += %( --tags "#{tags}" ) unless tags.nil?
         tagstr += %( --skip-tags "#{sktags}" ) unless sktags.nil?
         tty ||= Tmux.grab_a_tty
-        puts " tty == #{tty} (#{Tmux.pane_ttys.last})" unless DSL::_verbosity < 2
+        puts " tty == #{tty} (#{Tmux.pane_ttys.values.last})" unless DSL::_verbosity < 2
         if (book.type != :noop) and
           (bucher.first == :all or bucher.member?(book.type)) and
           (grouppe.first == :all or not (grouppe & book.family).empty?)

metadata

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