foreman_chef 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bed7f43a8fda06fdc85e6e6d2e6059dad4a0b3e2
-  data.tar.gz: 01c9bc5cd705a62dc4ec7ce017b40446c5ee5974
+  metadata.gz: 075d1d5147bf46098837bb05f3900aa8ac850aed
+  data.tar.gz: 583d6747a7d02477f8fbde87cf21ff2f30ddc384
 SHA512:
-  metadata.gz: 59b5c3e2e49bcf6b1e86902995fc14b5ca152f541c84f4f82e7d2529c6c65a9315fad4a59e1f94717f5eb4dfff68fae4aedde4fb0779a408ab0f0b9adf084f0e
-  data.tar.gz: b3f03e1b028a868bb6ea788b9e59dcf89e592b70632736381da589057242617c3e2cae98c4fde8ba5fe22aaf289fbf96c9d9d186cc98e370bba655de93e657dd
+  metadata.gz: 3dc48433b44ff0a836cf36be0d2ab8cdbe1fc9b4e6ca367221d408a927587ed92b76fbf4e454a233e7b3f7968883e37909f61325bac449a70293355021ae976f
+  data.tar.gz: 4aa4081ab221c9d2d55afe7695f4c9516a7f683f28ad89bcc8124233f2280a847771ff7704faa31b279e4d10b410f68b159cd96cd76098aa31016fae05d0dcc3

data/app/controllers/foreman_chef/concerns/hosts_controller_rescuer.rb

@@ -1,21 +1,17 @@
 module ForemanChef
   module Concerns
     module HostsControllerRescuer
-      extend ActiveSupport::Concern
-
-      included do
-        rescue_from ForemanChef::ProxyException, :with => :chef_exception
-        # this route is only allowed to puppet proxies so we need to allow it for chef proxies too
-        alias_method_chain :require_smart_proxy_or_login, :chef
+      def self.prepended(base)
+        base.rescue_from ForemanChef::ProxyException, :with => :chef_exception
       end
 
       private
 
-      def require_smart_proxy_or_login_with_chef(features = nil)
+      def require_smart_proxy_or_login(features = nil)
         if params[:action] == 'externalNodes' && features.kind_of?(Array) && features.include?('Puppet')
-          require_smart_proxy_or_login_without_chef(features + [ 'Chef' ])
+          super(features + [ 'Chef' ])
         else
-          require_smart_proxy_or_login_without_chef(features)
+          super(features)
         end
       end
 

data/app/controllers/foreman_chef/environments_controller.rb

@@ -3,7 +3,7 @@ module ForemanChef
     include Foreman::Controller::AutoCompleteSearch
     include ForemanChef::Concerns::EnvironmentParameters
 
-    before_filter :find_resource, :only => [:edit, :update, :destroy]
+    before_action :find_resource, :only => [:edit, :update, :destroy]
 
     def import
       proxy = SmartProxy.authorized(:view_smart_proxies).find(params[:proxy])

data/app/models/foreman_chef/concerns/host_action_subject.rb

@@ -1,9 +1,10 @@
 module ForemanChef
   module Concerns
     module HostActionSubject
-      extend ActiveSupport::Concern
-      include ForemanTasks::Concerns::ActionSubject
-      include ForemanTasks::Concerns::ActionTriggering
+      def self.prepended(base)
+        base.send :prepend, ForemanTasks::Concerns::ActionSubject
+        base.send :prepend, ForemanTasks::Concerns::ActionTriggering
+      end
 
       def update_action
         sync_action!

data/app/models/foreman_chef/concerns/host_build.rb

@@ -1,14 +1,11 @@
 module ForemanChef
   module Concerns
     module HostBuild
-      extend ActiveSupport::Concern
-      included do
-        include ForemanTasks::Concerns::ActionSubject
-        include ForemanTasks::Concerns::ActionTriggering
+      def self.prepended(base)
+        base.send :prepend, ForemanTasks::Concerns::ActionSubject
+        base.send :prepend, ForemanTasks::Concerns::ActionTriggering
 
-        alias_method_chain :setSSHProvisionScript, :chef
-
-        after_build do |host|
+        base.after_build do |host|
           ::ForemanTasks.sync_task ::Actions::ForemanChef::Client::Destroy, host.name, host.chef_proxy
           # private key is no longer valid
           host.chef_private_key = nil
@@ -22,7 +19,7 @@ module ForemanChef
         end
       end
 
-      def setSSHProvisionScript_with_chef
+      def setSSHProvisionScript
         ::ForemanTasks.sync_task ::Actions::ForemanChef::Client::Destroy, self.name, self.chef_proxy
         # private key is no longer valid
         self.chef_private_key = nil
@@ -32,7 +29,7 @@ module ForemanChef
           self.chef_private_key = new_client.output[:private_key]
         end
 
-        self.disable_dynflow_hooks { |h| setSSHProvisionScript_without_chef; h.save! }
+        self.disable_dynflow_hooks { |h| super; h.save! }
       end
     end
   end

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

@@ -1,16 +1,12 @@
 module ForemanChef
   module Concerns
     module HostExtensions
-      extend ActiveSupport::Concern
-
       DEFAULT = ['role[default]']
 
-      included do
-        alias_method_chain :inherited_attributes, :chef_attributes
-
+      def self.prepended(base)
         # even with autosave, save is called only if there's some change in attributes
