foreman_ansible_core 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 44d77dc2797ce73069b122c3632898d2216ba97ddb474c1f6f08e6bb18746829
-  data.tar.gz: 3926d312b5e13d8b38931ff4cf2657158aecbfdd3afd17b0f33b433a0287ff18
+SHA1:
+  metadata.gz: e195d6690093de003b7ddaf9b807ac0d79ad775a
+  data.tar.gz: 4286d8f97ffca80c17be58c302fb2aeffbf1d02f
 SHA512:
-  metadata.gz: d84b0cb0fda48488505d7f46820adfd6dc5149ffe8514f2a790acf5f2af8be84e6c7e42a450c2b8eaeb027ee40693e8d324bb939fc4c3d6608ec9cee61536f83
-  data.tar.gz: '08f71e6e969dae793369aa09ddf930dab78185ce039ce8539fee2210aeec41689980a8aed81ee23dc3ed8cc1700ae5f7134fecf2737a2f8d0f4697b5702c4687'
+  metadata.gz: b1555fd4cb45577b25aa1f6b6ff4ba0ac02d354fa3c74e33790dc63e3454de9d70c1a01b4cc929b1096437395dfbdbb519e82e22f333710da2a5b5cf0d12331b
+  data.tar.gz: 23e7b36347e64370135f75e18165d424ba6ee7bc429335be4e83a1778e05d6fd17c38c2ba1f76e8a0515cd424b4cf644c0b7995b876aa3f4055e4ccb5bcaf53c

data/lib/foreman_ansible_core.rb

@@ -1,39 +1,29 @@
-begin
-  require 'foreman_tasks_core'
-  require 'foreman_remote_execution_core'
-# rubocop:disable Lint/HandleExceptions
-rescue LoadError
-  # These gems are not available in a proxy SCLed context
-  # puts 'Running Foreman Ansible Core in non-SCL context'
-end
-# rubocop:enable Lint/HandleExceptions
+# frozen_string_literal: true
+
+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
 module ForemanAnsibleCore
   require 'foreman_ansible_core/exception'
-  require 'foreman_ansible_core/roles_reader'
   require 'foreman_ansible_core/version'
 
-  if defined? ForemanTasksCore
-    extend ForemanTasksCore::SettingsLoader
-    register_settings(:ansible, :ansible_dir => Dir.home,
-                                :working_dir => nil)
+  extend ForemanTasksCore::SettingsLoader
+  register_settings(:ansible, :ansible_dir => Dir.home,
+                              :working_dir => nil)
 
-    if ForemanTasksCore.dynflow_present?
-      require 'foreman_tasks_core/runner'
-      require 'foreman_ansible_core/playbook_runner'
-      require 'foreman_ansible_core/actions'
-    end
+  if ForemanTasksCore.dynflow_present?
+    require 'foreman_tasks_core/runner'
+    require 'foreman_ansible_core/playbook_runner'
+    require 'foreman_ansible_core/actions'
   end
 
-  if defined? ForemanTasksCore
-    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
+  )
 end

data/lib/foreman_ansible_core/actions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'foreman_tasks_core/shareable_action'
 
 module ForemanAnsibleCore

data/lib/foreman_ansible_core/command_creator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanAnsibleCore
   # Creates the actual command to be passed to foreman_tasks_core to run
   class CommandCreator
@@ -48,7 +50,7 @@ module ForemanAnsibleCore
       verbosity_level = @options[:verbosity_level]
       # rubocop:disable Rails/Present
       !verbosity_level.nil? && !verbosity_level.empty? &&
-        verbosity_level.to_i > 0
+        verbosity_level.to_i.positive?
       # rubocop:enable Rails/Present
     end
 

data/lib/foreman_ansible_core/exception.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanAnsibleCore
   # Taken from Foreman core, this class creates an error code for any exception
   class Exception < ::StandardError

data/lib/foreman_ansible_core/playbook_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'foreman_tasks_core/runner/command_runner'
 require_relative 'command_creator'
 require 'tmpdir'

data/lib/foreman_ansible_core/remote_execution_core/ansible_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanAnsibleCore
   module RemoteExecutionCore
     # Takes an inventory and runs it through REXCore CommandRunner
@@ -14,6 +16,7 @@ module ForemanAnsibleCore
       end
 
       def start
+        @playbook_runner.logger = logger
         @playbook_runner.start
       rescue StandardError => e
         logger.error(

data/lib/foreman_ansible_core/remote_execution_core/settings_override.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanAnsibleCore
   module RemoteExecutionCore
     # Ensure the Ansible provider is used whenever a JobTemplate using this

data/lib/foreman_ansible_core/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ForemanAnsibleCore
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible_core
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -84,7 +84,6 @@ files:
 - lib/foreman_ansible_core/playbook_runner.rb
 - lib/foreman_ansible_core/remote_execution_core/ansible_runner.rb
 - lib/foreman_ansible_core/remote_execution_core/settings_override.rb
-- lib/foreman_ansible_core/roles_reader.rb
 - lib/foreman_ansible_core/version.rb
 homepage: https://github.com/theforeman/foreman_ansible
 licenses:
@@ -106,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: 'Ansible integration with Foreman (theforeman.org): core bits'

data/lib/foreman_ansible_core/roles_reader.rb

@@ -1,61 +0,0 @@
-module ForemanAnsibleCore
-  # Implements the logic needed to read the roles and associated information
-  class RolesReader
-    class << self
-      DEFAULT_CONFIG_FILE = '/etc/ansible/ansible.cfg'.freeze
-      DEFAULT_ROLES_PATH = '/etc/ansible/roles'.freeze
-
-      def list_roles
-        roles_path.split(':').map { |path| read_roles(path) }.flatten
-      end
-
-      def roles_path(roles_line = roles_path_from_config)
-        # Default to /etc/ansible/roles if none found
-        return DEFAULT_ROLES_PATH if roles_line.empty?
-        roles_path_key = roles_line.first.split('=').first.strip
-        # In case of commented roles_path key "#roles_path", return default
-        return DEFAULT_ROLES_PATH unless roles_path_key == 'roles_path'
-        roles_line.first.split('=').last.strip
-      end
-
-      def logger
-        # Return a different logger depending on where ForemanAnsibleCore is
-        # running from
-        if defined?(::Foreman::Logging)
-          ::Foreman::Logging.logger('foreman_ansible')
-        else
-          ::Proxy::LogBuffer::Decorator.instance
-        end
-      end
-
-      private
-
-      def read_roles(roles_path)
-        rescue_and_raise_file_exception ReadRolesException,
-                                        roles_path, 'roles' do
-          Dir.glob("#{roles_path}/*").map do |path|
-            path.split('/').last
-          end
-        end
-      end
-
-      def roles_path_from_config
-        rescue_and_raise_file_exception ReadConfigFileException,
-                                        DEFAULT_CONFIG_FILE, 'config file' do
-          File.readlines(DEFAULT_CONFIG_FILE).select do |line|
-            line =~ /roles_path/
-          end
-        end
-      end
-
-      def rescue_and_raise_file_exception(exception, path, type)
-        yield
-      rescue Errno::ENOENT, Errno::EACCES => e
-        logger.debug(e.backtrace)
-        exception_message = "Could not read Ansible #{type} "\
-                            "#{path} - #{e.message}"
-        raise exception.new(exception_message)
-      end
-    end
-  end
-end