smart_proxy_ansible 3.5.7 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60ea073b5f26ee9b4a1f39f09658d89f54c126e16914f1139fb105a197714bbd
-  data.tar.gz: e1e95bed81cc2cf6cf180852f010905f38790cee89a511207e45cfd449123688
+  metadata.gz: c94b0334ddc75bab338d79841ac4cc17d813b5f40c5e06c6f739cfd531d88320
+  data.tar.gz: bcf96f811ef107f4737bfa5f37ee9f2ac757bf50ac4a7b64b3e8c31397f60fc0
 SHA512:
-  metadata.gz: 4829fdcc76602817f4e8fd1ce103cfbdd213bd492fa90fc0f280940a08cd094e1713d4e2dcf05b5500ec707166fb41428eb1f53616193110af6a5de120039c4c
-  data.tar.gz: b943569f68bb3153167fd6ebc2746861e95525da5f86f9cbbdc1a577f98051142839e95cbed1cd87a76b62d0b7cff75ac4bc02bb3d3d96b45b0dc51f04c14d74
+  metadata.gz: f4f41d9c0a2875c5f33d245d8fec3fb8a15b457102c344bd20bd801e54911de91eabdced4816c968b3ce655ebae3e9292a822f2d75d57553c073aee93e4ac1a6
+  data.tar.gz: 8fbbf65cb55fc9082ed7194fee478f8334a15a90a1ab3302fef22cde827e920dce29aac775b374b2ba5d651240425c233a08ec72fe6404329137b148aa453e85

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

@@ -22,6 +22,7 @@ module Proxy::Ansible
         @verbosity_level = action_input[:verbosity_level]
         @rex_command = action_input[:remote_execution_command]
         @check_mode = action_input[:check_mode]
+        @job_check_mode = action_input[:job_check_mode]
         @tags = action_input[:tags]
         @tags_flag = action_input[:tags_flag]
         @passphrase = action_input['secrets']['key_passphrase']
@@ -147,9 +148,17 @@ module Proxy::Ansible
           header, *rows = event['stdout'].strip.lines.map(&:rstrip)
           # #lines strips the leading newline that precedes the header
           broadcast_data("\n" + header + "\n", 'stdout')
-          @outputs.keys.select { |key| key.is_a? String }.each do |host|
-            line = rows.find { |row| row =~ /#{host}/ }
-            publish_data_for(host, line + "\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
@@ -216,7 +225,11 @@ module Proxy::Ansible
       end
 
       def check_cmd
-        check_mode? ? '"--check"' : ''
+        if check_mode? || job_check_mode?
+          '"--check"'
+        else
+          ''
+        end
       end
 
       def verbosity
@@ -231,6 +244,10 @@ module Proxy::Ansible
         @check_mode == true && @rex_command == false
       end
 
+      def job_check_mode?
+        @job_check_mode == true
+      end
+
       def prepare_directory_structure
         inner = %w[inventory project env].map { |part| File.join(@root, part) }
         ([@root] + inner).each do |path|

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.7'
+    VERSION = '3.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.6.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2025-05-08 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