foreman_ansible_core 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d8e4d3b45aae22532d3bd304aecedb410387da4
-  data.tar.gz: 204ba5ebb47a5011a4cff0ef4fd8e6175f1a9d03
+  metadata.gz: 12eefd8c004fc5fab3ba89e55d6f55a012fd5a8d
+  data.tar.gz: 0f6c6dc40d70761dd0ae7febfbc7e30b19115d07
 SHA512:
-  metadata.gz: 415ab2bca277f114eb7bee9d2d5c02ff31b87bd2f661a6e42af603c4a572606cab726cfa4fdfec5400c052c58119c168514d3a6864dcc11d04f63aa480503e00
-  data.tar.gz: 4e66585515270369b61aeca61b004faa60f6c873db876ecc8ebdf5b4fdc575404404cec87c47a1729b916a34fb3e2d02502dd1883f64b1db022cd478706b588b
+  metadata.gz: 283cbd551dba171fccfb7d3dd992a4e4f6c86dbd18f3cd2b1078eba877562c2af3d16457d33808cc4f90a8d4a5ffd95fd47edbff2ac09f3a6c2432e273d8d3f0
+  data.tar.gz: d04b049df94c5e507446998d6bb68c6667b3711574276e4544a3dbb27478d0ba1ee4f060f77d317cd61e4e852db96d68d1f716455aeea18a8112bb43eae59a23

data/lib/foreman_ansible_core.rb

@@ -1,4 +1,5 @@
 require 'foreman_tasks_core'
+require 'foreman_remote_execution_core'
 
 # Core actions for Foreman Ansible, used by both Foreman and Foreman proxy
 # This comprises running playbooks for the moment
@@ -14,15 +15,13 @@ module ForemanAnsibleCore
     require 'foreman_ansible_core/actions'
   end
 
-  if defined? ForemanRemoteExecutionCore
-    require 'foreman_remote_execution_core/actions'
-    require 'foreman_ansible_core/remote_execution_core/ansible_runner'
-    require 'foreman_ansible_core/remote_execution_core/settings_override'
-    ForemanRemoteExecutionCore::Actions::RunScript.send(
-      :prepend,
-      ForemanAnsibleCore::RemoteExecutionCore::SettingsOverride
-    )
-  end
+  require 'foreman_remote_execution_core/actions'
+  require 'foreman_ansible_core/remote_execution_core/ansible_runner'
+  require 'foreman_ansible_core/remote_execution_core/settings_override'
+  ForemanRemoteExecutionCore::Actions::RunScript.send(
+    :prepend,
+    ForemanAnsibleCore::RemoteExecutionCore::SettingsOverride
+  )
 
   require 'foreman_ansible_core/roles_reader'
   require 'foreman_ansible_core/version'

data/lib/foreman_ansible_core/remote_execution_core/ansible_runner.rb

@@ -1,43 +1,41 @@
-if defined? ::ForemanRemoteExecutionCore
-  module ForemanAnsibleCore
-    module RemoteExecutionCore
-      # Takes an inventory and runs it through REXCore CommandRunner
-      class AnsibleRunner < ::ForemanTasksCore::Runner::CommandRunner
-        DEFAULT_REFRESH_INTERVAL = 1
+module ForemanAnsibleCore
+  module RemoteExecutionCore
+    # Takes an inventory and runs it through REXCore CommandRunner
+    class AnsibleRunner < ::ForemanTasksCore::Runner::CommandRunner
+      DEFAULT_REFRESH_INTERVAL = 1
 
-        def initialize(options)
-          super(options)
-          @playbook_runner = ForemanAnsibleCore::PlaybookRunner.new(
-            options['ansible_inventory'],
-            options['script'],
-            options
-          )
-        end
+      def initialize(options)
+        super(options)
+        @playbook_runner = ForemanAnsibleCore::PlaybookRunner.new(
+          options['ansible_inventory'],
+          options['script'],
+          options
+        )
+      end
 
-        def start
-          @playbook_runner.start
-        rescue StandardError => e
-          logger.error(
-            'error while initalizing command'\
-            " #{e.class} #{e.message}:\n #{e.backtrace.join("\n")}"
-          )
-          publish_exception('Error initializing command', e)
-        end
+      def start
+        @playbook_runner.start
+      rescue StandardError => e
+        logger.error(
+          'error while initalizing command'\
+          " #{e.class} #{e.message}:\n #{e.backtrace.join("\n")}"
+        )
+        publish_exception('Error initializing command', e)
+      end
 
-        def fill_continuous_output(continuous_output)
-          delegated_output.fetch('result', []).each do |raw_output|
-            continuous_output.add_raw_output(raw_output)
-          end
-        rescue StandardError => e
-          continuous_output.add_exception(_('Error loading data from proxy'), e)
+      def fill_continuous_output(continuous_output)
+        delegated_output.fetch('result', []).each do |raw_output|
+          continuous_output.add_raw_output(raw_output)
         end
+      rescue StandardError => e
+        continuous_output.add_exception(_('Error loading data from proxy'), e)
+      end
 
-        def refresh
-          @command_out = @playbook_runner.command_out
-          @command_in = @playbook_runner.command_in
-          @command_pid = @playbook_runner.command_pid
-          super
-        end
+      def refresh
+        @command_out = @playbook_runner.command_out
+        @command_in = @playbook_runner.command_in
+        @command_pid = @playbook_runner.command_pid
+        super
       end
     end
   end

data/lib/foreman_ansible_core/version.rb

@@ -1,3 +1,3 @@
 module ForemanAnsibleCore
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible_core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: 'Ansible integration with Foreman (theforeman.org): core bits'