foreman_spacewalk 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d088219e7aacc2929db1a85c22791b29e9d191dbe45984ca0e38c3f07bab6aae
-  data.tar.gz: 3a6d0f46bc245913676c9c32f6c98ffb5b705b8c4830cf6012816fb90b76b85c
+  metadata.gz: e64ef92f1ce27ee28db10bc71bb45d15b7f3bd37faffefc5c01e96897fc37758
+  data.tar.gz: 3fe0f445b7754b4e31e5964d224e7451c948655a872847cac2902eaa3b53e0a5
 SHA512:
-  metadata.gz: '001259bd0035f8532ee507d4cbc15f8b35ca631201e592cf020bd1c92ff62ff7d7908952081b3335a1e0fb310ad7cde9f29b2171351087a439669f984b1e3a38'
-  data.tar.gz: b1406dbdfc1dc8d6e6b7cecd3d281c49bcf74bec8d852572bc867add0f56c36bffdbd1b2c47bf27935bb4c382c451e480f5dfc066a50ef5ef89e82cc823331aa
+  metadata.gz: 5588ae30efdb48c895cf9813b2b6347db9d5616c93edd62fd0298e3a6d96cc71b105253b35724268d261cbf72460a64c8da024266e3e671aaa76cceef7acb066
+  data.tar.gz: b2fabe71d8446fedc9d78f8b946a0378299177d015e65d746a7bee6d7cbd40132555f006ebb25767a147c5ca8061a0ee6898b1e76d0429776d8a4768f985a9b6

data/README.md

@@ -7,7 +7,8 @@ Spacewalk is an open source server management tool and downstream for RedHat Sat
 
 | Foreman Version | Plugin Version |
 | --------------- | -------------- |
-| >= 1.15         | any            |
+| >= 1.15         | ~> 0.1         |
+| >= 1.17         | ~> 1.0         |
 
 ## Installation
 

data/app/helpers/concerns/foreman_spacewalk/hosts_helper_ext.rb

@@ -2,18 +2,20 @@ module ForemanSpacewalk
   module HostsHelperExt
     extend ActiveSupport::Concern
 
-    included do
-      alias_method_chain :multiple_actions, :spacewalk
+    module Overrides
+      def multiple_actions
+        spacewalk_multiple_actions = []
+        if authorized_for(controller: :hosts, action: :select_multiple_downtime)
+          spacewalk_multiple_actions << [
+            _('Change Spacewalk Proxy'), select_multiple_spacewalk_proxy_hosts_path
+          ]
+        end
+        super + spacewalk_multiple_actions
+      end
     end
 
-    def multiple_actions_with_spacewalk
-      spacewalk_multiple_actions = []
-      if authorized_for(controller: :hosts, action: :select_multiple_downtime)
-        spacewalk_multiple_actions << [
-          _('Change Spacewalk Proxy'), select_multiple_spacewalk_proxy_hosts_path
-        ]
-      end
-      multiple_actions_without_spacewalk + spacewalk_multiple_actions
+    included do
+      prepend Overrides
     end
   end
 end

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

@@ -2,23 +2,23 @@ module ForemanSpacewalk
   module HostExtensions
     extend ActiveSupport::Concern
 
-    included do
-      include Orchestration::Spacewalk
-
-      alias_method_chain :smart_proxy_ids, :spacewalk_proxy
-      alias_method_chain :hostgroup_inherited_attributes, :spacewalk
-    end
+    module Overrides
+      def hostgroup_inherited_attributes
+        super + ['spacewalk_proxy_id']
+      end
 
-    def hostgroup_inherited_attributes_with_spacewalk
-      hostgroup_inherited_attributes_without_spacewalk + ['spacewalk_proxy_id']
+      def smart_proxy_ids
+        ids = super
+        [spacewalk_proxy, hostgroup.try(:spacewalk_proxy)].compact.each do |proxy|
+          ids << proxy.id
+        end
+        ids
+      end
     end
 
-    def smart_proxy_ids_with_spacewalk_proxy
-      ids = smart_proxy_ids_without_spacewalk_proxy
-      [spacewalk_proxy, hostgroup.try(:spacewalk_proxy)].compact.each do |proxy|
-        ids << proxy.id
-      end
-      ids
+    included do
+      include Orchestration::Spacewalk
+      prepend Overrides
     end
   end
 end

data/db/migrate/20180104155010_add_spacewalk_proxy_id_to_host_and_hostgroup.rb

@@ -1,4 +1,4 @@
-class AddSpacewalkProxyIdToHostAndHostgroup < ActiveRecord::Migration
+class AddSpacewalkProxyIdToHostAndHostgroup < ActiveRecord::Migration[4.2]
   def change
     add_column :hosts, :spacewalk_proxy_id, :integer, index: true
     add_column :hostgroups, :spacewalk_proxy_id, :integer, index: true

data/lib/foreman_spacewalk/engine.rb

@@ -15,7 +15,7 @@ module ForemanSpacewalk
 
     initializer 'foreman_spacewalk.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_spacewalk do
-        requires_foreman '>= 1.15'
+        requires_foreman '>= 1.17'
 
         spacewalk_proxy_options = {
           feature: 'Spacewalk',

data/lib/foreman_spacewalk/version.rb

@@ -1,3 +1,3 @@
 module ForemanSpacewalk
-  VERSION = '0.1.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_spacewalk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Timo Goebel