-        has_one :cached_run_list, :autosave => true, :class_name => 'ForemanChef::CachedRunList', :foreign_key => :host_id
-        attr_accessor :override_chef_attributes
+        base.has_one :cached_run_list, :autosave => true, :class_name => 'ForemanChef::CachedRunList', :foreign_key => :host_id
+        base.send :attr_accessor, :override_chef_attributes
       end
 
       def run_list
@@ -63,8 +59,8 @@ module ForemanChef
         run_list_differs? || chef_environment_differs?
       end
 
-      def inherited_attributes_with_chef_attributes
-        inherited_attributes_without_chef_attributes.concat(%w(chef_proxy_id chef_environment_id))
+      def inherited_attributes
+        super.concat(%w(chef_proxy_id chef_environment_id))
       end
 
       private

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

@@ -3,14 +3,12 @@ module ForemanChef
     module SmartProxyExtensions
       extend ActiveSupport::Concern
 
-      included do
-        alias_method_chain :taxonomy_foreign_conditions, :chef
-
-        has_many :chef_environments, :class_name => "::ForemanChef::Environment", :foreign_key => 'chef_proxy_id'
+      def self.prepended(base)
+        base.has_many :chef_environments, :class_name => "::ForemanChef::Environment", :foreign_key => 'chef_proxy_id'
       end
 
-      def taxonomy_foreign_conditions_with_chef
-        conditions = taxonomy_foreign_conditions_without_chef
+      def taxonomy_foreign_conditions
+        conditions = super
         if has_feature?('Chef')
           conditions[:chef_proxy_id] = id
         end

data/db/migrate/20140220145827_add_chef_proxy_id_to_host.rb

@@ -1,4 +1,4 @@
-class AddChefProxyIdToHost < ActiveRecord::Migration
+class AddChefProxyIdToHost < ActiveRecord::Migration[4.2]
   def change
     add_column :hosts, :chef_proxy_id, :integer
   end

data/db/migrate/20140513144804_add_chef_proxy_id_to_hostgroup.rb

@@ -1,4 +1,4 @@
-class AddChefProxyIdToHostgroup < ActiveRecord::Migration
+class AddChefProxyIdToHostgroup < ActiveRecord::Migration[4.2]
   def change
     add_column :hostgroups, :chef_proxy_id, :integer
   end

data/db/migrate/20150916141657_create_chef_environment.rb

@@ -1,4 +1,4 @@
-class CreateChefEnvironment < ActiveRecord::Migration
+class CreateChefEnvironment < ActiveRecord::Migration[4.2]
   def up
     create_table :foreman_chef_environments do |t|
       t.string :name, :default => '', :null => false

data/db/migrate/20160324151437_create_foreman_chef_cached_run_list.rb

@@ -1,4 +1,4 @@
-class CreateForemanChefCachedRunList < ActiveRecord::Migration
+class CreateForemanChefCachedRunList < ActiveRecord::Migration[4.2]
   def change
     create_table :foreman_chef_cached_run_lists do |t|
       t.text :list, :null => false

data/db/migrate/20160408091653_add_chef_private_key_to_host.rb

@@ -1,4 +1,4 @@
-class AddChefPrivateKeyToHost < ActiveRecord::Migration
+class AddChefPrivateKeyToHost < ActiveRecord::Migration[4.2]
   def change
     add_column :hosts, :chef_private_key, :text
   end

data/lib/foreman_chef/engine.rb

@@ -47,7 +47,7 @@ module ForemanChef
 
     initializer 'foreman_chef.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_chef do
-        requires_foreman '>= 1.15'
+        requires_foreman '>= 1.17'
         extend_template_helpers ForemanChef::Concerns::Renderer
 
         permission :import_chef_environments, { :environments => [:import, :synchronize] }, :resource_type => 'ForemanChef::Environment'
@@ -88,12 +88,12 @@ module ForemanChef
 
       ::Host::Managed.send :include, ForemanChef::Concerns::HostAndHostgroupExtensions
       ::Hostgroup.send :include, ForemanChef::Concerns::HostAndHostgroupExtensions
-      ::Host::Managed.send :include, ForemanChef::Concerns::HostExtensions
+      ::Host::Managed.send :prepend, ForemanChef::Concerns::HostExtensions
       ::Hostgroup.send :include, ForemanChef::Concerns::HostgroupExtensions
-      ::SmartProxy.send :include, ForemanChef::Concerns::SmartProxyExtensions
-      ::Host::Managed.send :include, ForemanChef::Concerns::HostActionSubject
-      ::Host::Managed.send :include, ForemanChef::Concerns::HostBuild
-      ::HostsController.send :include, ForemanChef::Concerns::HostsControllerRescuer
+      ::SmartProxy.send :prepend, ForemanChef::Concerns::SmartProxyExtensions
+      ::Host::Managed.send :prepend, ForemanChef::Concerns::HostActionSubject
+      ::Host::Managed.send :prepend, ForemanChef::Concerns::HostBuild
+      ::HostsController.send :prepend, ForemanChef::Concerns::HostsControllerRescuer
 
       ::Host::Managed.send :include, ForemanChef::Concerns::Renderer
     end

data/lib/foreman_chef/version.rb

@@ -1,3 +1,3 @@
 module ForemanChef
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_chef
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Plugin for Chef integration with Foreman