foreman_ansible 1.4.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00bb7f9d29564fb8e61f81e7406c05c50f185fbb
-  data.tar.gz: 6c4404d0e53c1fe991a08760af23243ce62fb542
+  metadata.gz: e0481242667e1e9da7b3d4d6388622034a7bc9ef
+  data.tar.gz: fbff270464c50108ba2aa78fde5a60eb369804b4
 SHA512:
-  metadata.gz: 5b13f77fa365d11d96e51da73e7cf72ac86335314a156de1b7ad7e7841efa172bbce7d69fb7820aab791f9563ec3fd5b4a2c7020fb6b08dcd966f22bb497fa90
-  data.tar.gz: 5d40a1a231244b4ed0efde3041946305385022a25a29994601eff5f29c8e4cb68faf509b6fa68078aae3707f2f0a6819ca3f4ddfa33aadb8915de0de484f09c0
+  metadata.gz: eced3f1c1e3a72dfadf847cc3a15b9f3dbf824b7b1e9040b0b8845f2c277e086db41ff3b917ade2c79fe698589b4ddd592de2ed4b93b7449750af61d53e460ac
+  data.tar.gz: 390cda1e7cff7734a039abe887eedc75bcc6b482e0952397d67a858c0e21b69b6cdd2759a4554f19dd5947ac163e70841d025a463de3812b1fe59c8e94364f61

data/app/controllers/ansible_roles_controller.rb

@@ -5,6 +5,7 @@ class AnsibleRolesController < ::ApplicationController
   before_action :find_resource, :only => [:destroy]
   before_action :find_proxy, :only => [:import]
   before_action :create_importer, :only => [:import, :confirm_import]
