ansible-powerplay 0.2.4 → 1.0.2

data/lib/ansible-powerplay/powerplay.rb

@@ -10,7 +10,6 @@ module Powerplay
     end
 
     module Tmux
-
       def self.current_tty
         %x[tty].chop
       end
@@ -53,14 +52,15 @@ module Powerplay
       PLAYBOOK = "ansible-playbook"
       OPTS = ""
 
+      # deprecated
       def self.playbooks
         plays = Play::clopts[:play].map{ |y| y.to_sym }
         DSL::_global[:playbooks].each do |pplay, group|
           yield pplay, group if plays.first == :all or plays.member? pplay
         end
       end
-      
-      # groups are serial
+
+      # deprecated
       def self.groups(playbook)
         grps = Play::clopts[:group].map{ |g| g.to_sym}
         playbook.groups.each do |group|
@@ -68,11 +68,22 @@ module Powerplay
         end
       end
 
-      def self.run_book(book, bucher, book_threads, errors)
-        dryrun = Play::clopts[:dryrun]
-        extra = Play::clopts[:extra]
-        tags = Play::clopts[:tags]
-        sktags = Play::clopts[:sktags]
+      def self.jobs
+        @jobs ||= []
+      end
+      
+      def self.join_jobs
+        while not jobs.empty?
+          jobs.shift.join
+        end
+      end
+      
+      def self.get_book_apcmd(book, bucher, grouppe)
+        dryrun  = Play::clopts[:dryrun]
+        extra   = Play::clopts[:extra]
+        tags    = Play::clopts[:tags]
+        sktags  = Play::clopts[:sktags]
+        tmuxout = Play::clopts[:tmux]
         tagstr = ''
         if tags and sktags
           puts "Cannot use both --tags (#{tags}) and --skip-tags (#{sktags})"
@@ -82,7 +93,9 @@ module Powerplay
         tagstr += %( --skip-tags "#{sktags}" ) unless sktags.nil?
         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)
+        if (book.type != :noop) and
+          (bucher.first == :all or bucher.member?(book.type)) and
+          (grouppe.first == :all or not (grouppe & book.family).empty?)
           puts "        BOOK #{book.type}"
           inv = if book.config.member? :inventory 
                   "-i #{book.config[:inventory].first}" 
@@ -90,48 +103,70 @@ module Powerplay
                   ''
                 end
           xxv = [extra[book.type], extra[:all]].compact.join(' ')
-          apcmd = %|#{PLAYBOOK} #{OPTS} #{inv} #{book.config[:playbook_directory].first}/#{book.yaml} #{tagstr} --extra-vars "#{book.aparams} #{xxv}" >#{tty}|
+          redirect = (tmuxout.nil?) ? '' : " > #{tty}"
+          apcmd = %|#{PLAYBOOK} #{OPTS} #{inv} #{book.config[:playbook_directory].first}/#{book.yaml} #{tagstr} --extra-vars "#{book.aparams} #{xxv}" #{redirect}|
           unless DSL::_verbosity < 1
-            puts "==============================\nRunning command:"
-            puts "#{apcmd}".yellow
+            puts "==============================".green
+            puts "Running #{book.plan} book ".light_yellow +
+                 ":#{book.type}".light_cyan +
+                 " group heirarchy [".light_yellow +
+                 "#{book.family.map{|g| ':' + g.to_s}.join(' < ')}".light_cyan +
+                 "]".light_yellow
+            puts "\n#{apcmd}".yellow
             puts "------------------------------" 
           end
-          book_threads << Thread.new {
-            std, status = Open3.capture2e apcmd
-            errors << [book.yaml, apcmd, std] unless status.success?
-          } unless dryrun
+          (dryrun) ? nil : apcmd
+        else
+          nil
         end
       end
 
+      # Will remove entries from the planning queue in FIFO
+      # fashion, and execution them according to the algorithm
+      # as described in the README.org, Implementation of
+      # the Execution Planning, which is considered "authoritative"
+      # on how power_run works.
       def self.power_run
         bucher = Play::clopts[:book].map{ |b| b.to_sym }
-        congroups = Play::clopts[:congroups]
-        playbooks do |pname, playbook|
-          group_threads = []
-          puts "PLAYBOOK #{pname} (group=#{Play::clopts[:group]}) -->"
-          groups playbook do |group|
-            tg = nil
-            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
-            group_threads.join unless congroups
+        grouppe = Play::clopts[:group].map{ |b| b.to_sym }
+        errors = []
+
+        # old-style looping, alas
+        while DSL::_peek
+          book = DSL::_dequeue
+          apcmd = get_book_apcmd book, bucher, grouppe
+          join_jobs if book.plan == :sync
+          j = unless apcmd.nil?
+                Thread.new(book, apcmd) { |bk, cmd|
+                  std, status = Open3.capture2e cmd
+                  puts "**** Playbook #{bk.yaml} ****".light_blue, std if status.success?
+                  errors << [bk.yaml, cmd, std, status] unless status.success?
+                }
+              else
+                nil
+              end
+          if book.plan == :sync
+            puts "Sync execution of :#{book.type} => #{book.yaml}".light_magenta unless DSL::_verbosity < 2
+            j.join unless j.nil?
+          elsif book.plan == :async
+            puts "ASync execution of :#{book.type} => #{book.yaml}".magenta unless DSL::_verbosity < 2
+            jobs << j unless j.nil?
+          else
+            raise "Book plan error #{book.plan} for book #{book.type}"
+          end
+        end
+        
+        # finish the lot and report on any errors
+        join_jobs
+        unless errors.empty?
+          errors.each do |yaml, cmd, txt, status|
+            puts ('=' * 60).light_red
+            puts (('*' * 10) + ' ' + yaml).light_red + " exit status #{status.exitstatus}".light_blue
+            puts txt.light_yellow
+            puts ('-' * 30).red
+            puts cmd.red
           end
-          group_threads.each{ |t| t.join }
+          exit 10
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ansible-powerplay
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.0.2
 platform: ruby
 authors:
 - Fred Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,35 +25,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: semver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: queue_ding
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: semver
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -284,6 +298,7 @@ description: |-
 email: fred.mitchell@gmx.de
 executables:
 - powerplay
+- pp
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -302,6 +317,14 @@ files:
 - SCRATCHPAD.org
 - ansible-powerplay.gemspec
 - bin/powerplay
+- bin/pp
+- examples/playbooks/dat.yml
+- examples/playbooks/elasticseach.yml
+- examples/playbooks/first.yml
+- examples/playbooks/nat.yml
+- examples/playbooks/rabbitmq.yml
+- examples/playbooks/rat.yml
+- examples/playbooks/second.yml
 - lib/ansible-powerplay.rb
 - lib/ansible-powerplay/cli.rb
 - lib/ansible-powerplay/dsl.rb