smart_proxy_ansible 3.5.6 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb206292fd57f3df0b026850f14e36a171ab612441a07eabda038564ed9882e
-  data.tar.gz: f81ec06c89616f468f8e0b2e91337604ac53083813afb78ac0428b81c2c3fab8
+  metadata.gz: 12f791dcb337052aba097f02210ac04a3fedd80afff15d79b370058d6f06b108
+  data.tar.gz: a41495f8bad24dcd1d7c5c0798b992abf96f1dff501c1cdd7e22dfd68e5406ea
 SHA512:
-  metadata.gz: c43173334f7e61412176729557b0d259c9f5a4c1be8e1e13d41c0a5fecc77ad2c4a3768b3d43dcd41db53ce46fbf5b5cf81328ebdaa3045fb083d4bff44ea835
-  data.tar.gz: de9b416be34c2a2f6abf0b9ef1747911356fdb770cfa3ea90ee37dc409b78f9b168477c3656327ecbfa412ddfe335e1043b9510c4260b58d5e50370df5eb8f6a
+  metadata.gz: 5ce5d1746e0bb01220cdd67bf1af0b414cbbb6d8215079e8b35ed089e83e95c70b4b75646867892dab443ed67fb8b1433d9b18da9d5a0142b1a18e7adea33f0a
+  data.tar.gz: c41477f577e7c73a026a3cb80fdc0a3910ed1f007f08c7121d3cec0b88a30ae2b76220d43def38db6bba53a3aa8130c7acb260f7dfb45840a116b7d0debc8ace

data/lib/smart_proxy_ansible/playbooks_reader.rb

@@ -14,13 +14,13 @@ module Proxy
         end
 
         def get_playbooks_names(collections_path)
-          Dir.glob("#{collections_path}/ansible_collections/*/*/playbooks/*").map do |path|
+          glob_path("#{collections_path}/ansible_collections/*/*/playbooks/*").map do |path|
             ReaderHelper.playbook_or_role_full_name(path)
           end
         end
 
         def read_collection_playbooks(collections_path, playbooks_to_import = nil)
-          Dir.glob("#{collections_path}/ansible_collections/*/*/playbooks/*").map do |path|
+          glob_path("#{collections_path}/ansible_collections/*/*/playbooks/*").map do |path|
             name = ReaderHelper.playbook_or_role_full_name(path)
             {
               name: name,
@@ -31,6 +31,12 @@ module Proxy
           message = "Could not read Ansible playbooks #{collections_path} - #{e.message}"
           raise ReadPlaybooksException, message
         end
+
+        private
+
+        def glob_path(path)
+          Dir.glob path
+        end
       end
     end
   end

data/lib/smart_proxy_ansible/roles_reader.rb

@@ -44,7 +44,7 @@ module Proxy
         end
 
         def read_collection_roles(collections_path)
-          Dir.glob("#{collections_path}/ansible_collections/*/*/roles/*").map do |path|
+          glob_path("#{collections_path}/ansible_collections/*/*/roles/*").map do |path|
             ReaderHelper.playbook_or_role_full_name(path)
           end
         rescue Errno::ENOENT, Errno::EACCES => e

data/lib/smart_proxy_ansible/runner/ansible_runner.rb

@@ -144,10 +144,20 @@ module Proxy::Ansible
           failures = event.dig('event_data', 'failures') || {}
           unreachable = event.dig('event_data', 'dark') || {}
           rescued = event.dig('event_data', 'rescued') || {}
-          header, *rows = event['stdout'].strip.lines.map(&:chomp)
-          @outputs.keys.select { |key| key.is_a? String }.each do |host|
-            line = rows.find { |row| row =~ /#{host}/ }
-            publish_data_for(host, [header, line].join("\n"), 'stdout')
+          header, *rows = event['stdout'].strip.lines.map(&:rstrip)
+          # #lines strips the leading newline that precedes the header
+          broadcast_data("\n" + header + "\n", 'stdout')
+
+          inventory_hosts = @outputs.keys.select { |key| key.is_a? String }
+          rows.each do |row|
+            host = inventory_hosts.find { |host| row =~ /#{host}/ }
+            line = row + "\n"
+            unless host
+              broadcast_data(line, 'stdout')
+              next
+            end
+
+            publish_data_for(host, line, 'stdout')
 
             # If the task has been rescued, it won't consider a failure
             if @exit_statuses[host].to_i != 0 && failures[host].to_i <= 0 && unreachable[host].to_i <= 0 && rescued[host].to_i > 0

data/lib/smart_proxy_ansible/version.rb

@@ -2,6 +2,6 @@ module Proxy
   # Version, this allows the proxy and other plugins know
   # what version of the Ansible plugin is running
   module Ansible
-    VERSION = '3.5.6'
+    VERSION = '3.5.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible
 version: !ruby/object:Gem::Version
-  version: 3.5.6
+  version: 3.5.8
 platform: ruby
 authors:
 - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,90 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: smart_proxy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  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: smart_proxy_dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +85,7 @@ files:
 - settings.d/ansible.yml.example
 homepage: https://github.com/theforeman/smart_proxy_ansible
 licenses:
-- GPL-3.0
+- GPL-3.0-only
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -179,14 +95,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Smart-Proxy Ansible plugin