foreman_remote_execution 1.3.7 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 459e92464d713529b6eda8dd33fa924c5ccdde44
-  data.tar.gz: a55e090cc66b55664b4b2f628b83c209cb0c0f3f
+  metadata.gz: abc43eab1a70a711a3ecb5ea217d164d1e41b796
+  data.tar.gz: 0763324144fef57d8a5c146f0d28de18f3f88f65
 SHA512:
-  metadata.gz: 282e5f81bf714aab0e020f35e6fe14c7cb82743d7ea77ced55f03322029a370769bb6f254bb9f729a2d7385ed54b10d91bf959fff5e89c764654c6b8ad27d9b5
-  data.tar.gz: 88989286761baae23ecba6f6b6242d4648f2ce01cd22af1aad6fc7a6e734a9ca07ce8463fd8318120e4c68f6949aa4c47c24df2defe9ae5407fbba6e1bd980d9
+  metadata.gz: 6c3d790c35b20ba1fa1e4ab3fe123f64c590661b14106aa4d002467175d58920c7149b8ed53c28fe33a9c1c44604a9aec0e7c379e763b69ccba5f0e030b328ea
+  data.tar.gz: 4259ae34af58ffcf160d48614eb542198488b07f3095f34498c9b70c8c2087c831398f3f227e250b6596fbf8dccf96c1510f797ebd1ecce0144025467d6a2ed2

data/app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb

@@ -1,14 +1,7 @@
 module ForemanRemoteExecution
   module HostsHelperExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain(:host_title_actions, :run_button)
-      alias_method_chain :multiple_actions, :remote_execution
-    end
-
-    def multiple_actions_with_remote_execution
-      multiple_actions_without_remote_execution + [ [_('Schedule Remote Job'), new_job_invocation_path, false] ]
+    def multiple_actions
+      super + [ [_('Schedule Remote Job'), new_job_invocation_path, false] ]
     end
 
     def schedule_job_multi_button(*args)
@@ -27,9 +20,9 @@ module ForemanRemoteExecution
       link_to(_('Schedule Remote Job'), new_job_invocation_path(:host_ids => [args.first.id]), :id => :run_button, :class => 'btn btn-default')
     end
 
-    def host_title_actions_with_run_button(*args)
+    def host_title_actions(*args)
       title_actions(button_group(schedule_job_multi_button(*args)))
-      host_title_actions_without_run_button(*args)
+      super(*args)
     end
   end
 end

data/app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb

@@ -1,13 +1,7 @@
 module ForemanRemoteExecution
   module JobTemplatesExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :permitted_actions, :run_button
-    end
-
-    def permitted_actions_with_run_button(template)
-      original = permitted_actions_without_run_button(template)
+    def permitted_actions(template)
+      original = super(template)
 
       if template.is_a?(JobTemplate)
         original.unshift(display_link_if_authorized(_('Run'), hash_for_new_job_invocation_path(:template_id => template.id).merge(:authorizer => authorizer))) unless template.snippet

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -1,44 +1,39 @@
 module ForemanRemoteExecution
   module HostExtensions
-    extend ActiveSupport::Concern
-
     # rubocop:disable Metrics/BlockLength
