foreman_theme_satellite 13.2.5 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e429335574eaa060f65234918f4c8ed7bff9468fa70f7a6692056e7fdfee6d4e
-  data.tar.gz: 64e189a7c9b42236e9af00063d018283dd3256859192ab77866b5871f5e9edf6
+  metadata.gz: 1ad1e23c6062e9751dfde7648814703fc6656e0604763d7f8f228e3a6f3e7cb8
+  data.tar.gz: 7a1b7d7a9119e28ff201abed28caecb39034dae5b1efe41a0dad098c45e192ff
 SHA512:
-  metadata.gz: 97d0dbf8203ccac0e3bb4cd7cb3b333659eb886bf9226d110de4974c1f0097cd3c399ce67c52706e85d99c0e5015f066d47fa0095c2f969f4f751df406bdce3a
-  data.tar.gz: 5df13cfec2643815b6e7bb038afdf0b20de4d465d89855189a59bb02073fc55944026375af77767f15d3c068db194e4ad8ebef395a46133e81e83cac9872f658
+  metadata.gz: f1faf4f3c03596f4975f169baefdacab1417e7a2e9ea81ce41d48d6cc86889a4571b9da65df98c53d4e1bd8693929e63fb08642dfa15c4c0cad94905d98b10fd
+  data.tar.gz: c9e43a7fb53b21d2147a27ccc9f7b3407400a3367d35027b6957e30ee1ab05e76fdf3c55eb18dbb0adebb5e08d585aa233c2f30046c20fc08ec0c004b1153a32

data/README.md

