foreman_theme_satellite 16.4.0 → 16.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98e86beca598ceb4aa66b0d6e4754371ab48e72ee48387518809d4ec647f6bfc
-  data.tar.gz: 7fed07fd050888777ed18dd85a2831708436665b42d79ef9f2b999c47031c247
+  metadata.gz: 32be64dac79d555b3e377502e059e1b3dd5a8fabcb459dbc8b778758a3b51409
+  data.tar.gz: eeb1151190cad9e338da092c25e2e96132e55b57a3f75763e730de42c50a2c91
 SHA512:
-  metadata.gz: 592a0e3703da9e37d7e53ff45afa35f138a5701991f186fc775a17a4c5fb8f94421c85131e58828f0d056be55b6f980bcde9b13ae448dff1fcba243387ab6842
-  data.tar.gz: 7f744e256220ab575cea9fbb8d4bbd5e7b578c6c8ee7e302af351f800d053d2c933cf6a572d42ac579d1ffdb9dc87399637e1f47ada894718b58aab0cfbb062a
+  metadata.gz: 50fe01b8ea75504bb0e290df0330b46cebe71f87df6f7778b9aa8f77fa7094ef31faca80e104c15319f855736096f0b2a3266900a5ca0b0d55e3fe45e05fb634
+  data.tar.gz: ff22352113ead26533ea39802ae51f214cc203165a897a1b2196d1e02d5a8555b932f8b7dbd469192e73fc16e00b009c8b971531f0724a4e9f21939a22254ff3

data/README.md

@@ -422,11 +422,17 @@ version: '6.8.000'
 documentation_version: "6.6"
 ```
 the metadata file should be called `/usr/share/satellite/metadata.yml` for
-production style deployments, or used from
+production style deployments, or used from the
 [source](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/config/metadata.yml)
-directory for development and test environments.
+directory for development and test environments. `SATELLITE_VERSION` and the
+`version` key take precedence over the lifecycle metadata.
 
-The mechanism resides in theme's
+The Satellite version is also provided by the `satellite-lifecycle` package in
+`/usr/share/satellite/lifecycle-metadata.yml` as `satellite_version`. This is
+used when the main metadata file is unavailable. If neither file is present,
+the theme falls back to `6.20.0-development`.
+
+The mechanism resides in the theme's
 [`engine.rb`](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/lib/foreman_theme_satellite/engine.rb#L119)
 
 ## Testing documentation
@@ -446,6 +452,11 @@ Another option is to add or change keys in `/usr/share/satellite/metadata.yml`:
 documentation_version: "6.6"
 ```
 
+The Satellite version itself is normally supplied by
+`/usr/share/satellite/lifecycle-metadata.yml` from the `satellite-lifecycle`
+package. Use the `version` key in `metadata.yml` or `SATELLITE_VERSION` only
+when an explicit override is required.
+
 There is also an automatic test that tests all documentation links on each PR,
 for the test to work
 [`metadata.yml`](https://github.com/RedHatSatellite/foreman_theme_satellite/blob/develop/config/metadata.yml)

data/lib/foreman_theme_satellite/engine.rb

@@ -2,6 +2,7 @@ require 'fast_gettext'
 require 'gettext_i18n_rails'
 require 'rubygems'
 require 'deface'
+require 'foreman_theme_satellite/lifecycle'
 
 module ForemanThemeSatellite
   class Engine < ::Rails::Engine
@@ -125,12 +126,16 @@ module ForemanThemeSatellite
     @metadata_yaml.fetch(key, default)
   end
 
+  def self.lifecycle_metadata_field(key, default)
+    ForemanThemeSatellite::Lifecycle.metadata.fetch(key, default)
+  end
+
   def self.lifecycle_data
     @lifecycle_data ||= ForemanThemeSatellite::Lifecycle.lifecycle_data(get_satellite_version)
   end
 
   def self.get_satellite_version
-    metadata_field('version', '6.15.0-development')
+    metadata_field('version', nil) || lifecycle_metadata_field('satellite_version', '6.20.0-development')
   end
 
   def self.get_satellite_short_version

data/{app/services → lib}/foreman_theme_satellite/lifecycle.rb

@@ -1,16 +1,19 @@
 module ForemanThemeSatellite
   class Lifecycle
     class << self
-      # rubocop:disable Metrics/AbcSize
-      def lifecycle_data(version)
+      def metadata
         metadata_path = ::ForemanThemeSatellite::LIFECYCLE_METADATA_PATH
+        File.exist?(metadata_path) ? (YAML.load_file(metadata_path) || {}) : {}
+      end
 
+      # rubocop:disable Metrics/AbcSize
+      def lifecycle_data(version)
+        yaml = metadata
         parsed = Foreman::Version.new(version)
         lifecycle_data = { current_version: version, short_version: "#{parsed.major}.#{parsed.minor}" }
 
-        return lifecycle_data unless File.exist?(metadata_path)
+        return lifecycle_data if yaml.empty?
 
-        yaml = YAML.load_file(metadata_path)
         raise "Unexpected lifecycle metadata file version '#{yaml['version']}'" unless yaml['version'] == '1'
 
         eol = yaml['releases'].fetch(lifecycle_data[:short_version], {})['end_of_life']

data/lib/foreman_theme_satellite/version.rb

@@ -1,3 +1,3 @@
 module ForemanThemeSatellite
-  VERSION = '16.4.0'.freeze
+  VERSION = '16.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_theme_satellite
 version: !ruby/object:Gem::Version
-  version: 16.4.0
+  version: 16.4.1
 platform: ruby
 authors:
 - Shimon Stein
@@ -100,7 +100,6 @@ files:
 - app/overrides/layouts/base/theme_style_resources.html.erb.deface
 - app/overrides/satellite_name_override.rb
 - app/services/concerns/setting_registry_branding.rb
-- app/services/foreman_theme_satellite/lifecycle.rb
 - app/services/foreman_theme_satellite/renderer_methods.rb
 - app/views/api/v2/home/status_extensions.json.rabl
 - app/views/foreman_theme_satellite/_theme_client_side_branding.js.erb
@@ -119,6 +118,7 @@ files:
 - lib/foreman_theme_satellite/documentation.rb
 - lib/foreman_theme_satellite/engine.rb
 - lib/foreman_theme_satellite/foreman_brand.rb
+- lib/foreman_theme_satellite/lifecycle.rb
 - lib/foreman_theme_satellite/pry_rack.rb
 - lib/foreman_theme_satellite/replacer_repository.rb
 - lib/foreman_theme_satellite/rss_checker_branding.rb
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: This is a plugin that enables building a theme for Foreman.
 test_files: []