-    included do
-      alias_method_chain :build_required_interfaces, :remote_execution
-      alias_method_chain :reload, :remote_execution
-      alias_method_chain :becomes, :remote_execution
-      alias_method_chain :host_params, :remote_execution
-
-      has_many :targeting_hosts, :dependent => :destroy, :foreign_key => 'host_id'
-      has_many :template_invocations, :dependent => :destroy, :foreign_key => 'host_id'
-      has_one :execution_status_object, :class_name => 'HostStatus::ExecutionStatus', :foreign_key => 'host_id'
-      has_many :run_host_job_tasks, :through => :template_invocations
-
-      scoped_search :relation => :run_host_job_tasks, :on => :result, :rename => 'job_invocation.result',
-                    :ext_method => :search_by_job_invocation,
-                    :only_explicit => true,
-                    :complete_value => TemplateInvocation::TaskResultMap::REVERSE_MAP
-
-      scoped_search :relation => :template_invocations, :on => :job_invocation_id,
-                    :rename => 'job_invocation.id', :only_explicit => true, :ext_method => :search_by_job_invocation
-
-      scoped_search :relation => :execution_status_object, :on => :status, :rename => :execution_status,
-                    :complete_value => { :ok => HostStatus::ExecutionStatus::OK, :error => HostStatus::ExecutionStatus::ERROR }
-
-      def self.search_by_job_invocation(key, operator, value)
-        if key == 'job_invocation.result'
-          operator = operator == '=' ? 'IN' : 'NOT IN'
-          value = TemplateInvocation::TaskResultMap.status_to_task_result(value)
+    def self.prepended(base)
+      base.instance_eval do
+        has_many :targeting_hosts, :dependent => :destroy, :foreign_key => 'host_id'
+        has_many :template_invocations, :dependent => :destroy, :foreign_key => 'host_id'
+        has_one :execution_status_object, :class_name => 'HostStatus::ExecutionStatus', :foreign_key => 'host_id'
+        has_many :run_host_job_tasks, :through => :template_invocations
+
+        scoped_search :relation => :run_host_job_tasks, :on => :result, :rename => 'job_invocation.result',
+                      :ext_method => :search_by_job_invocation,
+                      :only_explicit => true,
+                      :complete_value => TemplateInvocation::TaskResultMap::REVERSE_MAP
+
+        scoped_search :relation => :template_invocations, :on => :job_invocation_id,
+                      :rename => 'job_invocation.id', :only_explicit => true, :ext_method => :search_by_job_invocation
+
+        scoped_search :relation => :execution_status_object, :on => :status, :rename => :execution_status,
+                      :complete_value => { :ok => HostStatus::ExecutionStatus::OK, :error => HostStatus::ExecutionStatus::ERROR }
+
+        def search_by_job_invocation(key, operator, value)
+          if key == 'job_invocation.result'
+            operator = operator == '=' ? 'IN' : 'NOT IN'
+            value = TemplateInvocation::TaskResultMap.status_to_task_result(value)
+          end
+
+          mapping = {
+            'job_invocation.id'     => %(#{TemplateInvocation.table_name}.job_invocation_id #{operator} ?),
+            'job_invocation.result' => %(#{ForemanTasks::Task.table_name}.result #{operator} (?))
+          }
+          {
+            :conditions => sanitize_sql_for_conditions([mapping[key], value_to_sql(operator, value)]),
+            :joins => { :template_invocations => [:run_host_job_task] }
+          }
         end
-
-        mapping = {
-          'job_invocation.id'     => %(#{TemplateInvocation.table_name}.job_invocation_id #{operator} ?),
-          'job_invocation.result' => %(#{ForemanTasks::Task.table_name}.result #{operator} (?))
-        }
-        {
-          :conditions => sanitize_sql_for_conditions([mapping[key], value_to_sql(operator, value)]),
-          :joins => { :template_invocations => [:run_host_job_task] }
-        }
       end
     end
 
@@ -50,8 +45,8 @@ module ForemanRemoteExecution
       @execution_status_label ||= get_status(HostStatus::ExecutionStatus).to_label(options)
     end
 
-    def host_params_with_remote_execution
-      params = host_params_without_remote_execution
+    def host_params
+      params = super
       keys = remote_execution_ssh_keys
       params['remote_execution_ssh_keys'] = keys if keys.present?
       [:remote_execution_ssh_user, :remote_execution_effective_user_method,
@@ -93,21 +88,21 @@ module ForemanRemoteExecution
       @execution_interface = nil
     end
 
-    def becomes_with_remote_execution(*args)
-      became = becomes_without_remote_execution(*args)
+    def becomes(*args)
+      became = super(*args)
       became.drop_execution_interface_cache if became.respond_to? :drop_execution_interface_cache
       became
     end
 
-    def reload_with_remote_execution(*args)
+    def reload(*args)
       drop_execution_interface_cache
-      reload_without_remote_execution(*args)
+      super(*args)
     end
 
     private
 
-    def build_required_interfaces_with_remote_execution(attrs = {})
-      build_required_interfaces_without_remote_execution(attrs)
+    def build_required_interfaces(attrs = {})
+      super(attrs)
       self.primary_interface.execution = true if self.execution_interface.nil?
     end
   end

data/app/models/concerns/foreman_remote_execution/smart_proxy_extensions.rb

@@ -1,11 +1,5 @@
 module ForemanRemoteExecution
   module SmartProxyExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :refresh, :remote_execution
-    end
-
     def pubkey
       self[:pubkey] || update_pubkey
     end
@@ -17,8 +11,8 @@ module ForemanRemoteExecution
       key
     end
 
-    def refresh_with_remote_execution
-      errors = refresh_without_remote_execution
+    def refresh
+      errors = super
       update_pubkey
       errors
     end

data/lib/foreman_remote_execution/engine.rb

@@ -148,7 +148,7 @@ module ForemanRemoteExecution
 
       User.send(:include, ForemanRemoteExecution::UserExtensions)
 
-      Host::Managed.send(:include, ForemanRemoteExecution::HostExtensions)
+      Host::Managed.send(:prepend, ForemanRemoteExecution::HostExtensions)
       Host::Managed.send(:include, ForemanTasks::Concerns::HostActionSubject)
 
       (Nic::Base.descendants + [Nic::Base]).each do |klass|
@@ -156,10 +156,10 @@ module ForemanRemoteExecution
       end
 
       Bookmark.send(:include, ForemanRemoteExecution::BookmarkExtensions)
-      HostsHelper.send(:include, ForemanRemoteExecution::HostsHelperExtensions)
-      ProvisioningTemplatesHelper.send(:include, ForemanRemoteExecution::JobTemplatesExtensions)
+      HostsHelper.send(:prepend, ForemanRemoteExecution::HostsHelperExtensions)
+      ProvisioningTemplatesHelper.send(:prepend, ForemanRemoteExecution::JobTemplatesExtensions)
 
-      SmartProxy.send(:include, ForemanRemoteExecution::SmartProxyExtensions)
+      SmartProxy.send(:prepend, ForemanRemoteExecution::SmartProxyExtensions)
       Subnet.send(:include, ForemanRemoteExecution::SubnetExtensions)
 
       # We need to explicitly force to load the Task model due to Rails loader

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.3.7'.freeze
+  VERSION = '1.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface