foreman_scc_manager 3.1.1 → 4.0.1

data/app/models/concerns/recurring_logic_extensions.rb

@@ -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/lib/foreman_scc_manager/engine.rb

@@ -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

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '3.1.1'.freeze
+  VERSION = '4.0.1'.freeze
 end

data/locale/Makefile

@@ -31,9 +31,16 @@ all-mo: $(MOFILES)
 	cat $@
 	! grep -q msgid $@
 
-%.edit.po:
+%.edit.po: %.po.time_stamp
 	touch $@
 
+# gettext will trash the .edit.po file if the time stamp doesn't exist or is older than the po file
+%.po.time_stamp: %.po
+	touch --reference $< $@
+
+# Prevent make from treating this as an intermediate file to be cleaned up
+.PRECIOUS: %.po.time_stamp
+
 check: $(POXFILES)
 
 # Unify duplicate translations
@@ -43,7 +50,10 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	cd .. && tx pull -f --all
+	# Initialize new languages
+	cd .. && tx pull -f --all --minimum-perc 50
+	# Force update all existing languages
+	cd .. && tx pull -f --minimum-perc 0
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done