@@ -36,7 +36,7 @@ const SettingName = ({ setting }) => (
 
 In case there is a need to add more terms to be branded **or bypass branding**,
 it can be done in
-[`branded_words.rb`](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/lib/foreman_theme_satellite/branded_words.rb).
+[`foreman_brand.rb`](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/lib/foreman_theme_satellite/foreman_brand.rb).
 This is a dictionary where the key is a
 [Regular Expression](https://regex101.com/) and the value is a replacement
 string.
@@ -303,7 +303,7 @@ Deface::Override.new(:virtual_path  => "about/index",
                      :text          =>  "    <div class=\"stats-well\"><h4><%= _(\"Support\") %></h4> <p>Visit the <%= link_to _('Customer Portal'), \"https://access.redhat.com/\",
                                        :rel => \"external\" %> to get support, find solutions to common questions, and more.</p><h6><%= _(\"Documentation\") %></h6>
                                         <ul>
-                                        <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"https://access.redhat.com/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
+                                        <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"#{ForemanThemeSatellite.documentation_server}/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
                                         <li><%= link_to _('API Resources'), apipie_apipie_path, :title => _('Automate Satellite via a simple and powerful API') %></li>
                                         </ul>
                                         <h6><%= _(\"Blog\") %></h6>

data/app/controllers/concerns/documentation_controller_branding.rb

@@ -12,13 +12,11 @@ module DocumentationControllerBranding
     end
     if url.empty?
       upstream_url = super(section, options)
-      if (upstream_url =~ /redhat.com/)
-        url = upstream_url
-      else
-        special_links_pair = ForemanThemeSatellite::Documentation::SPECIAL_LINKS.find { |regex, _val| regex.match(upstream_url) }
-        url = special_links_pair[1] if special_links_pair
-        url = "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite" if url.empty?
-      end
+      url = if (upstream_url =~ /redhat.com/)
+              upstream_url
+            else
+              "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite"
+            end
     end
     url
   end

data/app/helpers/theme_application_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 # Overrides for functions used in helpers.
 module ThemeApplicationHelper
   def association_text()

data/app/overrides/satellite_name_override.rb

@@ -37,7 +37,7 @@ Deface::Override.new(:virtual_path  => "about/index",
                      :text          =>  "    <div class=\"stats-well\"><h4><%= _(\"Support\") %></h4> <p>Visit the <%= link_to _('Customer Portal'), \"https://access.redhat.com/\",
                                        :rel => \"external\" %> to get support, find solutions to common questions, and more.</p><h6><%= _(\"Documentation\") %></h6>
                                         <ul>
-                                        <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"https://access.redhat.com/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
+                                        <li><%= link_to _('Complete Product Documentation for Red Hat Satellite'),\"#{ForemanThemeSatellite.documentation_server}/documentation/en/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}\", :rel => \"external\" %></li>
                                         <li><%= link_to _('API Resources'), apipie_apipie_path, :title => _('Automate Satellite via a simple and powerful API') %></li>
                                         <li><%= link_to _('Templates DSL'), apipie_dsl_apipie_dsl_path, :title => _('Get DSL reference for templates writing') %></li>
                                         </ul>

data/app/views/foreman_theme_satellite/_theme_client_side_branding.js.erb

@@ -1,4 +1,4 @@
-<% require_relative '../../../lib/foreman_theme_satellite/branded_words' %>
+<% require_relative '../../../lib/foreman_theme_satellite/foreman_brand' %>
 
 var branded_words = []
 <% ForemanThemeSatellite::FOREMAN_BRAND.map do |exp, replace|  %>

data/db/migrate/20180605150932_deprecate_satellite_templates.rb

@@ -1,3 +1,5 @@
+# rubocop:disable Rails/SkipsModelValidations
+
 require_relative '../../lib/foreman_theme_satellite/deprecated_templates'
 
 class DeprecateSatelliteTemplates < ActiveRecord::Migration[5.1]
@@ -50,3 +52,5 @@ class DeprecateSatelliteTemplates < ActiveRecord::Migration[5.1]
     destination.operatingsystem_ids = (destination.operatingsystem_ids + source.operatingsystem_ids).uniq
   end
 end
+
+# rubocop:enable Rails/SkipsModelValidations

data/db/migrate/20181108171732_change_blog_url.rb

@@ -1,4 +1,4 @@
-class ChangeBlogUrl < ActiveRecord::Migration[5.1]
+class ChangeBlogURL < ActiveRecord::Migration[5.1]
   def up
     if Setting[:rss_url] == 'https://access.redhat.com/blogs/1169563/feed'
       Setting[:rss_url] = 'https://www.redhat.com/en/rss/blog/channel/red-hat-satellite'

data/lib/foreman_theme_satellite/documentation.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 module ForemanThemeSatellite
   module Documentation
     USER_GUIDE_DICTIONARY = {
-      # Ansible
-      'ImportingRoles' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Importing_Ansible_Roles_and_Variables_ansible",
-      'Variables' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Overriding_Ansible_Variables_in_satellite_ansible",
-
       # Managing Hosts
       'ForemanRemoteExecution' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts",
       'ExecutingaJob' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/configuring_and_setting_up_remote_jobs_managing-hosts#Configuring_the_Global_capsule_Remote_Execution_Setting_in_satellite_managing-hosts",
@@ -34,18 +30,18 @@ module ForemanThemeSatellite
       'Networking' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_networking_provisioning#Adding_a_Subnet_to_Server_provisioning",
 
       # Puppet Guide
-      'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/introducing-configuration-management-using-puppet_managing-configurations-puppet#performing-configuration-management_managing-configurations-puppet",
-      'using-config-groups' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/creating-a-puppet-config-group_managing-configurations-puppet",
-      'SmartMatchers' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
-      'Parameters' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
-      'Classes' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/importing_puppet_classes_and_environments_managing-configurations-puppet",
-      'Environments' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_using_puppet_integration/creating_a_custom_puppet_environment_managing-configurations-puppet",
+      'FactsandtheENC' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/introducing-configuration-management-using-puppet_managing-configurations-puppet#performing-configuration-management_managing-configurations-puppet",
+      'using-config-groups' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/creating-a-puppet-config-group_managing-configurations-puppet",
+      'SmartMatchers' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
+      'Parameters' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/configuring_puppet_smart_class_parameters_managing-configurations-puppet",
+      'Classes' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/importing_puppet_classes_and_environments_managing-configurations-puppet",
+      'Environments' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_puppet_integration/creating_a_custom_puppet_environment_managing-configurations-puppet",
 
       # Administering
       'ConfigurationOptions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/",
       'PuppetReports' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/monitoring_resources_admin#Using_the_Project_Content_Dashboard_admin",
       'Mail_Notifications' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/configuring_email_notifications_admin",
-      'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#External_Authentication_for_Provisioned_Hosts_satellite",
+      'Realm' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm_satellite",
       'Searching' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/searching_and_bookmarking_admin",
       'RolesandPermissions' => "#{ForemanThemeSatellite.documentation_root}/administering_red_hat_satellite/managing_users_and_roles_admin",
       'LDAPAuthentication' => "#{ForemanThemeSatellite.documentation_root}/installing_satellite_server_in_a_connected_network_environment/configuring_external_authentication_satellite#Using_LDAP_satellite",
@@ -74,16 +70,19 @@ module ForemanThemeSatellite
 
     PLUGINS_DOCUMENTATION = {
       'foreman_azure' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/provisioning_cloud_instances_on_microsoft_azure_resource_manager_azure-provisioning",
-      'foreman_discovery' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/configuring_the_discovery_service_provisioning",
+      'foreman_discovery' => "#{ForemanThemeSatellite.documentation_root}/provisioning_hosts/discovering-hosts-on-a-network_provisioning",
     }.freeze
 
-    SPECIAL_LINKS = [
-      [/docs\.theforeman\.org\/.*?\/Managing_Hosts\/.*?registering-a-host.*?managing-hosts/i, "#{ForemanThemeSatellite.documentation_root}/managing_hosts/registering_hosts_to_server_managing-hosts#Registering_Hosts_by_Using_Global_Registration_managing-hosts"],
-    ]
-
     DOCS_GUIDES_LINKS = {
+      'Managing_Content' => {
+        'Products_and_Repositories_content-management' => "#{ForemanThemeSatellite.documentation_root}/managing_content/importing_content_content-management#Products_and_Repositories_content-management",
+      },
       'Managing_Hosts' => {
         'registering-a-host_managing-hosts' => "#{ForemanThemeSatellite.documentation_root}/managing_hosts/registering_hosts_to_server_managing-hosts#Registering_Hosts_by_Using_Global_Registration_managing-hosts",
+      },
+      'Managing_Configurations_Ansible' => {
+        'Importing_Ansible_Roles_and_Variables_ansible' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Importing_Ansible_Roles_and_Variables_ansible",
+        'Overriding_Ansible_Variables_in_foreman_ansible' => "#{ForemanThemeSatellite.documentation_root}/managing_configurations_by_using_ansible_integration/getting_started_with_ansible_in_satellite_ansible#Overriding_Ansible_Variables_in_satellite_ansible",
       }
     }.freeze
 
@@ -96,11 +95,12 @@ module ForemanThemeSatellite
       source.map do |k, v|
         key = "#{prefix}/#{k}"
         if v.is_a?(Hash)
-          key_values.concat(*nested_to_flat_k_v(key, v))
+          key_values.concat(nested_to_flat_k_v(key, v))
         else
-          key_values.concat([key, v])
+          key_values.concat([[key, v]])
         end
       end
+      key_values
     end
   end
 end

data/lib/foreman_theme_satellite/engine.rb

@@ -6,21 +6,11 @@ require 'deface'
 module ForemanThemeSatellite
   class Engine < ::Rails::Engine
     engine_name 'foreman_theme_satellite'
-
-    config.eager_load_paths += Dir["#{config.root}/app/overrides"]
-    config.eager_load_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.eager_load_paths += Dir["#{config.root}/app/helpers"]
-    config.eager_load_paths += Dir["#{config.root}/app/models/concerns"]
-    config.eager_load_paths += Dir["#{config.root}/app/services/concerns"]
-    config.eager_load_paths += Dir["#{config.root}/lib/foreman_theme_satellite"]
-
-    initializer 'foreman_theme_satellite.load_default_settings', :before => :load_config_initializers do |app|
-      SettingRegistry.prepend SettingRegistryBranding
-    end
+    config.eager_load_paths += Dir["#{config.root}/lib"]
 
     initializer 'foreman_theme_satellite.register_plugin', :before=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_theme_satellite do
-        requires_foreman '>= 3.7.0'
+        requires_foreman '>= 3.13.0'
         register_gettext
 
         settings do
@@ -36,7 +26,7 @@ module ForemanThemeSatellite
           end
         end
 
-         tests_to_skip ({
+        tests_to_skip ({
                         "ComputeResourceTest" => ["friendly provider name"],
                         "RealmIntegrationTest" => ["create new page"],
                         "SmartProxyIntegrationTest" => ["create new page", "index page"],
@@ -49,7 +39,7 @@ module ForemanThemeSatellite
                         "OrganizationTest" => ["should clone organization with all associations"],
                         "RealmTest" => ["realm can be assigned to locations"],
                         "LocationTest" => ["should clone location with all associations"]
-                       })
+                      })
 
         extend_rabl_template 'api/v2/home/status', 'api/v2/home/status_extensions'
         extend_template_helpers ForemanThemeSatellite::RendererMethods
@@ -69,19 +59,12 @@ module ForemanThemeSatellite
       end
     end
 
-    initializer 'foreman_theme_satellite.rails_loading_workaround' do
-      # Without this, in production environment the module gets prepended too
-      # late and the extensions do not get applied
-      # the idea is stolen from https://github.com/theforeman/foreman_remote_execution/commit/2efd0a6eccfc19e282f453d5629cf46e729963eb
-      ProvisioningTemplatesHelper.prepend ProvisioningTemplatesHelperBranding
-    end
-
     # Include concerns in this config.to_prepare block
     config.to_prepare do
       begin
+        SettingRegistry.prepend SettingRegistryBranding
         # Include your monkey-patches over here
         ::ForemanGoogle::GCE.send(:prepend, GCE::ClassMethods) if Foreman::Plugin.installed?("foreman_google")
-        require 'rss_checker_branding'
         UINotifications::RssNotificationsChecker.send :prepend, RssCheckerBranding
         Foreman::Model::Openstack.send :include, Openstack
         Foreman::Model::Ovirt.send :include, Ovirt
@@ -139,7 +122,7 @@ module ForemanThemeSatellite
   end
 
   def self.documentation_server
-    @documentation_server ||= metadata_field('documentation_server', 'https://access.redhat.com')
+    @documentation_server ||= metadata_field('documentation_server', 'https://docs.redhat.com')
   end
 
   def self.documentation_version

data/lib/foreman_theme_satellite/foreman_brand.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module ForemanThemeSatellite
+  # This list is used for substitution of branded words by both client and server.
+  # The server just uses the list as is.
+  # The client is consuming it by generated .js.erb file: app/assets/javascripts/theme_client_side_branding.js.erb.
+  # For now, modifiers are not supported by the generator.
+  # Make sure the regexp works both with Ruby and JavaScript.
+  # Entries are processed in order and first wins.
+  # Occurrences of "proxy" should be treated as a bug as it is unclear whether the author refers to a HTTP(S) proxy or a Capsule
+  FOREMAN_BRAND = {
+    /%{proxy}/               => '%{proxy}',
+    /%{foreman}/             => '%{foreman}',
+    /\b[Pp]roxy [Hh][Tt][Tt][Pp]\b(?!-)/    => 'Proxy HTTP', # Workaround for French translation
+    /\b[Pp]roxies [Hh][Tt][Tt][Pp]\b(?!-)/ => 'Proxies HTTP', # Workaround for French translation
+    ## BEGIN Remove after imprecise strings have been fixed in core
+    /\b[Hh][Tt][Tt][Pp](?:\([sS]\))? [Pp]roxy\b(?!-)/ => 'HTTP proxy',
+    /\b[Hh][Tt][Tt][Pp](?:\([sS]\))? [Pp]roxies\b(?!-)/ => 'HTTP proxies',
+    /\bHTTP\(S\) proxy\b(?!-)/ => 'HTTP(S) proxy',
+    /\bIgnore Proxy\b(?!-)/  => 'Ignore Proxy',
+    /\bIgnore proxy\b(?!-)/  => 'Ignore Proxy',
+    /\bSystem-wide proxies\b(?!-)/  => 'System-wide proxies',
+    /\bLeave this blank if no proxy is used\b(?!-)/ => 'Leave this blank if no proxy is used',
+    /\bbypass proxy settings\b(?!-)/ => 'bypass proxy settings',
+    /\bURL of the proxy\b(?!-)/ => 'URL of the proxy',
+    %r{\bhttps://proxy.example.com:8080\b(?!-)} => 'https://proxy.example.com:8080',
+    /\bproxy for all outgoing HTTP connections\b(?!-)/ => 'proxy for all outgoing HTTP connections',
+    /\bperform various actions through those proxies\b(?!-)/ => 'perform various actions through those proxies',
+    ## END
+    /\b[Ff]oreman\b(?!-)/            => 'Satellite',
+    /\b[Ss]mart[- ]?[pP]roxy\b(?!-)/ => 'Capsule',
+    /\b[Ss]mart[- ]?[pP]roxies\b(?!-)/ => 'Capsules',
+    /\b[Pp]roxy\b(?!-)/              => 'Capsule',
+    /\b[Pp]roxies\b(?!-)/              => 'Capsules',
+    /\b[Oo][Vv]irt\b(?!-)/           => 'RHV',
+    /\bFreeIPA\b(?!-)/               => 'Red Hat Identity Management',
+    /\b[Oo]pen[Ss]tack\b(?!-)/       => 'Red Hat OpenStack Platform',
+    /\b[Kk]atello 4.0\b(?!-)/        => 'Satellite 6.11',
+    /\b[Kk]atello 4.10\b(?!-)/       => 'Satellite 6.15',
+    /\b[Kk]atello 4.11\b(?!-)/       => 'Satellite 6.15',
+    /\b[Kk]atello 4.12\b(?!-)/       => 'Satellite 6.16',
+    /\b[Kk]atello 4.13\b(?!-)/       => 'Satellite 6.16',
+  }.freeze
+end

data/lib/foreman_theme_satellite/replacer_repository.rb

@@ -1,5 +1,4 @@
 require 'fast_gettext'
-require_relative 'branded_words'
 
 module ForemanThemeSatellite
   # This repository is a wrapper above other repository,

data/lib/foreman_theme_satellite/version.rb

@@ -1,3 +1,3 @@
 module ForemanThemeSatellite
-  VERSION = '13.2.5'.freeze
+  VERSION = '14.0.0'.freeze
 end

data/lib/tasks/foreman_theme_satellite_tasks.rake

@@ -14,21 +14,6 @@ namespace :test do
 end
 
 namespace :foreman_theme_satellite do
-  task :rubocop do
-    begin
-      require 'rubocop/rake_task'
-      RuboCop::RakeTask.new(:rubocop_foreman_theme_satellite) do |task|
-        task.patterns = ["#{ForemanThemeSatellite::Engine.root}/app/**/*.rb",
-                         "#{ForemanThemeSatellite::Engine.root}/lib/**/*.rb",
-                         "#{ForemanThemeSatellite::Engine.root}/test/**/*.rb"]
-      end
-    rescue
-      puts 'Rubocop not loaded.'
-    end
-
-    Rake::Task['rubocop_foreman_theme_satellite'].invoke
-  end
-
   desc 'Validate documentation links against given TOC file'
   task :validate_docs do
     toc_file = ENV['TOC']
@@ -44,7 +29,6 @@ namespace :foreman_theme_satellite do
 
     all_links = ForemanThemeSatellite::Documentation::USER_GUIDE_DICTIONARY
                 .merge(ForemanThemeSatellite::Documentation::PLUGINS_DOCUMENTATION)
-                .merge(Hash[ForemanThemeSatellite::Documentation::SPECIAL_LINKS])
                 .merge(ForemanThemeSatellite::Documentation.flat_docs_guides_links)
 
     failed = all_links.filter { |_key, doc_address| doc_address.include?('/html/') && !checker.test_link(doc_address) }
@@ -57,8 +41,3 @@ end
 
 Rake::Task[:test].enhance ['test:foreman_theme_satellite']
 Rake::Task['test:foreman_theme_satellite'].enhance ['foreman_theme_satellite:validate_docs']
-
-load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task['jenkins:unit'].enhance ['test:foreman_theme_satellite', 'foreman_theme_satellite:rubocop']
-end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_theme_satellite",
-  "version": "13.2.5",
+  "version": "14.0.0",
   "description": "Satellite theme =============",
   "main": "index.js",
   "scripts": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_theme_satellite
 version: !ruby/object:Gem::Version
-  version: 13.2.5
+  version: 14.0.0
 platform: ruby
 authors:
 - Shimon Stein
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -54,61 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: theforeman-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 description: Theme changes for Satellite 6.
 email:
 - sshtein@redhat.com
@@ -182,10 +140,10 @@ files:
 - db/seeds.d/069-provisioning_templates_defaults.rb
 - db/seeds.d/850-global_parameters.rb
 - lib/foreman_theme_satellite.rb
-- lib/foreman_theme_satellite/branded_words.rb
 - lib/foreman_theme_satellite/deprecated_templates.rb
 - lib/foreman_theme_satellite/documentation.rb
 - lib/foreman_theme_satellite/engine.rb
+- lib/foreman_theme_satellite/foreman_brand.rb
 - lib/foreman_theme_satellite/pry_rack.rb
 - lib/foreman_theme_satellite/replacer_repository.rb
 - lib/foreman_theme_satellite/rss_checker_branding.rb
@@ -221,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: This is a plugin that enables building a theme for Foreman.

data/lib/foreman_theme_satellite/branded_words.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module ForemanThemeSatellite
-  # This list is used for substitution of branded words by both client and server.
-  # The server just uses the list as is.
-  # The client is consuming it by generated .js.erb file: app/assets/javascripts/theme_client_side_branding.js.erb.
-  # For now, modifiers are not supported by the generator.
-  # Make sure the regexp works both with Ruby and JavaScript.
-  # Entries are processed in order and first wins.
-  FOREMAN_BRAND = {
-    /%{proxy}/               => '%{proxy}',
-    /%{foreman}/             => '%{foreman}',
-    /\b[Hh][Tt][Tt][Pp] [Pp]roxy\b(?!-)/    => 'HTTP Proxy',
-    /\b[Hh][Tt][Tt][Pp] [Pp]roxies\b(?!-)/ => 'HTTP Proxies',
-    /\bHTTP\(S\) proxy\b(?!-)/ => 'HTTP(S) proxy',
-    /\bIgnore Proxy\b(?!-)/  => 'Ignore Proxy',
-    /\bIgnore proxy\b(?!-)/  => 'Ignore Proxy',
-    /\bSystem-wide proxies\b(?!-)/  => 'System-wide proxies',
-    /\bLeave this blank if no proxy is used\b(?!-)/ => 'Leave this blank if no proxy is used',
-    /\bbypass proxy settings\b(?!-)/ => 'bypass proxy settings',
-    /\bURL of the proxy\b(?!-)/ => 'URL of the proxy',
-    %r{\bhttps://proxy.example.com:8080\b(?!-)} => 'https://proxy.example.com:8080',
-    /\bproxy for all outgoing HTTP connections\b(?!-)/ => 'proxy for all outgoing HTTP connections',
-    /\bperform various actions through those proxies\b(?!-)/ => 'perform various actions through those proxies',
-    /\bForeman\b(?!-)/       => 'Satellite',
-    /\bforeman\b(?!-)/       => 'satellite',
-    /\bsmart-proxy\b(?!-)/   => 'capsule',
-    /\bSmart-proxy\b(?!-)/   => 'Capsule',
-    /\bsmart proxies\b(?!-)/ => 'capsules',
-    /\bSmart proxies\b(?!-)/ => 'Capsules',
-    /\bsmart-proxies\b(?!-)/ => 'capsules',
-    /\bSmart-proxies\b(?!-)/ => 'Capsules',
-    /\bSmart Proxies\b(?!-)/ => 'Capsules',
-    /\bSmart Proxy\(ies\)(?!-)/ => 'Capsule(s)',
-    /\bSmart Proxy\b(?!-)/   => 'Capsule',
-    /\bsmart proxy\b(?!-)/   => 'capsule',
-    /\bSmart-Proxies\b(?!-)/ => 'Capsules',
-    /\bSmart proxy\b(?!-)/   => 'Capsule',
-    /\bSmart-Proxy\b(?!-)/   => 'Capsule',
-    /\boVirt\b(?!-)/         => 'RHEV',
-    /\bovirt\b(?!-)/         => 'RHEV',
-    /\bOvirt\b(?!-)/         => 'RHEV',
-    /\bFreeIPA\b(?!-)/       => 'Red Hat Identity Management',
-    /\bOpenStack\b(?!-)/     => 'RHEL OpenStack Platform',
-    /\bopenstack\b(?!-)/     => 'RHEL OpenStack Platform',
-    /\bOpenstack\b(?!-)/     => 'RHEL OpenStack Platform',
-    /\bProxy\b(?!-)/         => 'Capsule',
-    /\bproxy\b(?!-)/         => 'Capsule',
-    /\bProxies\b(?!-)/       => 'Capsules',
-    /\bproxies\b(?!-)/       => 'Capsules',
-    /\b[Kk]atello 4.0\b(?!-)/       => 'Satellite 6.11',
-    /\b[Kk]atello 4.10\b(?!-)/       => 'Satellite 6.15',
-    /\b[Kk]atello 4.11\b(?!-)/       => 'Satellite 6.15',
-    /\b[Kk]atello 4.12\b(?!-)/       => 'Satellite 6.16',
-    /\b[Kk]atello 4.13\b(?!-)/       => 'Satellite 6.16',
-    %r{https://theforeman.org/plugins/katello/(?!-)} => "https://access.redhat.com/documentation/en-us/red_hat_satellite/#{ForemanThemeSatellite::SATELLITE_SHORT_VERSION}/html/managing_hosts/registering_hosts#registering-a-host-to-satellite-using-the-bootstrap-script"
-  }.freeze
-end