rails_app_version 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb48e4aced45b5ef329637e79b28124a30738a27150af084d32d10f648f9afd5
-  data.tar.gz: 004f482315db18e853c4f372bd480abf7b295c62fc6e49af1f970d046223ac2e
+  metadata.gz: c41e184fea20b627c872461c8fa973f24e1d7796ab17f285139254c5dea9347b
+  data.tar.gz: 37a270bd254b40ae1266f2ccf6ca3333e9eeea4e045487b5c6ba9c71a66f25da
 SHA512:
-  metadata.gz: b3002877e2c16298b37022d68ef7a1205321e16734f77c154f489450b9b464836dd02993fb8cbff1b68d861e276fad04e94685dfe0cc55d2cbb9ecf834da74fb
-  data.tar.gz: '09c8b2e6a8c7dbf311a3db7d0f47d3dd0fb6a2368dc34e6432bd1f612845118c0c8d235ab669a127988c8879eae0c01f674f5d8f83c1568d589bd774ca2c564c'
+  metadata.gz: 937af3be9c3f04a6fad951baba9534bd55f8c71ffe5b353c3ff57820987b60be5465b771acd4d5409f2501c9b9f36f4fc976d2d01cc2e9945aed274abb14b725
+  data.tar.gz: 6d8c60f28f77268385bb89eb1c4b791226359bf29b50af21be981e9dac9c69c036f238c31de69830d568b88df7df4eadf6332477de6a1f9295f2a5c0054815d3

data/Rakefile

@@ -1,7 +1,5 @@
 require "bundler/setup"
 
-load "rails/tasks/statistics.rake"
-
 require "bundler/gem_tasks"
 
 # Load Rakefile of the dummy app

data/lib/rails_app_version/railtie.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 module RailsAppVersion
   class Railtie < ::Rails::Railtie
+    CONFIG_FILE = "app_version.yml".freeze
+
     class << self
       def root
         @root ||= Pathname.new(File.expand_path(File.expand_path("../../", __dir__)))
@@ -9,52 +13,62 @@ module RailsAppVersion
     attr_reader :app_config, :version, :env
 
     rake_tasks do
-      namespace :app do
-        namespace :version do
-          desc "Copy config/app_version.yml to the main app config directory"
-          task :config do
-            source = Railtie.root.join("config", "app_version.yml")
-            destination = Rails.root.join("config", "app_version.yml")
-
-            FileUtils.cp(source, destination)
-
-            puts "Installed app_version.yml to #{destination}"
-          end
-        end
-      end
+      load File.expand_path("../../tasks/app_version_tasks.rake", __FILE__)
     end
 
-    # Console
     console do
-      # rubocop:disable Rails/Output
-      puts "Welcome to the Rails console!"
-      puts "Ruby version: #{RUBY_VERSION}"
-      puts "Application environment: #{Rails.application.env}"
-      puts "Application version: #{Rails.application.version}"
-      puts "To exit, press `Ctrl + D`."
-      # rubocop:enable Rails/Output
+      print_console_banner
     end
 
-    initializer "fetch_config" do |app|
-      @app_config = begin
-                      app.config_for(:app_version, env: Rails.env)
-                    rescue RuntimeError => e # file is not found
-                      # Load the default configuration from the gem
-                      require "erb"
-                      yaml = Railtie.root.join("config", "app_version.yml")
-                      all_configs = ActiveSupport::ConfigurationFile.parse(yaml).deep_symbolize_keys
-                      all_configs[:shared]
-                    end
-      @version = RailsAppVersion::Version.create(@app_config[:version], @app_config[:revision])
+    initializer "rails_app_version.fetch_config" do |app|
+      @app_config = load_config(app)
+      @version = Version.create(@app_config[:version], @app_config[:revision])
       @env = ActiveSupport::StringInquirer.new(@app_config.fetch(:environment, Rails.env))
     end
 
-    initializer "middleware" do |app|
+    initializer "rails_app_version.middleware" do |app|
       # Add the middleware to the stack if enabled
       if @app_config.dig(:middleware, :enabled)
         options = @app_config.dig(:middleware, :options) || {}
