securial 2.1.3 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6685ddf1efdce3df66dac73131e8cb8cb38c1c02841d469eeea090a32f5bf12d
-  data.tar.gz: 5e225dd6071383dda5b76636edf65549debabae162db4d434e67cb259fe4f8f5
+  metadata.gz: 914b5c4ac539dfc8c6994f001eeec7237a0fbda2030c828898864b9371ac2ac4
+  data.tar.gz: 3b23660aa0a8e439d0bfa46f8bfab87949634dd84a45eaedb91088058a1576d3
 SHA512:
-  metadata.gz: 5fb0b09611232bd05c972b5e122f7afd382d2666c87fde018ef4b10878c02db60b0d4ecbc6c0fade302948b0a9969b0dd675c56e7d176f0a535c5bdafbff311c
-  data.tar.gz: f332fd17e74bdec705ac54045a73b96ec4f4c738d37407dccb2858d2cd5cfe447c4ec34fb9910373c7c55d22c5d9cd2e5421543d3226d6f7a22257201dd63771
+  metadata.gz: 5f50a95757c49396f0c45ce9970e9f4333603e8499f8ae532def4f3d96252ec8dc91be4533f8f2cb190e2d905fd6cfcb4bccec4aad978ead7ed99bcedc40e183
+  data.tar.gz: a7e219a841c30569a68dec40b3ff2abbca4f446a60c6e0de7214a470bb188eb1bdcded2bea1c86a79ba5b31752f2b746bebde25c8b58ddce1dd4e6031d89fffb

data/lib/securial/cli.rb

@@ -197,22 +197,45 @@ module Securial
     # @param app_name [String] name of the Rails application
     # @return [void]
     #
-    def update_database_yml_host(app_name)
+    def update_database_yml_host(app_name) # rubocop:disable Metrics/MethodLength
       db_config_path = File.join(app_name, "config", "database.yml")
+
+      # Step 1: Parse to check adapter
       raw = File.read(db_config_path)
       rendered = ERB.new(raw).result
       config = YAML.safe_load(rendered, aliases: true) || {}
 
-      config["default"] ||= {}
-      return unless config["default"]["adapter"].is_a?(String) && !config["default"]["adapter"].empty?
-      return unless ["mysql2", "postgresql"].include?(config["default"]["adapter"])
-      config["default"]["host"] = "<%= ENV.fetch(\"DB_HOST\", \"localhost\") %>"
-      config["default"]["username"] = "<%= ENV.fetch(\"DB_USERNAME\") { \"postgres\" } %>"
-      config["default"]["password"] = "<%= ENV.fetch(\"DB_PASSWORD\") { \"postgres\" } %>"
+      adapter = config.dig("default", "adapter")
+      return unless adapter.is_a?(String) && %w[postgresql mysql2].include?(adapter)
+
+      # Step 2: Modify the raw YAML file line-by-line
+      lines = File.readlines(db_config_path)
+      updated_lines = []
+      inside_default = false
+      inserted = false
+
+      lines.each do |line|
+        updated_lines << line
+
+        if line =~ /^default:/
+          inside_default = true
+          next
+        end
+
+        if inside_default && line.strip.start_with?("adapter:")
+          # Insert immediately after the adapter line
+          updated_lines += [
+            "  host: <%= ENV.fetch(\"DB_HOST\", \"localhost\") %>\n",
+            "  username: <%= ENV.fetch(\"DB_USERNAME\") { \"postgres\" } %>\n",
+            "  password: <%= ENV.fetch(\"DB_PASSWORD\") { \"postgres\" } %>\n",
+          ]
+          inserted = true
+        end
 
-      # Dump YAML manually to preserve formatting
-      yaml = config.to_yaml.gsub(/['"](<%= .*? %>)['"]/, '\1') # Unquote the ERB
-      File.write(db_config_path, yaml)
+        # Exit `default:` block when another top-level key appears
+        inside_default = false if inside_default && line =~ /^\S/ && line !~ /^\s/
+      end
+      File.write(db_config_path, updated_lines.join)
     end
 
     # Adds the Securial gem to the application's Gemfile.

data/lib/securial/version.rb

@@ -6,5 +6,5 @@ module Securial
   #
   # @see https://semver.org/ Semantic Versioning 2.0.0
   # @return [String] the current version in the format "major.minor.patch"
-  VERSION = "2.1.3".freeze
+  VERSION = "2.1.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: securial
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.6
 platform: ruby
 authors:
 - Aly Badawy