+  before_action :default_order, :only => [:index]
 
   def index
     @ansible_roles = resource_base.search_for(params[:search],
@@ -39,6 +40,10 @@ class AnsibleRolesController < ::ApplicationController
 
   private
 
+  def default_order
+    params[:order] ||= 'name ASC'
+  end
+
   def find_proxy
     return nil unless params[:proxy]
     @proxy = SmartProxy.authorized(:view_smart_proxies).find(params[:proxy])

data/app/helpers/foreman_ansible/ansible_plugin_helper.rb

@@ -1,8 +1,12 @@
+require "#{ForemanAnsible::Engine.root}/lib/foreman_ansible/version"
+
 module ForemanAnsible
   # General helper for foreman_ansible
   module AnsiblePluginHelper
     def ansible_doc_url
-      'http://theforeman.org/plugins/foreman_ansible/1.x/index.html'
+      major_version = ::ForemanAnsible::VERSION.split('.')[0]
+      'https://theforeman.org/plugins/foreman_ansible/'\
+        "#{major_version}.x/index.html"
     end
   end
 end

data/app/models/ansible_role.rb

@@ -11,4 +11,5 @@ class AnsibleRole < ApplicationRecord
                         :dependent => :destroy
 
   scoped_search :on => :name, :complete_value => true
+  scoped_search :on => :updated_at
 end

data/app/models/concerns/foreman_ansible/has_many_ansible_roles.rb

@@ -6,7 +6,9 @@ module ForemanAnsible
 
     included do
       def all_ansible_roles
-        (ansible_roles + inherited_ansible_roles).uniq
+        result = (ansible_roles + inherited_ansible_roles).uniq
+        result += host_ansible_roles if is_a? Hostgroup
+        result
       end
     end
   end

data/app/models/concerns/foreman_ansible/host_managed_extensions.rb

@@ -7,6 +7,10 @@ module ForemanAnsible
       has_many :host_ansible_roles, :foreign_key => :host_id
       has_many :ansible_roles, :through => :host_ansible_roles,
                                :dependent => :destroy
+      scoped_search :relation => :ansible_roles, :on => :name,
+                    :complete_value => true, :rename => :role,
+                    :only_explicit => true
+
       before_provision :play_ansible_roles
       include ForemanAnsible::HasManyAnsibleRoles
 

data/app/models/concerns/foreman_ansible/hostgroup_extensions.rb

@@ -14,6 +14,10 @@ module ForemanAnsible
           roles + hostgroup.ansible_roles
         end.uniq
       end
+
+      def host_ansible_roles
+        hosts.all.includes(:ansible_roles).flat_map(&:ansible_roles)
+      end
     end
   end
 end

data/app/models/setting/ansible.rb

@@ -10,6 +10,7 @@ class Setting
       # rubocop:disable BlockLength
       def load_defaults
         return unless super
+        Setting::BLANK_ATTRS.push('ansible_ssh_private_key_file')
         transaction do
           [
             set(
@@ -99,7 +100,6 @@ class Setting
             create(s.update(:category => 'Setting::Ansible'))
           end
         end
-        Setting::BLANK_ATTRS.push('ansible_ssh_private_key_file')
         true
       end
 

data/app/views/ansible_roles/index.html.erb

@@ -1,19 +1,24 @@
 <% title _("Ansible Roles") %>
 
-<% title_actions ansible_proxy_import(hash_for_import_ansible_roles_path) %>
+<% title_actions ansible_proxy_import(hash_for_import_ansible_roles_path),
+  documentation_button('#4.1ImportingRoles', :root_url => ansible_doc_url) %>
 
 <table class="<%= table_css_classes 'table-fixed' %>">
   <thead>
     <tr>
-      <th class="col-md-3"><%= sort :name, :as => s_("Role|Name") %></th>
-      <th class="col-md-3"><%= _("Imported at") %></th>
-      <th class="col-md-1"><%= _("Actions") %></th>
+      <th class="col-md-6"><%= sort :name, :as => s_("Role|Name") %></th>
+      <th class="col-md-2"><%= _("Hostgroups") %></th>
+      <th class="col-md-2"><%= _("Hosts") %></th>
+      <th class="col-md-2"><%= sort :updated_at, :as => _("Imported at") %></th>
+      <th class="col-md-2"><%= _("Actions") %></th>
     </tr>
   </thead>
   <tbody>
     <% @ansible_roles.each do |role| %>
       <tr>
         <td class="ellipsis"><%= role.name %></td>
+        <td class="ellipsis"><%= role.hostgroups.count %></td>
+        <td class="ellipsis"><%= link_to role.hosts.count, hosts_path(:search => "role = #{role.name}")%></td>
         <td class="ellipsis"><%= import_time role %></td>
         <td>
           <%

data/app/views/foreman_ansible/ansible_roles/_hostgroup_ansible_roles_button.erb

@@ -1,14 +1,13 @@
 <%=
-if hostgroup.all_ansible_roles.empty?
+  play_roles = if hostgroup.all_ansible_roles.empty?
+    "<a title='No Roles assigned' href=\"#\">#{_('Play Roles')}</a>".html_safe
+  else
+    display_link_if_authorized(_('Play Roles'),   hash_for_play_roles_hostgroup_path(:id => hostgroup),   :'data-no-turbolink' => true)
+  end
+
   action_buttons(
               display_link_if_authorized(_('Nest'),    hash_for_nest_hostgroup_path(:id => hostgroup)),
               display_link_if_authorized(_('Clone'),   hash_for_clone_hostgroup_path(:id => hostgroup)),
+              play_roles,
               display_delete_if_authorized(hash_for_hostgroup_path(:id => hostgroup).merge(:auth_object => hostgroup, :authorizer => authorizer), :data => { :confirm => warning_message(hostgroup) }))
-else
-  action_buttons(
-              display_link_if_authorized(_('Nest'),    hash_for_nest_hostgroup_path(:id => hostgroup)),
-              display_link_if_authorized(_('Clone'),   hash_for_clone_hostgroup_path(:id => hostgroup)),
-              display_link_if_authorized(_('Play Roles'),   hash_for_play_roles_hostgroup_path(:id => hostgroup),   :'data-no-turbolink' => true),
-              display_delete_if_authorized(hash_for_hostgroup_path(:id => hostgroup).merge(:auth_object => hostgroup, :authorizer => authorizer), :data => { :confirm => warning_message(hostgroup) }))
-end
 %>

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.6'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -212,39 +218,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
+- test/factories/ansible_proxy.rb
+- test/factories/ansible_roles.rb
+- test/functional/api/v2/ansible_roles_controller_test.rb
+- test/functional/api/v2/hostgroups_controller_test.rb
+- test/functional/api/v2/hosts_controller_test.rb
+- test/functional/ansible_roles_controller_test.rb
+- test/functional/hosts_controller_test.rb
 - test/unit/ansible_role_test.rb
-- test/unit/hostgroup_ansible_role_test.rb
+- test/unit/concerns/host_managed_extensions_test.rb
+- test/unit/concerns/hostgroup_extensions_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
+- test/unit/services/fact_parser_test.rb
 - test/unit/services/fact_sparser_test.rb
+- test/unit/services/inventory_creator_test.rb
 - test/unit/services/proxy_selector_test.rb
+- test/unit/services/roles_importer_test.rb
 - test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/inventory_creator_test.rb
-- test/unit/services/fact_parser_test.rb
-- test/unit/services/roles_importer_test.rb
-- test/unit/services/fact_importer_test.rb
 - test/unit/helpers/foreman_ansible/ansible_reports_helper_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/host_ansible_role_test.rb
-- test/unit/concerns/host_managed_extensions_test.rb
-- test/unit/concerns/hostgroup_extensions_test.rb
-- test/factories/ansible_proxy.rb
-- test/factories/ansible_roles.rb
-- test/test_plugin_helper.rb
-- test/fixtures/ansible_permissions.yml
+- test/unit/hostgroup_ansible_role_test.rb
 - test/fixtures/sample_facts.json
+- test/fixtures/ansible_permissions.yml
 - test/support/fixture_support.rb
-- test/support/foreman_test_helper_additions.rb
 - test/support/foreman_tasks/task.rb
-- test/functional/ansible_roles_controller_test.rb
-- test/functional/api/v2/ansible_roles_controller_test.rb
-- test/functional/api/v2/hostgroups_controller_test.rb
-- test/functional/api/v2/hosts_controller_test.rb
-- test/functional/hosts_controller_test.rb
+- test/support/foreman_test_helper_additions.rb
+- test/test_plugin_helper.rb