-        app.middleware.insert_before Rails::Rack::Logger, RailsAppVersion::AppInfoMiddleware, **options
+        app.middleware.insert_before Rails::Rack::Logger, AppInfoMiddleware, options
       end
     end
+
+    initializer "rails_app_version.extend_application" do |app|
+      Rails::Application.include AppEnvironment
+      Rails::Application.include AppVersion
+    end
+
+    private
+
+    def load_config(app)
+      app.config_for(:app_version, env: Rails.env)
+    rescue StandardError => e
+      Rails.logger.warn("Could not load app_version.yml: #{e.message}. Using default configuration.")
+      load_default_config
+    end
+
+    def load_default_config
+      yaml_path = Railtie.root.join("config", CONFIG_FILE)
+      all_configs = parse_yaml_config(yaml_path)
+      all_configs[:shared] || {}
+    end
+
+    def parse_yaml_config(path)
+      return {} unless File.exist?(path)
+
+      require "erb"
+      ActiveSupport::ConfigurationFile.parse(path).deep_symbolize_keys
+    end
+
+    def self.print_console_banner
+      # rubocop:disable Rails/Output
+      puts "Welcome to the Rails console!"
+      puts "Ruby version: #{RUBY_VERSION}"
+      puts "Application environment: #{Rails.application.env}"
+      puts "Application version: #{Rails.application.version&.full}"
+      puts "To exit, press `Ctrl + D`."
+      # rubocop:enable Rails/Output
+    end
   end
 end

data/lib/rails_app_version/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RailsAppVersion
-  VERSION = "1.2.4"
+  VERSION = "1.3.0"
 
   class Version < Gem::Version
     attr_reader :major, :minor, :patch, :pre, :revision

data/lib/rails_app_version.rb

@@ -3,17 +3,13 @@
 require "rails"
 require "rails/application"
 require "rails_app_version/version"
-require "rails_app_version/railtie"
 require "rails_app_version/app_version"
 require "rails_app_version/app_environment"
-require "rails_app_version/version"
 require "action_controller/railtie"
+require "rails_app_version/railtie"
 
 module RailsAppVersion
   extend ActiveSupport::Autoload
 
   autoload :AppInfoMiddleware
 end
-
-Rails::Application.include RailsAppVersion::AppVersion
-Rails::Application.include RailsAppVersion::AppEnvironment

data/lib/tasks/app_version_tasks.rake

@@ -0,0 +1,26 @@
+# lib/tasks/app_version_tasks.rake
+namespace :app do
+  namespace :version do
+    desc "Copy config/app_version.yml to the main app config directory"
+    task :config do
+      source = RailsAppVersion::Railtie.root.join("config", RailsAppVersion::Railtie::CONFIG_FILE)
+      destination = Rails.root.join("config", RailsAppVersion::Railtie::CONFIG_FILE)
+
+      if File.exist?(destination)
+        puts "Config file already exists at #{destination}"
+        print "Overwrite? (y/n): "
+        next unless $stdin.gets.strip.downcase == "y"
+      end
+
+      FileUtils.cp(source, destination)
+      puts "Installed #{RailsAppVersion::Railtie::CONFIG_FILE} to #{destination}"
+    end
+
+    desc "Display current application version information"
+    task info: :environment do
+      puts "Application version: #{Rails.application.version}"
+      puts "Environment: #{Rails.application.env}"
+      puts "Config: #{Rails.application.app_config.inspect}"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails_app_version
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 bindir: bin
 cert_chain: []
-date: 2025-01-01 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -73,6 +73,7 @@ files:
 - lib/rails_app_version/app_version.rb
 - lib/rails_app_version/railtie.rb
 - lib/rails_app_version/version.rb
+- lib/tasks/app_version_tasks.rake
 homepage: https://github.com/seuros/rails_app_version
 licenses: []
 metadata:
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Get the version of your Rails app
 test_files: []