foreman_ansible 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 961b0d96c607da71c4214e237b1a5d1d595c2341
-  data.tar.gz: 7f277e85dbd6f315901320a7b17f0c2fbad7651f
+  metadata.gz: e4f9d4b535eba5a64364c983e66d655b71219145
+  data.tar.gz: bba604f472080caeff3417e6ff78fc573c49d35e
 SHA512:
-  metadata.gz: 0db1687cfc62fd88d5a2f15e29375588ce22b6a7bf0063c89bd70501167bacdf5d891188bc50746b614bf0e427ead475a75ee6d601a1fa6abbe73951fd16c721
-  data.tar.gz: 0128248c361e8253f9ef03cdcd39bc4a825cbf1f9f6d3b9b8e3a9954c708ff280ec5dd1510d392510ab45633a8b20a8b6575d2259c52be36cc4b1cd2ebe1500a
+  metadata.gz: ae73863ce2320c5a289f53a536f9844d72fcab62bd8f15468f4c790dc9d98e89a86cc1bf27d8bf07014a1c882367e36a4a2fb10b042a2f56a6e3c3fb43333371
+  data.tar.gz: 0adbe038a252a11fd4be2e36cea3ac2d08a2444fb0a9551c6add71df96fe21201bdecf1f9bb3a0350d3ccd1df09d7621ded843a609ca24e7a40286273e42e3b7

data/app/models/foreman_ansible/fact_name.rb

@@ -4,7 +4,7 @@ module ForemanAnsible
   # in the fact values table (/fact_values)
   class FactName < ::FactName
     def origin
-      'Ansible'
+      'foreman_ansible/Ansible'
     end
   end
 end

data/app/services/foreman_ansible/roles_importer.rb

@@ -1,5 +1,5 @@
 module ForemanAnsible
-  # imports roles from smart proxy
+  # Imports roles from smart proxy
   class RolesImporter
     attr_reader :ansible_proxy
 
@@ -39,9 +39,7 @@ module ForemanAnsible
     end
 
     def local_roles
-      Dir.glob('/etc/ansible/roles/*').map do |path|
-        path.split('/').last
-      end
+      ::ForemanAnsibleCore::RolesReader.list_roles
     end
 
     def remote_roles

data/lib/foreman_ansible/engine.rb

@@ -95,6 +95,18 @@ module ForemanAnsible
       end
     end
 
+    initializer 'foreman_ansible.assets.precompile' do |app|
+      app.config.assets.precompile += %w(foreman_ansible/Ansible.png)
+    end
+
+    initializer 'foreman_ansible.configure_assets', :group => :assets do
+      SETTINGS[:foreman_ansible] = {
+        :assets => {
+          :precompile => ['foreman_ansible/Ansible.png']
+        }
+      }
+    end
+
     initializer 'foreman_ansible.apipie' do
       Apipie.configuration.api_controllers_matcher <<
         "#{ForemanAnsible::Engine.root}/app/controllers/api/v2/*.rb"

data/lib/foreman_ansible/version.rb

@@ -2,5 +2,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '1.4.2'.freeze
+  VERSION = '1.4.3'.freeze
 end

data/test/functional/api/v2/hostgroups_controller_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'dynflow/testing'
 
 module Api
   module V2

data/test/unit/lib/foreman_ansible_core/roles_reader_test.rb

@@ -0,0 +1,57 @@
+require 'test_plugin_helper'
+
+class RolesReaderTest < ActiveSupport::TestCase
+  CONFIG_PATH = '/etc/ansible/ansible.cfg'.freeze
+  ROLES_PATH = '/etc/ansible/roles'.freeze
+
+  describe '#roles_path' do
+    test 'detects commented roles_path' do
+      expect_content_config ['#roles_path = thisiscommented!']
+      assert_equal(ROLES_PATH,
+                   ForemanAnsibleCore::RolesReader.roles_path(CONFIG_PATH))
+    end
+
+    test 'returns default path if no roles_path defined' do
+      expect_content_config ['norolepath!']
+      assert_equal(ROLES_PATH,
+                   ForemanAnsibleCore::RolesReader.roles_path(CONFIG_PATH))
+    end
+
+    test 'returns roles_path if one is defined' do
+      expect_content_config ['roles_path = /mycustom/ansibleroles/path']
+      assert_equal('/mycustom/ansibleroles/path',
+                   ForemanAnsibleCore::RolesReader.roles_path(CONFIG_PATH))
+    end
+  end
+
+  describe '#list_roles' do
+    setup do
+      # Return a path without actually reading the config file to make tests
+      # pass even on hosts without Ansible installed
+      ForemanAnsibleCore::RolesReader.stubs(:roles_path).
+        returns('/etc/ansible/roles')
+    end
+
+    test 'handles "No such file or dir" with exception' do
+      Dir.expects(:glob).with("#{ROLES_PATH}/*").raises(Errno::ENOENT)
+      ex = assert_raises(ForemanAnsibleCore::ReadConfigFileException) do
+        ForemanAnsibleCore::RolesReader.list_roles
+      end
+      assert_match(/Could not read Ansible config file/, ex.message)
+    end
+
+    test 'raises error if the roles path is not readable' do
+      Dir.expects(:glob).with("#{ROLES_PATH}/*").raises(Errno::EACCES)
+      ex = assert_raises(ForemanAnsibleCore::ReadConfigFileException) do
+        ForemanAnsibleCore::RolesReader.list_roles
+      end
+      assert_match(/Could not read Ansible config file/, ex.message)
+    end
+  end
+
+  private
+
+  def expect_content_config(ansible_cfg_content)
+    File.expects(:readlines).with(CONFIG_PATH).returns(ansible_cfg_content)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -90,7 +90,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/images/Ansible.png
+- app/assets/images/foreman_ansible/Ansible.png
 - app/controllers/ansible_roles_controller.rb
 - app/controllers/api/v2/ansible_roles_controller.rb
 - app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb
@@ -181,6 +181,7 @@ files:
 - test/unit/host_ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
+- test/unit/lib/foreman_ansible_core/roles_reader_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/api_roles_importer_test.rb
 - test/unit/services/fact_importer_test.rb
@@ -242,5 +243,6 @@ test_files:
 - test/unit/ansible_role_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
+- test/unit/lib/foreman_ansible_core/roles_reader_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
 - test/unit/helpers/foreman_ansible/ansible_reports_helper_test.rb