foreman_ansible_core 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3b57a124c8c6d747fd07e7f6efa4a685af79ccb
-  data.tar.gz: 72d91c1e01f1d2671973bafd66915d3f720b7c91
+  metadata.gz: 248f0459cfdc3a7f98c0fea3ede91120a1c81b2d
+  data.tar.gz: 87b41e00dfdfe240d6baefc5ab7b6c4cae7a6054
 SHA512:
-  metadata.gz: 05ab152cfca333ca3f870b8b9c1e94077256c323c5f6497c4ea28e47b5261189656dd932a9f9c23b6555a32965c12ed99d2c3f32d01cf4ef2da9f2046fd4b3c3
-  data.tar.gz: b06e4ca3736986e627f0685549c44b6c25859324e6f810bb7daaa4d50498832017f970d0c2e48ef97f75bdac2bb6f7e57d425228c6aa7621e3fd2e9f0305fe14
+  metadata.gz: e2e1a74f84b28a277fa0eb4c1f2f4ba1c841286ab44cafe65248a7d8022b1482747665ed71754fee1a07607a37c1f0cfff625fcceffe3137dfe54050690b84e5
+  data.tar.gz: 33a0479840efbee0b96f3ce1d27c2dd01b3c40e8f9b0bf5f4f19f31741965b3f79bd47f006399e1d7ae0ae13c593c292caac128b54088af7e8e2d65caf2714a2

data/lib/foreman_ansible_core/exception.rb

@@ -0,0 +1,35 @@
+module ForemanAnsibleCore
+  # Taken from Foreman core, this class creates an error code for any exception
+  class Exception < ::StandardError
+    def initialize(message, *params)
+      @message = message
+      @params = params
+    end
+
+    def self.calculate_error_code(classname, message)
+      return 'ERF00-0000' if classname.nil? || message.nil?
+      basename = classname.split(':').last
+      class_hash = Zlib.crc32(basename) % 100
+      msg_hash = Zlib.crc32(message) % 10_000
+      format 'ERF%02d-%04d', class_hash, msg_hash
+    end
+
+    def code
+      @code ||= Exception.calculate_error_code(self.class.name, @message)
+      @code
+    end
+
+    def message
+      # make sure it works without gettext too
+      translated_msg = @message % @params
+      "#{code} [#{self.class.name}]: #{translated_msg}"
+    end
+
+    def to_s
+      message
+    end
+  end
+
+  class ReadConfigFileException < ForemanAnsibleCore::Exception
+  end
+end

data/lib/foreman_ansible_core/playbook_runner.rb

@@ -16,7 +16,7 @@ module ForemanAnsibleCore
     def start
       write_inventory
       write_playbook
-      logger.debug('Initializing Ansible Runner')
+      logger.debug('[foreman_ansible] - Initializing Ansible Runner')
       Dir.chdir(@ansible_dir) do
         initialize_command(*command)
       end
@@ -26,12 +26,12 @@ module ForemanAnsibleCore
       command = [{ 'JSON_INVENTORY_FILE' => inventory_file }]
       command << 'ansible-playbook'
       command.concat(['-i', json_inventory_script])
-      if !@options[:verbosity_level].nil? && !@options[:verbosity_level].empty?
+      if !@options[:verbosity_level].nil? && !@options[:verbosity_level].empty? && @options[:verbosity_level] > 0
         command.concat([setup_verbosity])
       end
       command.concat(['-T', @options[:timeout]]) unless @options[:timeout].nil?
       command << playbook_file
-      logger.debug("Running command #{command}")
+      logger.debug("[foreman_ansible] - Running command #{command}")
       command
     end
 
@@ -109,12 +109,11 @@ module ForemanAnsibleCore
 
     def setup_verbosity
       verbosity_level = @options[:verbosity_level].to_i
-      logger.debug("Setting Ansible verbosity level to #{verbosity_level}")
-      if verbosity_level > 0
-        verbosity = '-'
-        verbosity_level.times do
-          verbosity += 'v'
-        end
+      logger.debug('[foreman_ansible] - Setting Ansible verbosity level to'\
+                   "#{verbosity_level}")
+      verbosity = '-'
+      verbosity_level.times do
+        verbosity += 'v'
       end
       verbosity
     end

data/lib/foreman_ansible_core/roles_reader.rb

@@ -0,0 +1,45 @@
+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
+
+      def list_roles
+        logger.info('[foreman_ansible] - Reading roles from '\
+                    '/etc/ansible/ansible.cfg roles_path')
+        Dir.glob("#{roles_path}/*").map do |path|
+          path.split('/').last
+        end
+      rescue Errno::ENOENT, Errno::EACCES => e
+        logger.debug("[foreman_ansible] - #{e.backtrace}")
+        exception_message = '[foreman_ansible] - Could not read Ansible config'\
+          " file #{DEFAULT_CONFIG_FILE} - #{e.message}"
+        raise ReadConfigFileException.new(exception_message)
+      end
+
+      def roles_path(ansible_config_file = DEFAULT_CONFIG_FILE)
+        default_path = '/etc/ansible/roles'
+        roles_line = File.readlines(ansible_config_file).select do |line|
+          line =~ /roles_path/
+        end
+        # Default to /etc/ansible/roles if none found
+        return default_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_path unless roles_path_key == 'roles_path'
+        # In case roles_path is there, and is not commented, return the value
+        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
+    end
+  end
+end

data/lib/foreman_ansible_core/version.rb

@@ -1,3 +1,3 @@
 module ForemanAnsibleCore
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/foreman_ansible_core.rb

@@ -6,6 +6,7 @@ module ForemanAnsibleCore
   extend ForemanTasksCore::SettingsLoader
   register_settings(:ansible, :ansible_dir => '/etc/ansible',
                               :working_dir => nil)
+  require 'foreman_ansible_core/exception'
 
   if ForemanTasksCore.dynflow_present?
     require 'foreman_tasks_core/runner'
@@ -13,5 +14,6 @@ module ForemanAnsibleCore
     require 'foreman_ansible_core/actions'
   end
 
+  require 'foreman_ansible_core/roles_reader'
   require 'foreman_ansible_core/version'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -51,7 +51,9 @@ files:
 - bin/json_inventory.sh
 - lib/foreman_ansible_core.rb
 - lib/foreman_ansible_core/actions.rb
+- lib/foreman_ansible_core/exception.rb
 - lib/foreman_ansible_core/playbook_runner.rb
+- lib/foreman_ansible_core/roles_reader.rb
 - lib/foreman_ansible_core/version.rb
 homepage: https://github.com/theforeman/foreman_ansible
 licenses: