RubyGems - foreman_scc_manager - Versions diffs - 3.1.0 → 4.0.0 - Mend

foreman_scc_manager 3.1.0 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +4 -4
data/README.md +3 -6
data/app/models/concerns/recurring_logic_extensions.rb +4 -6
data/app/models/scc_account.rb +2 -0
data/lib/foreman_scc_manager/engine.rb +80 -83
data/lib/foreman_scc_manager/version.rb +1 -1
data/test/controllers/api/v2/scc_accounts_test.rb +1 -1
metadata +33 -19

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 669ea1e4a29dacb7bb510a0ef50d72565e318210e4234bf91835030cccb68e09
-  data.tar.gz: 4e93f9ad2068857d52192850a0ec32096d6b27a2bbda17c47e8b375f75244277
+  metadata.gz: b29c4b97a8544a564b8a29e145d3ea818ab6a59f4bf0fcd4c6bbd322028aaddf
+  data.tar.gz: b778dd3e956f9246d0f19e1dc88b19e0a06d0d01d091fa4046fa1ba719da3e6c
 SHA512:
-  metadata.gz: c50116ce7db1bfe958e41a27ebc0e14a96355b21ecbab1e0449b297a87562030043f2fe5750be8a15151a9e1df8e9970f6b4a8caa607f7e53e713443f2e507ed
-  data.tar.gz: 2a38bafa3ecf2ba0340dbb2fdd074971ba9e24f47708e67531833359f63175063bb00044136ca569c8f51c15c6f9f23ebdbe95ffcc988e9765b6b222ea1c8880
+  metadata.gz: 474687d7b4181867f0a00cfe6a576c84198e4cf8784a4bd94119cb18cb2b3870cd8fc1e3f6a63207731f31321405260b49d00fb0999bf8255138a268accb012f
+  data.tar.gz: dce03a040429f9202de34c3861bd32cc349aed0ded288d10899e4933efb1889d8dea3466d574d3e5e58e7ec665266491e699525ff4d8f99c95f5bad80d7d9384

data/README.md CHANGED Viewed

@@ -26,14 +26,11 @@ foreman-installer
 | Foreman Version | Katello Version | Plugin Version |
 | --------------- | --------------- | -------------- |
+| 3.13            | 4.15            | ~> 4.0.0       |
+| 3.7             | 4.9             | ~> 3.0.0       |
 | 3.3             | 4.5             | ~> 2.0.0       |
 | 3.1             | 4.3             | ~> 1.8.20\*    |
 | 3.0             | 4.2             | ~> 1.8.20      |
-| 2.5             | 4.1             | ~> 1.8.20      |
-| 2.3             | 3.18            | ~> 1.8.9       |
-| 2.1             | 3.16            | ~> 1.8.5       |
-| 2.0             | 3.16            | ~> 1.8.4       |
-| 1.24            | 3.14            | ~> 1.8.0       |
 \* If you are using foreman_scc_manager in version 1.8.20 and then upgrade to Katello 4.3, you need to manually run the following rake task on your Foreman instance: `foreman-rake foreman_scc_manager:setup_authentication_tokens`.
@@ -51,7 +48,7 @@ Fork and send a Pull Request. Thanks!
 ## Copyright
-Copyright (c) 2023 ATIX AG - https://atix.de
+Copyright (c) 2024 ATIX AG - https://atix.de
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/app/models/concerns/recurring_logic_extensions.rb CHANGED Viewed

@@ -1,9 +1,7 @@
-module Concerns
-  module RecurringLogicExtensions
-    extend ActiveSupport::Concern
+module RecurringLogicExtensions
+  extend ActiveSupport::Concern
-    included do
-      has_one :scc_account, :inverse_of => :foreman_tasks_recurring_logic, :class_name => 'SccAccount'
-    end
+  included do
+    has_one :scc_account, :inverse_of => :foreman_tasks_recurring_logic, :class_name => 'SccAccount'
   end
 end

data/app/models/scc_account.rb CHANGED Viewed

@@ -38,6 +38,8 @@ class SccAccount < ApplicationRecord
   validates :mirroring_policy, :inclusion => { :in => SCC_MIRRORING_POLICIES }, :allow_blank => false
   validate :sync_date_is_valid_datetime
+  alias_attribute :recurring_logic_id, :foreman_tasks_recurring_logic_id
   after_initialize :init
   before_destroy :cancel_recurring_logic

data/lib/foreman_scc_manager/engine.rb CHANGED Viewed

@@ -4,13 +4,8 @@ module ForemanSccManager
   class Engine < ::Rails::Engine
     engine_name 'foreman_scc_manager'
-    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/overrides"]
     config.to_prepare do
-      ForemanTasks::RecurringLogic.include Concerns::RecurringLogicExtensions
+      ForemanTasks::RecurringLogic.include RecurringLogicExtensions
     end
     # Add any db migrations
@@ -20,84 +15,86 @@ module ForemanSccManager
       end
     end
-    initializer 'foreman_scc_manager.register_plugin', :before => :finisher_hook do |_app|
-      Foreman::Plugin.register :foreman_scc_manager do
-        requires_foreman '>= 3.7'
-        requires_foreman_plugin 'katello', '>= 3.16.0'
-        register_gettext
-        precompile_assets 'foreman_scc_manager/scc_accounts.js'
-        apipie_documented_controllers ["#{ForemanSccManager::Engine.root}/app/controllers/api/v2/*.rb"]
-        # Add permissions
-        security_block :foreman_scc_manager do
-          permission :view_scc_accounts,
-            { :scc_accounts => [:show, :index, :auto_complete_search],
-              :'api/v2/scc_accounts' => [:show, :index, :auto_complete_search] },
-            :resource_type => 'SccAccount'
-          permission :use_scc_accounts,
-            { :scc_accounts => [:bulk_subscribe],
-              :'api/v2/scc_accounts' => [:bulk_subscribe, :bulk_subscribe_with_repos] },
-            :resource_type => 'SccAccount'
-          permission :new_scc_accounts,
-            { :scc_accounts => [:new, :create],
-              :'api/v2/scc_accounts' => [:create] },
-            :resource_type => 'SccAccount'
-          permission :edit_scc_accounts,
-            { :scc_accounts => [:edit, :update],
-              :'api/v2/scc_accounts' => [:update] },
-            :resource_type => 'SccAccount'
-          permission :delete_scc_accounts,
-            { :scc_accounts => [:destroy],
-              :'api/v2/scc_accounts' => [:destroy] },
-            :resource_type => 'SccAccount'
-          permission :sync_scc_accounts,
-            { :scc_accounts => [:sync],
-              :'api/v2/scc_accounts' => [:sync] },
-            :resource_type => 'SccAccount'
-          permission :test_connection_scc_accounts,
-            { :scc_accounts => [:test_connection],
-              :'api/v2/scc_accounts' => [:test_connection] },
-            :resource_type => 'SccAccount'
-          permission :view_scc_products,
-            { :scc_products => [:index, :show],
-              :'api/v2/scc_products' => [:index, :show] },
-            :resource_type => 'SccProduct'
-          permission :subscribe_scc_products,
-            { :scc_products => [:subscribe, :unsubscribe],
-              :'api/v2/scc_products' => [:subscribe, :unsibscribe] },
-            :resource_type => 'SccProduct'
+    initializer 'foreman_scc_manager.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_scc_manager do
+          requires_foreman '>= 3.13'
+          requires_foreman_plugin 'katello', '>= 3.16.0'
+          register_gettext
+          precompile_assets 'foreman_scc_manager/scc_accounts.js'
+          apipie_documented_controllers ["#{ForemanSccManager::Engine.root}/app/controllers/api/v2/*.rb"]
+          # Add permissions
+          security_block :foreman_scc_manager do
+            permission :view_scc_accounts,
+              { :scc_accounts => [:show, :index, :auto_complete_search],
+                :'api/v2/scc_accounts' => [:show, :index, :auto_complete_search] },
+              :resource_type => 'SccAccount'
+            permission :use_scc_accounts,
+              { :scc_accounts => [:bulk_subscribe],
+                :'api/v2/scc_accounts' => [:bulk_subscribe, :bulk_subscribe_with_repos] },
+              :resource_type => 'SccAccount'
+            permission :new_scc_accounts,
+              { :scc_accounts => [:new, :create],
+                :'api/v2/scc_accounts' => [:create] },
+              :resource_type => 'SccAccount'
+            permission :edit_scc_accounts,
+              { :scc_accounts => [:edit, :update],
+                :'api/v2/scc_accounts' => [:update] },
+              :resource_type => 'SccAccount'
+            permission :delete_scc_accounts,
+              { :scc_accounts => [:destroy],
+                :'api/v2/scc_accounts' => [:destroy] },
+              :resource_type => 'SccAccount'
+            permission :sync_scc_accounts,
+              { :scc_accounts => [:sync],
+                :'api/v2/scc_accounts' => [:sync] },
+              :resource_type => 'SccAccount'
+            permission :test_connection_scc_accounts,
+              { :scc_accounts => [:test_connection],
+                :'api/v2/scc_accounts' => [:test_connection] },
+              :resource_type => 'SccAccount'
+            permission :view_scc_products,
+              { :scc_products => [:index, :show],
+                :'api/v2/scc_products' => [:index, :show] },
+              :resource_type => 'SccProduct'
+            permission :subscribe_scc_products,
+              { :scc_products => [:subscribe, :unsubscribe],
+                :'api/v2/scc_products' => [:subscribe, :unsibscribe] },
+              :resource_type => 'SccProduct'
+          end
+          # Add a new role called 'SccManager' if it doesn't exist
+          role 'SccManager',
+            %i[view_scc_accounts use_scc_accounts new_scc_accounts edit_scc_accounts
+               delete_scc_accounts sync_scc_accounts test_connection_scc_accounts
+               view_scc_products subscribe_scc_products],
+            'Role granting permissons to manage SUSE Subscriptions'
+          role 'SccViewer',
+            %i[view_scc_accounts use_scc_accounts sync_scc_accounts
+               create_products view_products subscribe_scc_products view_scc_products],
+            'Role granting permissons to view and use SUSE Subscriptions'
+          add_all_permissions_to_default_roles
+          # add menu entry
+          menu :top_menu, :scc_manager,
+            url_hash: { controller: :scc_accounts, action: :index },
+            caption: _('SUSE Subscriptions'),
+            parent: :content_menu,
+            after: :red_hat_subscriptions
         end
-        # Add a new role called 'SccManager' if it doesn't exist
-        role 'SccManager',
-          %i[view_scc_accounts use_scc_accounts new_scc_accounts edit_scc_accounts
-             delete_scc_accounts sync_scc_accounts test_connection_scc_accounts
-             view_scc_products subscribe_scc_products],
-          'Role granting permissons to manage SUSE Subscriptions'
-        role 'SccViewer',
-          %i[view_scc_accounts use_scc_accounts sync_scc_accounts
-             create_products view_products subscribe_scc_products view_scc_products],
-          'Role granting permissons to view and use SUSE Subscriptions'
-        add_all_permissions_to_default_roles
-        # add menu entry
-        menu :top_menu, :scc_manager,
-          url_hash: { controller: :scc_accounts, action: :index },
-          caption: _('SUSE Subscriptions'),
-          parent: :content_menu,
-          after: :red_hat_subscriptions
       end
     end

data/lib/foreman_scc_manager/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '3.1.0'.freeze
+  VERSION = '4.0.0'.freeze
 end

data/test/controllers/api/v2/scc_accounts_test.rb CHANGED Viewed

@@ -251,7 +251,7 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     put :update, params: { id: account.id, scc_account: { :base_url => '', :sync_date => Time.now, :interval => 'weekly' } }
     assert_response :unprocessable_entity
-    assert_error_message "Base url can't be blank"
+    assert_error_message "Base URL can't be blank"
   end
   test 'new account SCC server connection-test' do

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - ATIX AG
-autorequire:
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: katello
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +237,7 @@ homepage: https://www.orcharhino.com/
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -238,27 +252,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman
 test_files:
-- test/support/fixtures_support.rb
-- test/unit/foreman_scc_manager_test.rb
 - test/actions/sync_test.rb
-- test/test_plugin_helper.rb
+- test/controllers/api/v2/scc_accounts_test.rb
+- test/controllers/api/v2/scc_products_test.rb
+- test/controllers/scc_accounts_controller_test.rb
 - test/factories/foreman_scc_manager_factories.rb
-- test/models/scc_product_test.rb
-- test/models/scc_account_test.rb
 - test/features/sync_test.rb
-- test/fixtures/models/scc_repositories.yml
-- test/fixtures/models/katello_root_repositories.yml
-- test/fixtures/models/scc_accounts.yml
-- test/fixtures/models/scc_products.yml
 - test/fixtures/files/data_products_page1.json
-- test/fixtures/files/data_subscriptions.json
 - test/fixtures/files/data_products_page2.json
 - test/fixtures/files/data_repositories.json
-- test/controllers/scc_accounts_controller_test.rb
-- test/controllers/api/v2/scc_products_test.rb
-- test/controllers/api/v2/scc_accounts_test.rb
+- test/fixtures/files/data_subscriptions.json
+- test/fixtures/models/katello_root_repositories.yml
+- test/fixtures/models/scc_accounts.yml
+- test/fixtures/models/scc_products.yml
+- test/fixtures/models/scc_repositories.yml
+- test/models/scc_account_test.rb
+- test/models/scc_product_test.rb
+- test/support/fixtures_support.rb
+- test/test_plugin_helper.rb
+- test/unit/foreman_scc_manager_test.rb